From 5962da8a2a325b4927f1ce4fe5f6d40f96add8ce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lo=C3=AFc=20Est=C3=A8ve?= Date: Sun, 9 Nov 2025 20:31:00 +0100 Subject: [PATCH 1/5] debug --- continuous_integration/install.sh | 12 ++++++++++++ continuous_integration/install_flexiblas.sh | 2 +- 2 files changed, 13 insertions(+), 1 deletion(-) mode change 100644 => 100755 continuous_integration/install.sh mode change 100644 => 100755 continuous_integration/install_flexiblas.sh diff --git a/continuous_integration/install.sh b/continuous_integration/install.sh old mode 100644 new mode 100755 index 7a958980..25cc36a7 --- a/continuous_integration/install.sh +++ b/continuous_integration/install.sh @@ -112,6 +112,18 @@ elif [[ "$INSTALL_BLAS" == "flexiblas" ]]; then fi +if [[ "$PACKAGER" == conda* ]] || [[ -z "$PACKAGER" ]]; then + conda activate testenv + conda list +elif [[ "$PACKAGER" == pip* ]]; then + # we actually use conda to install the base environment: + conda activate testenv + pip list +elif [[ "$PACKAGER" == "ubuntu" ]]; then + source testenv/bin/activate + pip list +fi + python -m pip install -v -q -r dev-requirements.txt bash ./continuous_integration/build_test_ext.sh diff --git a/continuous_integration/install_flexiblas.sh b/continuous_integration/install_flexiblas.sh old mode 100644 new mode 100755 index 3d45ab54..755b7347 --- a/continuous_integration/install_flexiblas.sh +++ b/continuous_integration/install_flexiblas.sh @@ -12,7 +12,7 @@ git clone https://github.com/mpimd-csc/flexiblas.git pushd flexiblas # Temporary ping Flexiblas commit to avoid openmp symbols not found at link time -git checkout v3.4.2 +git checkout v3.5.0 mkdir build pushd build From 48cf127114cb68f1f68162a78f304a464fcb32d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lo=C3=AFc=20Est=C3=A8ve?= Date: Sun, 9 Nov 2025 20:54:04 +0100 Subject: [PATCH 2/5] debug --- continuous_integration/install.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/continuous_integration/install.sh b/continuous_integration/install.sh index 25cc36a7..2fa10a17 100755 --- a/continuous_integration/install.sh +++ b/continuous_integration/install.sh @@ -74,6 +74,7 @@ elif [[ "$PACKAGER" == "conda-forge" ]]; then TO_INSTALL="$TO_INSTALL libopenblas=*=*openmp*" fi make_conda "conda-forge" "$TO_INSTALL" + conda list -n testenv elif [[ "$PACKAGER" == "pip" ]]; then # Use conda to build an empty python env and then use pip to install From 89a2abb853029ec3c54efb1821badc861c12374c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lo=C3=AFc=20Est=C3=A8ve?= Date: Mon, 10 Nov 2025 06:48:03 +0100 Subject: [PATCH 3/5] wip --- continuous_integration/install_flexiblas.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/continuous_integration/install_flexiblas.sh b/continuous_integration/install_flexiblas.sh index 755b7347..1613cdcb 100755 --- a/continuous_integration/install_flexiblas.sh +++ b/continuous_integration/install_flexiblas.sh @@ -32,6 +32,7 @@ cmake ../ -DCMAKE_INSTALL_PREFIX=$ABS_PATH"/flexiblas_install" \ -DEXTRA="OPENBLAS_CONDA" \ -DFLEXIBLAS_DEFAULT="OPENBLAS_CONDA" \ -DOPENBLAS_CONDA_LIBRARY=$CONDA_PREFIX"/lib/libopenblas"$EXTENSION \ + -DCMAKE_POLICY_VERSION_MINIMUM=3.5 \ make make install From a8071854571874ada6eac58674c32ad824845c60 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lo=C3=AFc=20Est=C3=A8ve?= Date: Mon, 10 Nov 2025 06:48:41 +0100 Subject: [PATCH 4/5] debug --- continuous_integration/install_flexiblas.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/continuous_integration/install_flexiblas.sh b/continuous_integration/install_flexiblas.sh index 1613cdcb..ca94ff59 100755 --- a/continuous_integration/install_flexiblas.sh +++ b/continuous_integration/install_flexiblas.sh @@ -13,6 +13,7 @@ pushd flexiblas # Temporary ping Flexiblas commit to avoid openmp symbols not found at link time git checkout v3.5.0 +head contributed/lapack-3.12.0/CMakeLists.txt mkdir build pushd build From bfadbe81028193c270049a59749716264d3347cd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lo=C3=AFc=20Est=C3=A8ve?= Date: Mon, 10 Nov 2025 06:55:11 +0100 Subject: [PATCH 5/5] wip --- continuous_integration/install.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/continuous_integration/install.sh b/continuous_integration/install.sh index 2fa10a17..ec046349 100755 --- a/continuous_integration/install.sh +++ b/continuous_integration/install.sh @@ -69,7 +69,7 @@ if [[ "$PACKAGER" == "conda" ]]; then make_conda "defaults" "$TO_INSTALL" elif [[ "$PACKAGER" == "conda-forge" ]]; then - TO_INSTALL="numpy scipy blas=*=$BLAS" + TO_INSTALL="numpy scipy blas=*=$BLAS llvm-openmp=20.1.8=*_1" if [[ "$BLAS" == "openblas" && "$OPENBLAS_THREADING_LAYER" == "openmp" ]]; then TO_INSTALL="$TO_INSTALL libopenblas=*=*openmp*" fi