misc fixes

Author: matthiasdiener

pyopencl/array.py

@@ -370,6 +370,7 @@ def queue_for_pickling(queue, alloc=None):
         yield None
     finally:
         _QUEUE_FOR_PICKLING_TLS.queue = None
+        _QUEUE_FOR_PICKLING_TLS.alloc = None
 
 # }}}
 

test/test_array.py

@@ -2434,18 +2434,21 @@ def test_array_pickling(ctx_factory):
 
     # {{{ SVM test
 
-    from pyopencl.tools import SVMAllocator, SVMPool
+    from pyopencl.characterize import has_coarse_grain_buffer_svm
+
+    if has_coarse_grain_buffer_svm(queue.device):
+        from pyopencl.tools import SVMAllocator, SVMPool
 
-    alloc = SVMAllocator(context, alignment=0, queue=queue)
-    alloc = SVMPool(alloc)
+        alloc = SVMAllocator(context, alignment=0, queue=queue)
+        alloc = SVMPool(alloc)
 
-    a_dev = cl_array.to_device(queue, a, allocator=alloc)
+        a_dev = cl_array.to_device(queue, a, allocator=alloc)
 
-    with cl_array.queue_for_pickling(queue, alloc):
-        a_dev_pickled = pickle.loads(pickle.dumps(a_dev))
+        with cl_array.queue_for_pickling(queue, alloc):
+            a_dev_pickled = pickle.loads(pickle.dumps(a_dev))
 
-    assert np.all(a_dev_pickled.get() == a)
-    assert a_dev_pickled.allocator is alloc
+        assert np.all(a_dev_pickled.get() == a)
+        assert a_dev_pickled.allocator is alloc
 
     # }}}