Changes in / [e2d6e3b:43ff77c] in sasmodels

Files:

• .gitattributes (added)
• .travis.yml (modified) (1 diff)
• appveyor.yml (added)
• sasmodels/compare.py (modified) (1 diff)
• sasmodels/core.py (modified) (1 diff)
• sasmodels/kerneldll.py (modified) (4 diffs)
• sasmodels/kernelpy.py (modified) (1 diff)
• sasmodels/models/hayter_msa.py (modified) (1 diff)

.travis.yml

@@ -1 @@
-# Test Travis CL
-
 language: python
 python:
-  - "2.7"
-# whitelist
+- '2.7'
 branches:
   only:
-    - master
-# command to install dependencies
+  - master
 virtualenv:
   system_site_packages: true
 before_install:
-  - sudo apt-get update;
-  - sudo apt-get install python-numpy python-scipy
-#  - sudo apt-get install opencl-headers
-
+- sudo apt-get update;
+- sudo apt-get install python-numpy python-scipy
 install:
-#  - pip install pyopencl
-  - pip install bumps
-  - pip install unittest-xml-reporting
+- pip install bumps
+- pip install unittest-xml-reporting
 script:
-  - export WORKSPACE=/home/travis/build/SasView/sasmodels/
-  - python -m sasmodels.model_test dll all
+- export WORKSPACE=/home/travis/build/SasView/sasmodels/
+- python -m sasmodels.model_test dll all
+notifications:
+  slack:
+    secure: xNAUeSu1/it/x9Q2CSg79aw1LLc7d6mLpcqSCTeKROp71RhkFf8VjJnJm/lEbKHNC8yj5H9UHrz5DmzwJzI+6oMt4NdEeS6WvGhwGY/wCt2IcJKxw0vj1DAU04qFMS041Khwclo6jIqm76DloinXvmvsS+K/nSyQkF7q4egSlwA=

sasmodels/compare.py

@@ -546 +546 @@
     'f32': '32',
     'f64': '64',
+    'float16': '16',
+    'float32': '32',
+    'float64': '64',
+    'float128': '128',
     'longdouble': '128',
 }

sasmodels/core.py

@@ -250 +250 @@
         dtype = "longdouble"
     elif dtype == "half":
-        dtype = "f16"
+        dtype = "float16"
 
     # Convert dtype string to numpy dtype.

sasmodels/kerneldll.py

@@ -97 +97 @@
 
 if "SAS_COMPILER" in os.environ:
-    compiler = os.environ["SAS_COMPILER"]
+    COMPILER = os.environ["SAS_COMPILER"]
 elif os.name == 'nt':
-    # If vcvarsall.bat has been called, then VCINSTALLDIR is in the environment
-    # and we can use the MSVC compiler.  Otherwise, if tinycc is available
-    # the use it.  Otherwise, hope that mingw is available.
-    if "VCINSTALLDIR" in os.environ:
-        compiler = "msvc"
-    elif tinycc:
-        compiler = "tinycc"
+    if tinycc is not None:
+        COMPILER = "tinycc"
+    elif "VCINSTALLDIR" in os.environ:
+        # If vcvarsall.bat has been called, then VCINSTALLDIR is in the environment
+        # and we can use the MSVC compiler.  Otherwise, if tinycc is available
+        # the use it.  Otherwise, hope that mingw is available.
+        COMPILER = "msvc"
     else:
-        compiler = "mingw"
+        COMPILER = "mingw"
 else:
-    compiler = "unix"
+    COMPILER = "unix"
 
 ARCH = "" if ct.sizeof(ct.c_void_p) > 4 else "x86"  # 4 byte pointers on x86
-if compiler == "unix":
+if COMPILER == "unix":
     # Generic unix compile
     # On mac users will need the X code command line tools installed
@@ -123 +123 @@
         """unix compiler command"""
         return CC + [source, "-o", output, "-lm"]
-elif compiler == "msvc":
+elif COMPILER == "msvc":
     # Call vcvarsall.bat before compiling to set path, headers, libs, etc.
     # MSVC compiler is available, so use it.  OpenMP requires a copy of
@@ -139 +139 @@
         """MSVC compiler command"""
         return CC + ["/Tp%s"%source] + LN + ["/OUT:%s"%output]
-elif compiler == "tinycc":
+elif COMPILER == "tinycc":
     # TinyCC compiler.
     CC = [tinycc.TCC] + "-shared -rdynamic -Wall".split()
@@ -145 +145 @@
         """tinycc compiler command"""
         return CC + [source, "-o", output]
-elif compiler == "mingw":
+elif COMPILER == "mingw":
     # MinGW compiler.
     CC = "gcc -shared -std=c99 -O2 -Wall".split()

sasmodels/kernelpy.py

@@ -235 +235 @@
             # exclude all q for that NaN.  Even better would be to have an
             # INVALID expression like the C models, but that is too expensive.
-            Iq = form()
+            Iq = np.asarray(form(), 'd')
             if np.isnan(Iq).any(): continue
 

sasmodels/models/hayter_msa.py

@@ -74 +74 @@
     ["radius_effective", "Ang", 20.75,   [0, inf],    "volume", "effective radius of charged sphere"],
     ["volfraction",   "None",     0.0192, [0, 0.74],   "", "volume fraction of spheres"],
-    ["charge",        "e",   19.0,    [0, inf],    "", "charge on sphere (in electrons)"],
-    ["temperature",   "K",  318.16,   [0, inf],    "", "temperature, in Kelvin, for Debye length calculation"],
-    ["concentration_salt",      "M",    0.0,    [-inf, inf], "", "conc of salt, moles/litre, 1:1 electolyte, for Debye length"],
+    ["charge",        "e",   19.0,    [0, 200],    "", "charge on sphere (in electrons)"],
+    ["temperature",   "K",  318.16,   [0, 450],    "", "temperature, in Kelvin, for Debye length calculation"],
+    ["concentration_salt",      "M",    0.0,    [0, inf], "", "conc of salt, moles/litre, 1:1 electolyte, for Debye length"],
     ["dielectconst",  "None",    71.08,   [-inf, inf], "", "dielectric constant (relative permittivity) of solvent, default water, for Debye length"]
     ]