Skip to content

Commit bec10ae

Browse files
committed
Update dynamic_arch.yml
1 parent 2ab470b commit bec10ae

1 file changed

Lines changed: 11 additions & 18 deletions

File tree

.github/workflows/dynamic_arch.yml

Lines changed: 11 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -11,25 +11,24 @@ permissions:
1111

1212
jobs:
1313
build:
14-
if: "github.repository == 'OpenMathLib/OpenBLAS' || github.event_name == 'workflow_dispatch'"
14+
if: "true || github.repository == 'OpenMathLib/OpenBLAS' || github.event_name == 'workflow_dispatch'"
1515
runs-on: ${{ matrix.os }}
1616

1717
strategy:
1818
fail-fast: false
1919
matrix:
20-
os: [ubuntu-latest, macos-latest, ubuntu-24.04-arm]
20+
os: [ubuntu-latest, ubuntu-24.04-arm]
2121
cc: [gcc, clang, clang-21]
22-
fortran: [gfortran, flang]
22+
fortran: [gfortran, flang, flang-21]
2323
build: [cmake, make]
24+
include:
25+
- {os: macos-latest, cc: clang, fortran: gfortran, build: cmake}
26+
- {os: macos-latest, cc: clang, fortran: gfortran, build: make}
2427
exclude:
25-
- os: macos-latest
26-
cc: gcc
27-
- os: macos-latest
28-
cc: clang-21
29-
- os: macos-latest
30-
fortran: flang
3128
- os: ubuntu-24.04-arm
3229
fortran: flang
30+
- fortran: flang-21
31+
cc: clang
3332

3433
steps:
3534
- name: Checkout repository
@@ -55,12 +54,14 @@ jobs:
5554
EOF
5655
sudo apt-get update
5756
sudo apt-get install -y ccache
58-
if [ "${{ matrix.cc }}" == "clang-21" ]; then
57+
if [ "${{ matrix.cc }}" == "clang-21" ] || [ "${{ matrix.fortran }}" == "flang-21" ]; then
5958
wget https://apt.llvm.org/llvm.sh
6059
chmod +x llvm.sh
6160
sudo ./llvm.sh 21
6261
fi
6362
if [ "${{ matrix.fortran }}" == "flang" ]; then
63+
# download and install classic flang
64+
curl -fsSL https://github.com/flang-compiler/flang/releases/download/flang_20190329/flang-20190329-x86-70.tgz | sudo tar -C /usr -xz
6465
wget http://security.ubuntu.com/ubuntu/pool/universe/n/ncurses/libtinfo5_6.3-2ubuntu0.1_amd64.deb
6566
sudo apt install ./libtinfo5_6.3-2ubuntu0.1_amd64.deb
6667
else
@@ -120,14 +121,6 @@ jobs:
120121
121122
- name: Build OpenBLAS
122123
run: |
123-
if [ "${{ matrix.fortran }}" = "flang" ]; then
124-
# download and install classic flang
125-
cd /usr/
126-
sudo wget -nv https://github.com/flang-compiler/flang/releases/download/flang_20190329/flang-20190329-x86-70.tgz
127-
sudo tar xf flang-20190329-x86-70.tgz
128-
sudo rm flang-20190329-x86-70.tgz
129-
cd -
130-
fi
131124
case "${{ matrix.build }}" in
132125
"make")
133126
make -j$(nproc) DYNAMIC_ARCH=1 USE_OPENMP=0 CC="ccache ${{ matrix.cc }}" FC="ccache ${{ matrix.fortran }}"

0 commit comments

Comments
 (0)