Changeset d92182f in sasmodels for sasmodels/model_test.py

Timestamp:

Mar 11, 2019 9:30:49 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:

d8eaa3d

Parents:

aee8dfb

Message:

tweak option handling for model_test

File:

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

sasmodels/model_test.py

@@ -5 +5 @@
 Usage::
 
-    python -m sasmodels.model_test [opencl|cuda|dll] model1 model2 ...
-
-    if model1 is 'all', then all except the remaining models will be tested
+    python -m sasmodels.model_test [opencl|cuda|dll|all] model1 model2 ...
+
+If model1 is 'all', then all except the remaining models will be tested.
+Subgroups are also possible, such as 'py', 'single' or '1d'.  See
+:func:`core.list_models` for details.
 
 Each model is tested using the default parameters at q=0.1, (qx, qy)=(0.1, 0.1),
@@ -90 +92 @@
     suite = unittest.TestSuite()
 
-    if models[0] in core.KINDS:
+    try:
+        # See if the first model parses as a model group
+        group = list_models(models[0])
         skip = models[1:]
-        models = list_models(models[0])
-    else:
+        models = group
+    except Exception:
         skip = []
     for model_name in models:
@@ -475 +479 @@
 
 
-def main():
-    # type: (*str) -> int
-    """
-    Run tests given is models.
-
-    Returns 0 if success or 1 if any tests fail.
-    """
-    try:
-        from xmlrunner import XMLTestRunner as TestRunner
-        test_args = {'output': 'logs'}
-    except ImportError:
-        from unittest import TextTestRunner as TestRunner
-        test_args = {}
-
-    parser = argparse.ArgumentParser(description="Test SasModels Models")
-    parser.add_argument("-v", "--verbose", action="store_const",
-                        default=1, const=2, help="Use verbose output")
-    parser.add_argument("engine", metavar="[engine]",
-                        help="Engines on which to run the test.  "
-                        "Valid values are opencl, dll, and opencl_and_dll. "
-                        "Defaults to opencl_and_dll if no value is given")
-    parser.add_argument("models", nargs="*",
-                        help='The names of the models to be tested.  '
-                        'If the first model is "all", then all except the '
-                        'remaining models will be tested.')
-    args, models = parser.parse_known_args()
-
-    if args.engine == "opencl":
-        if not use_opencl():
-            print("opencl is not available")
-            return 1
-        loaders = ['opencl']
-    elif args.engine == "dll":
-        loaders = ["dll"]
-    elif args.engine == "cuda":
-        if not use_cuda():
-            print("cuda is not available")
-            return 1
-        loaders = ['cuda']
-    else:
-        # Default to running both engines
-        loaders = ['dll']
-        if use_opencl():
-            loaders.append('opencl')
-        if use_cuda():
-            loaders.append('cuda')
-        args.models.insert(0, args.engine)
-
-    runner = TestRunner(verbosity=args.verbose, **test_args)
-    result = runner.run(make_suite(loaders, args.models))
-    return 1 if result.failures or result.errors else 0
-
-
 def model_tests():
     # type: () -> Iterator[Callable[[], None]]
@@ -562 +513 @@
 
 
+def main():
+    # type: (*str) -> int
+    """
+    Run tests given is models.
+
+    Returns 0 if success or 1 if any tests fail.
+    """
+    try:
+        from xmlrunner import XMLTestRunner as TestRunner
+        test_args = {'output': 'logs'}
+    except ImportError:
+        from unittest import TextTestRunner as TestRunner
+        test_args = {}
+
+    parser = argparse.ArgumentParser(description="Test SasModels Models")
+    parser.add_argument("-v", "--verbose", action="store_const",
+                        default=1, const=2, help="Use verbose output")
+    parser.add_argument("-e", "--engine", default="all",
+                        help="Engines on which to run the test.  "
+                        "Valid values are opencl, cuda, dll, and all. "
+                        "Defaults to all if no value is given")
+    parser.add_argument("models", nargs="*",
+                        help="The names of the models to be tested.  "
+                        "If the first model is 'all', then all but the listed "
+                        "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":
+        if not use_opencl():
+            print("opencl is not available")
+            return 1
+        loaders = ['opencl']
+    elif args.engine == "dll":
+        loaders = ["dll"]
+    elif args.engine == "cuda":
+        if not use_cuda():
+            print("cuda is not available")
+            return 1
+        loaders = ['cuda']
+    elif args.engine == "all":
+        loaders = ['dll']
+        if use_opencl():
+            loaders.append('opencl')
+        if use_cuda():
+            loaders.append('cuda')
+    else:
+        print("unknown engine " + args.engine)
+        return 1
+
+    runner = TestRunner(verbosity=args.verbose, **test_args)
+    result = runner.run(make_suite(loaders, args.models))
+    return 1 if result.failures or result.errors else 0
+
+
 if __name__ == "__main__":
     sys.exit(main())