Skip to content

Commit

Permalink
Add clang-14 to CI
Browse files Browse the repository at this point in the history
  • Loading branch information
j-stephan authored and psychocoderHPC committed Dec 9, 2022
1 parent 3308d8b commit 4b50b39
Show file tree
Hide file tree
Showing 11 changed files with 148 additions and 14 deletions.
5 changes: 4 additions & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ concurrency:
# Therefore we aim to have each value been set in at lest one job.
# CXX : {g++, clang++}
# [g++] ALPAKA_CI_GCC_VER : {7, 8, 9, 10, 11, 12}
# [clang++] ALPAKA_CI_CLANG_VER : {6.0, 7, 8, 9, 10, 11, 12}
# [clang++] ALPAKA_CI_CLANG_VER : {6.0, 7, 8, 9, 10, 11, 12, 13, 14}
# [cl.exe] ALPAKA_CI_CL_VER : {2019, 2022}
# ALPAKA_CI_STDLIB : {libstdc++, [CXX==clang++]:libc++}
# CMAKE_BUILD_TYPE : {Debug, Release}
Expand Down Expand Up @@ -255,6 +255,9 @@ jobs:
- name: linux_clang-13_debug
os: ubuntu-22.04
env: {CXX: clang++, CC: clang, ALPAKA_CI_CLANG_VER: 13, ALPAKA_CI_STDLIB: libstdc++, CMAKE_BUILD_TYPE: Debug, ALPAKA_CI_BOOST_BRANCH: boost-1.74.0, ALPAKA_CI_CMAKE_VER: 3.20.6, OMP_NUM_THREADS: 3, ALPAKA_CI_DOCKER_BASE_IMAGE_NAME: "ubuntu:20.04", CMAKE_CXX_EXTENSIONS: OFF}
- name: linux_clang-14_debug_omp5
os: ubuntu-latest
env: {CXX: clang++, CC: clang, ALPAKA_CI_CLANG_VER: 14, ALPAKA_CI_STDLIB: libstdc++, CMAKE_BUILD_TYPE: Debug, ALPAKA_CI_BOOST_BRANCH: boost-1.77.0, ALPAKA_CI_CMAKE_VER: 3.19.8, OMP_NUM_THREADS: 4, ALPAKA_CI_DOCKER_BASE_IMAGE_NAME: "ubuntu:20.04", CMAKE_CXX_FLAGS: "-fopenmp=libomp -fopenmp-targets=x86_64-pc-linux-gnu -Wno-openmp-mapping", alpaka_ACC_ANY_BT_OMP5_ENABLE: ON, alpaka_OFFLOAD_MAX_BLOCK_SIZE: 1, CMAKE_EXE_LINKER_FLAGS: "-fopenmp", alpaka_ACC_CPU_B_OMP2_T_SEQ_ENABLE: OFF}

# icpx
- name: linux_icpx_release
Expand Down
22 changes: 11 additions & 11 deletions README.md

Large diffs are not rendered by default.

14 changes: 14 additions & 0 deletions script/gitlabci/job_cuda10.0.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,3 +37,17 @@ linux_clang-11_cuda-10.0_release:
CMAKE_CUDA_COMPILER: clang++
alpaka_ACC_CPU_B_OMP2_T_SEQ_ENABLE: "OFF"
stage: stageRun0

linux_clang-14_cuda-10.0_debug:
extends: .base_cuda_clang
variables:
ALPAKA_CI_UBUNTU_VER: "20.04"
ALPAKA_CI_CUDA_VERSION: "10.0"
ALPAKA_CI_CLANG_VER: 14
CMAKE_BUILD_TYPE: Debug
ALPAKA_BOOST_VERSION: 1.74.0
ALPAKA_CI_CMAKE_VER: 3.19.8
alpaka_ACC_GPU_CUDA_ENABLE: "ON"
CMAKE_CUDA_COMPILER: clang++
alpaka_ACC_CPU_B_OMP2_T_SEQ_ENABLE: "OFF"
stage: stageRun1
13 changes: 13 additions & 0 deletions script/gitlabci/job_cuda10.1.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,3 +39,16 @@ linux_clang-11_cuda-10.1_debug:
CMAKE_CUDA_COMPILER: clang++
alpaka_ACC_CPU_B_OMP2_T_SEQ_ENABLE: "OFF"
stage: stageRun1

