Skip to content

Commit 721f5da

Browse files
authored
Merge pull request #5961 from moluopro/fix-loongarch64-qemu-install
Fix issues with the LoongArch & macOS pipeline
2 parents 0c5fc45 + 210b6a2 commit 721f5da

2 files changed

Lines changed: 17 additions & 2 deletions

File tree

.github/workflows/loongarch64.yml

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ jobs:
5151
- name: Install APT deps
5252
run: |
5353
sudo apt-get update && \
54-
sudo apt-get install autoconf automake autotools-dev ninja-build make ccache qemu-user-static \
54+
sudo apt-get install autoconf automake autotools-dev ninja-build make ccache \
5555
gcc-14-loongarch64-linux-gnu g++-14-loongarch64-linux-gnu gfortran-14-loongarch64-linux-gnu
5656
5757
- name: Compilation cache
@@ -70,6 +70,19 @@ jobs:
7070
echo "compression = true" >> ~/.ccache/ccache.conf
7171
ccache -s
7272
73+
- name: Install QEMU 10.2.1
74+
run: |
75+
qemu_deb="${RUNNER_TEMP}/qemu-user_10.2.1+ds-1ubuntu3_amd64.deb"
76+
qemu_root="${RUNNER_TEMP}/qemu-user-10.2.1"
77+
wget --output-document="${qemu_deb}" \
78+
https://archive.ubuntu.com/ubuntu/pool/universe/q/qemu/qemu-user_10.2.1+ds-1ubuntu3_amd64.deb
79+
echo "e6bdaac070232a44b8657cad84ac0853d84b7167b55af82370af040291f55bd8 ${qemu_deb}" \
80+
| sha256sum --check -
81+
dpkg-deb --extract "${qemu_deb}" "${qemu_root}"
82+
sudo install -m 0755 "${qemu_root}/usr/bin/qemu-loongarch64" \
83+
/usr/local/bin/qemu-loongarch64-static
84+
qemu-loongarch64-static --version
85+
7386
- name: Disable utest dsdot:dsdot_n_1
7487
run: |
7588
echo -n > utest/test_dsdot.c
@@ -83,7 +96,6 @@ jobs:
8396
8497
- name: Test
8598
run: |
86-
sudo wget https://gist.github.com/martin-frbg/01de086ee9955966799821db0a4fb1db/raw/4fd13657b44eada4cf8b4a51e43636b9d7b0f42f/qemu-loongarch64 -P /usr/bin -o qemu-loongarch64-static
8799
qemu-loongarch64-static ./utest/openblas_utest
88100
qemu-loongarch64-static ./utest/openblas_utest_ext
89101
OPENBLAS_NUM_THREADS=2 qemu-loongarch64-static ./ctest/xscblat1

azure-pipelines.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -190,6 +190,7 @@ jobs:
190190
make CC=gcc-15 FC=gfortran-15
191191
192192
- job: OSX_LLVM_flangnew
193+
timeoutInMinutes: 100
193194
pool:
194195
vmImage: 'macOS-latest'
195196
variables:
@@ -203,6 +204,7 @@ jobs:
203204
make TARGET=NEHALEM CC=/usr/local/opt/llvm/bin/clang FC=/usr/local/opt/flang/bin/flang NO_SHARED=1
204205
205206
- job: OSX_OpenMP_Clang
207+
timeoutInMinutes: 100
206208
pool:
207209
vmImage: 'macOS-latest'
208210
variables:
@@ -216,6 +218,7 @@ jobs:
216218
make TARGET=CORE2 USE_OPENMP=1 DYNAMIC_ARCH=1 DYNAMIC_LIST='NEHALEM HASWELL SKYLAKEX' CC=/usr/local/opt/llvm/bin/clang NOFORTRAN=1
217219
218220
- job: OSX_OpenMP_Clang_cmake
221+
timeoutInMinutes: 100
219222
pool:
220223
vmImage: 'macOS-latest'
221224
variables:

0 commit comments

Comments
 (0)