Skip to content

Commit d1805ad

Browse files
beomki-yeobeomki-yeo
committed
Merge branch 'gitlab-sycl' into add-oneDPL
2 parents 202b51a + 0a0b6ce commit d1805ad

File tree

5 files changed

+64
-18
lines changed

5 files changed

+64
-18
lines changed

‎.github/ci_setup.sh

+8
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,14 @@
1313
# The platform name.
1414
PLATFORM_NAME=$1
1515

16+
# Set up the correct environment for the SYCL tests.
17+
if [ "${PLATFORM_NAME}" = "SYCL" ]; then
18+
if [ -f "/opt/intel/oneapi/setvars.sh" ]; then
19+
source /opt/intel/oneapi/setvars.sh
20+
fi
21+
export SYCL_DEVICE_FILTER=host
22+
fi
23+
1624
# Make sure that GNU Make and CTest would use all available cores.
1725
export MAKEFLAGS="-j`nproc`"
1826
export CTEST_PARALLEL_LEVEL=`nproc`

‎.gitlab-ci.yml

+38
Original file line numberDiff line numberDiff line change
@@ -37,3 +37,41 @@ test_cuda:
3737
- nvidia-smi
3838
- ctest --output-on-failure -E "^SeedingValidation/CompareWithActsSeedingTests.*"
3939

40+
41+
build_sycl:
42+
tags: [docker]
43+
stage: build
44+
image: "ghcr.io/acts-project/ubuntu2004_oneapi:v30"
45+
artifacts:
46+
paths:
47+
- build
48+
script:
49+
- git clone $CLONE_URL src
50+
- git -C src checkout $HEAD_SHA
51+
- source src/.github/ci_setup.sh SYCL
52+
- >
53+
cmake -S src -B build
54+
-DCMAKE_BUILD_TYPE=Release
55+
-DTRACCC_BUILD_CUDA=OFF
56+
-DTRACCC_BUILD_SYCL=ON
57+
-DBUILD_TESTING=ON
58+
-DTRACCC_BUILD_TESTING=ON
59+
- cmake --build build
60+
61+
62+
test_sycl:
63+
stage: test
64+
tags: [docker-gpu-nvidia]
65+
image: "ghcr.io/acts-project/ubuntu2004_oneapi:v30"
66+
needs:
67+
- build_sycl
68+
script:
69+
- git clone $CLONE_URL src
70+
- cd src
71+
- git checkout $HEAD_SHA
72+
- source .github/ci_setup.sh SYCL
73+
- data/traccc_data_get_files.sh
74+
- cd ..
75+
- cd build
76+
- nvidia-smi
77+
- ctest --output-on-failure -E "^SeedingValidation/CompareWithActsSeedingTests.*"

‎tests/cpu/test_kalman_fitter.cpp

+6-6
Original file line numberDiff line numberDiff line change
@@ -155,25 +155,25 @@ TEST_P(KalmanFittingTests, Run) {
155155
}
156156

157157
INSTANTIATE_TEST_SUITE_P(
158-
KalmanFitValidation0, KalmanFittingTests,
158+
CpuKalmanFitValidation0, KalmanFittingTests,
159159
::testing::Values(std::make_tuple(
160-
"1_GeV_0_phi", std::array<scalar, 3u>{0.f, 0.f, 0.f},
160+
"cpu_1_GeV_0_phi", std::array<scalar, 3u>{0.f, 0.f, 0.f},
161161
std::array<scalar, 3u>{0.f, 0.f, 0.f}, std::array<scalar, 2u>{1.f, 1.f},
162162
std::array<scalar, 2u>{0.f, 0.f}, std::array<scalar, 2u>{0.f, 0.f}, 100,
163163
100)));
164164

165165
INSTANTIATE_TEST_SUITE_P(
166-
KalmanFitValidation1, KalmanFittingTests,
166+
CpuKalmanFitValidation1, KalmanFittingTests,
167167
::testing::Values(std::make_tuple(
168-
"10_GeV_0_phi", std::array<scalar, 3u>{0.f, 0.f, 0.f},
168+
"cpu_10_GeV_0_phi", std::array<scalar, 3u>{0.f, 0.f, 0.f},
169169
std::array<scalar, 3u>{0.f, 0.f, 0.f},
170170
std::array<scalar, 2u>{10.f, 10.f}, std::array<scalar, 2u>{0.f, 0.f},
171171
std::array<scalar, 2u>{0.f, 0.f}, 100, 100)));
172172

173173
INSTANTIATE_TEST_SUITE_P(
174-
KalmanFitValidation2, KalmanFittingTests,
174+
CpuKalmanFitValidation2, KalmanFittingTests,
175175
::testing::Values(std::make_tuple(
176-
"100_GeV_0_phi", std::array<scalar, 3u>{0.f, 0.f, 0.f},
176+
"cpu_100_GeV_0_phi", std::array<scalar, 3u>{0.f, 0.f, 0.f},
177177
std::array<scalar, 3u>{0.f, 0.f, 0.f},
178178
std::array<scalar, 2u>{100.f, 100.f}, std::array<scalar, 2u>{0.f, 0.f},
179179
std::array<scalar, 2u>{0.f, 0.f}, 100, 100)));

