From 03ceb18eb00bd69dc3cfa32784d75f7e043f9532 Mon Sep 17 00:00:00 2001 From: Tom Hampson Date: Wed, 23 Oct 2024 11:29:21 +0100 Subject: [PATCH] Pin mkl to avoid Windows unit test failures with version 2024.2.2 Failing tests: AbinsBroadeningTest MuonMaxEntTest (unit test) --- conda/recipes/conda_build_config.yaml | 4 ++++ conda/recipes/mantid-developer/meta.yaml | 1 + conda/recipes/mantid/meta.yaml | 2 ++ 3 files changed, 7 insertions(+) diff --git a/conda/recipes/conda_build_config.yaml b/conda/recipes/conda_build_config.yaml index df5a5e1aff52..bb57c67fe905 100644 --- 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 index 672d9e8b4edc..9bf19088befb 100644 --- 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 index 530d1f16444a..7a682c6434b2 100644 --- 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 }}