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

argparse migration for cmsDriver and FWCore #43042

Merged
merged 7 commits into from
Oct 25, 2023
Merged

argparse migration for cmsDriver and FWCore #43042

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
5a3363f
migrate cmsDriver to argparse
kpedro88 Oct 16, 2023
c805714
argparse migration for FWCore/ParameterSet
kpedro88 Oct 16, 2023
907b15e
argparse migration for FWCore/PythonUtilities
kpedro88 Oct 16, 2023
19102b3
argparse migration for FWCore/Utilities (& some python3 fixes)
kpedro88 Oct 17, 2023
9429d62
remove __future__ imports
kpedro88 Oct 17, 2023
3ce3b6b
restore positional arg, fix conversions
kpedro88 Oct 18, 2023
d27742b
type fixes
kpedro88 Oct 18, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
57 changes: 28 additions & 29 deletions Configuration/Applications/python/ConfigBuilder.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
#! /usr/bin/env python3

from __future__ import print_function
__version__ = "$Revision: 1.19 $"
__source__ = "$Source: /local/reps/CMSSW/CMSSW/Configuration/Applications/python/ConfigBuilder.py,v $"

Expand Down Expand Up @@ -61,7 +60,7 @@ class Options:
defaultOptions.eventcontent = None
defaultOptions.datatier = None
defaultOptions.inlineEventContent = True
defaultOptions.inlineObjets =''
defaultOptions.inlineObjects =''
defaultOptions.hideGen=False
from Configuration.StandardSequences.VtxSmeared import VtxSmearedDefaultKey,VtxSmearedHIDefaultKey
defaultOptions.beamspot=None
Expand All @@ -86,10 +85,10 @@ class Options:
defaultOptions.runsScenarioForMCIntegerWeights = None
defaultOptions.runUnscheduled = False
defaultOptions.timeoutOutput = False
defaultOptions.nThreads = '1'
defaultOptions.nStreams = '0'
defaultOptions.nConcurrentLumis = '0'
defaultOptions.nConcurrentIOVs = '0'
defaultOptions.nThreads = 1
defaultOptions.nStreams = 0
defaultOptions.nConcurrentLumis = 0
defaultOptions.nConcurrentIOVs = 0
defaultOptions.accelerators = None

# some helper routines
Expand Down Expand Up @@ -424,9 +423,9 @@ def addCommon(self):

def addMaxEvents(self):
"""Here we decide how many evts will be processed"""
self.process.maxEvents.input = int(self._options.number)
self.process.maxEvents.input = self._options.number
if self._options.number_out:
self.process.maxEvents.output = int(self._options.number_out)
self.process.maxEvents.output = self._options.number_out
self.addedObjects.append(("","maxEvents"))

def addSource(self):
Expand Down Expand Up @@ -793,7 +792,7 @@ def addStandardSequences(self):
#the file is local
self.process.load(mixingDict['file'])
print("inlining mixing module configuration")
self._options.inlineObjets+=',mix'
self._options.inlineObjects+=',mix'
else:
self.loadAndRemember(mixingDict['file'])

Expand Down Expand Up @@ -1351,8 +1350,8 @@ def prepare_ALCA(self, stepSpec = None, workflow = 'full'):
if shortName in alcaList and isinstance(alcastream,cms.FilteredStream):
if shortName in AlCaNoConcurrentLumis:
print("Setting numberOfConcurrentLuminosityBlocks=1 because of AlCa sequence {}".format(shortName))
self._options.nConcurrentLumis = "1"
self._options.nConcurrentIOVs = "1"
self._options.nConcurrentLumis = 1
self._options.nConcurrentIOVs = 1
output = self.addExtraStream(name,alcastream, workflow = workflow)
self.executeAndRemember('process.ALCARECOEventContent.outputCommands.extend(process.OutALCARECO'+shortName+'_noDrop.outputCommands)')
self.AlCaPaths.append(shortName)
Expand Down Expand Up @@ -1403,9 +1402,9 @@ def prepare_LHE(self, stepSpec = None):
__import__(loadFragment)
self.process.load(loadFragment)
##inline the modules
self._options.inlineObjets+=','+stepSpec
self._options.inlineObjects+=','+stepSpec

getattr(self.process,stepSpec).nEvents = int(self._options.number)
getattr(self.process,stepSpec).nEvents = self._options.number

