Changeset 2547694 in sasmodels

Timestamp:

Jul 28, 2016 8:23:10 AM (8 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:

0f00d95

Parents:

20317b3

Message:

lint

File:

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

sasmodels/core.py

@@ -6 +6 @@
 __all__ = [
     "list_models", "load_model", "load_model_info",
-    "build_model", "precompile_dll",
+    "build_model", "precompile_dlls",
     ]
 
 import os
-from os.path import basename, dirname, join as joinpath, splitext
+from os.path import basename, dirname, join as joinpath
 from glob import glob
 
@@ -57 +57 @@
 #    build_model
 
+KINDS = ("all", "py", "c", "double", "single", "1d", "2d",
+         "nonmagnetic", "magnetic")
 def list_models(kind=None):
     # type: () -> List[str]
@@ -62 +64 @@
     Return the list of available models on the model path.
     """
-    KINDS = ("all", "py", "c", "double", "single", "1d", "2d", "nonmagnetic", "magnetic")
     if kind and kind not in KINDS:
-        raise ValueError("kind not in "+", ".join(KINDS))
+        raise ValueError("kind not in " + ", ".join(KINDS))
     root = dirname(__file__)
     files = sorted(glob(joinpath(root, 'models', "[a-zA-Z]*.py")))
@@ -73 +74 @@
 
 def _matches(name, kind):
-    if kind is None or kind=="all":
+    if kind is None or kind == "all":
         return True
     info = load_model_info(name)
@@ -85 +86 @@
     elif kind == "single" and info.single:
         return True
-    elif kind == "2d" and any(p.type=='orientation' for p in pars):
-        return True
-    elif kind == "1d" and any(p.type!='orientation' for p in pars):
-        return True
-    elif kind == "magnetic" and any(p.type=='sld' for p in pars):
-        return True
-    elif kind == "nonmagnetic" and any(p.type!='sld' for p in pars):
+    elif kind == "2d" and any(p.type == 'orientation' for p in pars):
+        return True
+    elif kind == "1d" and any(p.type != 'orientation' for p in pars):
+        return True
+    elif kind == "magnetic" and any(p.type == 'sld' for p in pars):
+        return True
+    elif kind == "nonmagnetic" and any(p.type != 'sld' for p in pars):
         return True
     return False
@@ -157 +158 @@
             return mixture.MixtureModel(model_info, models)
         elif composition_type == 'product':
-            from . import product
             P, S = models
             return product.ProductModel(model_info, P, S)
@@ -217 +217 @@
     if platform is None:
         platform = "ocl"
-    if platform=="ocl" and not HAVE_OPENCL:
+    if platform == "ocl" and not HAVE_OPENCL:
         platform = "dll"
 
@@ -226 +226 @@
 
     # Convert special type names "half", "fast", and "quad"
-    fast = (dtype=="fast")
+    fast = (dtype == "fast")
     if fast:
         dtype = "single"
-    elif dtype=="quad":
+    elif dtype == "quad":
         dtype = "longdouble"
-    elif dtype=="half":
+    elif dtype == "half":
         dtype = "f16"
 
     # Convert dtype string to numpy dtype.
     if dtype is None:
-        numpy_dtype = generate.F32 if platform=="ocl" and model_info.single else generate.F64
+        numpy_dtype = (generate.F32 if platform == "ocl" and model_info.single
+                       else generate.F64)
     else:
         numpy_dtype = np.dtype(dtype)
 
     # Make sure that the type is supported by opencl, otherwise use dll
-    if platform=="ocl":
+    if platform == "ocl":
         env = kernelcl.environment()
         if not env.has_type(numpy_dtype):
@@ -250 +251 @@
     return numpy_dtype, fast, platform
 
-if __name__ == "__main__":
+def list_models_main():
     import sys
     kind = sys.argv[1] if len(sys.argv) > 1 else "all"
     print("\n".join(list_models(kind)))
+
+if __name__ == "__main__":
+    list_models_main()