From a5f93656cbb1501c59a0de2a134a4e370b8334ee Mon Sep 17 00:00:00 2001
From: Matt Wala <wala1@illinois.edu>
Date: Tue, 16 Jun 2020 13:32:57 -0500
Subject: [PATCH] Array constructor: reject negative dims
---
pyopencl/array.py | 3 +++
test/test_array.py | 17 +++++++++++++++++
2 files changed, 20 insertions(+)
diff --git a/pyopencl/array.py b/pyopencl/array.py
index bcc0770f..73391f79 100644
--- a/pyopencl/array.py
+++ b/pyopencl/array.py
@@ -448,6 +448,9 @@ class Array(object):
size = shape
shape = (shape,)
+ if any(dim < 0 for dim in shape):
+ raise ValueError("negative dimensions are not allowed")
+
if isinstance(size, np.integer):
size = size.item()
diff --git a/test/test_array.py b/test/test_array.py
index 521f6719..acc818a7 100644
--- a/test/test_array.py
+++ b/test/test_array.py
@@ -1316,6 +1316,23 @@ def test_outoforderqueue_reductions(ctx_factory):
assert b1 == a.sum() and b2 == a.dot(3 - a) and b3 == 0
+def test_negative_dim_rejection(ctx_factory):
+ context = ctx_factory()
+ queue = cl.CommandQueue(context)
+
+ with pytest.raises(ValueError):
+ cl_array.Array(queue, shape=-10, dtype=np.float)
+
+ with pytest.raises(ValueError):
+ cl_array.Array(queue, shape=(-1, +1), dtype=np.float)
+
+ with pytest.raises(ValueError):
+ cl_array.Array(queue, shape=(+1, -1), dtype=np.float)
+
+ with pytest.raises(ValueError):
+ cl_array.Array(queue, shape=(-1, -1), dtype=np.float)
+
+
if __name__ == "__main__":
if len(sys.argv) > 1:
exec(sys.argv[1])
--
GitLab