Merge pull request #37305 from Dr15Jones/ConditionalTask

Added ConditionalTask
cms-sw · Apr 7, 2022 · 456b182 · 456b182
2 parents e7347a0 + 8b99210
commit 456b182
Show file tree

Hide file tree

Showing 24 changed files with 1,503 additions and 118 deletions.
diff --git a/DataFormats/Provenance/interface/ProductResolverIndexHelper.h b/DataFormats/Provenance/interface/ProductResolverIndexHelper.h
@@ -84,6 +84,10 @@ namespace edm {
     // If the TypeID for the wrapped type is already available,
     // it is faster to call getContainedTypeFromWrapper directly.
     TypeID getContainedType(TypeID const& typeID);
+
+    bool typeIsViewCompatible(TypeID const& requestedViewType,
+                              TypeID const& wrappedtypeID,
+                              std::string const& className);
   }  // namespace productholderindexhelper
 
   class ProductResolverIndexHelper {

diff --git a/DataFormats/Provenance/src/ProductResolverIndexHelper.cc b/DataFormats/Provenance/src/ProductResolverIndexHelper.cc
@@ -70,6 +70,32 @@ namespace edm {
       TypeID const wrappedTypeID = TypeID(wrappedType.typeInfo());
       return getContainedTypeFromWrapper(wrappedTypeID, className);
     }
+
+    bool typeIsViewCompatible(TypeID const& requestedViewType,
+                              TypeID const& wrappedtypeID,
+                              std::string const& className) {
+      auto elementType = getContainedTypeFromWrapper(wrappedtypeID, className);
+      if (elementType == TypeID(typeid(void)) or elementType == TypeID()) {
+        //the wrapped type is not a container
+        return false;
+      }
+      if (elementType == requestedViewType) {
+        return true;
+      }
+      //need to check for inheritance match
+      std::vector<std::string> missingDictionaries;
+      std::vector<TypeWithDict> baseTypes;
+      if (!public_base_classes(missingDictionaries, elementType, baseTypes)) {
+        return false;
+      }
+      for (auto const& base : baseTypes) {
+        if (TypeID(base.typeInfo()) == requestedViewType) {
+          return true;
+        }
+      }
+      return false;
+    }
+
   }  // namespace productholderindexhelper
 
   ProductResolverIndexHelper::ProductResolverIndexHelper()

diff --git a/FWCore/Framework/interface/Path.h b/FWCore/Framework/interface/Path.h
@@ -87,6 +87,7 @@ namespace edm {
     int timesFailed(size_type i) const { return workers_.at(i).timesFailed(); }
     int timesExcept(size_type i) const { return workers_.at(i).timesExcept(); }
     Worker const* getWorker(size_type i) const { return workers_.at(i).getWorker(); }
+    unsigned int bitPosition(size_type i) const { return workers_.at(i).bitPosition(); }
 
     void setEarlyDeleteHelpers(std::map<const Worker*, EarlyDeleteHelper*> const&);
 

diff --git a/FWCore/Framework/interface/StreamSchedule.h b/FWCore/Framework/interface/StreamSchedule.h
@@ -95,6 +95,7 @@
 #include <vector>
 #include <sstream>
 #include <atomic>
+#include <unordered_set>
 
 namespace edm {
 
@@ -288,6 +289,21 @@ namespace edm {
 
     void reportSkipped(EventPrincipal const& ep) const;
 
+    struct AliasInfo {
+      std::string friendlyClassName;
+      std::string instanceLabel;
+      std::string originalInstanceLabel;
+      std::string originalModuleLabel;
+    };
+    std::vector<Worker*> tryToPlaceConditionalModules(
+        Worker*,
+        std::unordered_set<std::string>& conditionalModules,
+        std::multimap<std::string, edm::BranchDescription const*> const& conditionalModuleBranches,
+        std::multimap<std::string, AliasInfo> const& aliasMap,
+        ParameterSet& proc_pset,
+        ProductRegistry& preg,
+        PreallocationConfiguration const* prealloc,
+        std::shared_ptr<ProcessConfiguration const> processConfiguration);
     void fillWorkers(ParameterSet& proc_pset,
                      ProductRegistry& preg,
                      PreallocationConfiguration const* prealloc,

diff --git a/FWCore/Framework/interface/TriggerNamesService.h b/FWCore/Framework/interface/TriggerNamesService.h
@@ -33,6 +33,7 @@
 #include <string>
 #include <map>
 #include <vector>
+#include <unordered_set>
 
 namespace edm {
 
@@ -83,7 +84,6 @@ namespace edm {
       std::string const& getTrigPathModule(size_type const i, size_type const j) const {
         return (modulenames_.at(i)).at(j);
       }
-
       Strings const& getEndPathModules(std::string const& name) const {
         return end_modulenames_.at(find(end_pos_, name));
       }

diff --git a/FWCore/Framework/interface/WorkerInPath.h b/FWCore/Framework/interface/WorkerInPath.h
@@ -51,6 +51,7 @@ namespace edm {
     FilterAction filterAction() const { return filterAction_; }
     Worker* getWorker() const { return worker_; }
     bool runConcurrently() const noexcept { return runConcurrently_; }
+    unsigned int bitPosition() const noexcept { return placeInPathContext_.placeInPath(); }
 
     void setPathContext(PathContext const* v) { placeInPathContext_.setPathContext(v); }
 

diff --git a/FWCore/Framework/src/Path.cc b/FWCore/Framework/src/Path.cc
@@ -326,10 +326,11 @@ namespace edm {
                       EventTransitionInfo const& iInfo,
                       StreamID const& streamID) {
     updateCounters(state_);
-    recordStatus(failedModuleIndex_, state_);
+    auto failedModuleBitPosition = bitPosition(failedModuleIndex_);
+    recordStatus(failedModuleBitPosition, state_);
     // Caught exception is propagated via WaitingTaskList
     CMS_SA_ALLOW try {
-      HLTPathStatus status(state_, failedModuleIndex_);
+      HLTPathStatus status(state_, failedModuleBitPosition);
 
       if (pathStatusInserter_) {  // pathStatusInserter is null for EndPaths
         pathStatusInserter_->setPathStatus(streamID, status);

diff --git a/FWCore/Framework/src/Schedule.cc b/FWCore/Framework/src/Schedule.cc
@@ -1042,14 +1042,12 @@ namespace edm {
                                      << "Name"
                                      << "";
 
-        unsigned int bitpos = 0;
         for (auto const& mod : p.moduleInPathSummaries) {
           LogFwkVerbatim("FwkSummary") << "TrigReport " << std::right << std::setw(5) << 1 << std::right << std::setw(5)
-                                       << bitpos << " " << std::right << std::setw(10) << mod.timesVisited << " "
-                                       << std::right << std::setw(10) << mod.timesPassed << " " << std::right
+                                       << mod.bitPosition << " " << std::right << std::setw(10) << mod.timesVisited
+                                       << " " << std::right << std::setw(10) << mod.timesPassed << " " << std::right
                                        << std::setw(10) << mod.timesFailed << " " << std::right << std::setw(10)
                                        << mod.timesExcept << " " << mod.moduleLabel << "";
-          ++bitpos;
         }
       }