Skip to content

Commit

Permalink
Merge pull request qutip#2529 from Ericgig/bug.mkl_win
Browse files Browse the repository at this point in the history
Fix failing test with mkl windows
  • Loading branch information
Ericgig authored Sep 11, 2024
2 parents ad35160 + 82a32cd commit 0b4260e
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 1 deletion.
1 change: 1 addition & 0 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -211,6 +211,7 @@ jobs:
# to see if something hung.
timeout-minutes: 60
run: |
export MKL_VERBOSE=2
if [[ -n "${{ matrix.openmp }}" ]]; then
# Force OpenMP runs to use more threads, even if there aren't
# actually that many CPUs. We have to check any dispatch code is
Expand Down
2 changes: 1 addition & 1 deletion qutip/about.py
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ def about():
print("Number of CPUs: %s" % settings.num_cpus)
print("BLAS Info: %s" % _blas_info())
# print("OPENMP Installed: %s" % str(qutip.settings.has_openmp))
print("INTEL MKL Ext: %s" % str(settings.has_mkl))
print("INTEL MKL Ext: %s" % settings.mkl_lib_location)
print("Platform Info: %s (%s)" % (platform.system(),
platform.machine()))
qutip_install_path = os.path.dirname(inspect.getsourcefile(qutip))
Expand Down
4 changes: 4 additions & 0 deletions qutip/settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,10 @@ def _find_mkl():
distributions.
"""
plat = sys.platform
# TODO: fix the mkl handling on windows or use modules like pydiso to do it
# for us.
if plat.startswith("win"):
return ""
python_dir = os.path.dirname(sys.executable)
if plat in ['darwin', 'linux2', 'linux']:
python_dir = os.path.dirname(python_dir)
Expand Down

0 comments on commit 0b4260e

Please sign in to comment.