From b0aae5337f68996bb024bc2d1a0232ef7de13432 Mon Sep 17 00:00:00 2001
From: Martin Bauer <martin.bauer@fau.de>
Date: Thu, 16 Jan 2020 14:17:44 +0100
Subject: [PATCH] Boundary Handling fix to work with ParallelDatahandling again
---
pystencils/boundaries/boundaryhandling.py | 14 +++++++++++---
1 file changed, 11 insertions(+), 3 deletions(-)
diff --git a/pystencils/boundaries/boundaryhandling.py b/pystencils/boundaries/boundaryhandling.py
index afad0221a..4c3f8aec0 100644
--- a/pystencils/boundaries/boundaryhandling.py
+++ b/pystencils/boundaries/boundaryhandling.py
@@ -8,6 +8,8 @@ from pystencils.boundaries.createindexlist import (
create_boundary_index_array, numpy_data_type_for_boundary_object)
from pystencils.cache import memorycache
from pystencils.data_types import TypedSymbol, create_type
+from pystencils.datahandling import ParallelDataHandling
+from pystencils.datahandling.pycuda import PyCudaArrayHandler
from pystencils.field import Field
from pystencils.kernelparameters import FieldPointerSymbol
@@ -96,11 +98,17 @@ class BoundaryHandling:
def to_gpu(gpu_version, cpu_version):
gpu_version = gpu_version.boundary_object_to_index_list
cpu_version = cpu_version.boundary_object_to_index_list
+
+ if isinstance(self.data_handling, ParallelDataHandling):
+ array_handler = PyCudaArrayHandler()
+ else:
+ array_handler = self.data_handling.array_handler
+
for obj, cpu_arr in cpu_version.items():
if obj not in gpu_version or gpu_version[obj].shape != cpu_arr.shape:
- gpu_version[obj] = self.data_handling.array_handler.to_gpu(cpu_arr)
+ gpu_version[obj] = array_handler.to_gpu(cpu_arr)
else:
- self.data_handling.array_handler.upload(gpu_version[obj], cpu_arr)
+ array_handler.upload(gpu_version[obj], cpu_arr)
class_ = self.IndexFieldBlockData
class_.to_cpu = to_cpu
@@ -332,7 +340,7 @@ class BoundaryHandling:
self.kernel = kernel
class IndexFieldBlockData:
- def __init__(self):
+ def __init__(self, *args, **kwargs):
self.boundary_object_to_index_list = {}
self.boundary_object_to_data_setter = {}
--
GitLab