Remove SwitchProducer tests

Author: makortel

FWCore/Framework/test/test_catch2_ScheduleBuilder.cc

@@ -30,7 +30,7 @@ namespace {
     std::string type_;
     std::string edmType_;
   };
-  enum class EdmType { kProducer, kFilter, kAnalyzer, kSwitchProducer, kOutputModule };
+  enum class EdmType { kProducer, kFilter, kAnalyzer, kOutputModule };
 
   struct ConfigBuilder {
     void addModule(std::string const& iLabel, std::string const& iType, EdmType iEdmType) {
@@ -47,8 +47,6 @@ namespace {
           return "EDAnalyzer";
         case EdmType::kOutputModule:
           return "OutputModule";
-        case EdmType::kSwitchProducer:
-          return "SwitchProducer";
       }
       return "";
     }
@@ -244,4 +242,4 @@ TEST_CASE("test edm::ScheduleBuilder", "[ScheduleBuilder]") {
     REQUIRE(builder.endPathStatusInserters_.empty());
     REQUIRE(not builder.resultsInserter_);
   }
-}
+}

FWCore/Framework/test/test_module_delete_cfg.py

@@ -16,7 +16,6 @@
 # - DAG of event/lumi/run producers that are not consumed by an always-running module, whole DAG deleted
 # - DAG of event(/lumi/run) producers that are partly consumed (kept) and partly non-consumed (delete)
 # - EDAlias with one instance consumed (original producer kept) and another non-consumed (original producer deleted)
-# - SwitchProducer non-chosen case deleted
 
 intEventProducer = cms.EDProducer("IntProducer", ivalue = cms.int32(1))
 intNonEventProducer = cms.EDProducer("NonEventIntProducer", ivalue = cms.int32(1))
@@ -114,20 +113,6 @@ def nonEventConsumer(transition, sourcePattern, expected):
     srcEvent = cms.untracked.VInputTag("producerEventAlias:consumed")
 )
 
