Skip to content

Commit

Permalink
Merge pull request #28426 from fabiocos/fc-py3scripts
Browse files Browse the repository at this point in the history 
Minimal python3 compatibility for FWCore/ParameterSet scripts
  • Loading branch information
@cmsbuild
cmsbuild committed Nov 19, 2019
2 parents 775ab38 + fad18ac commit 9bd2d52
Show file tree
Hide file tree
Showing 4 changed files with 73 additions and 67 deletions.
24 changes: 13 additions & 11 deletions FWCore/ParameterSet/scripts/edmConfigIncludeChecker
View file
Expand Up @@ -5,6 +5,8 @@
#
# for questions: benedikt.hegner@cern.ch

from __future__ import print_function
from builtins import object
import os.path
import sys
from os import environ
Expand Down Expand Up @@ -94,24 +96,24 @@ class IncludeChecker(object):


def printResult(self):
print "Included files:"
print "---------------"
print("Included files:")
print("---------------")
for item in self.includedFileNames:
print " ", item
print(" ", item)

if len(self.problematicIncludes) != 0:
print "\nProblematic files:"
print "------------------"
print("\nProblematic files:")
print("------------------")
for item in self.problematicIncludes:
print " ", item
print(" ", item)
else:
print "\nHaven't found any problematic files"
print("\nHaven't found any problematic files")

if len(self.missingIncludes) != 0:
print "\nMissing files:"
print "--------------"
print("\nMissing files:")
print("--------------")
for item in self.missingIncludes:
print " ", item
print(" ", item)



Expand All @@ -125,4 +127,4 @@ if __name__ == "__main__":
checker.check(filename)
checker.printResult()
else:
print "Please specify a file to check"
print("Please specify a file to check")
3 changes: 2 additions & 1 deletion FWCore/ParameterSet/scripts/edmConfigSplit
View file
Expand Up @@ -4,6 +4,7 @@ import sys
import os
import imp
import argparse
import six

from FWCore.ParameterSet.Mixins import PrintOptions

Expand Down Expand Up @@ -53,7 +54,7 @@ options.useSubdirectories = args.subdirectories
options.targetDirectory = args.output_directory

files = process.splitPython(options)
for fn, c in files.iteritems():
for fn, c in six.iteritems(files):
if fn == '-':
continue
d = os.path.dirname(fn)
Expand Down
104 changes: 53 additions & 51 deletions FWCore/ParameterSet/scripts/edmPythonConfigToCppValidation
View file
@@ -1,5 +1,7 @@
#! /usr/bin/env python

from __future__ import print_function
from builtins import str
from FWCore.ParameterSet.Modules import _TypedParameterizable
from FWCore.ParameterSet.Mixins import _ValidatingParameterListBase
import FWCore.ParameterSet.Config as cms
Expand Down Expand Up @@ -64,29 +66,29 @@ itemParamHandlers = {"vint32":("int",simpleItemToString),
}

def printVPSetDescription(spacing,descName,pList,label,depth):
print spacing+"{"
print(spacing+"{")
newSpacing = spacing+" "
newDescName = "vpsd"+str(depth)
print newSpacing+"edm::ParameterSetDescription "+newDescName+";"
print(newSpacing+"edm::ParameterSetDescription "+newDescName+";")
if len(pList) > 0:
printParameterSetDescription(newSpacing,newDescName,pList[0],0)
tempName = "temp"+str(depth)
print newSpacing+"std::vector<edm::ParameterSet> "+tempName+";"
print newSpacing+tempName+".reserve("+str(len(pList))+");"
print(newSpacing+"std::vector<edm::ParameterSet> "+tempName+";")
print(newSpacing+tempName+".reserve("+str(len(pList))+");")
for i in pList:
print newSpacing+"{"
print(newSpacing+"{")
newerSpacing = newSpacing+" "
otherTempName = "temp"+str(depth+1)
print newerSpacing+"edm::ParameterSet "+otherTempName+";"
print(newerSpacing+"edm::ParameterSet "+otherTempName+";")
printParameterSet(newerSpacing,otherTempName,i,depth+1)
print newerSpacing+tempName+".push_back("+otherTempName+");"
print newSpacing+"}"
print(newerSpacing+tempName+".push_back("+otherTempName+");")
print(newSpacing+"}")

trackiness=""
if not pList.isTracked():
trackiness="Untracked"
print newSpacing+descName+".addVPSet"+trackiness+'("'+label+'", '+newDescName+", "+tempName+");"
print spacing+"}"
print(newSpacing+descName+".addVPSet"+trackiness+'("'+label+'", '+newDescName+", "+tempName+");")
print(spacing+"}")

