Skip to content

Commit 58e38ec

Browse files
unpin mkl in dependencies (#39114)
mkl was pinned a while ago to avoid unit test failures. It seems that this is no longer required. --------- Co-authored-by: Tom Hampson <thomas.hampson@stfc.ac.uk>
1 parent 993b04f commit 58e38ec

File tree

3 files changed

+0
-7
lines changed

3 files changed

+0
-7
lines changed

conda/recipes/conda_build_config.yaml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -55,10 +55,6 @@ jsoncpp:
5555
libglu:
5656
- '>=9.0'
5757

58-
# Not a primary dependency, but pinning to avoid a couple of unit test failures
59-
mkl:
60-
- 2024.1.0
61-
6258
muparser:
6359
- '>=2.3.2'
6460

conda/recipes/mantid-developer/meta.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ requirements:
2626
- libopenblas {{ libopenblas }} # [osx or linux]
2727
- librdkafka {{ librdkafka }}
2828
- matplotlib {{ matplotlib }}
29-
- mkl {{ mkl }} # [win]
3029
- muparser {{ muparser }}
3130
- ninja {{ ninja }}
3231
- numpy>=2.0,<2.2 # This is intentionally different to conda_build_config.yaml, will address later.

conda/recipes/mantid/meta.yaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@ requirements:
4444
- libopenblas {{ libopenblas }} # [osx or linux]
4545
- librdkafka {{ librdkafka }}
4646
- lib3mf # [win]
47-
- mkl {{ mkl }} # [win]
4847
- muparser {{ muparser }}
4948
- numpy {{ numpy }}
5049
- occt {{ occt }}
@@ -63,7 +62,6 @@ requirements:
6362
- {{ pin_compatible("hdf5", max_pin="x.x") }}
6463
- jemalloc {{ jemalloc }} # [osx or linux]
6564
- lib3mf # [win]
66-
- mkl {{ mkl }} # [win]
6765
- {{ pin_compatible("numpy", upper_bound="2.2") }}
6866
- occt {{ occt }}
6967
- pycifrw

0 commit comments

Comments
 (0)