Changeset 71f8bdb in sasmodels


Ignore:
Timestamp:
Oct 4, 2016 5:54:30 PM (5 years ago)
Author:
wojciech
Children:
9acbd37
Parents:
b01a603 (diff), e6378f9 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merged with master

Files:
1 added
3 edited
1 moved

Legend:

Unmodified
Added
Removed
  • sasmodels/modelinfo.py

    r340428e rca55aa0  
    4343COMMON_PARAMETERS = [ 
    4444    ("scale", "", 1, (0.0, np.inf), "", "Source intensity"), 
    45     ("background", "1/cm", 1e-3, (0.0, np.inf), "", "Source background"), 
     45    ("background", "1/cm", 1e-3, (-np.inf, np.inf), "", "Source background"), 
    4646] 
    4747assert (len(COMMON_PARAMETERS) == 2 
  • doc/ref/gpu_computations.rst

    r1875f4e r0c1e5a9  
    11.. _models-complitation: 
    22 
    3 ****************** 
    4 Models Compliation 
    5 ****************** 
     3**************** 
     4GPU Computations 
     5**************** 
    66SasView model evaluations can run on your graphics card (GPU) or they can run 
    77on the processor (CPU). 
    88 
    99To run on the GPU, your computer must have OpenCL drivers installed. 
    10  
    11 ... give details on how to identify graphics cards, how to tell if OpenCL 
    12 is already installed and where to get drivers if it is not ... 
    13  
    14 Note that Intel provides an OpenCL drivers for Intel processors. 
    15 This can sometimes make use of special vector instructions across multiple 
    16 processors, so it is worth installing if the GPU does not support double 
    17 precision. 
    18 You can install this driver alongside the GPU driver for NVIDIA or AMD. 
     10For information about OpenCL installation see the 
     11:ref:`opencl-installation` documentation 
    1912 
    2013Where the model is evaluated is a little bit complicated. 
  • doc/ref/index.rst

    r1875f4e r0c1e5a9  
    99   intro.rst 
    1010   refs.rst 
    11    compilation.rst 
     11   gpu_computations.rst 
    1212   magnetism/magnetism.rst 
  • sasmodels/kerneldll.py

    r3764ec1 rb01a603  
    241241    if not os.path.exists(dll): 
    242242        need_recompile = True 
    243     elif getattr(sys, 'frozen', None) is not None: 
    244         # TODO: don't suppress time stamp 
    245         # Currently suppressing recompile when running in a frozen environment 
    246         need_recompile = False 
     243    #elif getattr(sys, 'frozen', None) is not None: 
     244    #    # TODO: don't suppress time stamp 
     245    #    # Currently suppressing recompile when running in a frozen environment 
     246    #    need_recompile = False 
    247247    else: 
    248248        dll_time = os.path.getmtime(dll) 
     
    259259        # Note: if there is a syntax error then compile raises an error 
    260260        # and the source file will not be deleted. 
    261         os.unlink(filename) 
    262         #print("saving compiled file in %r"%filename) 
     261        #os.unlink(filename) 
     262        print("saving compiled file in %r"%filename) 
    263263    return dll 
    264264 
     
    301301    def _load_dll(self): 
    302302        # type: () -> None 
    303         #print("dll", self.dllpath) 
     303        print("dll", self.dllpath) 
    304304        try: 
    305305            self._dll = ct.CDLL(self.dllpath) 
Note: See TracChangeset for help on using the changeset viewer.