-class SwitchProducerTest(cms.SwitchProducer):
-    def __init__(self, **kargs):
-        super(SwitchProducerTest,self).__init__(
-            dict(
-                test1 = lambda accelerators: (True, -10),
-                test2 = lambda accelerators: (True, -9)
-            ), **kargs)
-process.producerEventSwitchProducerNotConsumed = cms.EDProducer("edmtest::TestModuleDeleteProducer")
-process.producerEventSwitchProducerConsumed = intEventProducerMustRun.clone()
-process.producerEventSwitchProducer = SwitchProducerTest(
-    test1 = cms.EDProducer("AddIntsProducer", labels = cms.VInputTag("producerEventSwitchProducerNotConsumed")),
-    test2 = cms.EDProducer("AddIntsProducer", labels = cms.VInputTag("producerEventSwitchProducerConsumed")),
-)
-
 process.consumerNotExist = cms.EDAnalyzer("edmtest::GenericIntsAnalyzer",
     inputShouldBeMissing = cms.untracked.bool(True),
     srcBeginProcess = cms.untracked.VInputTag(
@@ -179,9 +164,6 @@ def __init__(self, **kargs):
     #
     process.producerEventAliasNotConsumed,
     process.producerEventAliasConsumed,
-    #
-    process.producerEventSwitchProducerNotConsumed,
-    process.producerEventSwitchProducerConsumed,
 )
 
 process.p = cms.Path(
@@ -199,8 +181,6 @@ def __init__(self, **kargs):
     #
     process.consumerEventAlias+
     #
-    process.producerEventSwitchProducer+
-    #
     process.intAnalyzerDelete
     ,
     process.t

FWCore/Integration/plugins/BuildFile.xml

@@ -22,7 +22,7 @@
       <use name="DataFormats/TestObjects"/>
 </library>
 
-  <library file="AssociationMapProducer.cc,AssociationMapAnalyzer.cc,MissingDictionaryTestProducer.cc,ExistingDictionaryTestModules.cc, TableTestModules.cc, TestGlobalOutput.cc, TestLimitedOutput.cc, TestOneOutput.cc, PluginUsingProducer.cc,SwitchProducerProvenanceAnalyzer.cc,ProducerUsingCollector.cc,ExceptionThrowingProducer.cc,TestServiceOne.cc,TestServiceTwo.cc,ProdigalAnalyzer.cc,IntSource.cc,ViewAnalyzer.cc,TestFindProduct.cc,ManyProductProducer.cc,TestParentage.cc,HierarchicalEDProducer.cc,ThrowingSource.cc, DelayedReaderThrowingSource.cc,TestHistoryKeeping.cc,PathAnalyzer.cc,SourceWithWaits.cc" name="FWCoreIntegrationSomeTestModules">
+  <library file="AssociationMapProducer.cc,AssociationMapAnalyzer.cc,MissingDictionaryTestProducer.cc,ExistingDictionaryTestModules.cc, TableTestModules.cc, TestGlobalOutput.cc, TestLimitedOutput.cc, TestOneOutput.cc, PluginUsingProducer.cc,ProducerUsingCollector.cc,ExceptionThrowingProducer.cc,TestServiceOne.cc,TestServiceTwo.cc,ProdigalAnalyzer.cc,IntSource.cc,ViewAnalyzer.cc,TestFindProduct.cc,ManyProductProducer.cc,TestParentage.cc,HierarchicalEDProducer.cc,ThrowingSource.cc, DelayedReaderThrowingSource.cc,TestHistoryKeeping.cc,PathAnalyzer.cc,SourceWithWaits.cc" name="FWCoreIntegrationSomeTestModules">
     <flags EDM_PLUGIN="1"/>
     <use name="FWCore/Framework"/>
     <use name="FWCore/ParameterSet"/>

FWCore/Integration/plugins/SwitchProducerProvenanceAnalyzer.cc

@@ -33,9 +33,7 @@
   <test name="TestIntegrationRefMerge" command="run_RefMerge.sh"/>
   <test name="TestIntegrationRefAlias" command="run_RefAlias.sh"/>
   <test name="TestIntegrationParameterSet" command="run_ParameterSet.sh"/>
-  <test name="TestIntegrationSwitchProducer" command="run_TestSwitchProducer.sh"/>
   <test name="TestIntegration_TestEDAlias" command="run_TestEDAlias.sh"/>
-  <test name="TestIntegrationProcessAccelerator" command="run_TestProcessAccelerator.sh"/>
   <test name="TestFWCoreIntegrationModuleTypeResolver" command="run_TestModuleTypeResolver.sh"/>
   <test name="CatchStdExceptiontest" command="CatchStdExceptiontest.sh"/>
   <test name="CatchCmsExceptiontest" command="CatchCmsExceptiontest.sh"/>
@@ -52,15 +50,6 @@
     <use name="catch2"/>
   </bin>
 
-  <bin file="SwitchProducer_t.cpp">
-    <use name="FWCore/Framework"/>
-    <use name="FWCore/ParameterSet"/>
-    <use name="FWCore/ParameterSetReader"/>
-    <use name="FWCore/TestProcessor"/>
-    <use name="DataFormats/Provenance"/>
-    <use name="catch2"/>
-  </bin>
-
   <bin file="ProcessAccelerator_t.cpp">
     <use name="FWCore/Framework"/>
     <use name="FWCore/ParameterSet"/>

FWCore/Integration/test/BuildFile.xml

@@ -14,51 +14,6 @@
 static constexpr auto s_tag = "[ProcessAccelerator]";
 
 namespace {
-  std::string makeSwitchConfig(bool test2Enabled,
-                               std::string_view test1,
-                               std::string_view test2,
-                               std::string_view accelerator) {
-    const std::string appendTest2 = test2Enabled ? "self._enabled.append('test2')" : "";
-    return fmt::format(
-        R"_(from FWCore.TestProcessor.TestProcess import *
-import FWCore.ParameterSet.Config as cms
-
-class ProcessAcceleratorTest(cms.ProcessAccelerator):
-    def __init__(self):
-        super(ProcessAcceleratorTest,self).__init__()
-        self._labels = ["test1", "test2"]
-        self._enabled = ["test1"]
-        {}
-    def labels(self):
-        return self._labels
-    def enabledLabels(self):
-        return self._enabled
-
-class SwitchProducerTest(cms.SwitchProducer):
-    def __init__(self, **kargs):
-        super(SwitchProducerTest,self).__init__(
-            dict(
-                cpu = cms.SwitchProducer.getCpu(),
-                test1 = lambda accelerators: ("test1" in accelerators, 2),
-                test2 = lambda accelerators: ("test2" in accelerators, 3),
-            ), **kargs)
-
-process = TestProcess()
-process.options.accelerators = ["{}"]
-process.ProcessAcceleratorTest = ProcessAcceleratorTest()
-process.s = SwitchProducerTest(
-   cpu = cms.EDProducer('IntProducer', ivalue = cms.int32(0)),
-   test1 = {},
-   test2 = {}
-)
-process.moduleToTest(process.s)
-)_",
-        appendTest2,
-        accelerator,
-        test1,
-        test2);
-  }
-
   std::string makeResolverConfig(bool enableOther, std::string_view accelerator, std::string_view variant) {
     const std::string appendOther = enableOther ? "self._enabled.append('other')" : "";
     const std::string explicitVariant =
@@ -116,105 +71,6 @@ process.moduleToTest(process.m)
   }
 }  // namespace
 
-TEST_CASE("Configuration with SwitchProducer", s_tag) {
-  const std::string test1{"cms.EDProducer('IntProducer', ivalue = cms.int32(1))"};
-  const std::string test2{"cms.EDProducer('ManyIntProducer', ivalue = cms.int32(2), values = cms.VPSet())"};
-
-  const std::string baseConfig_auto = makeSwitchConfig(true, test1, test2, "*");
-  const std::string baseConfig_test1 = makeSwitchConfig(true, test1, test2, "test1");
-  const std::string baseConfig_test2 = makeSwitchConfig(true, test1, test2, "test2");
-  const std::string baseConfigTest2Disabled_auto = makeSwitchConfig(false, test1, test2, "*");
-  const std::string baseConfigTest2Disabled_test1 = makeSwitchConfig(false, test1, test2, "test1");
-  const std::string baseConfigTest2Disabled_test2 = makeSwitchConfig(false, test1, test2, "test2");
-
-  SECTION("Configuration hash is not changed") {
-    std::unique_ptr<edm::ParameterSet> pset_auto, pset_test1, pset_test2;
-    std::unique_ptr<edm::ParameterSet> psetTest2Disabled_auto, psetTest2Disabled_test1, psetTest2Disabled_test2;
-    edm::makeParameterSets(baseConfig_auto, pset_auto);
-    edm::makeParameterSets(baseConfig_test1, pset_test1);
-    edm::makeParameterSets(baseConfig_test2, pset_test2);
-    edm::makeParameterSets(baseConfigTest2Disabled_auto, psetTest2Disabled_auto);
-    edm::makeParameterSets(baseConfigTest2Disabled_test1, psetTest2Disabled_test1);
-    edm::makeParameterSets(baseConfigTest2Disabled_test2, psetTest2Disabled_test2);
-    pset_auto->registerIt();
-    pset_test1->registerIt();
-    pset_test2->registerIt();
-    psetTest2Disabled_auto->registerIt();
-    psetTest2Disabled_test1->registerIt();
-    psetTest2Disabled_test2->registerIt();
-    REQUIRE(pset_auto->id() == pset_test1->id());
-    REQUIRE(pset_auto->id() == pset_test2->id());
-    REQUIRE(pset_auto->id() == psetTest2Disabled_auto->id());
-    REQUIRE(pset_auto->id() == psetTest2Disabled_test1->id());
-    REQUIRE(pset_auto->id() == psetTest2Disabled_test2->id());
-  }
-
-  edm::test::TestProcessor::Config config_auto{baseConfig_auto};
-  edm::test::TestProcessor::Config config_test1{baseConfig_test1};
-  edm::test::TestProcessor::Config config_test2{baseConfig_test2};
-  edm::test::TestProcessor::Config configTest2Disabled_auto{baseConfigTest2Disabled_auto};
-  edm::test::TestProcessor::Config configTest2Disabled_test1{baseConfigTest2Disabled_test1};
-  edm::test::TestProcessor::Config configTest2Disabled_test2{baseConfigTest2Disabled_test2};
-
-  SECTION("Base configuration is OK") { REQUIRE_NOTHROW(edm::test::TestProcessor(config_auto)); }
-
-  SECTION("No event data") {
-    edm::test::TestProcessor tester(config_auto);
-    REQUIRE_NOTHROW(tester.test());
-  }
-
-  SECTION("beginJob and endJob only") {
-    edm::test::TestProcessor tester(config_auto);
-    REQUIRE_NOTHROW(tester.testBeginAndEndJobOnly());
-  }
-
-  SECTION("Run with no LuminosityBlocks") {
-    edm::test::TestProcessor tester(config_auto);
-    REQUIRE_NOTHROW(tester.testRunWithNoLuminosityBlocks());
-  }
-
-  SECTION("LuminosityBlock with no Events") {
-    edm::test::TestProcessor tester(config_auto);
-    REQUIRE_NOTHROW(tester.testLuminosityBlockWithNoEvents());
-  }
-
-  SECTION("Test2 enabled, acclerators=*") {
-    edm::test::TestProcessor tester(config_auto);
-    auto event = tester.test();
-    REQUIRE(event.get<edmtest::IntProduct>()->value == 2);
-  }
-
-  SECTION("Test2 enabled, acclerators=test1") {
-    edm::test::TestProcessor tester(config_test1);
-    auto event = tester.test();
-    REQUIRE(event.get<edmtest::IntProduct>()->value == 1);
-  }
-
-  SECTION("Test2 enabled, acclerators=test2") {
-    edm::test::TestProcessor tester(config_test2);
-    auto event = tester.test();
-    REQUIRE(event.get<edmtest::IntProduct>()->value == 2);
-  }
-
-  SECTION("Test2 disabled, accelerators=*") {
-    edm::test::TestProcessor tester(configTest2Disabled_auto);
-    auto event = tester.test();
-    REQUIRE(event.get<edmtest::IntProduct>()->value == 1);
-  }
-
-  SECTION("Test2 disabled, accelerators=test1") {
-    edm::test::TestProcessor tester(configTest2Disabled_test1);
-    auto event = tester.test();
-    REQUIRE(event.get<edmtest::IntProduct>()->value == 1);
-  }
-
-  SECTION("Test2 disabled, accelerators=test2") {
-    REQUIRE_THROWS_WITH(
-        edm::test::TestProcessor(configTest2Disabled_test2),
-        Catch::Contains("The system has no compute accelerators that match the patterns") && Catch::Contains("test1"));
-  }
-}
-
 TEST_CASE("Configuration with ModuleTypeResolver", s_tag) {
   const std::string baseConfig_auto = makeResolverConfig(true, "*", "");
   const std::string baseConfig_cpu = makeResolverConfig(true, "cpu", "");