From bd5adb919fe2ea5bef5fb775887ec107e5b23778 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jean-No=C3=ABl=20Grad?= <jgrad@icp.uni-stuttgart.de>
Date: Mon, 11 Nov 2024 19:16:05 +0100
Subject: [PATCH] Fix PackInfo codegen
---
.../pystencils_walberla/templates/CpuPackInfo.tmpl.h | 12 ++++++++++--
.../pystencils_walberla/templates/GpuPackInfo.tmpl.h | 2 +-
src/communication/UniformPackInfo.h | 8 ++++++++
3 files changed, 19 insertions(+), 3 deletions(-)
diff --git a/python/pystencils_walberla/templates/CpuPackInfo.tmpl.h b/python/pystencils_walberla/templates/CpuPackInfo.tmpl.h
index 66114de6e..716da0445 100644
--- a/python/pystencils_walberla/templates/CpuPackInfo.tmpl.h
+++ b/python/pystencils_walberla/templates/CpuPackInfo.tmpl.h
@@ -25,6 +25,8 @@
#include "domain_decomposition/IBlock.h"
#include "communication/UniformPackInfo.h"
+#include <memory>
+
#define FUNC_PREFIX
#ifdef __GNUC__
@@ -52,7 +54,10 @@ public:
void unpackData(IBlock * receiver, stencil::Direction dir, mpi::RecvBuffer & buffer) {
const auto dataSize = size(dir, receiver);
- unpack(dir, buffer.skip(dataSize), receiver);
+ auto bufferSize = dataSize + sizeof({{dtype}});
+ auto bufferPtr = reinterpret_cast<void*>(buffer.skip(bufferSize));
+ std::align(alignof({{dtype}}), dataSize, bufferPtr, bufferSize);
+ unpack(dir, reinterpret_cast<unsigned char*>(bufferPtr), receiver);
}
void communicateLocal(const IBlock * sender, IBlock * receiver, stencil::Direction dir) {
@@ -65,7 +70,10 @@ public:
void packDataImpl(const IBlock * sender, stencil::Direction dir, mpi::SendBuffer & outBuffer) const {
const auto dataSize = size(dir, sender);
- pack(dir, outBuffer.forward(dataSize), const_cast<IBlock*>(sender));
+ auto bufferSize = dataSize + sizeof({{dtype}});
+ auto bufferPtr = reinterpret_cast<void*>(outBuffer.forward(bufferSize));
+ std::align(alignof({{dtype}}), dataSize, bufferPtr, bufferSize);
+ pack(dir, reinterpret_cast<unsigned char*>(bufferPtr), const_cast<IBlock *>(sender));
}
void pack (stencil::Direction dir, unsigned char * buffer, IBlock * block) const;
diff --git a/python/pystencils_walberla/templates/GpuPackInfo.tmpl.h b/python/pystencils_walberla/templates/GpuPackInfo.tmpl.h
index b301bced5..cd5b23677 100644
--- a/python/pystencils_walberla/templates/GpuPackInfo.tmpl.h
+++ b/python/pystencils_walberla/templates/GpuPackInfo.tmpl.h
@@ -59,7 +59,7 @@ public:
void pack (stencil::Direction dir, unsigned char * buffer, IBlock * block, gpuStream_t stream) override;
void communicateLocal ( stencil::Direction /*dir*/, const IBlock* /* sender */, IBlock* /* receiver */, gpuStream_t /* stream */ ) override
{
- WALBERLA_ABORT("Local Communication not implemented yet for standard PackInfos. To run your application turn of local communication in the Communication class")
+ WALBERLA_ABORT("Local Communication not implemented yet for standard PackInfos. To run your application, turn off local communication in the communication class, e.g. with useLocalCommunication=false")
}
void unpack(stencil::Direction dir, unsigned char * buffer, IBlock * block, gpuStream_t stream) override;
uint_t size (stencil::Direction dir, IBlock * block) override;
diff --git a/src/communication/UniformPackInfo.h b/src/communication/UniformPackInfo.h
index 168ce9685..dd35b0087 100644
--- a/src/communication/UniformPackInfo.h
+++ b/src/communication/UniformPackInfo.h
@@ -100,6 +100,10 @@ public:
*
* If NOT thread-safe, \ref threadsafeReceiving must return false!
*
+ * Implementations must reserve extra space and advance the send buffer
+ * pointer according to the alignment of the ghost layer data type!
+ * The buffer is char-aligned.
+ *
* @param receiver the block where the unpacked data should be stored into
* @param dir receive data from neighbor in this direction
* @param buffer buffer for reading the data from
@@ -145,6 +149,10 @@ protected:
*
* Must be thread-safe!
*
+ * Implementations must reserve extra space and advance the send buffer
+ * pointer according to the alignment of the ghost layer data type!
+ * The buffer is char-aligned.
+ *
* @param sender the block whose data should be packed into a buffer
* @param dir pack data for neighbor in this direction
* @param buffer buffer for writing the data into
--
GitLab