Skip to content

Commit cee059b

Browse files
committed
[GR-69542] Fix torch wheelbuilder
PullRequest: graalpython/3994
2 parents 7abd2db + 4a136fd commit cee059b

File tree

7 files changed

+4
-9
lines changed

7 files changed

+4
-9
lines changed

.github/workflows/build-linux-aarch64-wheels.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ jobs:
3535
cache: false
3636
- name: Build wheels
3737
run: |
38-
export PIP_GRAALPY_PATCHES_URL="${GITHUB_WORKSPACE}/graalpython/lib-graalpython/patches"
3938
python3 -m venv wheelbuilder_venv
4039
wheelbuilder_venv/bin/python3 scripts/wheelbuilder/build_wheels.py ${{ inputs.graalpy_url }}
4140
- name: Store wheels

.github/workflows/build-linux-amd64-wheels.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@ jobs:
3333
cache: false
3434
- name: Build wheels
3535
run: |
36-
export PIP_GRAALPY_PATCHES_URL="${GITHUB_WORKSPACE}/graalpython/lib-graalpython/patches"
3736
python3 -m venv wheelbuilder_venv
3837
wheelbuilder_venv/bin/python3 scripts/wheelbuilder/build_wheels.py ${{ inputs.graalpy_url }}
3938
- name: Store wheels

.github/workflows/build-macos-aarch64-wheels.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ jobs:
2828
python-version: 3.12
2929
- name: Build wheels
3030
run: |
31-
export PIP_GRAALPY_PATCHES_URL="${GITHUB_WORKSPACE}/graalpython/lib-graalpython/patches"
3231
python3 scripts/wheelbuilder/build_wheels.py ${{ inputs.graalpy_url }}
3332
- name: Store wheels
3433
uses: actions/upload-artifact@main

.github/workflows/build-macos-amd64-wheels.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ jobs:
2828
python-version: 3.12
2929
- name: Build wheels
3030
run: |
31-
export PIP_GRAALPY_PATCHES_URL="${GITHUB_WORKSPACE}/graalpython/lib-graalpython/patches"
3231
python3 scripts/wheelbuilder/build_wheels.py ${{ inputs.graalpy_url }}
3332
- name: Store wheels
3433
uses: actions/upload-artifact@main

.github/workflows/build-windows-amd64-wheels.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,6 @@ jobs:
3030
- name: Build wheels
3131
run: |
3232
$env:PATH+=";C:\Program Files\Git\usr\bin"
33-
$env:PIP_GRAALPY_PATCHES_URL=$env:GITHUB_WORKSPACE
34-
$env:PIP_GRAALPY_PATCHES_URL+="/graalpython/lib-graalpython/patches"
3533
python3 scripts/wheelbuilder/build_wheels.py ${{ inputs.graalpy_url }}
3634
- name: Store wheels
3735
uses: actions/upload-artifact@main

scripts/wheelbuilder/README.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,6 @@ For macOS/aarch64, you get no isolation from act, so I just run it directly.
6565
git clone https://github.com/oracle/graalpython
6666
VERSION=24.2.0
6767
export GITHUB_RUN_ID=doesntMatterJustTriggerBrewInstallScripts
68-
export PIP_GRAALPY_PATCHES_URL="$(pwd)/graalpython/graalpython/lib-graalpython/patches"
6968
python3 -m venv wheelbuilder-venv
7069
. wheelbuilder-venv/bin/activate
7170
python3 graalpython/scripts/wheelbuilder/build_wheels.py https://github.com/oracle/graalpython/releases/download/graal-$VERSION/graalpy-$VERSION-macos-aarch64.tar.gz
@@ -76,7 +75,6 @@ For Windows/amd64, you get no isolation from act, so I just run it directly in V
7675
git clone https://github.com/oracle/graalpython
7776
$VERSION="24.2.0"
7877
$env:GITHUB_RUN_ID="doesntMatterJustTriggerBrewInstallScripts"
79-
$env:PIP_GRAALPY_PATCHES_URL="$PWD/graalpython/graalpython/lib-graalpython/patches"
8078
python3 -m venv wheelbuilder-venv
8179
wheelbuilder-venv/scripts/activate
8280
python3 graalpython/scripts/wheelbuilder/build_wheels.py https://github.com/oracle/graalpython/releases/download/graal-$VERSION/graalpy-$VERSION-windows-amd64.zip

scripts/wheelbuilder/linux/torch.sh

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,10 @@
3838
# SOFTWARE.
3939

4040
if [ -n "$GITHUB_RUN_ID" ]; then
41-
dnf install -y openblas-devel /usr/bin/cmake /usr/bin/sudo libffi-devel
41+
dnf install -y openblas-devel /usr/bin/sudo libffi-devel
42+
# There's already cmake in the manylinux image installed via pipx that is
43+
# too new to build torch, this downgrades it
44+
pipx install --force cmake==3.28
4245
export USE_CUDA=0
4346
fi
4447
export MAX_JOBS=4

0 commit comments

Comments
 (0)