Skip to content

Commit 456b628

Browse files
committed
use read/write_events in tests
1 parent 89fe823 commit 456b628

File tree

1 file changed

+39
-20
lines changed

1 file changed

+39
-20
lines changed

test/test_array.py

Lines changed: 39 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1345,36 +1345,55 @@ def test_event_management(ctx_factory):
13451345
from pyopencl.clrandom import rand as clrand
13461346

13471347
x = clrand(queue, (5, 10), dtype=np.float32)
1348-
assert len(x.events) == 1, len(x.events)
1348+
assert len(x.write_events) == 1, x.write_events
1349+
assert len(x.read_events) == 0, x.read_events
13491350

13501351
x.finish()
13511352

1352-
assert len(x.events) == 0
1353-
1354-
y = x+x
1355-
assert len(y.events) == 1
1356-
y = x*x
1357-
assert len(y.events) == 1
1358-
y = 2*x
1359-
assert len(y.events) == 1
1360-
y = 2/x
1361-
assert len(y.events) == 1
1362-
y = x/2
1363-
assert len(y.events) == 1
1364-
y = x**2
1365-
assert len(y.events) == 1
1366-
y = 2**x
1367-
assert len(y.events) == 1
1353+
assert len(x.write_events) == 0
1354+
assert len(x.read_events) == 0
1355+
1356+
y = x + x
1357+
assert len(y.write_events) == 1 and len(y.read_events) == 0
1358+
assert len(x.write_events) == 0 and len(x.read_events) == 1
1359+
1360+
y = x * x
1361+
assert len(y.write_events) == 1 and len(y.read_events) == 0
1362+
assert len(x.write_events) == 0 and len(x.read_events) == 2
1363+
1364+
y = 2 * x
1365+
assert len(y.write_events) == 1 and len(y.read_events) == 0
1366+
assert len(x.write_events) == 0 and len(x.read_events) == 3
1367+
1368+
y = 2 / x
1369+
assert len(y.write_events) == 1 and len(y.read_events) == 0
1370+
assert len(x.write_events) == 0 and len(x.read_events) == 4
1371+
1372+
y = x / 2
1373+
assert len(y.write_events) == 1 and len(y.read_events) == 0
1374+
assert len(x.write_events) == 0 and len(x.read_events) == 5
1375+
1376+
y = x ** 2
1377+
assert len(y.write_events) == 1 and len(y.read_events) == 0
1378+
assert len(x.write_events) == 0 and len(x.read_events) == 6
1379+
1380+
y = 2 ** x
1381+
assert len(y.write_events) == 1 and len(y.read_events) == 0
1382+
assert len(x.write_events) == 0 and len(x.read_events) == 7
1383+
1384+
x.finish()
13681385

13691386
for _i in range(10):
13701387
x.fill(0)
13711388

1372-
assert len(x.events) == 10
1389+
assert len(x.write_events) == 10
1390+
assert len(x.read_events) == 0
13731391

13741392
for _i in range(1000):
13751393
x.fill(0)
13761394

1377-
assert len(x.events) < 100
1395+
assert len(x.write_events) < 100
1396+
assert len(x.read_events) == 0
13781397

13791398
# }}}
13801399

@@ -1618,7 +1637,7 @@ def test_get_async(ctx_factory):
16181637
assert np.abs(b1 - b).mean() < 1e-5
16191638

16201639
wait_event = cl.UserEvent(context)
1621-
b_gpu.add_event(wait_event)
1640+
b_gpu.add_write_event(wait_event)
16221641
b, evt = b_gpu.get_async() # testing that this doesn't hang
16231642
wait_event.set_status(cl.command_execution_status.COMPLETE)
16241643
evt.wait()

0 commit comments

Comments
 (0)