Skip to content

Commit 2b62f87

Browse files
committed
Revert "Build CI for A100, only use virtual architecture for reldeb, disable device debug"
This reverts commit 3b81610. We've got vecgeom built against 70, and it seems that the build time increased drastically as a result of that or virtual. Testing independently, it seems there is little to no difference for omitting the real architecture.
1 parent ed64bb2 commit 2b62f87

File tree

1 file changed

+3
-6
lines changed

1 file changed

+3
-6
lines changed

scripts/cmake-presets/ci-rocky-cuda.json

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,13 @@
55
{
66
"name": "base",
77
"displayName": "Ubuntu/nvidia-docker default options for GCC",
8-
"inherits": ["default"],
8+
"inherits": [".cuda-volta", "default"],
99
"binaryDir": "${sourceDir}/build",
1010
"generator": "Ninja",
1111
"cacheVariables": {
1212
"BUILD_SHARED_LIBS": {"type": "BOOL", "value": "ON"},
1313
"CELERITAS_BUILD_TESTS": {"type": "BOOL", "value": "ON"},
1414
"CELERITAS_BUILD_DOCS": {"type": "BOOL", "value": "OFF"},
15-
"CELERITAS_USE_CUDA": {"type": "BOOL", "value": "ON"},
1615
"CELERITAS_USE_covfie": {"type": "BOOL", "value": "OFF"},
1716
"CELERITAS_USE_Geant4": {"type": "BOOL", "value": "ON"},
1817
"CELERITAS_USE_HepMC3": {"type": "BOOL", "value": "ON"},
@@ -26,7 +25,6 @@
2625
"CMAKE_CXX_EXTENSIONS": {"type": "BOOL", "value": "OFF"},
2726
"CMAKE_CXX_FLAGS": "-Wall -Wextra -pedantic -Werror -Wno-error=deprecated-declarations",
2827
"CMAKE_CUDA_FLAGS": "-Werror all-warnings",
29-
"CMAKE_CUDA_ARCHITECTURES": {"type": "STRING", "value": "80"},
3028
"CMAKE_INSTALL_PREFIX": "${sourceDir}/install"
3129
}
3230
},
@@ -72,16 +70,15 @@
7270
"cacheVariables": {
7371
"CELERITAS_USE_OpenMP": {"type": "BOOL", "value": "OFF"},
7472
"CELERITAS_DEBUG": {"type": "BOOL", "value": "ON"},
75-
"CELERITAS_DEVICE_DEBUG": {"type": "BOOL", "value": "OFF"}
73+
"CELERITAS_DEVICE_DEBUG": {"type": "BOOL", "value": "ON"}
7674
}
7775
},
7876
{
7977
"name": "reldeb-vecgeom",
8078
"description": "Build with RelWithDebInfo, assertions, and VecGeom",
8179
"inherits": [".reldeb", ".vecgeom", "base"],
8280
"cacheVariables": {
83-
"CELERITAS_DEVICE_DEBUG": {"type": "BOOL", "value": "ON"},
84-
"CMAKE_CUDA_ARCHITECTURES": "80-virtual"
81+
"CELERITAS_DEVICE_DEBUG": {"type": "BOOL", "value": "ON"}
8582
}
8683
},
8784
{

0 commit comments

Comments
 (0)