Skip to content

Commit 3eed952

Browse files
committed
CI builds Linux: build also x86-64-v{3,4} builds
1 parent 4f46903 commit 3eed952

File tree

1 file changed

+20
-9
lines changed

1 file changed

+20
-9
lines changed

.github/workflows/ccpp.yml

Lines changed: 20 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -44,13 +44,13 @@ jobs:
4444
include:
4545
- conf: legacy
4646
cuda_arch: 30
47-
tar_name: GPUJPEG-Linux.tar.xz
47+
tar_name: GPUJPEG-Linux.tar
4848
name: Linux build
4949
cuda_repo: ubuntu1804
5050
cuda_pkg: cuda-toolkit-10-2
5151
- conf: all
5252
cuda_arch: all
53-
tar_name: GPUJPEG-Linux-all.tar.xz
53+
tar_name: GPUJPEG-Linux-all.tar
5454
name: Linux build (all CUDA architetures)
5555
cuda_repo: ubuntu2004
5656
cuda_pkg: cuda-toolkit
@@ -82,16 +82,27 @@ jobs:
8282
sudo ln -sf /usr/bin/gcc-8 /usr/local/cuda/bin/gcc
8383
- name: Build
8484
run: |
85-
cmake\
86-
-DCMAKE_CUDA_ARCHITECTURES=${{ matrix.cuda_arch }}\
85+
COMMON_FLAGS="-DCMAKE_CUDA_ARCHITECTURES=${{ matrix.cuda_arch }}\
8786
-DCMAKE_BUILD_TYPE=Release\
88-
-DCMAKE_INSTALL_RPATH='$ORIGIN/../lib' \
89-
-DENABLE_FPNGE=ON\
90-
-Bbuild .
87+
-DCMAKE_INSTALL_RPATH='$ORIGIN/../lib'\
88+
-DENABLE_FPNGE=ON"
89+
cmake $COMMON_FLAGS -Bbuild .
9190
cmake --build build --parallel
9291
ctest -R unittests
9392
cmake --install build --prefix GPUJPEG
94-
tar caf ${{ matrix.tar_name }} GPUJPEG
93+
tar cf ${{ matrix.tar_name }} GPUJPEG
94+
for v in 3 4; do
95+
m=$([ $v -eq 3 ] && echo haswell || echo skylake-avx512)
96+
cmake $COMMON_FLAGS\
97+
-DCMAKE_C_FLAGS=-march=$m\
98+
-DCMAKE_CXX_FLAGS=-march=$m\
99+
-DCMAKE_CUDA_FLAGS="-Xcompiler -march=$m"\
100+
-Bbuild-v$v .
101+
cmake --build build-v$v --parallel
102+
cmake --install build-v$v --prefix GPUJPEG-x86-64-v$v
103+
tar rf ${{ matrix.tar_name }} GPUJPEG-x86-64-v$v
104+
done
105+
xz ${{ matrix.tar_name }}
95106
96107
- name: Upload Archive
97108
if: github.repository != 'CESNET/GPUJPEG' || github.ref != 'refs/heads/master'
@@ -104,7 +115,7 @@ jobs:
104115
if: github.repository == 'CESNET/GPUJPEG' && github.ref == 'refs/heads/master'
105116
env:
106117
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
107-
run: .github/scripts/replace-asset.sh continuous ${{ matrix.tar_name }}
118+
run: .github/scripts/replace-asset.sh continuous ${{ matrix.tar_name }}.xz
108119
application/x-gtar "${{ matrix.name }}"
109120

110121
Windows:

0 commit comments

Comments
 (0)