From 719f209b880cdfd566795d58c2075b196fa05c38 Mon Sep 17 00:00:00 2001
From: Martin Bauer <martin.bauer@fau.de>
Date: Sat, 25 Nov 2017 13:11:30 +0100
Subject: [PATCH] Bugfix in cuda python export
---
src/cuda/python/Exports.impl.h | 2 +-
src/field/python/FieldExport.impl.h | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/cuda/python/Exports.impl.h b/src/cuda/python/Exports.impl.h
index 69807dbd8..ada1586f3 100644
--- a/src/cuda/python/Exports.impl.h
+++ b/src/cuda/python/Exports.impl.h
@@ -78,6 +78,7 @@ namespace internal {
.add_property("offsets", &field::internal::field_offsets < GpuField_T > )
.add_property("ptr", &gpufield_ptr < GpuField_T > )
.add_property("dtypeStr", &gpufield_dtypeStr < GpuField_T > )
+ .add_property("isPitchedMem", &GpuField_T::isPitchedMem )
.def("swapDataPointers", &field::internal::field_swapDataPointers < GpuField_T > )
.add_property("nrOfGhostLayers", &GpuField_T::nrOfGhostLayers )
.def("cloneUninitialized", &GpuField_T::cloneUninitialized, return_value_policy<manage_new_object>())
@@ -91,7 +92,6 @@ namespace internal {
bases<walberla::communication::UniformPackInfo>,
boost::noncopyable >( "GpuFieldPackInfo", no_init );
-
using field::communication::UniformMPIDatatypeInfo;
class_< UniformMPIDatatypeInfo<GpuField_T>,
shared_ptr< UniformMPIDatatypeInfo<GpuField_T> >,
diff --git a/src/field/python/FieldExport.impl.h b/src/field/python/FieldExport.impl.h
index e14d9fa78..058379e65 100644
--- a/src/field/python/FieldExport.impl.h
+++ b/src/field/python/FieldExport.impl.h
@@ -561,7 +561,7 @@ namespace internal {
template<typename GlField_T>
boost::python::object field_sizeWithGhostLayer( const GlField_T & field ) {
- return boost::python::make_tuple( field.xSizeWithGhostLayer(), field.xSizeWithGhostLayer(), field.xSizeWithGhostLayer(), field.fSize() );
+ return boost::python::make_tuple( field.xSizeWithGhostLayer(), field.ySizeWithGhostLayer(), field.zSizeWithGhostLayer(), field.fSize() );
}
--
GitLab