Skip to content

Commit 03fc2b6

Browse files
maksleventalmakslevental
committed
[llvm] fix aarch64 cibuildwheel
1 parent afc8db3 commit 03fc2b6

File tree

5 files changed

+21
-26
lines changed

5 files changed

+21
-26
lines changed

‎.github/workflows/build_test_release_eudsl.yml

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -142,16 +142,11 @@ jobs:
142142
- name: "Build eudsl-tblgen"
143143
run: |
144144
145-
if [[ "${{ github.event_name }}" == "workflow_dispatch" ]]; then
146-
if [[ "${{ matrix.os }}" == "ubuntu" ]]; then
147-
export CCACHE_DIR=/host/$CCACHE_DIR
148-
fi
149-
$python3_command -m cibuildwheel "$PWD/projects/eudsl-tblgen" --output-dir wheelhouse
150-
else
151-
export CMAKE_PREFIX_PATH=$PWD/llvm-install
152-
export PIP_FIND_LINKS=$PWD/wheelhouse
153-
$python3_command -m pip wheel "$PWD/projects/eudsl-tblgen" -w wheelhouse -v --no-build-isolation
145+
# this one is different from the rest as a smoketest re cibuildwheel
146+
if [[ "${{ matrix.os }}" == "ubuntu" ]]; then
147+
export CCACHE_DIR=/host/$CCACHE_DIR
154148
fi
149+
$python3_command -m cibuildwheel "$PWD/projects/eudsl-tblgen" --output-dir wheelhouse
155150
156151
- name: "Build eudsl-llvmpy"
157152
if: ${{ ! startsWith(matrix.os, 'windows') }}
@@ -201,7 +196,7 @@ jobs:
201196
202197
# just to/make sure total build continues to work
203198
- name: "Build all of eudsl"
204-
if: ${{ github.event_name == 'pull_request' }}
199+
if: ${{ github.event_name != 'workflow_dispatch' }}
205200
run: |
206201
207202
$python3_command -m pip install eudsl-tblgen -f wheelhouse

