From ef3cbf8399db9a593ebaf27e26f46ea23522716f Mon Sep 17 00:00:00 2001 From: Daniel Weindl Date: Fri, 5 Jan 2024 12:14:51 +0100 Subject: [PATCH] mpip --- .github/workflows/test_python_cplusplus.yml | 6 ------ scripts/installAmiciSource.sh | 8 ++++---- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/.github/workflows/test_python_cplusplus.yml b/.github/workflows/test_python_cplusplus.yml index 035804f621..be94544f86 100644 --- a/.github/workflows/test_python_cplusplus.yml +++ b/.github/workflows/test_python_cplusplus.yml @@ -12,8 +12,6 @@ jobs: ubuntu-cpp-python-tests: name: C++/Python tests Ubuntu runs-on: ubuntu-22.04 - env: - AMICI_PARALLEL_COMPILE: "" strategy: matrix: @@ -109,8 +107,6 @@ jobs: ubuntu-python-tests: name: Python tests Ubuntu runs-on: ubuntu-22.04 - env: - AMICI_PARALLEL_COMPILE: "" strategy: matrix: @@ -187,8 +183,6 @@ jobs: ubuntu-notebook-tests: name: Notebook tests Ubuntu runs-on: ubuntu-22.04 - env: - AMICI_PARALLEL_COMPILE: "" strategy: matrix: diff --git a/scripts/installAmiciSource.sh b/scripts/installAmiciSource.sh index f218180105..bbb4bf4a83 100755 --- a/scripts/installAmiciSource.sh +++ b/scripts/installAmiciSource.sh @@ -29,9 +29,9 @@ else source "${venv_dir}/bin/activate" fi -pip install --upgrade pip wheel -pip install --upgrade pip setuptools cmake_build_extension numpy -pip install git+https://github.com/FFroehlich/pysb@fix_pattern_matching # pin to PR for SPM with compartments +python -m pip install --upgrade pip wheel +python -m pip install --upgrade pip setuptools cmake_build_extension numpy +python -m pip install git+https://github.com/FFroehlich/pysb@fix_pattern_matching # pin to PR for SPM with compartments AMICI_BUILD_TEMP="${AMICI_PATH}/python/sdist/build/temp" \ - pip install --verbose -e "${AMICI_PATH}/python/sdist[petab,test,vis]" --no-build-isolation + python -m pip install --verbose -e "${AMICI_PATH}/python/sdist[petab,test,vis]" --no-build-isolation deactivate