Changeset e922c5d in sasmodels

Timestamp:

Nov 22, 2015 11:58:04 PM (9 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:

87e70a3

Parents:

3b4243d

Message:

move compare/compare_many into sasmodels package

Files:

• compare.sh (modified) (1 diff)
• compare_many.sh (modified) (1 diff)
• sasmodels/compare.py (moved) (moved from compare.py) (2 diffs)
• sasmodels/compare_many.py (moved) (moved from compare_many.py) (1 diff)

compare.sh

@@ -9 +9 @@
 set -x
 
-./compare.py $*
+python -m sasmodels.compare $*

compare_many.sh

@@ -7 +7 @@
 #echo PYTHONPATH=$PYTHONPATH
 
-./compare_many.py $*
+python -m sasmodels.compare_many $*
 
 #for dim in 1d100 2d32; do
-#    ./compare_many.py all 100 $dim 0 > ${dim}_poly_0.csv
-#    ./compare_many.py all 100 $dim 1e-5 > ${dim}_poly_1e-5.csv
-#    ./compare_many.py all 100 $dim 1e-3 > ${dim}_poly_1e-3.csv
-#    ./compare_many.py all 100 $dim mono > ${dim}_mono.csv
+#    python -m sasmodels.compare_many all 100 $dim 0 > ${dim}_poly_0.csv
+#    python -m sasmodels.compare_many all 100 $dim 1e-5 > ${dim}_poly_1e-5.csv
+#    python -m sasmodels.compare_many all 100 $dim 1e-3 > ${dim}_poly_1e-3.csv
+#    python -m sasmodels.compare_many all 100 $dim mono > ${dim}_mono.csv
 #done
 

sasmodels/compare.py

@@ -14 +14 @@
 
 
-from sasmodels import core
-from sasmodels import kerneldll
-from sasmodels.data import plot_theory, empty_data1D, empty_data2D
-from sasmodels.direct_model import DirectModel
-from sasmodels.convert import revert_model
+from . import core
+from . import kerneldll
+from . import models
+from .data import plot_theory, empty_data1D, empty_data2D
+from .direct_model import DirectModel
+from .convert import revert_model
 kerneldll.ALLOW_SINGLE_PRECISION_DLLS = True
 
 # List of available models
 MODELS = [basename(f)[:-3]
-          for f in sorted(glob.glob(joinpath(ROOT,"sasmodels","models","[a-zA-Z]*.py")))]
+          for f in sorted(glob.glob(joinpath(ROOT,"models","[a-zA-Z]*.py")))]
 
 # CRUFT python 2.6
@@ -396 +397 @@
 
 def get_demo_pars(name):
-    import sasmodels.models
     __import__('sasmodels.models.'+name)
-    model = getattr(sasmodels.models, name)
+    model = getattr(models, name)
     pars = getattr(model, 'demo', None)
     if pars is None: pars = dict((p[0],p[2]) for p in model.parameters)

sasmodels/compare_many.py

@@ -5 +5 @@
 import numpy as np
 
-from sasmodels import core
-from sasmodels.kernelcl import environment
-from compare import (MODELS, randomize_model, suppress_pd, eval_sasview,
-                     eval_opencl, eval_ctypes, make_data, get_demo_pars,
-                     columnize)
+from . import core
+from .kernelcl import environment
+from .compare import (MODELS, randomize_model, suppress_pd, eval_sasview,
+                      eval_opencl, eval_ctypes, make_data, get_demo_pars,
+                      columnize)
 
 def get_stats(target, value, index):