Changeset 71f8bdb in sasmodels

Timestamp:

Oct 4, 2016 3:54:30 PM (8 years ago)

Author:

wojciech

Children:

9acbd37

Parents:

b01a603 (diff), e6378f9 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merged with master

Files:

• sasmodels/modelinfo.py (modified) (1 diff)
• 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) (3 diffs)

sasmodels/modelinfo.py

@@ -43 +43 @@
 COMMON_PARAMETERS = [
     ("scale", "", 1, (0.0, np.inf), "", "Source intensity"),
-    ("background", "1/cm", 1e-3, (0.0, np.inf), "", "Source background"),
+    ("background", "1/cm", 1e-3, (-np.inf, np.inf), "", "Source background"),
 ]
 assert (len(COMMON_PARAMETERS) == 2

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

sasmodels/kerneldll.py

@@ -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
+    #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)
@@ -259 +259 @@
         # Note: if there is a syntax error then compile raises an error
         # and the source file will not be deleted.
-        os.unlink(filename)
-        #print("saving compiled file in %r"%filename)
+        #os.unlink(filename)
+        print("saving compiled file in %r"%filename)
     return dll
 
@@ -301 +301 @@
     def _load_dll(self):
         # type: () -> None
-        #print("dll", self.dllpath)
+        print("dll", self.dllpath)
         try:
             self._dll = ct.CDLL(self.dllpath)