Unverified Commit 43591d41 authored by Bolea Sanchez, Vicente Adolfo's avatar Bolea Sanchez, Vicente Adolfo Committed by GitHub
Browse files

Merge pull request #4377 from anagainaru/ndcopy-no-break-abi 

Overload NdCopy instead of adding a new argument for the 2.10 release
parents d8e8822a ee1ee295

source/adios2/helper/adiosMemory.cpp

+11 −0
Original line number Diff line number Diff line
@@ -252,7 +252,18 @@ int NdCopy(const char *in, const CoreDims &inStart, const CoreDims &inCount, 
           const bool outIsLittleEndian, const int typeSize, const CoreDims &inMemStart,

           const CoreDims &inMemCount, const CoreDims &outMemStart, const CoreDims &outMemCount,

           const bool safeMode, MemorySpace MemSpace)

{

    return NdCopy(in, inStart, inCount, inIsRowMajor, inIsLittleEndian, out, outStart, outCount,

                  outIsRowMajor, outIsLittleEndian, typeSize, inMemStart, inMemCount, outMemStart,

                  outMemCount, safeMode, MemSpace, false);

}



int NdCopy(const char *in, const CoreDims &inStart, const CoreDims &inCount,

           const bool inIsRowMajor, const bool inIsLittleEndian, char *out,

           const CoreDims &outStart, const CoreDims &outCount, const bool outIsRowMajor,

           const bool outIsLittleEndian, const int typeSize, const CoreDims &inMemStart,

           const CoreDims &inMemCount, const CoreDims &outMemStart, const CoreDims &outMemCount,

           const bool safeMode, const MemorySpace MemSpace, const bool duringWrite)

{



    // use values of ioStart and ioCount if ioMemStart and ioMemCount are

source/adios2/helper/adiosMemory.h

+7 −0
Original line number Diff line number Diff line
@@ -242,6 +242,13 @@ int NdCopy(const char *in, const CoreDims &inStart, const CoreDims &inCount, 
           const CoreDims &outMemStart = CoreDims(), const CoreDims &outMemCount = CoreDims(),

           const bool safeMode = false, MemorySpace MemSpace = MemorySpace::Host);



int NdCopy(const char *in, const CoreDims &inStart, const CoreDims &inCount,

           const bool inIsRowMajor, const bool inIsLittleEndian, char *out,

           const CoreDims &outStart, const CoreDims &outCount, const bool outIsRowMajor,

           const bool outIsLittleEndian, const int typeSize, const CoreDims &inMemStart,

           const CoreDims &inMemCount, const CoreDims &outMemStart, const CoreDims &outMemCount,

           const bool safeMode, const MemorySpace MemSpace, const bool duringWrite);



template <class T>

size_t PayloadSize(const T *data, const Dims &count) noexcept;