def printListTypeParameterDescription(spacing,descName,pList,label,depth):
if isinstance(pList,cms.VPSet):
Expand All @@ -97,12 +99,12 @@ def printListTypeParameterDescription(spacing,descName,pList,label,depth):
if not pList.isTracked():
trackiness="Untracked"
if len(pList) == 0:
print spacing+descName+".add"+trackiness+"<std::vector<"+itemType+'>>("'+label+'", {});'
print(spacing+descName+".add"+trackiness+"<std::vector<"+itemType+'>>("'+label+'", {});')
else:
print spacing+descName+".add"+trackiness+"<std::vector<"+itemType+'>>("'+label+'", {'
print(spacing+descName+".add"+trackiness+"<std::vector<"+itemType+'>>("'+label+'", {')
for i in pList:
print spacing+' '+converter(i)+','
print spacing+'});'
print(spacing+' '+converter(i)+',')
print(spacing+'});')


def expandRefToPSet(pset):
Expand Down Expand Up @@ -130,16 +132,16 @@ def printParameterSetDescription(spacing,descName, pset, depth):
pset = expandRefToPSet(pset)
for l,p in six.iteritems(pset.parameters_()):
if isinstance(p,cms.PSet):
print spacing+"{"
print(spacing+"{")
newSpacing = spacing+" "
newDescName = "psd"+str(depth)
print newSpacing+"edm::ParameterSetDescription "+newDescName+";"
print(newSpacing+"edm::ParameterSetDescription "+newDescName+";")
printParameterSetDescription(newSpacing,newDescName,p,depth+1)
trackiness=""
if not p.isTracked():
trackiness="Untracked"
print newSpacing+descName+".add"+trackiness+'<edm::ParameterSetDescription>("'+l+'", '+newDescName+");"
print spacing+"}"
print(newSpacing+descName+".add"+trackiness+'<edm::ParameterSetDescription>("'+l+'", '+newDescName+");")
print(spacing+"}")
else:
if isinstance(p,_ValidatingParameterListBase):
printListTypeParameterDescription(spacing,descName,p,l,depth+1)
Expand All @@ -150,28 +152,28 @@ def printParameterSetDescription(spacing,descName, pset, depth):
if not p.isTracked():
trackiness="Untracked"
(t,c) = simpleParamHandlers[type(p).__name__]
print spacing+descName+".add"+trackiness+"<"+t+'>("'+l+'", '+c(p)+");"
print(spacing+descName+".add"+trackiness+"<"+t+'>("'+l+'", '+c(p)+");")

def printVPSet(spacing,psetName,pList,label,depth):
print spacing+"{"
print(spacing+"{")
newSpacing = spacing+" "
tempName = "temp"+str(depth)
print newSpacing+"std::vector<edm::ParameterSet> "+tempName+";"
print newSpacing+tempName+".reserve("+str(len(pList))+");"
print(newSpacing+"std::vector<edm::ParameterSet> "+tempName+";")
print(newSpacing+tempName+".reserve("+str(len(pList))+");")
for i in pList:
print newSpacing+"{"
print(newSpacing+"{")
newerSpacing = newSpacing+" "
newPSetName = "vps"
print newerSpacing+"edm::ParameterSet "+newPSetName+";"
print(newerSpacing+"edm::ParameterSet "+newPSetName+";")
printParameterSet(newerSpacing,newPSetName,i,depth+1)
print newerSpacing+tempName+".push_back("+newPSetName+");"
print newSpacing+"}"
print(newerSpacing+tempName+".push_back("+newPSetName+");")
print(newSpacing+"}")

trackiness=""
if not pList.isTracked():
trackiness="Untracked"
print newSpacing+psetName+".add"+trackiness+'Parameter<std::vector<edm::ParameterSet>>("'+label+'", '+tempName+");"
print spacing+"}"
print(newSpacing+psetName+".add"+trackiness+'Parameter<std::vector<edm::ParameterSet>>("'+label+'", '+tempName+");")
print(spacing+"}")

def printListTypeParameter(spacing,psetName,pList,label,depth):
if isinstance(pList,cms.VPSet):
Expand All @@ -183,28 +185,28 @@ def printListTypeParameter(spacing,psetName,pList,label,depth):
if not pList.isTracked():
trackiness="Untracked"
if len(pList) == 0:
print spacing+psetName+".add"+trackiness+'Parameter<std::vector<'+itemType+'>>("'+label+'", {});'
print(spacing+psetName+".add"+trackiness+'Parameter<std::vector<'+itemType+'>>("'+label+'", {});')
else:
print spacing+psetName+".add"+trackiness+'Parameter<std::vector<'+itemType+'>>("'+label+'", {'
print(spacing+psetName+".add"+trackiness+'Parameter<std::vector<'+itemType+'>>("'+label+'", {')
for i in pList:
print spacing+' '+converter(i)+','
print spacing+'});'
print(spacing+' '+converter(i)+',')
print(spacing+'});')


