Skip to content

DataAlgo : Move to dedicated namespace #1561

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
johnhaddon wants to merge 2 commits into
base: main
Choose a base branch
from
Open

DataAlgo : Move to dedicated namespace #1561

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bbd1978
DataAlgo : Move to dedicated namespace
johnhaddon Sep 9, 2026
ab69dc4
DataAlgo clients : Use DataAlgo namespace
johnhaddon Sep 9, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions Changes
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
10.7.x.x (relative to 10.7.1.3)
========

Improvements
------------

- DataAlgo : Moved all functionality into an `IECore::DataAlgo` namespace.

10.7.1.3 (relative to 10.7.1.2)
========
Expand Down
2 changes: 1 addition & 1 deletion contrib/IECoreAlembic/src/IECoreAlembic/CurvesReader.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ class CurvesReader : public PrimitiveReader
auto it = result->variables.find( "uv" );
if( it != result->variables.end() )
{
setGeometricInterpretation( it->second.data.get(), GeometricData::UV );
DataAlgo::setGeometricInterpretation( it->second.data.get(), GeometricData::UV );
}
}

Expand Down
22 changes: 11 additions & 11 deletions contrib/IECoreUSD/src/IECoreUSD/DataAlgo.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ template<typename T>
IECore::DataPtr dataFromValue( const pxr::VtValue &value, GeometricData::Interpretation interpretation, bool arrayAccepted )
{
using CortexDataType = typename USDTypeTraits<T>::CortexDataType;
typename CortexDataType::Ptr d = new CortexDataType( DataAlgo::fromUSD( value.Get<T>() ) );
typename CortexDataType::Ptr d = new CortexDataType( IECoreUSD::DataAlgo::fromUSD( value.Get<T>() ) );
setInterpretation( d.get(), interpretation );
return d;
}
Expand All @@ -153,7 +153,7 @@ IECore::DataPtr dataFromArray( const pxr::VtValue &value, GeometricData::Interpr
return dataFromValue<T>( VtValue( a[0] ), interpretation, arrayAccepted );
}

auto d = DataAlgo::fromUSD( a );
auto d = IECoreUSD::DataAlgo::fromUSD( a );
setInterpretation( d.get(), interpretation );
return d;
}
Expand Down Expand Up @@ -318,7 +318,7 @@ IECore::DataPtr colorDataFromArray( const pxr::VtValue &value, bool arrayAccepte
IECore::msg( IECore::Msg::Warning, "IECoreUSD::DataAlgo::fromUSD", "Array not accepted but array length is not 1" );
return nullptr;
}
return new TypedData<CortexType>( DataAlgo::fromUSD( array[0] ) );
return new TypedData<CortexType>( IECoreUSD::DataAlgo::fromUSD( array[0] ) );
}

return new TypedData<vector<CortexType>>(
Expand Down Expand Up @@ -425,7 +425,7 @@ struct VtValueFromData
array.reserve( data->readable().size() );
for( const auto &e : data->readable() )
{
array.push_back( DataAlgo::toUSD( e ) );
array.push_back( IECoreUSD::DataAlgo::toUSD( e ) );
}
return VtValue( array );
}
Expand All @@ -445,9 +445,9 @@ struct VtValueFromData
{
using USDType = typename CortexTypeTraits<T>::USDType;
using ArrayType = VtArray<USDType>;
return VtValue( ArrayType( 1, DataAlgo::toUSD( data->readable() ) ) );
return VtValue( ArrayType( 1, IECoreUSD::DataAlgo::toUSD( data->readable() ) ) );
}
return VtValue( DataAlgo::toUSD( data->readable() ) );
return VtValue( IECoreUSD::DataAlgo::toUSD( data->readable() ) );
}

