Skip to content

Commit cc55256

Browse files
committed
Made the CIs use the updated build presets.
Also removed the c++ standard configurability from the GitHub CI, as we only (really) support C++20 at the moment in this project.
1 parent fc1be83 commit cc55256

File tree

2 files changed

+18
-26
lines changed

2 files changed

+18
-26
lines changed

.github/workflows/builds.yml

+15-23
Original file line numberDiff line numberDiff line change
@@ -26,23 +26,23 @@ jobs:
2626
platform:
2727
- name: CPU
2828
container: ghcr.io/acts-project/ubuntu2404:56
29-
cxx_standard: "20"
30-
options:
29+
options: --preset host-fp32
3130
run_tests: true
31+
- name: CPU
32+
container: ghcr.io/acts-project/ubuntu2404:56
33+
options: --preset host-fp64
34+
run_tests: false
3235
- name: CUDA
3336
container: ghcr.io/acts-project/ubuntu2404_cuda:56
34-
cxx_standard: "20"
35-
options: -DTRACCC_BUILD_CUDA=TRUE -DCMAKE_CUDA_FLAGS="-std=c++20"
37+
options: --preset cuda-fp32
3638
run_tests: false
3739
- name: SYCL
3840
container: ghcr.io/acts-project/ubuntu2404_oneapi:56
39-
cxx_standard: "20"
40-
options: -DTRACCC_BUILD_SYCL=TRUE -DCMAKE_SYCL_FLAGS="-fsycl -fsycl-targets=spir64"
41+
options: --preset sycl-fp32
4142
run_tests: true
4243
- name: KOKKOS
4344
container: ghcr.io/acts-project/ubuntu2404:56
44-
cxx_standard: "20"
45-
options: -DTRACCC_BUILD_KOKKOS=TRUE
45+
options: -DTRACCC_BUILD_CUDA=FALSE --preset kokkos-fp32
4646
run_tests: false
4747
build:
4848
- Release
@@ -51,34 +51,31 @@ jobs:
5151
- platform:
5252
name: CUDA
5353
container: ghcr.io/acts-project/ubuntu2404_cuda:56
54-
cxx_standard: "20"
55-
options: -DTRACCC_CUSTOM_SCALARTYPE=double -DDETRAY_CUSTOM_SCALARTYPE=double -DTRACCC_BUILD_CUDA=TRUE -DCMAKE_CUDA_FLAGS="-std=c++20"
54+
options: --preset cuda-fp64
5655
run_tests: false
5756
build: Release
5857
- platform:
5958
name: "SYCL"
6059
container: ghcr.io/acts-project/ubuntu2404_cuda_oneapi:56
61-
cxx_standard: "20"
62-
options: -DTRACCC_BUILD_SYCL=TRUE -DTRACCC_BUILD_CUDA=FALSE -DVECMEM_BUILD_CUDA_LIBRARY=FALSE
60+
options: --preset sycl-fp32
61+
run_tests: false
6362
build: Release
6463
- platform:
6564
name: "SYCL"
6665
container: ghcr.io/acts-project/ubuntu2404_rocm_oneapi:56
67-
cxx_standard: "20"
68-
options: -DTRACCC_BUILD_SYCL=TRUE -DVECMEM_BUILD_HIP_LIBRARY=FALSE
66+
options: --preset sycl-fp32
67+
run_tests: false
6968
build: Release
7069
- platform:
7170
name: ALPAKA
7271
container: ghcr.io/acts-project/ubuntu2404:56
73-
cxx_standard: "20"
74-
options: -DTRACCC_BUILD_ALPAKA=TRUE
72+
options: -DTRACCC_BUILD_CUDA=FALSE --preset alpaka-fp32
7573
run_tests: true
7674
build: Release
7775
- platform:
7876
name: ALPAKA
7977
container: ghcr.io/acts-project/ubuntu2404:56
80-
cxx_standard: "20"
81-
options: -DTRACCC_BUILD_ALPAKA=TRUE
78+
options: -DTRACCC_BUILD_CUDA=FALSE --preset alpaka-fp32
8279
run_tests: false
8380
build: Debug
8481
# Use BASH as the shell from the images.
@@ -92,12 +89,7 @@ jobs:
9289
source ${GITHUB_WORKSPACE}/.github/ci_setup.sh ${{ matrix.platform.name }}
9390
cmake \
9491
-DCMAKE_BUILD_TYPE=${{ matrix.build }} \
95-
-DCMAKE_CXX_STANDARD=${{ matrix.platform.cxx_standard }} \
96-
-DCMAKE_CUDA_STANDARD=${{ matrix.platform.cxx_standard }} \
97-
-DCMAKE_HIP_STANDARD=${{ matrix.platform.cxx_standard }} \
98-
-DCMAKE_SYCL_STANDARD=${{ matrix.platform.cxx_standard }} \
9992
${{ matrix.platform.options }} \
100-
-DTRACCC_FAIL_ON_WARNINGS=TRUE \
10193
-S ${GITHUB_WORKSPACE} \
10294
-B build
10395
- name: Build

.gitlab-ci.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ build:cuda:
5656
image: ghcr.io/acts-project/ubuntu2204_cuda:56
5757
variables:
5858
TRACCC_BUILD_TYPE: CUDA
59-
TRACCC_BUILD_PRESET: cuda
59+
TRACCC_BUILD_PRESET: cuda-fp32
6060

6161
# CUDA test job.
6262
test:cuda:
@@ -73,7 +73,7 @@ build:sycl_intel:
7373
image: ghcr.io/acts-project/ubuntu2404_oneapi:56
7474
variables:
7575
TRACCC_BUILD_TYPE: SYCL
76-
TRACCC_BUILD_PRESET: sycl
76+
TRACCC_BUILD_PRESET: sycl-fp32
7777
TRACCC_SYCL_FLAGS: -fsycl -fsycl-targets=spir64
7878
TRACCC_CMAKE_ARGS: -DTRACCC_BUILD_CUDA=FALSE
7979

@@ -93,7 +93,7 @@ build:sycl_nvidia:
9393
image: ghcr.io/acts-project/ubuntu2204_cuda_oneapi:56
9494
variables:
9595
TRACCC_BUILD_TYPE: SYCL
96-
TRACCC_BUILD_PRESET: sycl
96+
TRACCC_BUILD_PRESET: sycl-fp32
9797
TRACCC_SYCL_FLAGS: -fsycl -fsycl-targets=nvidia_gpu_sm_75 -Wno-unknown-cuda-version -Wno-deprecated-declarations
9898
TRACCC_CXX_FLAGS: -Wno-deprecated-declarations
9999
TRACCC_CMAKE_ARGS: -DTRACCC_BUILD_CUDA=FALSE

0 commit comments

Comments
 (0)