Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[llvm] fix aarch64 cibuildwheel #59

Merged
merged 1 commit into from
Jan 30, 2025
Merged

[llvm] fix aarch64 cibuildwheel #59

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 5 additions & 10 deletions .github/workflows/build_test_release_eudsl.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,16 +142,11 @@ jobs:
- name: "Build eudsl-tblgen"
run: |

if [[ "${{ github.event_name }}" == "workflow_dispatch" ]]; then
if [[ "${{ matrix.os }}" == "ubuntu" ]]; then
export CCACHE_DIR=/host/$CCACHE_DIR
fi
$python3_command -m cibuildwheel "$PWD/projects/eudsl-tblgen" --output-dir wheelhouse
else
export CMAKE_PREFIX_PATH=$PWD/llvm-install
export PIP_FIND_LINKS=$PWD/wheelhouse
$python3_command -m pip wheel "$PWD/projects/eudsl-tblgen" -w wheelhouse -v --no-build-isolation
# this one is different from the rest as a smoketest re cibuildwheel
if [[ "${{ matrix.os }}" == "ubuntu" ]]; then
export CCACHE_DIR=/host/$CCACHE_DIR
fi
$python3_command -m cibuildwheel "$PWD/projects/eudsl-tblgen" --output-dir wheelhouse

- name: "Build eudsl-llvmpy"
if: ${{ ! startsWith(matrix.os, 'windows') }}
Expand Down Expand Up @@ -201,7 +196,7 @@ jobs:

# just to/make sure total build continues to work
- name: "Build all of eudsl"
if: ${{ github.event_name == 'pull_request' }}
if: ${{ github.event_name != 'workflow_dispatch' }}
run: |

$python3_command -m pip install eudsl-tblgen -f wheelhouse
Expand Down
7 changes: 3 additions & 4 deletions projects/eudsl-llvmpy/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ build-verbosity = 1
skip = ["*-manylinux_i686", "*-musllinux*", "pp*", "*-win32"]
archs = ["auto64"]
manylinux-x86_64-image = "manylinux_2_28"
manylinux-aarch64-image = "manylinux_2_34"
manylinux-aarch64-image = "quay.io/pypa/manylinux_2_34_aarch64"
environment-pass = [
"LLVM_DIR",
"CMAKE_GENERATOR",
Expand All @@ -68,9 +68,8 @@ test-command = "ccache -sv"
before-all = [
"yum install -y clang",
# ccache
"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",
"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)",
"echo $(if [ \"$(arch)\" == \"aarch64\" ]; then dnf install -y ccache; fi)",
"ccache -z"
]
# synchronize TZ with host so ccache files have correct timestamp
Expand Down
8 changes: 4 additions & 4 deletions projects/eudsl-nbgen/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ build = ["cp39*"]
skip = ["*-manylinux_i686", "*-musllinux*", "pp*", "*-win32"]
archs = ["auto64"]
manylinux-x86_64-image = "manylinux_2_28"
manylinux-aarch64-image = "manylinux_2_34"
manylinux-aarch64-image = "quay.io/pypa/manylinux_2_34_aarch64"
environment-pass = [
"LLVM_DIR",
"CMAKE_GENERATOR",
Expand Down Expand Up @@ -70,9 +70,9 @@ repair-wheel-command = []
before-all = [
"yum install -y clang",
# ccache
"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"
"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)",
"echo $(if [ \"$(arch)\" == \"aarch64\" ]; then dnf install -y ccache; fi)",
"ccache -z"
]
# synchronize TZ with host so ccache files have correct timestamp
container-engine = { name = "docker", create-args = ["-v", "/etc/timezone:/etc/timezone:ro", "-v", "/etc/localtime:/etc/localtime:ro"] }
Expand Down
8 changes: 4 additions & 4 deletions projects/eudsl-py/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ build-verbosity = 1
skip = ["*-manylinux_i686", "*-musllinux*", "pp*", "*-win32"]
archs = ["auto64"]
manylinux-x86_64-image = "manylinux_2_28"
manylinux-aarch64-image = "manylinux_2_34"
manylinux-aarch64-image = "quay.io/pypa/manylinux_2_34_aarch64"
environment-pass = [
"LLVM_DIR",
"MLIR_DIR",
Expand Down Expand Up @@ -78,9 +78,9 @@ test-command = "ccache -s"
before-all = [
"yum install -y clang",
# ccache
"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"
"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)",
"echo $(if [ \"$(arch)\" == \"aarch64\" ]; then dnf install -y ccache; fi)",
"ccache -z"
]
# synchronize TZ with host so ccache files have correct timestamp
container-engine = { name = "docker", create-args = ["-v", "/etc/timezone:/etc/timezone:ro", "-v", "/etc/localtime:/etc/localtime:ro"] }
Expand Down
9 changes: 5 additions & 4 deletions projects/eudsl-tblgen/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ build-verbosity = 1
skip = ["*-manylinux_i686", "*-musllinux*", "pp*", "*-win32"]
archs = ["auto64"]
manylinux-x86_64-image = "manylinux_2_28"
manylinux-aarch64-image = "manylinux_2_34"
manylinux-aarch64-image = "quay.io/pypa/manylinux_2_34_aarch64"
environment-pass = [
"LLVM_DIR",
"CMAKE_GENERATOR",
Expand All @@ -59,11 +59,12 @@ test-command = "ccache -s"

[tool.cibuildwheel.linux]
before-all = [
"set -x",
"yum install -y clang",
# ccache
"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"
"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)",
"echo $(if [ \"$(arch)\" == \"aarch64\" ]; then dnf install -y ccache; fi)",
"ccache -z"
]
# synchronize TZ with host so ccache files have correct timestamp
container-engine = { name = "docker", create-args = ["-v", "/etc/timezone:/etc/timezone:ro", "-v", "/etc/localtime:/etc/localtime:ro"] }
Expand Down
Loading