VtValue operator()( const IECore::CompoundData *data, bool arrayRequired )
Expand All @@ -460,7 +460,7 @@ struct VtValueFromData
VtDictionary result;
for( const auto &[name, value] : data->readable() )
{
VtValue v = DataAlgo::toUSD( value.get() );
VtValue v = IECoreUSD::DataAlgo::toUSD( value.get() );
if( !v.IsEmpty() )
{
result[name] = v;
Expand Down Expand Up @@ -489,7 +489,7 @@ pxr::VtValue IECoreUSD::DataAlgo::toUSD( const IECore::Data *data, bool arrayReq
// Manual dispatch since CompoundData not handled by `dispatch()`.
return valueFromData( cd, arrayRequired );
}
return IECore::dispatch( data, valueFromData, arrayRequired );
return IECore::DataAlgo::dispatch( data, valueFromData, arrayRequired );
}
catch( const IECore::Exception & )
{
Expand Down Expand Up @@ -528,14 +528,14 @@ struct VtValueTypeNameFromData
{
using ArrayType = VtArray<typename CortexTypeTraits<T>::USDType>;
const auto &s = SdfSchema::GetInstance();
return s.FindType( TfType::Find<ArrayType>(), DataAlgo::role( data->getInterpretation() ) );
return s.FindType( TfType::Find<ArrayType>(), IECoreUSD::DataAlgo::role( data->getInterpretation() ) );
}

template<typename T>
SdfValueTypeName operator()( const IECore::GeometricTypedData<T> *data ) const
{
const auto &s = SdfSchema::GetInstance();
return s.FindType( TfType::Find<typename CortexTypeTraits<T>::USDType>(), DataAlgo::role( data->getInterpretation() ) );
return s.FindType( TfType::Find<typename CortexTypeTraits<T>::USDType>(), IECoreUSD::DataAlgo::role( data->getInterpretation() ) );
}

// Colors
Expand Down Expand Up @@ -600,7 +600,7 @@ pxr::SdfValueTypeName IECoreUSD::DataAlgo::valueTypeName( const IECore::Data *da
{
try
{
return IECore::dispatch( data, VtValueTypeNameFromData() );
return IECore::DataAlgo::dispatch( data, VtValueTypeNameFromData() );
}
catch( const IECore::Exception & )
{
Expand Down
10 changes: 5 additions & 5 deletions contrib/IECoreUSD/src/IECoreUSD/PrimitiveAlgo.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,7 @@ pxr::VtValue IECoreUSD::PrimitiveAlgo::toUSDExpanded( const IECoreScene::Primiti
}
else
{
return IECore::dispatch( primitiveVariable.data.get(), VtValueFromExpandedData(), primitiveVariable.indices.get() );
return IECore::DataAlgo::dispatch( primitiveVariable.data.get(), VtValueFromExpandedData(), primitiveVariable.indices.get() );
}
}

Expand Down Expand Up @@ -230,7 +230,7 @@ void readPrimitiveVariable( const pxr::UsdGeomPrimvar &primVar, pxr::UsdTimeCode
return;
}

IECore::DataPtr data = DataAlgo::fromUSD(
IECore::DataPtr data = IECoreUSD::DataAlgo::fromUSD(
value, primVar.GetTypeName(),
/* arrayAccepted = */ interpolation != IECoreScene::PrimitiveVariable::Constant || constantAcceptsArray
);
Expand All @@ -245,7 +245,7 @@ void readPrimitiveVariable( const pxr::UsdGeomPrimvar &primVar, pxr::UsdTimeCode
IECore::IntVectorDataPtr indices;
if( !srcIndices.empty() )
{
indices = DataAlgo::fromUSD( srcIndices );
indices = IECoreUSD::DataAlgo::fromUSD( srcIndices );
}

addPrimitiveVariableIfValid(
Expand Down Expand Up @@ -419,7 +419,7 @@ bool readPrimitiveVariables( const pxr::UsdSkelRoot &skelRoot, const pxr::UsdGeo
}

Canceller::check( canceller );
auto p = boost::static_pointer_cast<V3fVectorData>( DataAlgo::fromUSD( points ) );
auto p = boost::static_pointer_cast<V3fVectorData>( IECoreUSD::DataAlgo::fromUSD( points ) );
if( !p )
{
return false;
Expand Down Expand Up @@ -461,7 +461,7 @@ bool readPrimitiveVariables( const pxr::UsdSkelRoot &skelRoot, const pxr::UsdGeo

if( normalsValid )
{
auto n = boost::static_pointer_cast<V3fVectorData>( DataAlgo::fromUSD( normals ) );
auto n = boost::static_pointer_cast<V3fVectorData>( IECoreUSD::DataAlgo::fromUSD( normals ) );
n->setInterpretation( GeometricData::Normal );
addPrimitiveVariableIfValid(
primitive, "N", IECoreScene::PrimitiveVariable( PrimitiveAlgo::fromUSD( normalsInterpolation ), n ),
Expand Down
Loading
Loading