From 01bdde89bc22988cf7acc8bde3322517489c7563 Mon Sep 17 00:00:00 2001 From: Evgeni Burovski Date: Tue, 18 Jun 2024 09:56:55 +0300 Subject: [PATCH] CI: fix the graviton job --- .cirun.yml | 4 ++-- .github/workflows/run_cirun_graviton.yml | 15 ++++++++++----- pyproject.toml | 4 +++- 3 files changed, 15 insertions(+), 8 deletions(-) diff --git a/.cirun.yml b/.cirun.yml index bfc6494d..ccae08b6 100644 --- a/.cirun.yml +++ b/.cirun.yml @@ -7,8 +7,8 @@ runners: region: "us-east-1" # Cheapest VM on AWS instance_type: "c7g.large" - # Ubuntu-22.04, ami image - machine_image: "ami-0a0c8eebcdd6dcbd0" + # Ubuntu-24.04, ami image + machine_image: "ami-0eac975a54dfee8cb" preemptible: false # Add this label in the "runs-on" param in .github/workflows/.yml # So that this runner is created for running the workflow diff --git a/.github/workflows/run_cirun_graviton.yml b/.github/workflows/run_cirun_graviton.yml index 7b81a590..032b1682 100644 --- a/.github/workflows/run_cirun_graviton.yml +++ b/.github/workflows/run_cirun_graviton.yml @@ -47,7 +47,7 @@ jobs: run: | if [ "$RUNNER_OS" == "Linux" ]; then sudo apt update - sudo apt-get install -y gfortran cmake ccache libtinfo5 python3-pip pkg-config + sudo apt-get install -y gfortran cmake ccache python3-pip pkg-config else echo "::error::$RUNNER_OS not supported" exit 1 @@ -55,18 +55,22 @@ jobs: - name: Install python dependencies run: | - pip3 install numpy meson meson-python ninja build asv virtualenv + pip3 install "numpy<2" meson meson-python ninja build asv virtualenv --break-system-packages # pip3 install scipy_openblas32 # install the nightly OpenBLAS wheel - pip install -i https://pypi.anaconda.org/scientific-python-nightly-wheels/simple scipy-openblas32 + pip install -i https://pypi.anaconda.org/scientific-python-nightly-wheels/simple scipy-openblas32 --break-system-packages python3 -c'import scipy_openblas32 as so; print(so.get_pkg_config())' > scipy_openblas.pc export PKG_CONFIG_PATH=$PWD echo ">>>> PKG_CONFIG" $PKG_CONFIG_PATH cat scipy_openblas.pc + echo ">>> mesonpy" + python3 -c'import mesonpy; print(mesonpy.__file__)' + echo $PATH + echo $PYTHONPATH + - name: Set and log asv machine configuration run: | - cd benchmark/pybench/asv python3 -m asv machine --yes --config asv.conf.json echo "Machine Configuration:" cat ~/.asv-machine.json @@ -79,8 +83,9 @@ jobs: - name: Run benchmarks run: | echo ${{ github.workspace}} - cd benchmark/pybench/asv + python3 -c"import mesonpy; print(mesonpy.__file__)" python3 -m asv run --config $ASV_CONFIG -v env: PKG_CONFIG_PATH: ${{ github.workspace }} + PYTHONPATH: ${{ github.workspace }} # FIXME diff --git a/pyproject.toml b/pyproject.toml index 535f9642..cb6133f1 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -2,7 +2,9 @@ build-backend = "mesonpy" requires = [ "meson-python>=0.16.0", - "numpy", + "meson", + "ninja", + "numpy<2", "scipy_openblas32" ]