Merge pull request #38281 from mantidproject/pin_mkl_to_2024_1_0_rele…

…ase-next Pin mkl to avoid Windows unit test failures with version 2024.2.2 (release-next)
mantidproject · Oct 23, 2024 · c66b9d7 · c66b9d7
2 parents 470de8e + 03ceb18
commit c66b9d7
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 0 deletions.
diff --git a/conda/recipes/conda_build_config.yaml b/conda/recipes/conda_build_config.yaml
@@ -52,6 +52,10 @@ jsoncpp:
 libglu:
   - '>=9.0'
 
+# Not a primary dependency, but pinning to avoid a couple of unit test failures
+mkl:
+  - 2024.1.0
+
 muparser:
   - '>=2.3.2'
 

diff --git a/conda/recipes/mantid-developer/meta.yaml b/conda/recipes/mantid-developer/meta.yaml
@@ -24,6 +24,7 @@ requirements:
     - libopenblas {{ libopenblas }} # [osx or linux]
     - librdkafka {{ librdkafka }}
     - matplotlib {{ matplotlib }}
+    - mkl {{ mkl }} # [win]
     - muparser {{ muparser }}
     - nexus {{ nexus }}
     - ninja {{ ninja }}

diff --git a/conda/recipes/mantid/meta.yaml b/conda/recipes/mantid/meta.yaml
@@ -43,6 +43,7 @@ requirements:
     - libopenblas {{ libopenblas }}  # [osx or linux]
     - librdkafka {{ librdkafka }}
     - lib3mf  # [win]
+    - mkl {{ mkl }} # [win]
     - muparser {{ muparser }}
     - nexus {{ nexus }}
     - numpy {{ numpy }}
@@ -60,6 +61,7 @@ requirements:
     - {{ pin_compatible("hdf5", max_pin="x.x") }}
     - jemalloc {{ jemalloc }}  # [osx or linux]
     - lib3mf  # [win]
+    - mkl {{ mkl }} # [win]
     - nexus {{ nexus }}
     - {{ pin_compatible("numpy", upper_bound="1.27") }}
     - occt {{ occt }}