Skip to content

Commit 2300c68

Browse files
Update linux_qemu.yml
include the --platform flag in all docker run commands
1 parent 816fd7c commit 2300c68

File tree

1 file changed

+31
-20
lines changed

1 file changed

+31
-20
lines changed

.github/workflows/linux_qemu.yml

Lines changed: 31 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -44,22 +44,25 @@ jobs:
4444
# test_unary_spurious_fpexception is currently skipped
4545
# FIXME(@seiko2plus): Requires confirmation for the following issue:
4646
# The presence of an FP invalid exception caused by sqrt. Unsure if this is a qemu bug or not.
47-
"(test_kind or test_multiarray or test_simd or test_umath or test_ufunc) and not test_unary_spurious_fpexception"
48-
]
47+
"(test_kind or test_multiarray or test_simd or test_umath or test_ufunc) and not test_unary_spurious_fpexception",
48+
"arm"
49+
]
4950
- [
5051
"ppc64le",
5152
"powerpc64le-linux-gnu",
5253
"ppc64le/ubuntu:22.04",
5354
"-Dallow-noblas=true",
5455
"test_kind or test_multiarray or test_simd or test_umath or test_ufunc",
55-
]
56+
"ppc64le"
57+
]
5658
- [
5759
"ppc64le - baseline(Power9)",
5860
"powerpc64le-linux-gnu",
5961
"ppc64le/ubuntu:22.04",
6062
"-Dallow-noblas=true -Dcpu-baseline=vsx3",
6163
"test_kind or test_multiarray or test_simd or test_umath or test_ufunc",
62-
]
64+
"ppc64le"
65+
]
6366
- [
6467
"s390x",
6568
"s390x-linux-gnu",
@@ -68,27 +71,31 @@ jobs:
6871
# Skipping TestRationalFunctions.test_gcd_overflow test
6972
# because of a possible qemu bug that appears to be related to int64 overflow in absolute operation.
7073
# TODO(@seiko2plus): Confirm the bug and provide a minimal reproducer, then report it to upstream.
71-
"(test_kind or test_multiarray or test_simd or test_umath or test_ufunc) and not test_gcd_overflow"
72-
]
74+
"(test_kind or test_multiarray or test_simd or test_umath or test_ufunc) and not test_gcd_overflow",
75+
"s390x"
76+
]
7377
- [
7478
"s390x - baseline(Z13)",
7579
"s390x-linux-gnu",
7680
"s390x/ubuntu:22.04",
7781
"-Dallow-noblas=true -Dcpu-baseline=vx",
78-
"(test_kind or test_multiarray or test_simd or test_umath or test_ufunc) and not test_gcd_overflow"
79-
]
82+
"(test_kind or test_multiarray or test_simd or test_umath or test_ufunc) and not test_gcd_overflow",
83+
"s390x"
84+
]
8085
- [
8186
"riscv64",
8287
"riscv64-linux-gnu",
8388
"riscv64/ubuntu:22.04",
8489
"-Dallow-noblas=true",
85-
"test_kind or test_multiarray or test_simd or test_umath or test_ufunc"
86-
]
90+
"test_kind or test_multiarray or test_simd or test_umath or test_ufunc",
91+
"riscv64"
92+
]
8793
env:
8894
TOOLCHAIN_NAME: ${{ matrix.BUILD_PROP[1] }}
8995
DOCKER_CONTAINER: ${{ matrix.BUILD_PROP[2] }}
9096
MESON_OPTIONS: ${{ matrix.BUILD_PROP[3] }}
9197
RUNTIME_TEST_FILTER: ${{ matrix.BUILD_PROP[4] }}
98+
ARCH: ${{ matrix.BUILD_PROP[5] }}
9299
TERM: xterm-256color
93100

94101
name: "${{ matrix.BUILD_PROP[0] }}"
@@ -117,7 +124,8 @@ jobs:
117124
- name: Creates new container
118125
if: steps.container-cache.outputs.cache-hit != 'true'
119126
run: |
120-
docker run --name the_container --interactive -v /:/host -v $(pwd):/numpy ${DOCKER_CONTAINER} /bin/bash -c "
127+
docker run --platform=linux/${ARCH} --name the_container --interactive \
128+
-v /:/host -v $(pwd):/numpy ${DOCKER_CONTAINER} /bin/bash -c "
121129
apt update &&
122130
apt install -y cmake git python3 python-is-python3 python3-dev python3-pip &&
123131
mkdir -p /lib64 && ln -s /host/lib64/ld-* /lib64/ &&
@@ -147,20 +155,23 @@ jobs:
147155

148156
- name: Meson Build
149157
run: |
150-
docker run --rm -e "TERM=xterm-256color" -v $(pwd):/numpy -v /:/host the_container \
151-
/bin/script -e -q -c "/bin/bash --noprofile --norc -eo pipefail -c '
152-
cd /numpy && spin build --clean -- ${MESON_OPTIONS}
153-
'"
158+
docker run --rm --platform=linux/${ARCH} -e "TERM=xterm-256color" \
159+
-v $(pwd):/numpy -v /:/host the_container \
160+
/bin/script -e -q -c "/bin/bash --noprofile --norc -eo pipefail -c '
161+
cd /numpy && spin build --clean -- ${MESON_OPTIONS}
162+
'"
154163
155164
- name: Meson Log
156165
if: always()
157166
run: 'cat build/meson-logs/meson-log.txt'
158167

159168
- name: Run Tests
160169
run: |
161-
docker run --rm -e "TERM=xterm-256color" -v $(pwd):/numpy -v /:/host the_container \
162-
/bin/script -e -q -c "/bin/bash --noprofile --norc -eo pipefail -c '
163-
export F90=/usr/bin/gfortran
164-
cd /numpy && spin test -- -k \"${RUNTIME_TEST_FILTER}\"
165-
'"
170+
docker run --rm --platform=linux/${ARCH} -e "TERM=xterm-256color" \
171+
-v $(pwd):/numpy -v /:/host the_container \
172+
/bin/script -e -q -c "/bin/bash --noprofile --norc -eo pipefail -c '
173+
export F90=/usr/bin/gfortran
174+
cd /numpy && spin test -- -k \"${RUNTIME_TEST_FILTER}\"
175+
'"
176+
166177

0 commit comments

Comments
 (0)