Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
Podhorszki, Norbert
ADIOS2
Commits
a1b2666a
Unverified
Commit
a1b2666a
authored
Jun 29, 2019
by
pnorbert
Committed by
GitHub
Jun 29, 2019
Browse files
Merge pull request #1582 from pnorbert/germasch-msvc-fixes
fix MSVC/conda build (resubmit #1575)
parents
425033da
d0c3be17
Changes
4
Hide whitespace changes
Inline
Side-by-side
source/adios2/helper/adiosMemory.h
View file @
a1b2666a
...
...
@@ -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
&
src
Coun
t
,
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
CopyMemory
Block
(
T
*
dest
,
const
Dims
&
destStart
,
const
Dims
&
destCount
,
const
bool
destRowMajor
,
const
U
*
src
,
const
Dims
&
src
Star
t
,
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
,
...
...
source/adios2/helper/adiosMemory.inl
View file @
a1b2666a
...
...
@@ -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 &src
Coun
t, const
bool srcRowMajor
,
const bool
endianReverse, const Dims &destMemStart
,
const Dims &destMem
Coun
t, const Dims &
srcMemStar
t,
const Dims &srcMemCount) noexcept
void CopyMemory
Block
(T *dest, const Dims &destStart, const Dims &destCount,
const bool destRowMajor, const U *src,
const Dims &src
Star
t, const
Dims &srcCount
,
const bool
srcRowMajor, const bool endianReverse
,
const Dims &destMem
Star
t, const Dims &
destMemCoun
t,
const Dims &srcMemStart,
const Dims &srcMemCount) noexcept
{
// transform everything to payload dims
const Dims destStartPayload = PayloadDims<T>(destStart, destRowMajor);
...
...
source/adios2/toolkit/format/bp3/BP3Serializer.tcc
View file @
a1b2666a
...
...
@@ -862,7 +862,7 @@ void BP3Serializer::PutPayloadInBuffer(
ProfilerStart("memcpy");
if (!blockInfo.MemoryStart.empty())
{
helper::CopyMemory(
helper::CopyMemory
Block
(
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(),
...
...
source/adios2/toolkit/format/bp4/BP4Serializer.tcc
View file @
a1b2666a
...
...
@@ -883,7 +883,7 @@ void BP4Serializer::PutPayloadInBuffer(
if (!blockInfo.MemoryStart.empty())
{
// TODO make it a BP4Serializer function
helper::CopyMemory(
helper::CopyMemory
Block
(
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(),
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment