fix: Restart files contain incorrect types for ArrayOfArrays #3434
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -490,6 +490,100 @@ | |
| std::memcpy( var.data(), valuesNode.data_ptr(), numBytesFromArray ); | ||
| } | ||
|
|
||
|
|
||
|
|
||
| template< typename T, typename INDEX_TYPE > | ||
| std::enable_if_t< bufferOps::can_memcpy< T > > | ||
| pushDataToConduitNode( ArrayOfArrays< T, INDEX_TYPE > const & var2, | ||
| conduit::Node & node ) | ||
| { | ||
| ArrayOfArraysView< T const, INDEX_TYPE > const & var = var2.toViewConst(); | ||
| internal::logOutputType( LvArray::system::demangleType( var ), "Output array via external pointer: " ); | ||
|
|
||
| // ArrayOfArray::m_numArrays | ||
| INDEX_TYPE const numArrays = var.size(); | ||
| conduit::DataType const numArraysType( conduitTypeInfo< INDEX_TYPE >::id, 1 ); | ||
| node[ "__numberOfArrays__" ].set( numArraysType, const_cast< void * >( static_cast< void const * >(&numArrays) ) ); | ||
|
|
||
| // ArrayOfArray::m_offsets | ||
| INDEX_TYPE const * const offsets = var.getOffsets(); | ||
| conduit::DataType const offsetsType( conduitTypeInfo< INDEX_TYPE >::id, numArrays+1 ); | ||
| node[ "__offsets__" ].set_external( offsetsType, const_cast< void * >( static_cast< void const * >( offsets ) ) ); | ||
|
|
||
| // ArrayOfArray::m_sizes | ||
| INDEX_TYPE const * const sizes = var.getSizes(); | ||
| conduit::DataType const sizesType( conduitTypeInfo< INDEX_TYPE >::id, numArrays ); | ||
| node[ "__sizes__" ].set_external( sizesType, const_cast< void * >( static_cast< void const * >( sizes ) ) ); | ||
|
|
||
| // Push the data into conduit | ||
| constexpr int conduitTypeID = conduitTypeInfo< T >::id; | ||
| constexpr int sizeofConduitType = conduitTypeInfo< T >::sizeOfConduitType; | ||
| conduit::DataType const dtype( conduitTypeID, offsets[numArrays] * sizeof( T ) / sizeofConduitType ); | ||
|
There was a problem hiding this comment. I don't fully understand the size here. What' s in Shouldn't this be the size of each array * There was a problem hiding this comment.
There was a problem hiding this comment. oh I see. I would write this exact comment in the code. There was a problem hiding this comment. From /// The number of arrays contained.
INDEX_TYPE_NC m_numArrays = 0;
/// Holds the offset of each array, of length m_numArrays + 1. Array i begins at
/// m_offsets[ i ] and has capacity m_offsets[i+1] - m_offsets[ i ].
BUFFER_TYPE< INDEX_TYPE > m_offsets;
/// Holds the size of each array.
BUFFER_TYPE< SIZE_TYPE > m_sizes;
/// Holds the values of each array. Values in the range [m_offsets[ i ], m_offsets[ i ] + m_sizes[ i ])
/// are valid. All other entries contain uninitialized values.
BUFFER_TYPE< T > m_values;There was a problem hiding this comment. I agree with Randy. The last offset is one measure of the total length of the underlying memory. Other measures are the capacity from the underlying buffer, or offsets(numArrays - 1) + sizeOfArray(numArrays - 1) which would be the end of the valid values. For io you should only need to write up to this last value. There was a problem hiding this comment. @corbett5 I did notice it would be nice for a bit different nomenclature for this object....for example:
There was a problem hiding this comment. 1If you're accessing the underlying data (ie through There is a way to get the total underlying buffer capacity /**
* @return Return the total number values that can be stored before reallocation.
*/
LVARRAY_HOST_DEVICE constexpr inline
INDEX_TYPE_NC valueCapacity() const
{ return m_values.capacity(); }One way to do IO for the whole buffer would be std::copy(arrayOfArryays[1].begin(), arrayOfArrays[arrayOfArrays.size() - 1].end(), dst_iter);2Certainly open for a name change. I thought I tried to call them inner arrays in the docs, but it's certainly confusing. 3I agree it's strange that you can |
||
| void * const ptr = const_cast< void * >( static_cast< void const * >( var.getValues() ) ); | ||
| node[ "__values__" ].set_external( dtype, ptr ); | ||
| } | ||
|
|
||
| // This is an LvArray that doesn't need to be packed. | ||
| template< typename T, typename INDEX_TYPE > | ||
| std::enable_if_t< bufferOps::can_memcpy< T > > | ||
| pullDataFromConduitNode( ArrayOfArrays< T, INDEX_TYPE > & var, | ||
| conduit::Node const & node ) | ||
| { | ||
|
|
||
|
|
||
| conduit::Node const & numArraysNode = node.fetch_existing( "__numberOfArrays__" ); | ||
| INDEX_TYPE const * const numArrays = numArraysNode.value(); | ||
|
|
||
| conduit::Node const & offsetsNode = node.fetch_existing( "__offsets__" ); | ||
| conduit::DataType const & offsetsDataType = offsetsNode.dtype(); | ||
| INDEX_TYPE const * const offsets = offsetsNode.value(); | ||
| INDEX_TYPE const sizeOffsets = offsetsDataType.number_of_elements(); | ||
|
|
||
| conduit::Node const & sizesNode = node.fetch_existing( "__sizes__" ); | ||
| conduit::DataType const & sizesDataType = sizesNode.dtype(); | ||
| INDEX_TYPE const * const sizes = sizesNode.value(); | ||
| INDEX_TYPE const sizeSizes = sizesDataType.number_of_elements(); | ||
|
|
||
| GEOS_ERROR_IF_NE( *numArrays, sizeSizes ); | ||
| GEOS_ERROR_IF_NE( *numArrays+1, sizeOffsets ); | ||
|
|
||
| // values node | ||
| conduit::Node const & valuesNode = node.fetch_existing( "__values__" ); | ||
| conduit::DataType const & valuesDataType = valuesNode.dtype(); | ||
| const INDEX_TYPE valuesSize = valuesDataType.number_of_elements(); | ||
|
|
||
| var.resize( *numArrays, valuesSize/(*numArrays) ); | ||
| localIndex allocatedSize = 0; | ||
| for( INDEX_TYPE i = 0; i < *numArrays; ++i ) | ||
| { | ||
| INDEX_TYPE const arrayAllocation = offsets[i+1] - offsets[i]; | ||
| var.setCapacityOfArray( i, arrayAllocation ); | ||
| var.resizeArray( i, sizes[ i ] ); | ||
| allocatedSize += arrayAllocation; | ||
| } | ||
| ArrayOfArraysView< T const, INDEX_TYPE > const & varView = var.toViewConst(); | ||
|
|
||
| GEOS_ERROR_IF_NE( valuesSize, allocatedSize ); | ||
| GEOS_ERROR_IF_NE( allocatedSize, offsets[sizeOffsets] ); | ||
|
|
||
| INDEX_TYPE const * const varOffsets = varView.getOffsets(); | ||
| INDEX_TYPE const * const varSizes = varView.getSizes(); | ||
|
|
||
| GEOS_ERROR_IF_NE( varOffsets[0], offsets[0] ); | ||
| for( INDEX_TYPE i = 0; i<*numArrays; ++i ) | ||
| { | ||
| GEOS_ERROR_IF_NE( varOffsets[i+1], offsets[i+1] ); | ||
| GEOS_ERROR_IF_NE( varSizes[i], sizes[i] ); | ||
| } | ||
|
|
||
|
|
||
| localIndex numBytesFromArray = allocatedSize * sizeof( T ); | ||
| // GEOS_ERROR_IF_NE( numBytesFromArray, valuesNode.dtype().strided_bytes() ); | ||
rrsettgast marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| std::memcpy( &var( 0, 0 ), valuesNode.data_ptr(), numBytesFromArray ); | ||
| } | ||
|
|
||
|
|
||
|
|
||
| template< typename T > | ||
| void pushDataToConduitNode( InterObjectRelation< T > const & var, | ||
| conduit::Node & node ) | ||
|
|
||
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
or maybe you want it as a comment?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
yes