Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Replace vstring with VInputTag in edmtest::AddIntsProducer #31245

Merged
merged 1 commit into from Aug 27, 2020
Merged

Replace vstring with VInputTag in edmtest::AddIntsProducer #31245

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions FWCore/Concurrency/test/streamGrapher_stallMonitor_cfg.py
View file
Open in desktop
Expand Up @@ -8,14 +8,14 @@
process.legacy1 = cms.EDProducer("BusyWaitIntLegacyProducer",ivalue = cms.int32(12), iterations = cms.uint32(3000*1000))

process.adder1 = cms.EDProducer("AddIntsProducer",
labels = cms.vstring("a","busy1","legacy1"))
labels = cms.VInputTag("a","busy1","legacy1"))

process.busy2 = cms.EDProducer("BusyWaitIntProducer", ivalue = cms.int32(7), iterations = cms.uint32(4*1000*1000))
process.busy3 = cms.EDProducer("BusyWaitIntProducer", ivalue = cms.int32(2), iterations = cms.uint32(1000*1000))
process.legacy2 = cms.EDProducer("BusyWaitIntLegacyProducer", ivalue=cms.int32(-1), iterations = cms.uint32(6000*1000))

process.strt = cms.EDProducer("AddIntsProducer",
labels = cms.vstring("busy2","busy3","legacy2","b", "adder1"))
labels = cms.VInputTag("busy2","busy3","legacy2","b", "adder1"))

process.t = cms.Task(process.busy1, process.legacy1, process.adder1, process.busy2, process.busy3, process.legacy2)

Expand Down
4 changes: 2 additions & 2 deletions FWCore/Framework/test/stubs/ToyIntProducers.cc
View file
Open in desktop
Expand Up @@ -353,9 +353,9 @@ namespace edmtest {
: putToken_{produces<IntProduct>()},
otherPutToken_{produces<IntProduct>("other")},
onlyGetOnEvent_(p.getUntrackedParameter<unsigned int>("onlyGetOnEvent", 0u)) {
auto const& labels = p.getParameter<std::vector<std::string>>("labels");
auto const& labels = p.getParameter<std::vector<edm::InputTag>>("labels");
for (auto const& label : labels) {
tokens_.emplace_back(consumes<IntProduct>(edm::InputTag{label}));
tokens_.emplace_back(consumes<IntProduct>(label));
}
}
void produce(edm::StreamID, edm::Event& e, edm::EventSetup const& c) const override;
Expand Down
6 changes: 3 additions & 3 deletions FWCore/Framework/test/test_deepCall_unscheduled_cfg.py
View file
Open in desktop
Expand Up @@ -44,16 +44,16 @@
)

process.result1 = cms.EDProducer("AddIntsProducer",
labels = cms.vstring('one')
labels = cms.VInputTag('one')
)

