Changeset 17bbadd in sasmodels for sasmodels/model_test.py

Timestamp:

Mar 15, 2016 10:47:12 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:

754e27b

Parents:

5ceb7d0

Message:

refactor so all model defintion queries use model_info; better documentation of model_info structure; initial implementation of product model (broken)

File:

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

sasmodels/model_test.py

@@ -50 +50 @@
 import numpy as np
 
-from .core import list_models, load_model_definition, load_model, HAVE_OPENCL
+from .core import list_models, load_model_info, build_model, HAVE_OPENCL
 from .core import make_kernel, call_kernel, call_ER, call_VR
 from .exception import annotate_exception
 
+#TODO: rename to tests so that tab completion works better for models directory
 
 def make_suite(loaders, models):
@@ -76 +77 @@
     for model_name in models:
         if model_name in skip: continue
-        model_definition = load_model_definition(model_name)
+        model_info = load_model_info(model_name)
 
         #print('------')
@@ -85 +86 @@
         # don't try to call cl kernel since it will not be
         # available in some environmentes.
-        is_py = callable(getattr(model_definition, 'Iq', None))
+        is_py = callable(model_info['Iq'])
 
         if is_py:  # kernel implemented in python
             test_name = "Model: %s, Kernel: python"%model_name
             test_method_name = "test_%s_python" % model_name
-            test = ModelTestCase(test_name, model_definition,
+            test = ModelTestCase(test_name, model_info,
                                  test_method_name,
                                  platform="dll",  # so that
@@ -104 +105 @@
                 # single precision.  The choice is determined by the
                 # presence of *single=False* in the model file.
-                test = ModelTestCase(test_name, model_definition,
+                test = ModelTestCase(test_name, model_info,
                                      test_method_name,
                                      platform="ocl", dtype=None)
@@ -114 +115 @@
                 test_name = "Model: %s, Kernel: dll"%model_name
                 test_method_name = "test_%s_dll" % model_name
-                test = ModelTestCase(test_name, model_definition,
+                test = ModelTestCase(test_name, model_info,
                                      test_method_name,
                                      platform="dll",
@@ -132 +133 @@
         description file.
         """
-        def __init__(self, test_name, definition, test_method_name,
+        def __init__(self, test_name, model_info, test_method_name,
                      platform, dtype):
             self.test_name = test_name
-            self.definition = definition
+            self.info = model_info
             self.platform = platform
             self.dtype = dtype
@@ -150 +151 @@
                 ]
 
-            tests = getattr(self.definition, 'tests', [])
+            tests = self.info['tests']
             try:
-                model = load_model(self.definition, dtype=self.dtype,
-                                   platform=self.platform)
+                model = build_model(self.info, dtype=self.dtype,
+                                    platform=self.platform)
                 for test in smoke_tests + tests:
                     self._run_one_test(model, test)