Skip to content

Commit 956c228

Browse files
j-stephanj-stephan
committed
CI update
1 parent 01a80e4 commit 956c228

13 files changed

+324
-133
lines changed

‎.github/workflows/ci.yml

+66-39
Large diffs are not rendered by default.

‎.gitlab-ci.yml

+2
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,9 @@ include:
5959
- local: '/script/gitlabci/job_cuda11.4.yml'
6060
- local: '/script/gitlabci/job_cuda11.5.yml'
6161
- local: '/script/gitlabci/job_cuda11.6.yml'
62+
- local: '/script/gitlabci/job_cuda11.7.yml'
6263
- local: '/script/gitlabci/job_hip4.2.yml'
6364
- local: '/script/gitlabci/job_hip4.3.yml'
6465
- local: '/script/gitlabci/job_hip4.5.yml'
6566
- local: '/script/gitlabci/job_hip5.0.yml'
67+
- local: '/script/gitlabci/job_hip5.1.yml'

‎README.md

+14-14
Original file line numberDiff line numberDiff line change
@@ -70,20 +70,20 @@ Supported Compilers
7070

7171
This library uses C++17 (or newer when available).
7272

73-
| Accelerator Back-end | gcc 7.5 <br/> (Linux) | gcc 8.5 <br/> (Linux) | gcc 9.4 <br/> (Linux) | gcc 10.3 <br/> (Linux) | gcc 11.1 <br/> (Linux) | clang 6-7 <br/> (Linux) | clang 8-9 <br/> (Linux) | clang 10 <br/> (Linux) | clang 11 <br/> (Linux) | clang 12 <br/> (Linux) | clang 13 <br/> (Linux) | icpx (latest) | Apple LLVM 12.4.0/13.2.1 <br /> (macOS) | Visual Studio 2019 <br/> (Windows) | Visual Studio 2022 <br/> (Windows) |
74-
|--------------------------------------------------------------------------------|-------------------------------------------|-------------------------------------------|-------------------------------------------|--------------------------------------|------------------------|-------------------------|-------------------------------------------------|--------------------------------------------------|------------------------------------------|-------------------------------------------|--------------------------------------|--------------------|-------------------------------------------------------|-------------------------------------------|--------------------------------------|
75-
| Serial | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: |
76-
| OpenMP 2.0+ blocks | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :x: | :white_check_mark: | :white_check_mark: |
77-
| OpenMP 2.0+ threads | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :x: | :white_check_mark: | :white_check_mark: |
78-
| OpenMP 5.0 (CPU) | :x: | :x: | :x: | :x: | :x: | :x: | :x: | :x: | :white_check_mark: | :white_check_mark: | - | :white_check_mark: | :x: | :x: | :x: |
79-
| std::thread | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: |
80-
| Boost.Fiber | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :x: | :white_check_mark: | :white_check_mark: |
81-
| TBB | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :x: | :x: |
82-
| CUDA (nvcc) | :white_check_mark: <br/> (CUDA 11.0-11.6) | :white_check_mark: <br/> (CUDA 11.0-11.6) | :white_check_mark: <br/> (CUDA 11.0-11.6) | :white_check_mark: <br/> (CUDA 11.6) | :x: | :x: | :white_check_mark: <br/> (CUDA 11.0-11.2; 11.6) | :white_check_mark: <br/> (CUDA 11.1, 11.2, 11.6) | :white_check_mark: <br/> (CUDA 11.6) | :white_check_mark: <br/> (CUDA 11.6) | :white_check_mark: <br/> (CUDA 11.6) | :x: | :x: | :white_check_mark: <br/> (CUDA 11.2-11.6) | :white_check_mark: <br/> (CUDA 11.6) |
83-
| CUDA (clang) | - | - | - | - | - | - | - | :x: | :white_check_mark: <br/> (CUDA 9.2-10.1) | :white_check_mark: <br/> (CUDA 10.0-10.2) | - | :x: | - | - | - |
84-
| [HIP](https://alpaka.readthedocs.io/en/latest/install/HIP.html) (clang) | :x: | :x: | :x: | :x: | :x: | :x: | :x: | :x: | :x: | :white_check_mark: (HIP 4.2) | :white_check_mark: (HIP 4.3 - 5.0) | :x: | - | - | - |
85-
86-
Other compilers or combinations marked with :x: in the table above may work but are not tested in CI and are therefore not explicitly supported.
73+
| Accelerator back-end | gcc 7 - 9 <br/> (Linux) | gcc 10 - 11 <br/> (Linux) | gcc 12 <br/> (Linux) | clang 6-7 <br/> (Linux) | clang 8-9 <br/> (Linux) | clang 10 <br/> (Linux) | clang 11 <br/> (Linux) | clang 12 <br/> (Linux) | clang 13 <br/> (Linux) | clang 14 <br/> (Linux) | icpx (latest) | Apple LLVM 12.4.0/13.2.1/13.3.1 <br /> (macOS) | Visual Studio 2019 <br/> (Windows) | Visual Studio 2022 <br/> (Windows) |
74+
|----------------------|---------------------------------------------|-----------------------------------------|----------------------|-------------------------|-------------------------------------------------|--------------------------------------------------|------------------------------------------|-------------------------------------------|-------------------------------------------|-------------------------------------------|--------------------|------------------------------------------------|-------------------------------------------|-------------------------------------------|
75+
| Serial | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: |
76+
| OpenMP 2.0+ blocks | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :x: | :white_check_mark: | :white_check_mark: |
77+
| OpenMP 2.0+ threads | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :x: | :white_check_mark: | :white_check_mark: |
78+
| OpenMP 5.0 (CPU) | :x: | :x: | :x: | :x: | :x: | :x: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :x: | :x: | :x: |
79+
| std::thread | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: |
80+
| Boost.Fiber | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :x: | :white_check_mark: | :white_check_mark: |
81+
| TBB | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :x: | :x: |
82+
| CUDA (nvcc) | :white_check_mark: <br/> (CUDA 11.0-11.6) | :white_check_mark: <br/> (CUDA 11.6) | :x: | :x: | :white_check_mark: <br/> (CUDA 11.0-11.2; 11.6) | :white_check_mark: <br/> (CUDA 11.1, 11.2, 11.6) | :white_check_mark: <br/> (CUDA 11.6) | :white_check_mark: <br/> (CUDA 11.6) | :white_check_mark: <br/> (CUDA 11.7) | :x: | :x: | :x: | :white_check_mark: <br/> (CUDA 11.2-11.6) | :white_check_mark: <br/> (CUDA 11.6-11.7) |
83+
| CUDA (clang) | - | - | - | :x: | - | :x: | :white_check_mark: <br/> (CUDA 9.2-10.1) | :white_check_mark: <br/> (CUDA 10.0-10.1) | :white_check_mark: <br/> (CUDA 10.0-10.1) | :white_check_mark: <br/> (CUDA 10.0-11.5) | :x: | - | - | - |
84+
| HIP (HIP-clang) | - | - | - | :x: | :x: | :x: | :x: | :white_check_mark: <br/> (HIP 4.2) | :white_check_mark: <br/> (HIP 4.3-5.0) | :white_check_mark: <br/> (HIP 4.3-5.1) | - | - | - | - |
85+
86+
Other compilers or combinations marked with :x: in the table above may work but are not tested in CI and are therefore not explicitly supported. Combinations marked with `-` in the table are impossible.
8787

8888
Dependencies
8989
------------

‎cmake/alpakaCommon.cmake

+4
Original file line numberDiff line numberDiff line change
@@ -270,6 +270,10 @@ if(alpaka_ACC_CPU_B_SEQ_T_FIBERS_ENABLE)
270270
if(NOT Boost_FIBER_FOUND)
271271
message(FATAL_ERROR "Optional alpaka dependency Boost.Fiber could not be found!")
272272
endif()
273+
274+
if(${alpaka_CXX_STANDARD} VERSION_GREATER_EQUAL "20")
275+
message(FATAL_ERROR "The Boost.fiber back-end cannot be used in C++20 mode!")
276+
endif()
273277
endif()
274278

275279
if(${alpaka_DEBUG} GREATER 1)

‎script/gitlabci/job_cuda10.0.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
linux_clang-9_cuda-10.0_debug:
22
extends: .base_cuda_clang_compile_only
33
variables:
4-
ALPAKA_CI_UBUNTU_VER: "20.04"
4+
ALPAKA_CI_UBUNTU_VER: "18.04"
55
ALPAKA_CI_CUDA_VERSION: "10.0"
66
ALPAKA_CI_CLANG_VER: 9
77
CMAKE_BUILD_TYPE: Debug
@@ -15,7 +15,7 @@ linux_clang-9_cuda-10.0_debug:
1515
linux_clang-10_cuda-10.0_release:
1616
extends: .base_cuda_clang_compile_only
1717
variables:
18-
ALPAKA_CI_UBUNTU_VER: "20.04"
18+
ALPAKA_CI_UBUNTU_VER: "18.04"
1919
ALPAKA_CI_CUDA_VERSION: "10.0"
2020
ALPAKA_CI_CLANG_VER: 10
2121
ALPAKA_BOOST_VERSION: 1.75.0
@@ -28,7 +28,7 @@ linux_clang-10_cuda-10.0_release:
2828
linux_clang-11_cuda-10.0_release:
2929
extends: .base_cuda_clang
3030
variables:
31-
ALPAKA_CI_UBUNTU_VER: "20.04"
31+
ALPAKA_CI_UBUNTU_VER: "18.04"
3232
ALPAKA_CI_CUDA_VERSION: "10.0"
3333
ALPAKA_CI_CLANG_VER: 11
3434
ALPAKA_BOOST_VERSION: 1.74.0

‎script/gitlabci/job_cuda10.1.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
linux_clang-9_cuda-10.1_debug:
22
extends: .base_cuda_clang_compile_only
33
variables:
4-
ALPAKA_CI_UBUNTU_VER: "20.04"
4+
ALPAKA_CI_UBUNTU_VER: "18.04"
55
ALPAKA_CI_CUDA_VERSION: "10.1"
66
ALPAKA_CI_CLANG_VER: 9
77
CMAKE_BUILD_TYPE: Debug
@@ -15,7 +15,7 @@ linux_clang-9_cuda-10.1_debug:
1515
linux_clang-10_cuda-10.1_release:
1616
extends: .base_cuda_clang_compile_only
1717
variables:
18-
ALPAKA_CI_UBUNTU_VER: "20.04"
18+
ALPAKA_CI_UBUNTU_VER: "18.04"
1919
ALPAKA_CI_CUDA_VERSION: "10.1"
2020
CMAKE_CUDA_ARCHITECTURES: "35;61"
2121
ALPAKA_CI_CLANG_VER: 10
@@ -29,7 +29,7 @@ linux_clang-10_cuda-10.1_release:
2929
linux_clang-11_cuda-10.1_debug:
3030
extends: .base_cuda_clang
3131
variables:
32-
ALPAKA_CI_UBUNTU_VER: "20.04"
32+
ALPAKA_CI_UBUNTU_VER: "18.04"
3333
ALPAKA_CI_CUDA_VERSION: "10.1"
3434
ALPAKA_CI_CLANG_VER: 11
3535
CMAKE_BUILD_TYPE: Debug

‎script/gitlabci/job_cuda10.2.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
linux_clang-11_cuda-10.2_release:
22
extends: .base_cuda_clang
33
variables:
4-
ALPAKA_CI_UBUNTU_VER: "20.04"
4+
ALPAKA_CI_UBUNTU_VER: "18.04"
55
ALPAKA_CI_CUDA_VERSION: "10.2"
66
CMAKE_CUDA_ARCHITECTURES: "61;72"
77
ALPAKA_CI_CLANG_VER: 11

‎script/gitlabci/job_cuda11.6.yml

+11
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,17 @@ linux_nvcc-11.6_gcc-10_debug:
4343
ALPAKA_CI_CMAKE_VER: 3.19.8
4444
stage: stageRun1
4545

46+
linux_nvcc-11.6_gcc-11_release:
47+
extends: .base_cuda_gcc
48+
variables:
49+
ALPAKA_CI_UBUNTU_VER: "20.04"
50+
ALPAKA_CI_CUDA_VERSION: "11.6"
51+
ALPAKA_CI_GCC_VER: 11
52+
CMAKE_BUILD_TYPE: Release
53+
ALPAKA_BOOST_VERSION: 1.79.0
54+
ALPAKA_CI_CMAKE_VER: 3.23.1
55+
stage: stageRun1
56+
4657
# nvcc + clang
4758
linux_nvcc-11.6_clang-8_release:
4859
extends: .base_cuda_clang

0 commit comments

Comments
 (0)