From bc4c8a76c267428839eebc71be6102463a4b8481 Mon Sep 17 00:00:00 2001 From: Gray Putnam Date: Wed, 18 Jun 2025 14:11:45 -0500 Subject: [PATCH] Fixup GPU enabled WC DNN configs. Move cpu setting into default fcl. --- fcl/reco/Definitions/enable_dnn_sp.fcl | 5 +++++ fcl/reco/Stage0/data/stage0_run2_wcdnn_gpu_icarus.fcl | 11 +++++++++++ .../Stage0/mc/stage0_run2_wcdnn_gpu_icarus_mc.fcl | 4 +--- fcl/reco/Stage0/mc/stage0_run2_wcdnn_icarus_mc.fcl | 5 ----- .../overlay/stage0_run2_wcdnn_gpu_icarus_overlay.fcl | 3 +++ 5 files changed, 20 insertions(+), 8 deletions(-) create mode 100644 fcl/reco/Stage0/data/stage0_run2_wcdnn_gpu_icarus.fcl create mode 100644 fcl/reco/Stage0/overlay/stage0_run2_wcdnn_gpu_icarus_overlay.fcl diff --git a/fcl/reco/Definitions/enable_dnn_sp.fcl b/fcl/reco/Definitions/enable_dnn_sp.fcl index 5961c8bca..ae90ef157 100644 --- a/fcl/reco/Definitions/enable_dnn_sp.fcl +++ b/fcl/reco/Definitions/enable_dnn_sp.fcl @@ -3,6 +3,11 @@ physics.producers.decon2droiEW.wcls_main.configs: ["pgrapher/experiment/icarus/w physics.producers.decon2droiWE.wcls_main.configs: ["pgrapher/experiment/icarus/wcls-decode-to-sig-twofaced-dnnroi.jsonnet"] physics.producers.decon2droiWW.wcls_main.configs: ["pgrapher/experiment/icarus/wcls-decode-to-sig-twofaced-dnnroi.jsonnet"] +physics.producers.decon2droiEE.wcls_main.params.wc_device: "cpu" +physics.producers.decon2droiEW.wcls_main.params.wc_device: "cpu" +physics.producers.decon2droiWE.wcls_main.params.wc_device: "cpu" +physics.producers.decon2droiWW.wcls_main.params.wc_device: "cpu" + physics.producers.wire2channelroi2d.WireModuleLabelVec: ["decon2droiEE:dnnsp", "decon2droiEW:dnnsp", "decon2droiWE:dnnsp", "decon2droiWW:dnnsp"] physics.analyzers.spanaE.HitProducers: ["gaushit2dTPCEE", "gaushit2dTPCEW"] diff --git a/fcl/reco/Stage0/data/stage0_run2_wcdnn_gpu_icarus.fcl b/fcl/reco/Stage0/data/stage0_run2_wcdnn_gpu_icarus.fcl new file mode 100644 index 000000000..8db736759 --- /dev/null +++ b/fcl/reco/Stage0/data/stage0_run2_wcdnn_gpu_icarus.fcl @@ -0,0 +1,11 @@ +#include "stage0_run2_wcdnn_icarus.fcl" + +physics.producers.decon2droiEE.wcls_main.params.wc_device: "gpu" +physics.producers.decon2droiEW.wcls_main.params.wc_device: "gpu" +physics.producers.decon2droiWE.wcls_main.params.wc_device: "gpu" +physics.producers.decon2droiWW.wcls_main.params.wc_device: "gpu" + +physics.producers.decon2droiEE.wcls_main.plugins: [@sequence::icarus_stage0_producers.decon2droiEE.wcls_main.plugins, "WireCellCuda"] +physics.producers.decon2droiEW.wcls_main.plugins: [@sequence::icarus_stage0_producers.decon2droiEW.wcls_main.plugins, "WireCellCuda"] +physics.producers.decon2droiWE.wcls_main.plugins: [@sequence::icarus_stage0_producers.decon2droiWE.wcls_main.plugins, "WireCellCuda"] +physics.producers.decon2droiWW.wcls_main.plugins: [@sequence::icarus_stage0_producers.decon2droiWW.wcls_main.plugins, "WireCellCuda"] diff --git a/fcl/reco/Stage0/mc/stage0_run2_wcdnn_gpu_icarus_mc.fcl b/fcl/reco/Stage0/mc/stage0_run2_wcdnn_gpu_icarus_mc.fcl index fb9a3977d..8a1e7edc3 100644 --- a/fcl/reco/Stage0/mc/stage0_run2_wcdnn_gpu_icarus_mc.fcl +++ b/fcl/reco/Stage0/mc/stage0_run2_wcdnn_gpu_icarus_mc.fcl @@ -1,6 +1,4 @@ -#include "stage0_run2_wc_icarus.fcl" - -#include "enable_dnn_sp.fcl" +#include "stage0_run2_wcdnn_icarus_mc.fcl" physics.producers.decon2droiEE.wcls_main.params.wc_device: "gpu" physics.producers.decon2droiEW.wcls_main.params.wc_device: "gpu" diff --git a/fcl/reco/Stage0/mc/stage0_run2_wcdnn_icarus_mc.fcl b/fcl/reco/Stage0/mc/stage0_run2_wcdnn_icarus_mc.fcl index 69c42a272..8e3c557f9 100644 --- a/fcl/reco/Stage0/mc/stage0_run2_wcdnn_icarus_mc.fcl +++ b/fcl/reco/Stage0/mc/stage0_run2_wcdnn_icarus_mc.fcl @@ -1,8 +1,3 @@ #include "stage0_run2_wc_icarus_mc.fcl" #include "enable_dnn_sp.fcl" - -physics.producers.decon2droiEE.wcls_main.params.wc_device: "cpu" -physics.producers.decon2droiEW.wcls_main.params.wc_device: "cpu" -physics.producers.decon2droiWE.wcls_main.params.wc_device: "cpu" -physics.producers.decon2droiWW.wcls_main.params.wc_device: "cpu" diff --git a/fcl/reco/Stage0/overlay/stage0_run2_wcdnn_gpu_icarus_overlay.fcl b/fcl/reco/Stage0/overlay/stage0_run2_wcdnn_gpu_icarus_overlay.fcl new file mode 100644 index 000000000..67c88b449 --- /dev/null +++ b/fcl/reco/Stage0/overlay/stage0_run2_wcdnn_gpu_icarus_overlay.fcl @@ -0,0 +1,3 @@ +#include "stage0_run2_wcdnn_gpu_icarus_mc.fcl" + +#include "enable_overlay_sp.fcl"