Changeset 32c160a in sasmodels for sasmodels/core.py

Timestamp:

Aug 25, 2014 12:55:08 AM (10 years ago)

Author:

Paul Kienzle <pkienzle@…>

Branches:

master, core_shell_microgels, costrafo411, magnetic_model, release_v0.94, release_v0.95, ticket-1257-vesicle-product, ticket_1156, ticket_1265_superball, ticket_822_more_unit_tests

Children:

13d86bc

Parents:

1f21edf

Message:

support ER/VR python kernels; move metadata to python

File:

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

sasmodels/core.py

@@ -8 +8 @@
 import numpy as np
 
-def load_model(modelname):
-    from os.path import abspath, join as joinpath, dirname
-    from sasmodels import gen
-    modelpath = abspath(joinpath(dirname(gen.__file__), 'models',
-                                 modelname+'.c'))
-    return gen.make(modelpath)
-
-
-
-def opencl_model(modelname, dtype="single"):
-    from sasmodels import gpu
-
-    source, info, _ = load_model(modelname)
-    # for debugging, save source to a .cl file, edit it, and reload as model
+
+def opencl_model(kernel_module, dtype="single"):
+    from sasmodels import gen, gpu
+
+    source, info = gen.make(kernel_module)
+    ## for debugging, save source to a .cl file, edit it, and reload as model
     #open(modelname+'.cl','w').write(source)
     #source = open(modelname+'.cl','r').read()
@@ -42 +34 @@
 
 
-def dll_model(modelname):
+def dll_model(kernel_module):
     import os
-    from sasmodels import dll
-
-    source, info, _ = load_model(modelname)
+    import tempfile
+    from sasmodels import gen, dll
+
+    source, info = gen.make(kernel_module)
     dllpath = dll_path(info)
     if not os.path.exists(dllpath) \
             or (os.path.getmtime(dllpath) < os.path.getmtime(info['filename'])):
         # Replace with a proper temp file
-        srcfile = '/tmp/%s.c'%modelname
+        srcfile = tempfile.mkstemp(suffix=".c",prefix="sas_"+info['name'])
         open(srcfile, 'w').write(source)
         os.system(COMPILE%(srcfile, dllpath))
+        ## comment the following to keep the generated c file
+        #os.unlink(srcfile)
     return dll.DllModel(dllpath, info)