Changeset 00afc15 in sasmodels

Timestamp:

Nov 9, 2018 2:55:32 PM (6 years ago)

Author:

pkienzle

Branches:

master, core_shell_microgels, magnetic_model, ticket-1257-vesicle-product, ticket_1156, ticket_1265_superball, ticket_822_more_unit_tests

Children:

3199b17

Parents:

0be86aa

Message:

fix cuda tests

Location:

sasmodels

Files:

• kernelcl.py (modified) (1 diff)
• kernelcuda.py (modified) (6 diffs)
• model_test.py (modified) (1 diff)

sasmodels/kernelcl.py

@@ -444 +444 @@
         variants = ['Iq', 'Iqxy', 'Imagnetic']
         names = [generate.kernel_name(self.info, k) for k in variants]
-        handles = [getattr(program, k) for k in names]
-        self._kernels = {k: v for k, v in zip(variants, handles)}
+        functions = [getattr(program, k) for k in names]
+        self._kernels = {k: v for k, v in zip(variants, functions)}
         # keep a handle to program so GC doesn't collect
         self._program = program

sasmodels/kernelcuda.py

@@ -63 +63 @@
 import time
 import re
+import atexit
 
 import numpy as np  # type: ignore
@@ -138 +139 @@
     return ENV
 
+def free_context():
+    global ENV
+    if ENV is not None:
+        ENV.release()
+        ENV = None
+
+atexit.register(free_context)
+
 def has_type(dtype):
     # type: (np.dtype) -> bool
@@ -341 +350 @@
         variants = ['Iq', 'Iqxy', 'Imagnetic']
         names = [generate.kernel_name(self.info, k) for k in variants]
-        handles = [program.get_function(k) for k in names]
-        self._kernels = {k: v for k, v in zip(variants, kernels)}
+        functions = [program.get_function(k) for k in names]
+        self._kernels = {k: v for k, v in zip(variants, functions)}
         # keep a handle to program so GC doesn't collect
         self._program = program
-
-    def release(self):
-        # type: () -> None
-        """
-        Free the resources associated with the model.
-        """
-        if self.program is not None:
-            self.program = None
-
-    def __del__(self):
-        # type: () -> None
-        self.release()
 
 # TODO: check that we don't need a destructor for buffers which go out of scope
@@ -473 +470 @@
         kernel_args = [
             np.uint32(self.q_input.nq), None, None,
-            details_b, values_b, self.q_input.q_b, self.result_b,
+            details_b, values_b, self.q_input.q_b, self._result_b,
             self._as_dtype(cutoff),
             np.uint32(effective_radius_type),
@@ -487 +484 @@
             stop = min(start + step, call_details.num_eval)
             #print("queuing",start,stop)
-            args[1:3] = [np.int32(start), np.int32(stop)]
-            kernel(*args, **grid)
+            kernel_args[1:3] = [np.int32(start), np.int32(stop)]
+            kernel(*kernel_args, **grid)
             if stop < call_details.num_eval:
                 sync()
@@ -497 +494 @@
                     last_nap = current_time
         sync()
-        cuda.memcpy_dtoh(self.result, self.result_b)
+        cuda.memcpy_dtoh(self.result, self._result_b)
         #print("result", self.result)
 

sasmodels/model_test.py

@@ -167 +167 @@
         # test using cuda if desired and available
         if 'cuda' in loaders and use_cuda():
-            test_name = "%s-cuda"%model_name
+            test_name = "%s-cuda" % model_info.id
             test_method_name = "test_%s_cuda" % model_info.id
             # Using dtype=None so that the models that are only