Changeset b297ba9 in sasmodels for sasmodels/model_test.py

Timestamp:

Mar 20, 2019 5:03:50 PM (5 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:

4e28511

Parents:

0d362b7

Message:

lint

File:

• sasmodels/model_test.py (modified) (11 diffs)

sasmodels/model_test.py

@@ -61 +61 @@
 import numpy as np  # type: ignore
 
-from . import core
 from .core import list_models, load_model_info, build_model
 from .direct_model import call_kernel, call_Fq
@@ -137 +136 @@
         test_method_name = "test_%s_python" % model_info.id
         test = ModelTestCase(test_name, model_info,
-                                test_method_name,
-                                platform="dll",  # so that
-                                dtype="double",
-                                stash=stash)
+                             test_method_name,
+                             platform="dll",  # so that
+                             dtype="double",
+                             stash=stash)
         suite.addTest(test)
     else:   # kernel implemented in C
@@ -149 +148 @@
             test_method_name = "test_%s_dll" % model_info.id
             test = ModelTestCase(test_name, model_info,
-                                    test_method_name,
-                                    platform="dll",
-                                    dtype="double",
-                                    stash=stash)
+                                 test_method_name,
+                                 platform="dll",
+                                 dtype="double",
+                                 stash=stash)
             suite.addTest(test)
 
@@ -164 +163 @@
             # presence of *single=False* in the model file.
             test = ModelTestCase(test_name, model_info,
-                                    test_method_name,
-                                    platform="ocl", dtype=None,
-                                    stash=stash)
+                                 test_method_name,
+                                 platform="ocl", dtype=None,
+                                 stash=stash)
             #print("defining", test_name)
             suite.addTest(test)
@@ -179 +178 @@
             # presence of *single=False* in the model file.
             test = ModelTestCase(test_name, model_info,
-                                    test_method_name,
-                                    platform="cuda", dtype=None,
-                                    stash=stash)
+                                 test_method_name,
+                                 platform="cuda", dtype=None,
+                                 stash=stash)
             #print("defining", test_name)
             suite.addTest(test)
@@ -413 +412 @@
 # CRUFT: old interface; should be deprecated and removed
 def run_one(model_name):
+    # type: (str) -> str
+    """
+    [Deprecated] Run the tests associated with *model_name*.
+
+    Use the following instead::
+
+        succss, output = check_model(load_model_info(model_name))
+    """
     # msg = "use check_model(model_info) rather than run_one(model_name)"
     # warnings.warn(msg, category=DeprecationWarning, stacklevel=2)
@@ -421 +428 @@
         return output
 
-    success, output = check_model(model_info)
+    _, output = check_model(model_info)
     return output
 
 def check_model(model_info):
-    # type: (ModelInfo) -> str
+    # type: (ModelInfo) -> Tuple[bool, str]
     """
     Run the tests for a single model, capturing the output.
@@ -492 +499 @@
         loaders.append('cuda')
     tests = make_suite(loaders, ['all'])
-    def build_test(test):
+    def _build_test(test):
         # In order for nosetest to show the test name, wrap the test.run_all
         # instance in function that takes the test name as a parameter which
@@ -510 +517 @@
 
     for test in tests:
-        yield build_test(test)
+        yield _build_test(test)
 
 
@@ -539 +546 @@
                         "models will be tested.  See core.list_models() for "
                         "names of other groups, such as 'py' or 'single'.")
-    args, models = parser.parse_known_args()
-
-    if args.engine == "opencl":
+    opts = parser.parse_args()
+
+    if opts.engine == "opencl":
         if not use_opencl():
             print("opencl is not available")
             return 1
         loaders = ['opencl']
-    elif args.engine == "dll":
+    elif opts.engine == "dll":
         loaders = ["dll"]
-    elif args.engine == "cuda":
+    elif opts.engine == "cuda":
         if not use_cuda():
             print("cuda is not available")
             return 1
         loaders = ['cuda']
-    elif args.engine == "all":
+    elif opts.engine == "all":
         loaders = ['dll']
         if use_opencl():
@@ -560 +567 @@
             loaders.append('cuda')
     else:
-        print("unknown engine " + args.engine)
+        print("unknown engine " + opts.engine)
         return 1
 
-    runner = TestRunner(verbosity=args.verbose, **test_args)
-    result = runner.run(make_suite(loaders, args.models))
+    runner = TestRunner(verbosity=opts.verbose, **test_args)
+    result = runner.run(make_suite(loaders, opts.models))
     return 1 if result.failures or result.errors else 0