mkl fix

gprMax/__init__.py

@@ -12,8 +12,8 @@ import sys
 # There is a bug with threading and MKL on macOS
 # (https://github.com/gprMax/gprMax/issues/195) . Setting the MKL threading
 # layer to sequential solves it, but must be done before numpy is imported.
-if sys.platform == 'darwin':
+#if sys.platform == 'darwin':
-    os.environ["MKL_THREADING_LAYER"] = 'sequential'
+#    os.environ["MKL_THREADING_LAYER"] = 'sequential'
 
 from ._version import __version__
 from .cmds_single_use import Discretisation

setup.py

@@ -180,6 +180,7 @@ if sys.platform == 'win32':
     compile_args = ['/O2', '/openmp', '/w']  # No static linking as no static version of OpenMP library; /w disables warnings
     linker_args = []
     extra_objects = []
+    libraries=[]
 # macOS - needs gcc (usually via HomeBrew) because the default compiler LLVM (clang) does not support OpenMP
 #          - with gcc -fopenmp option implies -pthread
 elif sys.platform == 'darwin':
@@ -192,12 +193,14 @@ elif sys.platform == 'darwin':
         raise('Cannot find gcc 4-9 in /usr/local/bin. gprMax requires gcc to be installed - easily done through the Homebrew package manager (http://brew.sh). Note: gcc with OpenMP support is required.')
     compile_args = ['-O3', '-w', '-fopenmp', '-march=native']  # Sometimes worth testing with '-fstrict-aliasing', '-fno-common'
     linker_args = ['-fopenmp', '-Wl,-rpath,' + rpath]
+    libraries=['iomp5', 'pthread']
     extra_objects = []
 # Linux
 elif sys.platform == 'linux':
     compile_args = ['-O3', '-w', '-fopenmp', '-march=native']
     linker_args = ['-fopenmp']
     extra_objects = []
+    libraries=[]
 
 # Build a list of all the extensions
 extensions = []
@@ -213,6 +216,7 @@ for file in cythonfiles:
                           include_dirs=[np.get_include()],
                           extra_compile_args=compile_args,
                           extra_link_args=linker_args,
+                          libraries=libraries,
                           extra_objects=extra_objects)
     extensions.append(extension)