Skip to content

Commit

Permalink
Merge pull request #507 from krasznaa/VSCodeIntegration-main-20231218
Browse files Browse the repository at this point in the history
Better VSCode Integration, main branch (2023.12.18.)
  • Loading branch information
krasznaa authored Dec 19, 2023
2 parents be6e630 + 31b76a6 commit 6d44c3d
Show file tree
Hide file tree
Showing 5 changed files with 105 additions and 11 deletions.
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -30,3 +30,6 @@
*.exe
*.out
*.app

# VSCode build output.
out/
17 changes: 9 additions & 8 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
# TRACCC library, part of the ACTS project (R&D line)
#
# (c) 2022-2023 CERN for the benefit of the ACTS project
#
# Mozilla Public License Version 2.0

stages:
- build
- test
Expand All @@ -8,23 +14,19 @@ build_cuda:
stage: build
image: ghcr.io/acts-project/ubuntu2004_cuda:v30
artifacts:
paths:
paths:
- build
script:
- git clone $CLONE_URL src
- git -C src checkout $HEAD_SHA
- >
cmake -S src -B build -GNinja
-DCMAKE_BUILD_TYPE=Release
-DTRACCC_BUILD_TESTING=ON
-DTRACCC_BUILD_CUDA=ON
- cmake --preset cuda -DCMAKE_BUILD_TYPE=Release -S src -B build -G Ninja
- cmake --build build --parallel 2

test_cuda:
stage: test
tags: [docker-gpu-nvidia]
image: ghcr.io/acts-project/ubuntu2004_cuda:v30
needs:
needs:
- build_cuda
script:
- git clone $CLONE_URL src
Expand All @@ -35,4 +37,3 @@ test_cuda:
- cd build
- nvidia-smi
- ctest --output-on-failure -E "^SeedingValidation/CompareWithActsSeedingTests.*"

7 changes: 7 additions & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"files.associations": {
"*.hip": "cpp",
"*.sycl": "cpp",
"*.ipp": "cpp"
}
}
83 changes: 83 additions & 0 deletions CMakePresets.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,83 @@
{
"version" : 3,
"configurePresets": [
{
"name" : "base",
"displayName" : "Base Configuration",
"warnings": {
"deprecated": true
},
"cacheVariables": {
"CMAKE_BUILD_TYPE" : "RelWithDebInfo",
"TRACCC_BUILD_TESTING" : "TRUE",
"TRACCC_BUILD_EXAMPLES" : "TRUE",
"TRACCC_FAIL_ON_WARNINGS" : "TRUE",
"TRACCC_USE_ROOT" : "FALSE"
}
},
{
"name" : "cuda",
"displayName" : "CUDA Code Development",
"inherits": ["base"],
"cacheVariables": {
"TRACCC_BUILD_CUDA" : "TRUE",
"VECMEM_BUILD_CUDA_LIBRARY" : "TRUE"
}
},
{
"name" : "sycl",
"displayName" : "SYCL Code Development",
"inherits": ["base"],
"cacheVariables": {
"TRACCC_BUILD_SYCL" : "TRUE",
"VECMEM_BUILD_SYCL_LIBRARY" : "TRUE"
}
},
{
"name" : "alpaka",
"displayName" : "Alpaka Code Development",
"inherits": ["cuda"],
"cacheVariables": {
"TRACCC_BUILD_ALPAKA" : "TRUE"
}
},
{
"name" : "kokkos",
"displayName" : "Kokkos Code Development",
"inherits": ["cuda"],
"cacheVariables": {
"TRACCC_BUILD_KOKKOS" : "TRUE"
}
},
{
"name" : "root",
"displayName" : "ROOT Enabled Code Development",
"inherits": ["base"],
"cacheVariables": {
"TRACCC_USE_ROOT" : "TRUE",
"TRACCC_USE_SYSTEM_TBB" : "TRUE"
}
},
{
"name" : "array",
"displayName" : "ARRAY Backended Code Development",
"inherits": ["base"],
"cacheVariables": {
"TRACCC_ALGEBRA_PLUGINS" : "ARRAY"
}
},
{
"name" : "eigen",
"displayName" : "EIGEN Backended Code Development",
"inherits": ["base"],
"cacheVariables": {
"TRACCC_ALGEBRA_PLUGINS" : "EIGEN"
}
},
{
"name" : "default",
"displayName": "Default Build Configuration",
"inherits": ["root", "array"]
}
]
}
6 changes: 3 additions & 3 deletions tests/io/test_binary.cpp
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/** TRACCC library, part of the ACTS project (R&D line)
*
* (c) 2022 CERN for the benefit of the ACTS project
* (c) 2022-2023 CERN for the benefit of the ACTS project
*
* Mozilla Public License Version 2.0
*/
Expand Down Expand Up @@ -29,7 +29,7 @@ TEST(io_binary, cell) {

// Set event configuration
const std::size_t event = 0;
const std::string cells_directory = "tml_full/ttbar_mu200/";
const std::string cells_directory = "tml_full/ttbar_mu100/";

// Memory resource used by the EDM.
vecmem::host_memory_resource host_mr;
Expand Down Expand Up @@ -171,7 +171,7 @@ TEST(io_binary, spacepoint) {
TEST(io_binary, measurement) {
// Set event configuration
const std::size_t event = 0;
const std::string measurements_directory = "tml_full/ttbar_mu200/";
const std::string measurements_directory = "tml_full/ttbar_mu300/";

// Memory resource used by the EDM.
vecmem::host_memory_resource host_mr;
Expand Down

0 comments on commit 6d44c3d

Please sign in to comment.