Changes in / [33969b6:1662ebe] in sasmodels
- Files:
-
- 3 added
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
.gitignore
re9ed2de re9ed2de 8 8 *.so 9 9 *.obj 10 *.o 10 11 /doc/_build/ 11 12 /doc/api/ … … 19 20 /.pydevproject 20 21 /.idea 22 .vscode 21 23 /sasmodels.egg-info/ 22 24 /example/Fit_*/ -
sasmodels/kerneldll.py
r33969b6 r33969b6 181 181 subprocess.check_output(command, shell=shell, stderr=subprocess.STDOUT) 182 182 except subprocess.CalledProcessError as exc: 183 raise RuntimeError("compile failed.\n%s\n%s"%(command_str, exc.output)) 183 raise RuntimeError("compile failed.\n%s\n%s" 184 % (command_str, exc.output.decode())) 184 185 if not os.path.exists(output): 185 186 raise RuntimeError("compile failed. File is in %r"%source) -
sasmodels/modelinfo.py
r95498a3 r95498a3 12 12 from os.path import abspath, basename, splitext 13 13 import inspect 14 import logging 14 15 15 16 import numpy as np # type: ignore 17 18 from . import autoc 16 19 17 20 # Optional typing … … 32 35 TestCondition = Tuple[ParameterSetUser, TestInput, TestValue] 33 36 # pylint: enable=unused-import 37 38 logger = logging.getLogger(__name__) 34 39 35 40 # If MAX_PD changes, need to change the loop macros in kernel_iq.c … … 807 812 info.sesans = getattr(kernel_module, 'sesans', None) # type: ignore 808 813 # Default single and opencl to True for C models. Python models have callable Iq. 809 info.opencl = getattr(kernel_module, 'opencl', not callable(info.Iq))810 info.single = getattr(kernel_module, 'single', not callable(info.Iq))811 814 info.random = getattr(kernel_module, 'random', None) 812 815 … … 817 820 info.hidden = getattr(kernel_module, 'hidden', None) # type: ignore 818 821 822 info.lineno = {} 823 _find_source_lines(info, kernel_module) 824 if getattr(kernel_module, 'py2c', False): 825 try: 826 autoc.convert(info, kernel_module) 827 except Exception as exc: 828 logger.warn(str(exc) + " while converting %s from C to python"%name) 829 830 # Needs to come after autoc.convert since the Iq symbol may have been 831 # converted from python to C 832 info.opencl = getattr(kernel_module, 'opencl', not callable(info.Iq)) 833 info.single = getattr(kernel_module, 'single', not callable(info.Iq)) 834 819 835 if callable(info.Iq) and parameters.has_2d: 820 836 raise ValueError("oriented python models not supported") 821 822 info.lineno = {}823 _find_source_lines(info, kernel_module)824 837 825 838 return info
Note: See TracChangeset
for help on using the changeset viewer.