def printParameterSet(spacing, psetName, pset, depth):
pset = expandRefToPSet(pset)
for l,p in six.iteritems(pset.parameters_()):
if isinstance(p,cms.PSet):
print spacing+"{"
print(spacing+"{")
newSpacing = spacing+" "
newPSetName = "ps"+str(depth)
print newSpacing+"edm::ParameterSet "+newPSetName+";"
print(newSpacing+"edm::ParameterSet "+newPSetName+";")
printParameterSet(newSpacing,newPSetName,p,depth+1)
trackiness=""
if not p.isTracked():
trackiness="Untracked"
print newSpacing+psetName+".add"+trackiness+'Parameter<edm::ParameterSet>("'+l+'", '+newPSetName+");"
print spacing+"}"
print(newSpacing+psetName+".add"+trackiness+'Parameter<edm::ParameterSet>("'+l+'", '+newPSetName+");")
print(spacing+"}")
else:
if isinstance(p,_ValidatingParameterListBase):
printListTypeParameter(spacing,psetName,p,l,depth)
Expand All @@ -215,7 +217,7 @@ def printParameterSet(spacing, psetName, pset, depth):
if not p.isTracked():
trackiness="Untracked"
(t,c) = simpleParamHandlers[type(p).__name__]
print spacing+psetName+".add"+trackiness+"Parameter<"+t+'>("'+l+'", '+c(p)+");"
print(spacing+psetName+".add"+trackiness+"Parameter<"+t+'>("'+l+'", '+c(p)+");")


import optparse
Expand All @@ -228,14 +230,14 @@ if len(args) != 1:

filename = args[0]

f = open(filename)
f = open(filename,'r').read()

#this dictionary will contain the python objects from the file
config = dict()

exec f in config
exec(f, config)

#print config
#print(config)

modules = {}
for item in config:
Expand All @@ -255,22 +257,22 @@ if len(modulesTypes) > 1:
moduleType = modulesTypes.pop()

spacing = ' ';
print '#include <FWCore/ParameterSet/interface/ConfigurationDescriptions.h>'
print '#include <FWCore/ParameterSet/interface/ParameterSetDescription.h>'
print
print 'void'
print moduleType + '::fillDescriptions(edm::ConfigurationDescriptions& descriptions) {'
print('#include <FWCore/ParameterSet/interface/ConfigurationDescriptions.h>')
print('#include <FWCore/ParameterSet/interface/ParameterSetDescription.h>')
print()
print('void')
print(moduleType + '::fillDescriptions(edm::ConfigurationDescriptions& descriptions) {')
if len(modules) > 1:
newSpacing = spacing + ' ';
else:
newSpacing = spacing
for label, module in six.iteritems(modules):
if len(modules) > 1:
print spacing+'{'
print newSpacing + '// ' + label
print newSpacing + 'edm::ParameterSetDescription desc;'
print(spacing+'{')
print(newSpacing + '// ' + label)
print(newSpacing + 'edm::ParameterSetDescription desc;')
printParameterSetDescription(newSpacing, 'desc', module, 0)
print newSpacing + 'descriptions.add("' + label + '", desc);'
print(newSpacing + 'descriptions.add("' + label + '", desc);')
if len(modules) > 1:
print spacing+'}'
print '}'
print(spacing+'}')
print('}')
9 changes: 5 additions & 4 deletions FWCore/ParameterSet/scripts/edmPythonSearch
View file
@@ -1,5 +1,6 @@
#! /usr/bin/env python

from __future__ import print_function
from FWCore.ParameterSet.TreeCrawler import getImportTree, Color
import sys, os
import optparse
Expand Down Expand Up @@ -29,15 +30,15 @@ result.sort(key= lambda x: x.filename)
dumpStack = True
# dump to screen
for item in result:
print item.line.replace(pattern,Color.hilight+pattern+Color.none)
print "%s (line: %s)" %(item.filename, item.number)
print(item.line.replace(pattern,Color.hilight+pattern+Color.none))
print("%s (line: %s)" %(item.filename, item.number))
if dumpStack and hasattr(item, 'stacks'):
# make a set of strings, so it's unique
froms = set()
for stack in item.stacks:
froms.add('From ' + ' -> '.join(stack))
print '\n'.join(froms)
print '\n'
print('\n'.join(froms))
print('\n')



Expand Down

0 comments on commit 9bd2d52

Please sign in to comment.