Enable back the cfi generation for module definitions with explicit b…

…ackend namespace
cms-sw · Jan 25, 2023 · f93cd75 · f93cd75
1 parent 9e62d3d
commit f93cd75
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 15 deletions.
diff --git a/HeterogeneousCore/AlpakaCore/interface/MakerMacros.h b/HeterogeneousCore/AlpakaCore/interface/MakerMacros.h
@@ -7,15 +7,12 @@
 // force expanding ALPAKA_ACCELERATOR_NAMESPACE before stringification
 // use the serial_sync variant for cfi file generation with the type@alpaka C++ type
 #ifdef ALPAKA_ACC_CPU_B_SEQ_T_SEQ_ENABLED
-#define DEFINE_FWK_ALPAKA_MODULE3(name_ns, name)                                   \
-  DEFINE_EDM_PLUGIN(edm::MakerPluginFactory, edm::WorkerMaker<name_ns>, #name_ns); \
-  DEFINE_FWK_PSET_DESC_FILLER_IMPL(name_ns, #name "@alpaka")
-#define DEFINE_FWK_ALPAKA_MODULE2(name_ns, name) DEFINE_FWK_ALPAKA_MODULE3(name_ns, name)
+#define DEFINE_FWK_ALPAKA_MODULE2(name_ns, name) \
+  DEFINE_FWK_MODULE(name_ns);                    \
+  DEFINE_FWK_PSET_DESC_FILLER_IMPL(name_ns, #name "@alpaka", _1)
 #define DEFINE_FWK_ALPAKA_MODULE(name) DEFINE_FWK_ALPAKA_MODULE2(ALPAKA_ACCELERATOR_NAMESPACE::name, name)
 #else
-#define DEFINE_FWK_ALPAKA_MODULE3(name_ns) \
-  DEFINE_EDM_PLUGIN(edm::MakerPluginFactory, edm::WorkerMaker<name_ns>, #name_ns)
-#define DEFINE_FWK_ALPAKA_MODULE2(name_ns) DEFINE_FWK_ALPAKA_MODULE3(name_ns)
+#define DEFINE_FWK_ALPAKA_MODULE2(name_ns) DEFINE_FWK_MODULE(name_ns)
 #define DEFINE_FWK_ALPAKA_MODULE(name) DEFINE_FWK_ALPAKA_MODULE2(ALPAKA_ACCELERATOR_NAMESPACE::name)
 #endif
 

diff --git a/HeterogeneousCore/AlpakaCore/interface/alpaka/ModuleFactory.h b/HeterogeneousCore/AlpakaCore/interface/alpaka/ModuleFactory.h
@@ -7,16 +7,13 @@
 // force expanding ALPAKA_ACCELERATOR_NAMESPACE before stringification
 // use the serial_sync variant for cfi file generation with the type@alpaka C++ type
 #ifdef ALPAKA_ACC_CPU_B_SEQ_T_SEQ_ENABLED
-#define DEFINE_FWK_EVENTSETUP_ALPAKA_MODULE3(type_ns, type)                                                 \
-  DEFINE_EDM_PLUGIN(edm::eventsetup::ModulePluginFactory, edm::eventsetup::ModuleMaker<type_ns>, #type_ns); \
-  DEFINE_DESC_FILLER_FOR_ESPRODUCERS_IMPL(type_ns, #type "@alpaka")
-#define DEFINE_FWK_EVENTSETUP_ALPAKA_MODULE2(type_ns, type) DEFINE_FWK_EVENTSETUP_ALPAKA_MODULE3(type_ns, type)
+#define DEFINE_FWK_EVENTSETUP_ALPAKA_MODULE2(type_ns, type) \
+  DEFINE_FWK_EVENTSETUP_MODULE(type_ns);                    \
+  DEFINE_DESC_FILLER_FOR_ESPRODUCERS_IMPL(type_ns, #type "@alpaka", _1)
 #define DEFINE_FWK_EVENTSETUP_ALPAKA_MODULE(type) \
   DEFINE_FWK_EVENTSETUP_ALPAKA_MODULE2(ALPAKA_ACCELERATOR_NAMESPACE::type, type)
 #else
-#define DEFINE_FWK_EVENTSETUP_ALPAKA_MODULE3(type_ns) \
-  DEFINE_EDM_PLUGIN(edm::eventsetup::ModulePluginFactory, edm::eventsetup::ModuleMaker<type_ns>, #type_ns);
-#define DEFINE_FWK_EVENTSETUP_ALPAKA_MODULE2(type_ns) DEFINE_FWK_EVENTSETUP_ALPAKA_MODULE3(type_ns)
+#define DEFINE_FWK_EVENTSETUP_ALPAKA_MODULE2(type_ns) DEFINE_FWK_EVENTSETUP_MODULE(type_ns)
 #define DEFINE_FWK_EVENTSETUP_ALPAKA_MODULE(type) \
   DEFINE_FWK_EVENTSETUP_ALPAKA_MODULE2(ALPAKA_ACCELERATOR_NAMESPACE::type)
 #endif

diff --git a/HeterogeneousCore/AlpakaCore/src/module_backend_config.cc b/HeterogeneousCore/AlpakaCore/src/module_backend_config.cc
@@ -4,7 +4,9 @@
 
 namespace {
   const std::string kPSetName("alpaka");
-  const char* const kComment = "PSet allows to override the Alpaka backend per module instance";
+  const char* const kComment =
+      "PSet allows to override the Alpaka backend per module instance. Has an effect only when the module class name "
+      "has '@alpaka' suffix, i.e. has no effect when the Alpaka backend namespace is used explicitly.";
 }  // namespace
 
 namespace cms::alpakatools {