Skip to content

Commit

Permalink
Fix CI (#3)
Browse files Browse the repository at this point in the history
* Fix bad presets
* Remove celeritas cuda preset
  • Loading branch information
sethrj authored Feb 12, 2024
1 parent e034ada commit b2fa6ca
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 20 deletions.
1 change: 0 additions & 1 deletion CMakePresets.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
"hidden": true,
"description": "Options to enable CUDA 11 on Volta architecture",
"cacheVariables": {
"CELERITAS_USE_CUDA": {"type": "BOOL", "value": "ON"},
"CMAKE_CUDA_ARCHITECTURES": {"type": "STRING", "value": "70"}
}
},
Expand Down
21 changes: 2 additions & 19 deletions scripts/cmake-presets/ci-ubuntu-cuda.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,30 +18,17 @@
"CMAKE_INSTALL_PREFIX": "${sourceDir}/install"
}
},
{
"name": ".mpi",
"hidden": true,
"description": "Options to enable MPI with Docker",
"cacheVariables": {
"CELERITAS_USE_MPI": {"type": "BOOL", "value": "ON"},
"MPI_CXX_LINK_FLAGS": "-pthread",
"MPIEXEC_PREFLAGS": "--allow-run-as-root"
}
},
{
"name": ".vecgeom",
"hidden": true,
"description": "Options to enable VecGeom on Ubuntu",
"cacheVariables": {
}
"cacheVariables": {}
},
{
"name": "debug-vecgeom",
"description": "Build tests in debug with vecgeom",
"inherits": [".vecgeom", "base"],
"cacheVariables": {
"CELERITAS_USE_OpenMP": {"type": "BOOL", "value": "OFF"}
}
"cacheVariables": {}
},
{
"name": "reldeb-vecgeom",
Expand All @@ -64,8 +51,6 @@
"verbose": true,
"jobs": 16
},
{"name": "debug-orange" , "configurePreset": "debug-orange" , "inherits": "base"},
{"name": "ndebug-orange", "configurePreset": "ndebug-orange", "inherits": "base", "targets": ["all", "install"]},
{"name": "reldeb-vecgeom" , "configurePreset": "reldeb-vecgeom" , "inherits": "base", "targets": ["all", "install"]},
{"name": "debug-vecgeom" , "configurePreset": "debug-vecgeom" , "inherits": "base", "jobs": 8},
{"name": "ndebug-vecgeom" , "configurePreset": "ndebug-vecgeom" , "inherits": "base", "jobs": 8, "targets": ["app/all", "install"]}
Expand All @@ -86,8 +71,6 @@
"outputOnFailure": true
}
},
{"name": "debug-orange" , "configurePreset": "debug-orange" , "inherits": "base"},
{"name": "ndebug-orange", "configurePreset": "ndebug-orange", "inherits": "base"},
{"name": "reldeb-vecgeom" , "configurePreset": "reldeb-vecgeom" , "inherits": "base"},
{"name": "debug-vecgeom" , "configurePreset": "debug-vecgeom" , "inherits": "base"},
{"name": "ndebug-vecgeom" , "configurePreset": "ndebug-vecgeom" , "inherits": "base"}
Expand Down
1 change: 1 addition & 0 deletions test/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -20,5 +20,6 @@ target_link_libraries(g4vg_test
target_include_directories(g4vg_test
PUBLIC "${PROJECT_BINARY_DIR}/test"
)
add_test(NAME g4vg_test COMMAND "$<TARGET_FILE:g4vg_test>")

#-----------------------------------------------------------------------------#

0 comments on commit b2fa6ca

Please sign in to comment.