process.result2 = cms.EDProducer("AddIntsProducer",
labels = cms.vstring('result1',
labels = cms.VInputTag('result1',
'one')
)

process.result4 = cms.EDProducer("AddIntsProducer",
labels = cms.vstring('result2',
labels = cms.VInputTag('result2',
'result2')
)

Expand Down
6 changes: 3 additions & 3 deletions FWCore/Framework/test/test_deepCall_unscheduled_fail_cfg.py
View file
Open in desktop
Expand Up @@ -18,16 +18,16 @@
process.Tracer = cms.Service("Tracer")

process.result1 = cms.EDProducer("AddIntsProducer",
labels = cms.vstring('one')
labels = cms.VInputTag('one')
)

process.result2 = cms.EDProducer("AddIntsProducer",
labels = cms.vstring('result1',
labels = cms.VInputTag('result1',
'one')
)

process.result4 = cms.EDProducer("AddIntsProducer",
labels = cms.vstring('result2',
labels = cms.VInputTag('result2',
'result2')
)

Expand Down
2 changes: 1 addition & 1 deletion FWCore/Framework/test/test_dependentPathsAndExceptions_cfg.py
View file
Open in desktop
Expand Up @@ -6,7 +6,7 @@

process.fail = cms.EDProducer("FailingProducer")

process.readFail = cms.EDProducer("AddIntsProducer", labels = cms.vstring("fail"))
process.readFail = cms.EDProducer("AddIntsProducer", labels = cms.VInputTag("fail"))

process.a = cms.EDProducer("BusyWaitIntProducer", ivalue = cms.int32(5), iterations = cms.uint32(10000))

Expand Down
2 changes: 1 addition & 1 deletion FWCore/Framework/test/test_emptyEndPathWithTask_cfg.py
View file
Open in desktop
Expand Up @@ -8,6 +8,6 @@
)

process.intProducer1 = cms.EDProducer("IntProducer", ivalue = cms.int32(1))
process.intProducer2 = cms.EDProducer("AddIntsProducer", labels = cms.vstring("intProducer1"))
process.intProducer2 = cms.EDProducer("AddIntsProducer", labels = cms.VInputTag("intProducer1"))

process.ep = cms.EndPath(cms.Task(process.intProducer1, process.intProducer2))
2 changes: 1 addition & 1 deletion FWCore/Framework/test/test_emptyPathWithTask_cfg.py
View file
Open in desktop
Expand Up @@ -8,6 +8,6 @@
)

process.intProducer1 = cms.EDProducer("IntProducer", ivalue = cms.int32(1))
process.intProducer2 = cms.EDProducer("AddIntsProducer", labels = cms.vstring("intProducer1"))
process.intProducer2 = cms.EDProducer("AddIntsProducer", labels = cms.VInputTag("intProducer1"))

process.p = cms.Path(cms.Task(process.intProducer1, process.intProducer2))
168 changes: 84 additions & 84 deletions FWCore/Framework/test/unit_test_outputs/test_deepCall_unscheduled.log
View file
Open in desktop

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions FWCore/Integration/test/EDAlias_t.cpp
View file
Open in desktop
Expand Up @@ -20,7 +20,7 @@ process.intprod = cms.EDProducer('IntProducer', ivalue = cms.int32(1))
process.intalias = cms.EDAlias(intprod = cms.VPSet(cms.PSet(type = cms.string('edmtestIntProduct'))))

# Module to be tested can not be an EDAlias
process.test = cms.EDProducer('AddIntsProducer', labels = cms.vstring('intalias'))
process.test = cms.EDProducer('AddIntsProducer', labels = cms.VInputTag('intalias'))

process.moduleToTest(process.test, cms.Task(process.intprod))
)_"};
Expand Down Expand Up @@ -72,7 +72,7 @@ process.intalias = cms.EDAlias(intprod = cms.VPSet(cms.PSet(type = cms.string('e
)

# Module to be tested can not be an EDAlias
process.test = cms.EDProducer('AddIntsProducer', labels = cms.vstring('intalias', 'intalias:bar'))
process.test = cms.EDProducer('AddIntsProducer', labels = cms.VInputTag('intalias', 'intalias:bar'))

process.moduleToTest(process.test, cms.Task(process.intprod))
)_"};
Expand Down Expand Up @@ -102,7 +102,7 @@ process.intalias = cms.EDAlias(intprod = cms.VPSet(cms.PSet(type = cms.string('e
)

# Module to be tested can not be an EDAlias
process.test = cms.EDProducer('AddIntsProducer', labels = cms.vstring('intalias'))
process.test = cms.EDProducer('AddIntsProducer', labels = cms.VInputTag('intalias'))

process.moduleToTest(process.test, cms.Task(process.intprod))
)_"};
Expand Down
32 changes: 16 additions & 16 deletions FWCore/Integration/test/testDropOnInput1_1_cfg.py
View file
Open in desktop
Expand Up @@ -11,74 +11,74 @@
)

process.prod1 = cms.EDProducer("AddIntsProducer",
labels = cms.vstring()
labels = cms.VInputTag()
)

process.prod2 = cms.EDProducer("AddIntsProducer",
labels = cms.vstring("prod1")
labels = cms.VInputTag("prod1")
)

process.prod3 = cms.EDProducer("AddIntsProducer",
labels = cms.vstring("prod2")
labels = cms.VInputTag("prod2")
)

process.prodA = cms.EDProducer("AddIntsProducer",
labels = cms.vstring()
labels = cms.VInputTag()
)

process.prodB = cms.EDProducer("AddIntsProducer",
labels = cms.vstring("prodA"),
labels = cms.VInputTag("prodA"),
onlyGetOnEvent = cms.untracked.uint32(1)
)

process.prodC = cms.EDProducer("AddIntsProducer",
labels = cms.vstring("prodB"),
labels = cms.VInputTag("prodB"),
onlyGetOnEvent = cms.untracked.uint32(2)
)

process.prodF = cms.EDProducer("AddIntsProducer",
labels = cms.vstring()
labels = cms.VInputTag()
)

process.prodG = cms.EDProducer("AddIntsProducer",
labels = cms.vstring("prodF"),
labels = cms.VInputTag("prodF"),
onlyGetOnEvent = cms.untracked.uint32(2)
)

process.K100 = cms.EDProducer("AddIntsProducer",
labels = cms.vstring()
labels = cms.VInputTag()
)

process.NK101 = cms.EDProducer("AddIntsProducer",
labels = cms.vstring("K100")
labels = cms.VInputTag("K100")
)

process.A101 = cms.EDAlias(NK101 = cms.VPSet( cms.PSet(type=cms.string('edmtestIntProduct') ) ) )

process.K102 = cms.EDProducer("AddIntsProducer",
labels = cms.vstring("NK101")
labels = cms.VInputTag("NK101")
)

process.K104 = cms.EDProducer("AddIntsProducer",
labels = cms.vstring("A101")
labels = cms.VInputTag("A101")
)

process.K200 = cms.EDProducer("AddIntsProducer",
labels = cms.vstring()
labels = cms.VInputTag()
)

process.K201 = cms.EDProducer("AddIntsProducer",
labels = cms.vstring("K200")
labels = cms.VInputTag("K200")
)

process.A201 = cms.EDAlias(K201 = cms.VPSet( cms.PSet(type=cms.string('edmtestIntProduct') ) ) )

process.K202 = cms.EDProducer("AddIntsProducer",
labels = cms.vstring("K201")
labels = cms.VInputTag("K201")
)

process.K204 = cms.EDProducer("AddIntsProducer",
labels = cms.vstring("A201")
labels = cms.VInputTag("A201")
)

process.out = cms.OutputModule("PoolOutputModule",
Expand Down
32 changes: 16 additions & 16 deletions FWCore/Integration/test/testDropOnInput1_2_cfg.py
View file
Open in desktop
Expand Up @@ -11,74 +11,74 @@
)

process.prod1 = cms.EDProducer("AddIntsProducer",
labels = cms.vstring()
labels = cms.VInputTag()
)

process.prod2 = cms.EDProducer("AddIntsProducer",
labels = cms.vstring("prod1")
labels = cms.VInputTag("prod1")
)

process.prod3 = cms.EDProducer("AddIntsProducer",
labels = cms.vstring("prod2")
labels = cms.VInputTag("prod2")
)

process.prodA = cms.EDProducer("AddIntsProducer",
labels = cms.vstring()
labels = cms.VInputTag()
)

process.prodB = cms.EDProducer("AddIntsProducer",
labels = cms.vstring("prodA"),
labels = cms.VInputTag("prodA"),
onlyGetOnEvent = cms.untracked.uint32(1)
)

process.prodC = cms.EDProducer("AddIntsProducer",
labels = cms.vstring("prodB"),
labels = cms.VInputTag("prodB"),
onlyGetOnEvent = cms.untracked.uint32(2)
)

process.prodF = cms.EDProducer("AddIntsProducer",
labels = cms.vstring()
labels = cms.VInputTag()
)

process.prodG = cms.EDProducer("AddIntsProducer",
labels = cms.vstring("prodF"),
labels = cms.VInputTag("prodF"),
onlyGetOnEvent = cms.untracked.uint32(2)
)

process.K100 = cms.EDProducer("AddIntsProducer",
labels = cms.vstring()
labels = cms.VInputTag()
)

process.NK101 = cms.EDProducer("AddIntsProducer",
labels = cms.vstring("K100")
labels = cms.VInputTag("K100")
)

process.A101 = cms.EDAlias(NK101 = cms.VPSet( cms.PSet(type=cms.string('edmtestIntProduct') ) ) )

process.K102 = cms.EDProducer("AddIntsProducer",
labels = cms.vstring("NK101")
labels = cms.VInputTag("NK101")
)

process.K104 = cms.EDProducer("AddIntsProducer",
labels = cms.vstring("A101")
labels = cms.VInputTag("A101")
)

process.K200 = cms.EDProducer("AddIntsProducer",
labels = cms.vstring()
labels = cms.VInputTag()
)

process.K201 = cms.EDProducer("AddIntsProducer",
labels = cms.vstring("K200")
labels = cms.VInputTag("K200")
)

process.A201 = cms.EDAlias(K201 = cms.VPSet( cms.PSet(type=cms.string('edmtestIntProduct') ) ) )

process.K202 = cms.EDProducer("AddIntsProducer",
labels = cms.vstring("K201")
labels = cms.VInputTag("K201")
)

process.K204 = cms.EDProducer("AddIntsProducer",
labels = cms.vstring("A201")
labels = cms.VInputTag("A201")
)

process.out = cms.OutputModule("PoolOutputModule",
Expand Down
8 changes: 4 additions & 4 deletions FWCore/Integration/test/testDropOnInput2_cfg.py
View file
Open in desktop
Expand Up @@ -19,21 +19,21 @@
)

process.prodD = cms.EDProducer("AddIntsProducer",
labels = cms.vstring("prodC"),
labels = cms.VInputTag("prodC"),
onlyGetOnEvent = cms.untracked.uint32(1)
)

process.prodE = cms.EDProducer("AddIntsProducer",
labels = cms.vstring("prodD"),
labels = cms.VInputTag("prodD"),
onlyGetOnEvent = cms.untracked.uint32(2)
)

process.K103 = cms.EDProducer("AddIntsProducer",
labels = cms.vstring("A101")
labels = cms.VInputTag("A101")
)

process.K203 = cms.EDProducer("AddIntsProducer",
labels = cms.vstring("K201")
labels = cms.VInputTag("K201")
)

process.out = cms.OutputModule("PoolOutputModule",
Expand Down