Changeset 47fb816 in sasmodels for sasmodels/core.py

Timestamp:

Oct 12, 2018 3:44:26 PM (6 years ago)

Author:

Paul Kienzle <pkienzle@…>

Branches:

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

Children:

b0de252

Parents:

0db7dbd (diff), 353e899 (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:

Merge branch 'master' into cuda-test

File:

• sasmodels/core.py (modified) (2 diffs)

sasmodels/core.py

@@ -43 +43 @@
 if CUSTOM_MODEL_PATH == "":
     CUSTOM_MODEL_PATH = joinpath(os.path.expanduser("~"), ".sasmodels", "custom_models")
-    if not os.path.isdir(CUSTOM_MODEL_PATH):
-        os.makedirs(CUSTOM_MODEL_PATH)
+    #if not os.path.isdir(CUSTOM_MODEL_PATH):
+    #    os.makedirs(CUSTOM_MODEL_PATH)
 
 # TODO: refactor composite model support
@@ -242 +242 @@
         if not callable(model_info.Iq):
             source = generate.make_source(model_info)['dll']
-            old_path = kerneldll.DLL_PATH
+            old_path = kerneldll.SAS_DLL_PATH
             try:
-                kerneldll.DLL_PATH = path
+                kerneldll.SAS_DLL_PATH = path
                 dll = kerneldll.make_dll(source, model_info, dtype=numpy_dtype)
             finally:
-                kerneldll.DLL_PATH = old_path
+                kerneldll.SAS_DLL_PATH = old_path
             compiled_dlls.append(dll)
     return compiled_dlls