Skip to content
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

Jump to bottom

fix MSVC/conda build (resubmit #1575) #1582

Merged
merged 1 commit into from
Jun 30, 2019
Merged

fix MSVC/conda build (resubmit #1575) #1582

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 8 additions & 8 deletions source/adios2/helper/adiosMemory.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,14 +111,14 @@ T ReadValue(const std::vector<char> &buffer, size_t &position,
* @param srcMemCount
*/
template <class T, class U>
void CopyMemory(T *dest, const Dims &destStart, const Dims &destCount,
const bool destRowMajor, const U *src, const Dims &srcStart,
const Dims &srcCount, const bool srcRowMajor,
const bool endianReverse = false,
const Dims &destMemStart = Dims(),
const Dims &destMemCount = Dims(),
const Dims &srcMemStart = Dims(),
const Dims &srcMemCount = Dims()) noexcept;
void CopyMemoryBlock(T *dest, const Dims &destStart, const Dims &destCount,
const bool destRowMajor, const U *src,
const Dims &srcStart, const Dims &srcCount,
const bool srcRowMajor, const bool endianReverse = false,
const Dims &destMemStart = Dims(),
const Dims &destMemCount = Dims(),
const Dims &srcMemStart = Dims(),
const Dims &srcMemCount = Dims()) noexcept;

void CopyPayload(char *dest, const Dims &destStart, const Dims &destCount,
const bool destRowMajor, const char *src, const Dims &srcStart,
Expand Down
12 changes: 6 additions & 6 deletions source/adios2/helper/adiosMemory.inl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -252,12 +252,12 @@ void ClipVector(std::vector<T> &vec, const size_t start,
}

template <class T, class U>
void CopyMemory(T *dest, const Dims &destStart, const Dims &destCount,
const bool destRowMajor, const U *src, const Dims &srcStart,
const Dims &srcCount, const bool srcRowMajor,
const bool endianReverse, const Dims &destMemStart,
const Dims &destMemCount, const Dims &srcMemStart,
const Dims &srcMemCount) noexcept
void CopyMemoryBlock(T *dest, const Dims &destStart, const Dims &destCount,
const bool destRowMajor, const U *src,
const Dims &srcStart, const Dims &srcCount,
const bool srcRowMajor, const bool endianReverse,
const Dims &destMemStart, const Dims &destMemCount,
const Dims &srcMemStart, const Dims &srcMemCount) noexcept
{
// transform everything to payload dims
const Dims destStartPayload = PayloadDims<T>(destStart, destRowMajor);
Expand Down
2 changes: 1 addition & 1 deletion source/adios2/toolkit/format/bp3/BP3Serializer.tcc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -862,7 +862,7 @@ void BP3Serializer::PutPayloadInBuffer(
ProfilerStart("memcpy");
if (!blockInfo.MemoryStart.empty())
{
helper::CopyMemory(
helper::CopyMemoryBlock(
reinterpret_cast<T *>(m_Data.m_Buffer.data() + m_Data.m_Position),
blockInfo.Start, blockInfo.Count, sourceRowMajor, blockInfo.Data,
blockInfo.Start, blockInfo.Count, sourceRowMajor, false, Dims(),
Expand Down
2 changes: 1 addition & 1 deletion source/adios2/toolkit/format/bp4/BP4Serializer.tcc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -883,7 +883,7 @@ void BP4Serializer::PutPayloadInBuffer(
if (!blockInfo.MemoryStart.empty())
{
// TODO make it a BP4Serializer function
helper::CopyMemory(
helper::CopyMemoryBlock(
reinterpret_cast<T *>(m_Data.m_Buffer.data() + m_Data.m_Position),
blockInfo.Start, blockInfo.Count, sourceRowMajor, blockInfo.Data,
blockInfo.Start, blockInfo.Count, sourceRowMajor, false, Dims(),
Expand Down