Changeset ca78fe6 in sasview

Timestamp:

Jul 30, 2018 5:01:29 AM (6 years ago)

Author:

wojciech

Branches:

ESS_GUI, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_iss879, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc

Children:

2ae3edb

Parents:

3067196

Message:

spec file modified to check if numerical lib is required for osx

Files:

• build_tools/conda_qt5_min_osx.yml (modified) (1 diff)
• installers/sasview_qt5_osx.spec (modified) (1 diff)

build_tools/conda_qt5_min_osx.yml

@@ -3 +3 @@
   - conda-forge
 dependencies:
- - numpy
  - matplotlib
  - scipy

installers/sasview_qt5_osx.spec

@@ -72 +72 @@
 datas.append((os.path.join(PYTHON_LOC,'lib','python3.6', 'site-packages','zmq','libzmq.cpython-36m-darwin.so'),'.'))
 # These depend on whether we have MKL or Atlas numpy
-if os.path.exists(os.path.join(LIBLOC, LIBPREFIX + 'mkl_core.' + LIBSUFFIX)):
-    datas.append(add_binary(LIBPREFIX + 'mkl_avx2.' + LIBSUFFIX))
-    datas.append(add_binary(LIBPREFIX + 'mkl_core.' + LIBSUFFIX))
-elif os.path.exists(os.path.join(LIBLOC, LIBPREFIX + 'numpy-atlas.' + LIBSUFFIX)):
-    datas.append(add_binary(LIBPREFIX + 'numpy-atlas.' + LIBSUFFIX))
-else:
-    raise Exception("No numerical library for numpy found.")
+#if os.path.exists(os.path.join(LIBLOC, LIBPREFIX + 'mkl_core.' + LIBSUFFIX)):
+#    datas.append(add_binary(LIBPREFIX + 'mkl_avx2.' + LIBSUFFIX))
+#    datas.append(add_binary(LIBPREFIX + 'mkl_core.' + LIBSUFFIX))
+#elif os.path.exists(os.path.join(LIBLOC, LIBPREFIX + 'numpy-atlas.' + LIBSUFFIX)):
+#    datas.append(add_binary(LIBPREFIX + 'numpy-atlas.' + LIBSUFFIX))
+#else:
+#    raise Exception("No numerical library for numpy found.")
 
 #import sas.sascalc.dataloader.readers