‎tests/cuda/test_kalman_filter.cpp

+6-6
Original file line numberDiff line numberDiff line change
@@ -195,25 +195,25 @@ TEST_P(KalmanFittingTests, Run) {
195195
}
196196

197197
INSTANTIATE_TEST_SUITE_P(
198-
KalmanFitValidation0, KalmanFittingTests,
198+
CudaKalmanFitValidation0, KalmanFittingTests,
199199
::testing::Values(std::make_tuple(
200-
"1_GeV_0_phi", std::array<scalar, 3u>{0.f, 0.f, 0.f},
200+
"cuda_1_GeV_0_phi", std::array<scalar, 3u>{0.f, 0.f, 0.f},
201201
std::array<scalar, 3u>{0.f, 0.f, 0.f}, std::array<scalar, 2u>{1.f, 1.f},
202202
std::array<scalar, 2u>{0.f, 0.f}, std::array<scalar, 2u>{0.f, 0.f}, 100,
203203
100)));
204204

205205
INSTANTIATE_TEST_SUITE_P(
206-
KalmanFitValidation1, KalmanFittingTests,
206+
CudaKalmanFitValidation1, KalmanFittingTests,
207207
::testing::Values(std::make_tuple(
208-
"10_GeV_0_phi", std::array<scalar, 3u>{0.f, 0.f, 0.f},
208+
"cuda_10_GeV_0_phi", std::array<scalar, 3u>{0.f, 0.f, 0.f},
209209
std::array<scalar, 3u>{0.f, 0.f, 0.f},
210210
std::array<scalar, 2u>{10.f, 10.f}, std::array<scalar, 2u>{0.f, 0.f},
211211
std::array<scalar, 2u>{0.f, 0.f}, 100, 100)));
212212

213213
INSTANTIATE_TEST_SUITE_P(
214-
KalmanFitValidation2, KalmanFittingTests,
214+
CudaKalmanFitValidation2, KalmanFittingTests,
215215
::testing::Values(std::make_tuple(
216-
"100_GeV_0_phi", std::array<scalar, 3u>{0.f, 0.f, 0.f},
216+
"cuda_100_GeV_0_phi", std::array<scalar, 3u>{0.f, 0.f, 0.f},
217217
std::array<scalar, 3u>{0.f, 0.f, 0.f},
218218
std::array<scalar, 2u>{100.f, 100.f}, std::array<scalar, 2u>{0.f, 0.f},
219219
std::array<scalar, 2u>{0.f, 0.f}, 100, 100)));

‎tests/sycl/test_kalman_filter.sycl

+6-6
Original file line numberDiff line numberDiff line change
@@ -216,25 +216,25 @@ TEST_P(KalmanFittingTests, Run) {
216216
}
217217

218218
INSTANTIATE_TEST_SUITE_P(
219-
KalmanFitValidation0, KalmanFittingTests,
219+
SyclKalmanFitValidation0, KalmanFittingTests,
220220
::testing::Values(std::make_tuple(
221-
"1_GeV_0_phi", std::array<scalar, 3u>{0.f, 0.f, 0.f},
221+
"sycl_1_GeV_0_phi", std::array<scalar, 3u>{0.f, 0.f, 0.f},
222222
std::array<scalar, 3u>{0.f, 0.f, 0.f}, std::array<scalar, 2u>{1.f, 1.f},
223223
std::array<scalar, 2u>{0.f, 0.f}, std::array<scalar, 2u>{0.f, 0.f}, 100,
224224
100)));
225225

226226
INSTANTIATE_TEST_SUITE_P(
227-
KalmanFitValidation1, KalmanFittingTests,
227+
SyclKalmanFitValidation1, KalmanFittingTests,
228228
::testing::Values(std::make_tuple(
229-
"10_GeV_0_phi", std::array<scalar, 3u>{0.f, 0.f, 0.f},
229+
"sycl_10_GeV_0_phi", std::array<scalar, 3u>{0.f, 0.f, 0.f},
230230
std::array<scalar, 3u>{0.f, 0.f, 0.f},
231231
std::array<scalar, 2u>{10.f, 10.f}, std::array<scalar, 2u>{0.f, 0.f},
232232
std::array<scalar, 2u>{0.f, 0.f}, 100, 100)));
233233

234234
INSTANTIATE_TEST_SUITE_P(
235-
KalmanFitValidation2, KalmanFittingTests,
235+
SyclKalmanFitValidation2, KalmanFittingTests,
236236
::testing::Values(std::make_tuple(
237-
"100_GeV_0_phi", std::array<scalar, 3u>{0.f, 0.f, 0.f},
237+
"sycl_100_GeV_0_phi", std::array<scalar, 3u>{0.f, 0.f, 0.f},
238238
std::array<scalar, 3u>{0.f, 0.f, 0.f},
239239
std::array<scalar, 2u>{100.f, 100.f}, std::array<scalar, 2u>{0.f, 0.f},
240240
std::array<scalar, 2u>{0.f, 0.f}, 100, 100)));

0 commit comments

Comments
 (0)