‎projects/eudsl-llvmpy/pyproject.toml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ build-verbosity = 1
4242
skip = ["*-manylinux_i686", "*-musllinux*", "pp*", "*-win32"]
4343
archs = ["auto64"]
4444
manylinux-x86_64-image = "manylinux_2_28"
45-
manylinux-aarch64-image = "manylinux_2_34"
45+
manylinux-aarch64-image = "quay.io/pypa/manylinux_2_34_aarch64"
4646
environment-pass = [
4747
"LLVM_DIR",
4848
"CMAKE_GENERATOR",
@@ -68,9 +68,8 @@ test-command = "ccache -sv"
6868
before-all = [
6969
"yum install -y clang",
7070
# ccache
71-
"curl -sLO https://github.com/ccache/ccache/releases/download/v4.10.2/ccache-4.10.2-linux-x86_64.tar.xz",
72-
"tar -xf ccache-4.10.2-linux-x86_64.tar.xz",
73-
"pushd ccache-4.10.2-linux-x86_64 && make install && popd",
71+
"echo $(if [ \"$(arch)\" == \"x86_64\" ]; then curl -sLO https://github.com/ccache/ccache/releases/download/v4.10.2/ccache-4.10.2-linux-x86_64.tar.xz && tar -xf ccache-4.10.2-linux-x86_64.tar.xz && pushd ccache-4.10.2-linux-x86_64 && make install && popd; fi)",
72+
"echo $(if [ \"$(arch)\" == \"aarch64\" ]; then dnf install -y ccache; fi)",
7473
"ccache -z"
7574
]
7675
# synchronize TZ with host so ccache files have correct timestamp

‎projects/eudsl-nbgen/pyproject.toml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ build = ["cp39*"]
4141
skip = ["*-manylinux_i686", "*-musllinux*", "pp*", "*-win32"]
4242
archs = ["auto64"]
4343
manylinux-x86_64-image = "manylinux_2_28"
44-
manylinux-aarch64-image = "manylinux_2_34"
44+
manylinux-aarch64-image = "quay.io/pypa/manylinux_2_34_aarch64"
4545
environment-pass = [
4646
"LLVM_DIR",
4747
"CMAKE_GENERATOR",
@@ -70,9 +70,9 @@ repair-wheel-command = []
7070
before-all = [
7171
"yum install -y clang",
7272
# ccache
73-
"curl -sLO https://github.com/ccache/ccache/releases/download/v4.10.2/ccache-4.10.2-linux-x86_64.tar.xz",
74-
"tar -xf ccache-4.10.2-linux-x86_64.tar.xz",
75-
"pushd ccache-4.10.2-linux-x86_64 && make install && popd"
73+
"echo $(if [ \"$(arch)\" == \"x86_64\" ]; then curl -sLO https://github.com/ccache/ccache/releases/download/v4.10.2/ccache-4.10.2-linux-x86_64.tar.xz && tar -xf ccache-4.10.2-linux-x86_64.tar.xz && pushd ccache-4.10.2-linux-x86_64 && make install && popd; fi)",
74+
"echo $(if [ \"$(arch)\" == \"aarch64\" ]; then dnf install -y ccache; fi)",
75+
"ccache -z"
7676
]
7777
# synchronize TZ with host so ccache files have correct timestamp
7878
container-engine = { name = "docker", create-args = ["-v", "/etc/timezone:/etc/timezone:ro", "-v", "/etc/localtime:/etc/localtime:ro"] }

‎projects/eudsl-py/pyproject.toml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ build-verbosity = 1
4646
skip = ["*-manylinux_i686", "*-musllinux*", "pp*", "*-win32"]
4747
archs = ["auto64"]
4848
manylinux-x86_64-image = "manylinux_2_28"
49-
manylinux-aarch64-image = "manylinux_2_34"
49+
manylinux-aarch64-image = "quay.io/pypa/manylinux_2_34_aarch64"
5050
environment-pass = [
5151
"LLVM_DIR",
5252
"MLIR_DIR",
@@ -78,9 +78,9 @@ test-command = "ccache -s"
7878
before-all = [
7979
"yum install -y clang",
8080
# ccache
81-
"curl -sLO https://github.com/ccache/ccache/releases/download/v4.10.2/ccache-4.10.2-linux-x86_64.tar.xz",
82-
"tar -xf ccache-4.10.2-linux-x86_64.tar.xz",
83-
"pushd ccache-4.10.2-linux-x86_64 && make install && popd"
81+
"echo $(if [ \"$(arch)\" == \"x86_64\" ]; then curl -sLO https://github.com/ccache/ccache/releases/download/v4.10.2/ccache-4.10.2-linux-x86_64.tar.xz && tar -xf ccache-4.10.2-linux-x86_64.tar.xz && pushd ccache-4.10.2-linux-x86_64 && make install && popd; fi)",
82+
"echo $(if [ \"$(arch)\" == \"aarch64\" ]; then dnf install -y ccache; fi)",
83+
"ccache -z"
8484
]
8585
# synchronize TZ with host so ccache files have correct timestamp
8686
container-engine = { name = "docker", create-args = ["-v", "/etc/timezone:/etc/timezone:ro", "-v", "/etc/localtime:/etc/localtime:ro"] }

‎projects/eudsl-tblgen/pyproject.toml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ build-verbosity = 1
3333
skip = ["*-manylinux_i686", "*-musllinux*", "pp*", "*-win32"]
3434
archs = ["auto64"]
3535
manylinux-x86_64-image = "manylinux_2_28"
36-
manylinux-aarch64-image = "manylinux_2_34"
36+
manylinux-aarch64-image = "quay.io/pypa/manylinux_2_34_aarch64"
3737
environment-pass = [
3838
"LLVM_DIR",
3939
"CMAKE_GENERATOR",
@@ -59,11 +59,12 @@ test-command = "ccache -s"
5959

6060
[tool.cibuildwheel.linux]
6161
before-all = [
62+
"set -x",
6263
"yum install -y clang",
6364
# ccache
64-
"curl -sLO https://github.com/ccache/ccache/releases/download/v4.10.2/ccache-4.10.2-linux-x86_64.tar.xz",
65-
"tar -xf ccache-4.10.2-linux-x86_64.tar.xz",
66-
"pushd ccache-4.10.2-linux-x86_64 && make install && popd"
65+
"echo $(if [ \"$(arch)\" == \"x86_64\" ]; then curl -sLO https://github.com/ccache/ccache/releases/download/v4.10.2/ccache-4.10.2-linux-x86_64.tar.xz && tar -xf ccache-4.10.2-linux-x86_64.tar.xz && pushd ccache-4.10.2-linux-x86_64 && make install && popd; fi)",
66+
"echo $(if [ \"$(arch)\" == \"aarch64\" ]; then dnf install -y ccache; fi)",
67+
"ccache -z"
6768
]
6869
# synchronize TZ with host so ccache files have correct timestamp
6970
container-engine = { name = "docker", create-args = ["-v", "/etc/timezone:/etc/timezone:ro", "-v", "/etc/localtime:/etc/localtime:ro"] }

0 commit comments

Comments
 (0)