Changeset 886fa25 in sasmodels

Timestamp:

Oct 6, 2016 2:24:32 PM (8 years ago)

Author:

ajj

Branches:

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

Children:

5b37fd6

Parents:

4a2e1e5

git-author:

Wojciech Potrzebowski <Wojciech.Potrzebowski@…> (10/06/16 14:24:32)

git-committer:

Andrew Jackson <andrew.jackson@…> (10/06/16 14:24:32)

Message:

Ticket576 - updated custom models not being recompiled (#10)

• OpenCL drivers installation has been added

• Moved compilation.rst to gpu_computations.rst (more propreiate name)

• Check-ups for 576

• Checks for #576

• Unloading lib from ctypes by triggering release function in kerneldll ref #576

• Import clean-ups in kerneldll

Files:

• doc/ref/gpu_computations.rst (moved) (moved from doc/ref/compilation.rst) (1 diff)
• doc/ref/index.rst (modified) (1 diff)
• doc/ref/opencl_installation.rst (added)
• sasmodels/kerneldll.py (modified) (7 diffs)
• sasmodels/sasview_model.py (modified) (1 diff)

doc/ref/gpu_computations.rst

@@ -1 +1 @@
 .. _models-complitation:
 
-******************
-Models Compliation
-******************
+****************
+GPU Computations
+****************
 SasView model evaluations can run on your graphics card (GPU) or they can run
 on the processor (CPU).
 
 To run on the GPU, your computer must have OpenCL drivers installed.
-
-... give details on how to identify graphics cards, how to tell if OpenCL
-is already installed and where to get drivers if it is not ...
-
-Note that Intel provides an OpenCL drivers for Intel processors.
-This can sometimes make use of special vector instructions across multiple
-processors, so it is worth installing if the GPU does not support double
-precision.
-You can install this driver alongside the GPU driver for NVIDIA or AMD.
+For information about OpenCL installation see the
+:ref:`opencl-installation` documentation
 
 Where the model is evaluated is a little bit complicated.

doc/ref/index.rst

@@ -9 +9 @@
    intro.rst
    refs.rst
-   compilation.rst
+   gpu_computations.rst
    magnetism/magnetism.rst
    sesans/sans_to_sesans.rst

sasmodels/kerneldll.py

@@ -73 +73 @@
 import tempfile
 import ctypes as ct  # type: ignore
-from ctypes import c_void_p, c_int32, c_longdouble, c_double, c_float  # type: ignore
+import _ctypes as _ct
 import logging
 
@@ -111 +111 @@
     compiler = "unix"
 
-ARCH = "" if ct.sizeof(c_void_p) > 4 else "x86"  # 4 byte pointers on x86
+ARCH = "" if ct.sizeof(ct.c_void_p) > 4 else "x86"  # 4 byte pointers on x86
 if compiler == "unix":
     # Generic unix compile
@@ -241 +241 @@
     if not os.path.exists(dll):
         need_recompile = True
-    elif getattr(sys, 'frozen', None) is not None:
-        # TODO: don't suppress time stamp
-        # Currently suppressing recompile when running in a frozen environment
-        need_recompile = False
     else:
         dll_time = os.path.getmtime(dll)
@@ -301 +297 @@
     def _load_dll(self):
         # type: () -> None
-        #print("dll", self.dllpath)
         try:
             self._dll = ct.CDLL(self.dllpath)
@@ -308 +303 @@
             raise
 
-        float_type = (c_float if self.dtype == generate.F32
-                      else c_double if self.dtype == generate.F64
-                      else c_longdouble)
+        float_type = (ct.c_float if self.dtype == generate.F32
+                      else ct.c_double if self.dtype == generate.F64
+                      else ct.c_longdouble)
 
         # int, int, int, int*, double*, double*, double*, double*, double
-        argtypes = [c_int32]*3 + [c_void_p]*4 + [float_type]
+        argtypes = [ct.c_int32]*3 + [ct.c_void_p]*4 + [float_type]
         names = [generate.kernel_name(self.info, variant)
                  for variant in ("Iq", "Iqxy", "Imagnetic")]
@@ -344 +339 @@
         Release any resources associated with the model.
         """
+        dll_handle = self._dll._handle
         if os.name == 'nt':
-            #dll = ct.cdll.LoadLibrary(self.dllpath)
-            dll = ct.CDLL(self.dllpath)
-            dll_handle = dll._handle
-            #dll_handle = ct.c_void_p(dll._handle)
-            del dll, self._dll
-            self._dll = None
             ct.windll.kernel32.FreeLibrary(dll_handle)
         else:
-            pass
-
+            _ct.dlclose(dll_handle)
+        del self._dll
+        self._dll = None
 
 class DllKernel(Kernel):
@@ -411 +402 @@
         #print("returned",self.q_input.q, self.result)
         pd_norm = self.result[self.q_input.nq]
-        scale = values[0]/(pd_norm if pd_norm!=0.0 else 1.0)
+        scale = values[0]/(pd_norm if pd_norm != 0.0 else 1.0)
         background = values[1]
         #print("scale",scale,background)

sasmodels/sasview_model.py

@@ -575 +575 @@
                             magnetic=is_magnetic)
         calculator.release()
+        self._model.release()
         return result