diff --git a/continuous_integration/install.sh b/continuous_integration/install.sh old mode 100644 new mode 100755 index 7a958980..ec046349 --- a/continuous_integration/install.sh +++ b/continuous_integration/install.sh @@ -69,11 +69,12 @@ 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 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 @@ -112,6 +113,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..ca94ff59 --- a/continuous_integration/install_flexiblas.sh +++ b/continuous_integration/install_flexiblas.sh @@ -12,7 +12,8 @@ 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 +head contributed/lapack-3.12.0/CMakeLists.txt mkdir build pushd build @@ -32,6 +33,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