#schedule it
self.process.lhe_step = cms.Path( getattr( self.process,stepSpec) )
Expand Down Expand Up @@ -1452,13 +1451,13 @@ def prepare_GEN(self, stepSpec = None):
for name in genModules:
theObject = getattr(generatorModule,name)
if isinstance(theObject, cmstypes._Module):
self._options.inlineObjets=name+','+self._options.inlineObjets
self._options.inlineObjects=name+','+self._options.inlineObjects
if theObject.type_() in noConcurrentLumiGenerators:
print("Setting numberOfConcurrentLuminosityBlocks=1 because of generator {}".format(theObject.type_()))
self._options.nConcurrentLumis = "1"
self._options.nConcurrentIOVs = "1"
self._options.nConcurrentLumis = 1
self._options.nConcurrentIOVs = 1
elif isinstance(theObject, cms.Sequence) or isinstance(theObject, cmstypes.ESProducer):
self._options.inlineObjets+=','+name
self._options.inlineObjects+=','+name

if stepSpec == self.GENDefaultSeq or stepSpec == 'pgen_genonly' or stepSpec == 'pgen_smear':
if 'ProductionFilterSequence' in genModules and ('generator' in genModules):
Expand Down Expand Up @@ -1708,8 +1707,8 @@ def leave(self,v): pass

expander=PrintAllModules()
getattr(self.process,filterSeq).visit( expander )
self._options.inlineObjets+=','+expander.inliner
self._options.inlineObjets+=','+filterSeq
self._options.inlineObjects+=','+expander.inliner
self._options.inlineObjects+=','+filterSeq

## put the filtering path in the schedule
self.scheduleSequence(filterSeq,'filtering_step')
Expand Down Expand Up @@ -2285,7 +2284,7 @@ def prepare(self, doChecking = False):
self.pythonCfgCode += command + "\n"

#comma separated list of objects that deserve to be inlined in the configuration (typically from a modified config deep down)
for object in self._options.inlineObjets.split(','):
for object in self._options.inlineObjects.split(','):
if not object:
continue
if not hasattr(self.process,object):
Expand Down Expand Up @@ -2344,24 +2343,24 @@ def prepare(self, doChecking = False):
self.pythonCfgCode+="from PhysicsTools.PatAlgos.tools.helpers import associatePatAlgosToolsTask\n"
self.pythonCfgCode+="associatePatAlgosToolsTask(process)\n"

overrideThreads = (self._options.nThreads != "1")
overrideThreads = (self._options.nThreads != 1)
overrideConcurrentLumis = (self._options.nConcurrentLumis != defaultOptions.nConcurrentLumis)
overrideConcurrentIOVs = (self._options.nConcurrentIOVs != defaultOptions.nConcurrentIOVs)

if overrideThreads or overrideConcurrentLumis or overrideConcurrentIOVs:
self.pythonCfgCode +="\n"
self.pythonCfgCode +="#Setup FWK for multithreaded\n"
if overrideThreads:
self.pythonCfgCode +="process.options.numberOfThreads = "+self._options.nThreads+"\n"
self.pythonCfgCode +="process.options.numberOfStreams = "+self._options.nStreams+"\n"
self.process.options.numberOfThreads = int(self._options.nThreads)
self.process.options.numberOfStreams = int(self._options.nStreams)
self.pythonCfgCode +="process.options.numberOfThreads = {}\n".format(self._options.nThreads)
self.pythonCfgCode +="process.options.numberOfStreams = {}\n".format(self._options.nStreams)
self.process.options.numberOfThreads = self._options.nThreads
self.process.options.numberOfStreams = self._options.nStreams
if overrideConcurrentLumis:
self.pythonCfgCode +="process.options.numberOfConcurrentLuminosityBlocks = "+self._options.nConcurrentLumis+"\n"
self.process.options.numberOfConcurrentLuminosityBlocks = int(self._options.nConcurrentLumis)
self.pythonCfgCode +="process.options.numberOfConcurrentLuminosityBlocks = {}\n".format(self._options.nConcurrentLumis)
self.process.options.numberOfConcurrentLuminosityBlocks = self._options.nConcurrentLumis
if overrideConcurrentIOVs:
self.pythonCfgCode +="process.options.eventSetup.numberOfConcurrentIOVs = "+self._options.nConcurrentIOVs+"\n"
self.process.options.eventSetup.numberOfConcurrentIOVs = int(self._options.nConcurrentIOVs)
self.pythonCfgCode +="process.options.eventSetup.numberOfConcurrentIOVs = {}\n".format(self._options.nConcurrentIOVs)
self.process.options.eventSetup.numberOfConcurrentIOVs = self._options.nConcurrentIOVs

if self._options.accelerators is not None:
accelerators = self._options.accelerators.split(',')
Expand Down
Loading