Skip to content

Commit 36aac55

Browse files
committed
Add 'device' subdir for SOM and future work
1 parent 3414c51 commit 36aac55

File tree

1 file changed

+30
-17
lines changed

1 file changed

+30
-17
lines changed

src/accel/SetupOptionsMessenger.cc

+30-17
Original file line numberDiff line numberDiff line change
@@ -204,23 +204,36 @@ SetupOptionsMessenger::SetupOptionsMessenger(SetupOptions* options)
204204
"enabled",
205205
"Call back to Geant4 sensitive detectors");
206206

207-
if (CELERITAS_USE_CUDA)
208-
{
209-
directories_.emplace_back(new CelerDirectory(
210-
"/celer/cuda/", "Celeritas CUDA setup options"));
211-
add_cmd(&options->cuda_stack_size,
212-
"stackSize",
213-
"Set the CUDA per-thread stack size for VecGeom");
214-
add_cmd(&options->cuda_heap_size,
215-
"heapSize",
216-
"Set the CUDA per-thread heap size for VecGeom");
217-
add_cmd(&options->action_times,
218-
"actionTimes",
219-
"Add timers around every action (may reduce performance)");
220-
add_cmd(&options->default_stream,
221-
"defaultStream",
222-
"Launch all kernels on the default stream (REMOVED)");
223-
}
207+
// TODO: add enabled flag: CELERITAS_USE_CUDA
208+
directories_.emplace_back(new CelerDirectory(
209+
"/celer/cuda/",
210+
R"(Celeritas CUDA setup options (DEPRECATED: moved to /celer/device)"));
211+
add_cmd(&options->cuda_stack_size,
212+
"stackSize",
213+
"Set the CUDA per-thread stack size for VecGeom");
214+
add_cmd(&options->cuda_heap_size,
215+
"heapSize",
216+
"Set the CUDA per-thread heap size for VecGeom");
217+
add_cmd(&options->action_times,
218+
"actionTimes",
219+
"Add timers around every action (may reduce performance)");
220+
add_cmd(&options->default_stream,
221+
"defaultStream",
222+
"Launch all kernels on the default stream (REMOVED)");
223+
224+
// TODO: add enabled flag: CELERITAS_USE_CUDA|| CELERITAS_USE_HIP
225+
directories_.emplace_back(
226+
new CelerDirectory("/celer/device/", "Celeritas device setup"));
227+
// TODO: add enabled flag: CELERITAS_CORE_GEO == CELERITAS_CORE_GEO_VECGEOM
228+
add_cmd(&options->cuda_stack_size,
229+
"stackSize",
230+
"Set the CUDA per-thread stack size for VecGeom");
231+
add_cmd(&options->cuda_heap_size,
232+
"heapSize",
233+
"Set the CUDA per-thread heap size for VecGeom");
234+
add_cmd(&options->action_times,
235+
"actionTimes",
236+
"Add timers around every action (may reduce performance)");
224237

225238
add_cmd(&options->slot_diagnostic_prefix,
226239
"slotDiagnosticPrefix",

0 commit comments

Comments
 (0)