Changeset 7e923c2 in sasmodels for sasmodels/core.py
- Timestamp:
- Aug 7, 2018 10:45:52 PM (6 years ago)
- Branches:
- master, core_shell_microgels, magnetic_model, ticket-1257-vesicle-product, ticket_1156, ticket_1265_superball, ticket_822_more_unit_tests
- Children:
- 1a7ddc9
- Parents:
- c036ddb (diff), e9b17b18 (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. - File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
sasmodels/core.py
rc036ddb r7e923c2 37 37 if CUSTOM_MODEL_PATH == "": 38 38 CUSTOM_MODEL_PATH = joinpath(os.path.expanduser("~"), ".sasmodels", "custom_models") 39 if not os.path.isdir(CUSTOM_MODEL_PATH):40 os.makedirs(CUSTOM_MODEL_PATH)39 #if not os.path.isdir(CUSTOM_MODEL_PATH): 40 # os.makedirs(CUSTOM_MODEL_PATH) 41 41 42 42 # TODO: refactor composite model support … … 232 232 if not callable(model_info.Iq): 233 233 source = generate.make_source(model_info)['dll'] 234 old_path = kerneldll. DLL_PATH234 old_path = kerneldll.SAS_DLL_PATH 235 235 try: 236 kerneldll. DLL_PATH = path236 kerneldll.SAS_DLL_PATH = path 237 237 dll = kerneldll.make_dll(source, model_info, dtype=numpy_dtype) 238 238 finally: 239 kerneldll. DLL_PATH = old_path239 kerneldll.SAS_DLL_PATH = old_path 240 240 compiled_dlls.append(dll) 241 241 return compiled_dlls
Note: See TracChangeset
for help on using the changeset viewer.