linux_clang-14_cuda-10.1_release:
extends: .base_cuda_clang
variables:
ALPAKA_CI_UBUNTU_VER: "20.04"
ALPAKA_CI_CUDA_VERSION: "10.1"
ALPAKA_CI_CLANG_VER: 14
ALPAKA_BOOST_VERSION: 1.77.0
ALPAKA_CI_CMAKE_VER: 3.20.6
alpaka_ACC_GPU_CUDA_ENABLE: "ON"
CMAKE_CUDA_COMPILER: clang++
alpaka_ACC_CPU_B_OMP2_T_SEQ_ENABLE: "OFF"
stage: stageRun0
15 changes: 15 additions & 0 deletions script/gitlabci/job_cuda10.2.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,3 +11,18 @@ linux_clang-11_cuda-10.2_release:
CMAKE_CUDA_COMPILER: clang++
alpaka_ACC_CPU_B_OMP2_T_SEQ_ENABLE: "OFF"
stage: stageRun0

linux_clang-14_cuda-10.2_debug:
extends: .base_cuda_clang
variables:
ALPAKA_CI_UBUNTU_VER: "20.04"
ALPAKA_CI_CUDA_VERSION: "10.2"
CMAKE_CUDA_ARCHITECTURES: "61;72"
ALPAKA_CI_CLANG_VER: 14
CMAKE_BUILD_TYPE: Debug
ALPAKA_BOOST_VERSION: 1.77.0
ALPAKA_CI_CMAKE_VER: 3.20.6
alpaka_ACC_GPU_CUDA_ENABLE: "ON"
CMAKE_CUDA_COMPILER: clang++
alpaka_ACC_CPU_B_OMP2_T_SEQ_ENABLE: "OFF"
stage: stageRun0
15 changes: 15 additions & 0 deletions script/gitlabci/job_cuda11.0.yml
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,7 @@ linux_nvcc-11.0_clang-9_debug:
CMAKE_CUDA_COMPILER: nvcc
stage: stageCompile1

# clang++ as CUDA compiler
linux_clang-12_cuda-11.0_release:
extends: .base_cuda_clang
variables:
Expand All @@ -94,3 +95,17 @@ linux_clang-12_cuda-11.0_release:
CMAKE_CUDA_COMPILER: clang++
alpaka_ACC_CPU_B_OMP2_T_SEQ_ENABLE: "OFF"
stage: stageRun0

linux_clang-14_cuda-11.0_debug:
extends: .base_cuda_clang
variables:
ALPAKA_CI_UBUNTU_VER: "20.04"
ALPAKA_CI_CUDA_VERSION: "11.0"
ALPAKA_CI_CLANG_VER: 12
CMAKE_BUILD_TYPE: Debug
ALPAKA_BOOST_VERSION: 1.74.0
ALPAKA_CI_CMAKE_VER: 3.19.8
alpaka_ACC_GPU_CUDA_ENABLE: "ON"
CMAKE_CUDA_COMPILER: clang++
alpaka_ACC_CPU_B_OMP2_T_SEQ_ENABLE: "OFF"
stage: stageRun1
14 changes: 14 additions & 0 deletions script/gitlabci/job_cuda11.1.yml
Original file line number Diff line number Diff line change
Expand Up @@ -67,3 +67,17 @@ linux_nvcc-11.1_clang-10_release:
ALPAKA_CI_CMAKE_VER: 3.19.8
CMAKE_CUDA_COMPILER: nvcc
stage: stageRun1

# clang++ as CUDA compiler
linux_clang-14_cuda-11.1_release:
extends: .base_cuda_clang_compile_only
variables:
ALPAKA_CI_UBUNTU_VER: "20.04"
ALPAKA_CI_CUDA_VERSION: "11.1"
ALPAKA_CI_CLANG_VER: 14
ALPAKA_BOOST_VERSION: 1.79.0
ALPAKA_CI_CMAKE_VER: 3.23.2
alpaka_ACC_GPU_CUDA_ENABLE: "ON"
CMAKE_CUDA_COMPILER: clang++
alpaka_ACC_CPU_B_OMP2_T_SEQ_ENABLE: "OFF"
stage: stageCompile0
15 changes: 15 additions & 0 deletions script/gitlabci/job_cuda11.2.yml
Original file line number Diff line number Diff line change
Expand Up @@ -67,3 +67,18 @@ linux_nvcc-11.2_clang-10_release:
ALPAKA_CI_CMAKE_VER: 3.19.8
CMAKE_CUDA_COMPILER: nvcc
stage: stageRun1

