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

Overload NdCopy instead of adding a new argument for the 2.10 release
ornladios · Oct 24, 2024 · 43591d4 · 43591d4
2 parents d8e8822 + ee1ee29
commit 43591d4
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 0 deletions.
diff --git a/source/adios2/helper/adiosMemory.cpp b/source/adios2/helper/adiosMemory.cpp
@@ -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

diff --git a/source/adios2/helper/adiosMemory.h b/source/adios2/helper/adiosMemory.h
@@ -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;