Merge branch 'opencl-fixes' into 'master'

Opencl fixes

Closes lbmpy#9

See merge request pycodegen/pystencils!148

pystencils/boundaries/boundaryhandling.py

@@ -96,21 +96,21 @@ class BoundaryHandling:
         fi = flag_interface
         self.flag_interface = fi if fi is not None else FlagInterface(data_handling, name + "Flags")
 
+        if ParallelDataHandling and isinstance(self.data_handling, ParallelDataHandling):
+            array_handler = PyCudaArrayHandler()
+        else:
+            array_handler = self.data_handling.array_handler
+
         def to_cpu(gpu_version, cpu_version):
             gpu_version = gpu_version.boundary_object_to_index_list
             cpu_version = cpu_version.boundary_object_to_index_list
             for obj, cpu_arr in cpu_version.items():
-                gpu_version[obj].get(cpu_arr)
+                array_handler.download(gpu_version[obj], cpu_arr)
 
         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 ParallelDataHandling and 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] = array_handler.to_gpu(cpu_arr)

pystencils/datahandling/serial_datahandling.py

@@ -226,7 +226,7 @@ class SerialDataHandling(DataHandling):
 
     def swap(self, name1, name2, gpu=None):
         if gpu is None:
-            gpu = self.default_target == "gpu"
+            gpu = self.default_target in self._GPU_LIKE_TARGETS
         arr = self.gpu_arrays if gpu else self.cpu_arrays
         arr[name1], arr[name2] = arr[name2], arr[name1]
 

pystencils/gpucuda/periodicity.py

@@ -35,13 +35,14 @@ def get_periodic_boundary_functor(stencil, domain_size, index_dimensions=0, inde
     assert target in ['gpu', 'opencl']
     src_dst_slice_tuples = get_periodic_boundary_src_dst_slices(stencil, ghost_layers, thickness)
     kernels = []
-    index_dimensions = index_dimensions
 
     for src_slice, dst_slice in src_dst_slice_tuples:
         ast = create_copy_kernel(domain_size, src_slice, dst_slice, index_dimensions, index_dim_shape, dtype)
         if target == 'gpu':
             kernels.append(pystencils.gpucuda.make_python_function(ast))
         else:
+            ast._target = 'opencl'
+            ast._backend = 'opencl'
             kernels.append(pystencils.opencl.make_python_function(ast, opencl_queue, opencl_ctx))
 
     def functor(pdfs, **_):