# clang++ as CUDA compiler
linux_clang-14_cuda-11.2_debug:
extends: .base_cuda_clang_compile_only
variables:
ALPAKA_CI_UBUNTU_VER: "20.04"
ALPAKA_CI_CUDA_VERSION: "11.2"
ALPAKA_CI_CLANG_VER: 14
CMAKE_BUILD_TYPE: Debug
ALPAKA_BOOST_VERSION: 1.79.0
ALPAKA_CI_CMAKE_VER: 3.23.2
alpaka_ACC_GPU_CUDA_ENABLE: "ON"
CMAKE_CUDA_COMPILER: clang++
alpaka_ACC_CPU_B_OMP2_T_SEQ_ENABLE: "OFF"
stage: stageCompile1
2 changes: 2 additions & 0 deletions script/gitlabci/job_cuda11.3.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,3 +34,5 @@ linux_nvcc-11.3_gcc-9_release:
# gcc 10 not included because of an GCC 10.3 bug: https://github.com/alpaka-group/alpaka/issues/1297

# clang not included because of an CUDA 11.3 bug: https://github.com/alpaka-group/alpaka/issues/1625

# clang++ as CUDA compiler not included because of an unknown bug: https://github.com/alpaka-group/alpaka/issues/1857
17 changes: 16 additions & 1 deletion script/gitlabci/job_cuda11.4.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,4 +33,19 @@ linux_nvcc-11.4_gcc-9_release:

# gcc 10 not included because of an GCC 10.3 bug: https://github.com/alpaka-group/alpaka/issues/1297

# clang not included because of an CUDA 11.4 bug: https://github.com/alpaka-group/alpaka/issues/1625
# clang not included because of an CUDA 11.4 bug: https://github.com/alpaka-group/alpaka/issues/1625

# clang++ as CUDA compiler
linux_clang-14_cuda-11.4_release:
extends: .base_cuda_clang
variables:
ALPAKA_CI_UBUNTU_VER: "20.04"
ALPAKA_CI_CUDA_VERSION: "11.4"
ALPAKA_CI_CLANG_VER: 14
CMAKE_BUILD_TYPE: Release
ALPAKA_BOOST_VERSION: 1.79.0
ALPAKA_CI_CMAKE_VER: 3.23.2
alpaka_ACC_GPU_CUDA_ENABLE: "ON"
CMAKE_CUDA_COMPILER: clang++
alpaka_ACC_CPU_B_OMP2_T_SEQ_ENABLE: "OFF"
stage: stageRun1
30 changes: 29 additions & 1 deletion script/gitlabci/job_cuda11.5.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,4 +43,32 @@ linux_nvcc-11.5_gcc-10_debug:
ALPAKA_CI_CMAKE_VER: 3.19.8
stage: stageRun1

# clang not included because of an CUDA 11.5 bug: https://github.com/alpaka-group/alpaka/issues/1625
# nvcc + clang not included because of an CUDA 11.5 bug: https://github.com/alpaka-group/alpaka/issues/1625

# clang++ as CUDA compiler
linux_clang-14_cuda-11.5_release:
extends: .base_cuda_clang
variables:
ALPAKA_CI_UBUNTU_VER: "20.04"
ALPAKA_CI_CUDA_VERSION: "11.5"
ALPAKA_CI_CLANG_VER: 14
ALPAKA_BOOST_VERSION: 1.79.0
ALPAKA_CI_CMAKE_VER: 3.23.2
alpaka_ACC_GPU_CUDA_ENABLE: "ON"
CMAKE_CUDA_COMPILER: clang++
alpaka_ACC_CPU_B_OMP2_T_SEQ_ENABLE: "OFF"
stage: stageRun1

# nvhpc
linux_nvhpc-21.11_cuda-11.5_oacc:
extends: .base_oacc_nvhpc
variables:
ALPAKA_CI_UBUNTU_VER: "20.04"
ALPAKA_CI_CUDA_VERSION: "11.5"
ALPAKA_CI_NVHPC_VER: "21.11"
CMAKE_BUILD_TYPE: ""
ALPAKA_BOOST_VERSION: 1.74.0
ALPAKA_CI_CMAKE_VER: 3.19.8
alpaka_CHECK_HEADERS: "ON"
stage: stageRun0

0 comments on commit 4b50b39

Please sign in to comment.