From 4dcc3ea551be499330a468cb6b003b7bc3e8793d Mon Sep 17 00:00:00 2001
From: Stephan Seitz <stephan.seitz@fau.de>
Date: Wed, 15 Jan 2020 20:14:35 +0100
Subject: [PATCH] Fix {PyCuda,PyOpenCl}ArrayHandler.{zeros,ones,randn}
---
pystencils/datahandling/pycuda.py | 6 ++++--
pystencils/datahandling/pyopencl.py | 2 ++
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/pystencils/datahandling/pycuda.py b/pystencils/datahandling/pycuda.py
index 30602a30c..75967c1cc 100644
--- a/pystencils/datahandling/pycuda.py
+++ b/pystencils/datahandling/pycuda.py
@@ -21,7 +21,7 @@ class PyCudaArrayHandler:
def empty(self, shape, dtype=np.float64, layout=None):
if layout:
cpu_array = pystencils.field.create_numpy_array_with_layout(shape, dtype, layout)
- return self.from_numpy(cpu_array)
+ return self.to_gpu(cpu_array)
else:
return gpuarray.empty(shape, dtype)
@@ -36,4 +36,6 @@ class PyCudaArrayHandler:
def randn(self, shape, dtype=np.float64):
cpu_array = np.random.randn(*shape).astype(dtype)
- return self.from_numpy(cpu_array)
+ return self.to_gpu(cpu_array)
+
+ from_numpy = to_gpu
diff --git a/pystencils/datahandling/pyopencl.py b/pystencils/datahandling/pyopencl.py
index 7b6f44088..b4e53150f 100644
--- a/pystencils/datahandling/pyopencl.py
+++ b/pystencils/datahandling/pyopencl.py
@@ -43,3 +43,5 @@ class PyOpenClArrayHandler:
def randn(self, shape, dtype=np.float64):
cpu_array = np.random.randn(*shape).astype(dtype)
return self.from_numpy(cpu_array)
+
+ from_numpy = to_gpu
--
GitLab