- Timestamp:
- Aug 12, 2016 4:40:40 AM (8 years ago)
- Branches:
- master, ESS_GUI, ESS_GUI_Docs, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_iss879, ESS_GUI_iss959, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc, costrafo411, magnetic_scatt, release-4.1.1, release-4.1.2, release-4.2.2, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload
- Children:
- 1925a8e
- Parents:
- 2c627ad (diff), 2cff9db (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. - Location:
- sasview
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
sasview/setup_exe.py
rc3e4e213 r98d89df 243 243 data_files.append(('.', [f])) 244 244 245 # atlas DLL required by matplotlib 11.1 246 # ** REVISIT WHEN MOVING TO ANACONDA ** 247 f = "c:\\python27\\lib\\site-packages\\numpy\\core\\numpy-atlas.dll" 248 if os.path.isfile(f): 249 data_files.append(('.', [f])) 250 245 # numerical libraries 246 def dll_check(dll_path, dlls): 247 dll_includes = [os.path.join(dll_path, dll+'.dll') for dll in dlls] 248 return [dll for dll in dll_includes if os.path.exists(dll)] 249 250 python_root = os.path.dirname(os.path.abspath(sys.executable)) 251 # Check for ATLAS 252 dll_path = os.path.join(python_root, 'lib', 'site-packages', 'numpy', 'core') 253 dlls = ['numpy-atlas'] 254 atlas_dlls = dll_check(dll_path, dlls) 255 256 # Check for MKL 257 dll_path = os.path.join(python_root, 'Library', 'bin') 258 dlls = ['mkl_core', 'mkl_def', 'libiomp5md'] 259 mkl_dlls = dll_check(dll_path, dlls) 260 261 if atlas_dlls: 262 data_files.append(('.', atlas_dlls)) 263 elif mkl_dlls: 264 data_files.append(('.', mkl_dlls)) 265 251 266 if os.path.isfile("BUILD_NUMBER"): 252 267 data_files.append(('.', ["BUILD_NUMBER"])) -
sasview/sasview.py
r1be5202 rc23f303 81 81 #Always use private .matplotlib setup to avoid conflicts with other 82 82 #uses of matplotlib 83 #Have to check if .sasview exists first 83 #Have to check if .sasview exists first 84 84 sasdir = os.path.join(os.path.expanduser("~"),'.sasview') 85 85 if not os.path.exists(sasdir): … … 119 119 # Fitting perspective 120 120 try: 121 import sas.sasgui.perspectives.fitting as module 121 import sas.sasgui.perspectives.fitting as module 122 122 fitting_plug = module.Plugin() 123 123 self.gui.add_perspective(fitting_plug) … … 145 145 logging.error(traceback.format_exc()) 146 146 147 #Calculator perspective 147 # Corfunc perspective 148 try: 149 import sas.sasgui.perspectives.corfunc as module 150 corfunc_plug = module.Plugin() 151 self.gui.add_perspective(corfunc_plug) 152 except: 153 logging.error("Unable to load corfunc module") 154 155 #Calculator perspective 148 156 try: 149 157 import sas.sasgui.perspectives.calculator as module … … 191 199 if __name__ == "__main__": 192 200 run() 193
Note: See TracChangeset
for help on using the changeset viewer.