| 10 |
|
import os, string, glob |
| 11 |
|
|
| 12 |
|
class Cmssw(JobType): |
| 13 |
< |
def __init__(self, cfg_params, ncjobs): |
| 13 |
> |
def __init__(self, cfg_params, ncjobs,skip_blocks, isNew): |
| 14 |
|
JobType.__init__(self, 'CMSSW') |
| 15 |
|
common.logger.debug(3,'CMSSW::__init__') |
| 16 |
< |
|
| 16 |
> |
self.skip_blocks = skip_blocks |
| 17 |
> |
|
| 18 |
|
self.argsList = [] |
| 19 |
|
|
| 20 |
|
self._params = {} |
| 60 |
|
if not cfg_params.has_key('CMSSW.datasetpath'): |
| 61 |
|
msg = "Error: datasetpath not defined " |
| 62 |
|
raise CrabException(msg) |
| 63 |
+ |
|
| 64 |
+ |
### Temporary: added to remove input file control in the case of PU |
| 65 |
+ |
if not cfg_params.has_key('USER.dataset_pu'): |
| 66 |
+ |
self.dataset_pu = 'NONE' |
| 67 |
+ |
else: |
| 68 |
+ |
self.dataset_pu = cfg_params['USER.dataset_pu'] |
| 69 |
+ |
#### |
| 70 |
+ |
|
| 71 |
|
tmp = cfg_params['CMSSW.datasetpath'] |
| 72 |
|
log.debug(6, "CMSSW::CMSSW(): datasetPath = "+tmp) |
| 73 |
|
if string.lower(tmp)=='none': |
| 78 |
|
self.selectNoInput = 0 |
| 79 |
|
|
| 80 |
|
self.dataTiers = [] |
| 81 |
< |
|
| 82 |
< |
self.debug_pset = cfg_params.get('USER.debug_pset',False) |
| 83 |
< |
|
| 81 |
> |
self.debugWrap = '' |
| 82 |
> |
self.debug_wrapper = cfg_params.get('USER.debug_wrapper',False) |
| 83 |
> |
if self.debug_wrapper: self.debugWrap='--debug' |
| 84 |
|
## now the application |
| 85 |
|
self.executable = cfg_params.get('CMSSW.executable','cmsRun') |
| 86 |
|
log.debug(6, "CMSSW::CMSSW(): executable = "+self.executable) |
| 103 |
|
self.output_file_sandbox.append(self.fjrFileName) |
| 104 |
|
|
| 105 |
|
# other output files to be returned via sandbox or copied to SE |
| 106 |
+ |
outfileflag = False |
| 107 |
|
self.output_file = [] |
| 108 |
|
tmp = cfg_params.get('CMSSW.output_file',None) |
| 109 |
|
if tmp : |
| 110 |
< |
tmpOutFiles = string.split(tmp,',') |
| 111 |
< |
log.debug(7, 'cmssw::cmssw(): output files '+str(tmpOutFiles)) |
| 112 |
< |
for tmp in tmpOutFiles: |
| 113 |
< |
tmp=string.strip(tmp) |
| 104 |
< |
self.output_file.append(tmp) |
| 105 |
< |
pass |
| 106 |
< |
else: |
| 107 |
< |
log.message("No output file defined: only stdout/err and the CRAB Framework Job Report will be available\n") |
| 108 |
< |
pass |
| 110 |
> |
self.output_file = [x.strip() for x in tmp.split(',')] |
| 111 |
> |
outfileflag = True #output found |
| 112 |
> |
#else: |
| 113 |
> |
# log.message("No output file defined: only stdout/err and the CRAB Framework Job Report will be available\n") |
| 114 |
|
|
| 115 |
|
# script_exe file as additional file in inputSandbox |
| 116 |
|
self.scriptExe = cfg_params.get('USER.script_exe',None) |
| 124 |
|
msg ="Error. script_exe not defined" |
| 125 |
|
raise CrabException(msg) |
| 126 |
|
|
| 127 |
+ |
# use parent files... |
| 128 |
+ |
self.useParent = self.cfg_params.get('CMSSW.use_parent',False) |
| 129 |
+ |
|
| 130 |
|
## additional input files |
| 131 |
|
if cfg_params.has_key('USER.additional_input_files'): |
| 132 |
|
tmpAddFiles = string.split(cfg_params['USER.additional_input_files'],',') |
| 171 |
|
self.total_number_of_events = int(cfg_params['CMSSW.total_number_of_events']) |
| 172 |
|
self.selectTotalNumberEvents = 1 |
| 173 |
|
if self.selectNumberOfJobs == 1: |
| 174 |
< |
if int(self.total_number_of_events) < int(self.theNumberOfJobs): |
| 174 |
> |
if (self.total_number_of_events != -1) and int(self.total_number_of_events) < int(self.theNumberOfJobs): |
| 175 |
|
msg = 'Must specify at least one event per job. total_number_of_events > number_of_jobs ' |
| 176 |
|
raise CrabException(msg) |
| 177 |
|
else: |
| 227 |
|
|
| 228 |
|
self.firstRun = cfg_params.get('CMSSW.first_run',None) |
| 229 |
|
|
| 222 |
– |
if self.pset != None: #CarlosDaniele |
| 223 |
– |
import PsetManipulator as pp |
| 224 |
– |
PsetEdit = pp.PsetManipulator(self.pset) #Daniele Pset |
| 230 |
|
|
| 231 |
|
# Copy/return |
| 227 |
– |
|
| 232 |
|
self.copy_data = int(cfg_params.get('USER.copy_data',0)) |
| 233 |
|
self.return_data = int(cfg_params.get('USER.return_data',0)) |
| 234 |
|
|
| 244 |
|
blockSites = self.DataDiscoveryAndLocation(cfg_params) |
| 245 |
|
#DBSDLS-end |
| 246 |
|
|
| 243 |
– |
|
| 247 |
|
## Select Splitting |
| 248 |
|
if self.selectNoInput: |
| 249 |
|
if self.pset == None: |
| 253 |
|
else: |
| 254 |
|
self.jobSplittingByBlocks(blockSites) |
| 255 |
|
|
| 256 |
< |
# modify Pset |
| 257 |
< |
if self.pset != None: |
| 258 |
< |
try: |
| 259 |
< |
# Add FrameworkJobReport to parameter-set, set max events. |
| 260 |
< |
# Reset later for data jobs by writeCFG which does all modifications |
| 261 |
< |
PsetEdit.addCrabFJR(self.fjrFileName) # FUTURE: Job report addition not needed by CMSSW>1.5 |
| 262 |
< |
PsetEdit.maxEvent(self.eventsPerJob) |
| 263 |
< |
PsetEdit.psetWriter(self.configFilename()) |
| 264 |
< |
except: |
| 265 |
< |
msg='Error while manipulating ParameterSet: exiting...' |
| 266 |
< |
raise CrabException(msg) |
| 267 |
< |
self.tgzNameWithPath = self.getTarBall(self.executable) |
| 256 |
> |
# modify Pset only the first time |
| 257 |
> |
if isNew: |
| 258 |
> |
if self.pset != None: |
| 259 |
> |
import PsetManipulator as pp |
| 260 |
> |
PsetEdit = pp.PsetManipulator(self.pset) |
| 261 |
> |
try: |
| 262 |
> |
# Add FrameworkJobReport to parameter-set, set max events. |
| 263 |
> |
# Reset later for data jobs by writeCFG which does all modifications |
| 264 |
> |
PsetEdit.addCrabFJR(self.fjrFileName) # FUTURE: Job report addition not needed by CMSSW>1.5 |
| 265 |
> |
PsetEdit.maxEvent(self.eventsPerJob) |
| 266 |
> |
PsetEdit.psetWriter(self.configFilename()) |
| 267 |
> |
## If present, add TFileService to output files |
| 268 |
> |
if not int(cfg_params.get('CMSSW.skip_TFileService_output',0)): |
| 269 |
> |
tfsOutput = PsetEdit.getTFileService() |
| 270 |
> |
if tfsOutput: |
| 271 |
> |
if tfsOutput in self.output_file: |
| 272 |
> |
common.logger.debug(5,"Output from TFileService "+tfsOutput+" already in output files") |
| 273 |
> |
else: |
| 274 |
> |
outfileflag = True #output found |
| 275 |
> |
self.output_file.append(tfsOutput) |
| 276 |
> |
common.logger.message("Adding "+tfsOutput+" to output files (from TFileService)") |
| 277 |
> |
pass |
| 278 |
> |
pass |
| 279 |
> |
## If present and requested, add PoolOutputModule to output files |
| 280 |
> |
if int(cfg_params.get('CMSSW.get_edm_output',0)): |
| 281 |
> |
edmOutput = PsetEdit.getPoolOutputModule() |
| 282 |
> |
if edmOutput: |
| 283 |
> |
if edmOutput in self.output_file: |
| 284 |
> |
common.logger.debug(5,"Output from PoolOutputModule "+edmOutput+" already in output files") |
| 285 |
> |
else: |
| 286 |
> |
self.output_file.append(edmOutput) |
| 287 |
> |
common.logger.message("Adding "+edmOutput+" to output files (from PoolOutputModule)") |
| 288 |
> |
pass |
| 289 |
> |
pass |
| 290 |
> |
except CrabException: |
| 291 |
> |
msg='Error while manipulating ParameterSet: exiting...' |
| 292 |
> |
raise CrabException(msg) |
| 293 |
> |
## Prepare inputSandbox TarBall (only the first time) |
| 294 |
> |
self.tgzNameWithPath = self.getTarBall(self.executable) |
| 295 |
|
|
| 296 |
|
def DataDiscoveryAndLocation(self, cfg_params): |
| 297 |
|
|
| 304 |
|
## Contact the DBS |
| 305 |
|
common.logger.message("Contacting Data Discovery Services ...") |
| 306 |
|
try: |
| 307 |
< |
self.pubdata=DataDiscovery.DataDiscovery(datasetPath, cfg_params) |
| 307 |
> |
self.pubdata=DataDiscovery.DataDiscovery(datasetPath, cfg_params,self.skip_blocks) |
| 308 |
|
self.pubdata.fetchDBSInfo() |
| 309 |
|
|
| 310 |
|
except DataDiscovery.NotExistingDatasetError, ex : |
| 320 |
|
self.filesbyblock=self.pubdata.getFiles() |
| 321 |
|
self.eventsbyblock=self.pubdata.getEventsPerBlock() |
| 322 |
|
self.eventsbyfile=self.pubdata.getEventsPerFile() |
| 323 |
+ |
self.parentFiles=self.pubdata.getParent() |
| 324 |
|
|
| 325 |
|
## get max number of events |
| 326 |
|
self.maxEvents=self.pubdata.getMaxEvents() |
| 437 |
|
|
| 438 |
|
# ---- Iterate over the files in the block until we've met the requested ---- # |
| 439 |
|
# ---- total # of events or we've gone over all the files in this block ---- # |
| 440 |
+ |
pString='' |
| 441 |
|
while ( (eventsRemaining > 0) and (fileCount < numFilesInBlock) and (jobCount < totalNumberOfJobs) ): |
| 442 |
|
file = files[fileCount] |
| 443 |
+ |
if self.useParent: |
| 444 |
+ |
parent = self.parentFiles[file] |
| 445 |
+ |
for f in parent : |
| 446 |
+ |
pString += '\\\"' + f + '\\\"\,' |
| 447 |
+ |
common.logger.debug(6, "File "+str(file)+" has the following parents: "+str(parent)) |
| 448 |
+ |
common.logger.write("File "+str(file)+" has the following parents: "+str(parent)) |
| 449 |
|
if newFile : |
| 450 |
|
try: |
| 451 |
|
numEventsInFile = self.eventsbyfile[file] |
| 466 |
|
# end job using last file, use remaining events in block |
| 467 |
|
# close job and touch new file |
| 468 |
|
fullString = parString[:-2] |
| 469 |
< |
list_of_lists.append([fullString,str(-1),str(jobSkipEventCount)]) |
| 469 |
> |
if self.useParent: |
| 470 |
> |
fullParentString = pString[:-2] |
| 471 |
> |
list_of_lists.append([fullString,fullParentString,str(-1),str(jobSkipEventCount)]) |
| 472 |
> |
else: |
| 473 |
> |
list_of_lists.append([fullString,str(-1),str(jobSkipEventCount)]) |
| 474 |
|
common.logger.debug(3,"Job "+str(jobCount+1)+" can run over "+str(filesEventCount - jobSkipEventCount)+" events (last file in block).") |
| 475 |
|
self.jobDestination.append(blockSites[block]) |
| 476 |
|
common.logger.debug(5,"Job "+str(jobCount+1)+" Destination: "+str(self.jobDestination[jobCount])) |
| 482 |
|
eventsRemaining = eventsRemaining - filesEventCount + jobSkipEventCount |
| 483 |
|
jobSkipEventCount = 0 |
| 484 |
|
# reset file |
| 485 |
+ |
pString = "" |
| 486 |
|
parString = "" |
| 487 |
|
filesEventCount = 0 |
| 488 |
|
newFile = 1 |
| 495 |
|
elif ( filesEventCount - jobSkipEventCount == eventsPerJobRequested ) : |
| 496 |
|
# close job and touch new file |
| 497 |
|
fullString = parString[:-2] |
| 498 |
< |
list_of_lists.append([fullString,str(eventsPerJobRequested),str(jobSkipEventCount)]) |
| 498 |
> |
if self.useParent: |
| 499 |
> |
fullParentString = pString[:-2] |
| 500 |
> |
list_of_lists.append([fullString,fullParentString,str(eventsPerJobRequested),str(jobSkipEventCount)]) |
| 501 |
> |
else: |
| 502 |
> |
list_of_lists.append([fullString,str(eventsPerJobRequested),str(jobSkipEventCount)]) |
| 503 |
|
common.logger.debug(3,"Job "+str(jobCount+1)+" can run over "+str(eventsPerJobRequested)+" events.") |
| 504 |
|
self.jobDestination.append(blockSites[block]) |
| 505 |
|
common.logger.debug(5,"Job "+str(jobCount+1)+" Destination: "+str(self.jobDestination[jobCount])) |
| 510 |
|
eventsRemaining = eventsRemaining - eventsPerJobRequested |
| 511 |
|
jobSkipEventCount = 0 |
| 512 |
|
# reset file |
| 513 |
+ |
pString = "" |
| 514 |
|
parString = "" |
| 515 |
|
filesEventCount = 0 |
| 516 |
|
newFile = 1 |
| 520 |
|
else : |
| 521 |
|
# close job but don't touch new file |
| 522 |
|
fullString = parString[:-2] |
| 523 |
< |
list_of_lists.append([fullString,str(eventsPerJobRequested),str(jobSkipEventCount)]) |
| 523 |
> |
if self.useParent: |
| 524 |
> |
fullParentString = pString[:-2] |
| 525 |
> |
list_of_lists.append([fullString,fullParentString,str(eventsPerJobRequested),str(jobSkipEventCount)]) |
| 526 |
> |
else: |
| 527 |
> |
list_of_lists.append([fullString,str(eventsPerJobRequested),str(jobSkipEventCount)]) |
| 528 |
|
common.logger.debug(3,"Job "+str(jobCount+1)+" can run over "+str(eventsPerJobRequested)+" events.") |
| 529 |
|
self.jobDestination.append(blockSites[block]) |
| 530 |
|
common.logger.debug(5,"Job "+str(jobCount+1)+" Destination: "+str(self.jobDestination[jobCount])) |
| 538 |
|
jobSkipEventCount = eventsPerJobRequested - (filesEventCount - jobSkipEventCount - self.eventsbyfile[file]) |
| 539 |
|
# remove all but the last file |
| 540 |
|
filesEventCount = self.eventsbyfile[file] |
| 541 |
+ |
if self.useParent: |
| 542 |
+ |
for f in parent : pString += '\\\"' + f + '\\\"\,' |
| 543 |
|
parString = '\\\"' + file + '\\\"\,' |
| 544 |
|
pass # END if |
| 545 |
|
pass # END while (iterate over files in the block) |
| 668 |
|
self.list_of_args.append([str(i)]) |
| 669 |
|
return |
| 670 |
|
|
| 671 |
< |
def split(self, jobParams): |
| 671 |
> |
def split(self, jobParams,firstJobID): |
| 672 |
|
|
| 673 |
|
njobs = self.total_number_of_jobs |
| 674 |
|
arglist = self.list_of_args |
| 678 |
|
|
| 679 |
|
listID=[] |
| 680 |
|
listField=[] |
| 681 |
< |
for job in range(njobs): |
| 682 |
< |
jobParams[job] = arglist[job] |
| 681 |
> |
for id in range(njobs): |
| 682 |
> |
job = id + int(firstJobID) |
| 683 |
> |
jobParams[id] = arglist[id] |
| 684 |
|
listID.append(job+1) |
| 685 |
|
job_ToSave ={} |
| 686 |
|
concString = ' ' |
| 687 |
|
argu='' |
| 688 |
< |
if len(jobParams[job]): |
| 689 |
< |
argu += concString.join(jobParams[job] ) |
| 688 |
> |
if len(jobParams[id]): |
| 689 |
> |
argu += concString.join(jobParams[id] ) |
| 690 |
|
job_ToSave['arguments']= str(job+1)+' '+argu |
| 691 |
< |
job_ToSave['dlsDestination']= self.jobDestination[job] |
| 691 |
> |
job_ToSave['dlsDestination']= self.jobDestination[id] |
| 692 |
|
listField.append(job_ToSave) |
| 693 |
|
msg="Job "+str(job)+" Arguments: "+str(job+1)+" "+argu+"\n" \ |
| 694 |
< |
+" Destination: "+str(self.jobDestination[job]) |
| 694 |
> |
+" Destination: "+str(self.jobDestination[id]) |
| 695 |
|
common.logger.debug(5,msg) |
| 696 |
|
common._db.updateJob_(listID,listField) |
| 697 |
|
self.argsList = (len(jobParams[0])+1) |
| 764 |
|
tar.add(module,moduleDir) |
| 765 |
|
|
| 766 |
|
## Now check if any data dir(s) is present |
| 712 |
– |
swAreaLen=len(swArea) |
| 767 |
|
self.dataExist = False |
| 768 |
< |
for root, dirs, files in os.walk(swArea): |
| 769 |
< |
if "data" in dirs: |
| 770 |
< |
self.dataExist=True |
| 771 |
< |
common.logger.debug(5,"data "+root+"/data"+" to be tarred") |
| 772 |
< |
tar.add(root+"/data",root[swAreaLen:]+"/data") |
| 768 |
> |
todo_list = [(i, i) for i in os.listdir(swArea+"/src")] |
| 769 |
> |
while len(todo_list): |
| 770 |
> |
entry, name = todo_list.pop() |
| 771 |
> |
if name.startswith('crab_0_') or name.startswith('.') or name == 'CVS': |
| 772 |
> |
continue |
| 773 |
> |
if os.path.isdir(swArea+"/src/"+entry): |
| 774 |
> |
entryPath = entry + '/' |
| 775 |
> |
todo_list += [(entryPath + i, i) for i in os.listdir(swArea+"/src/"+entry)] |
| 776 |
> |
if name == 'data': |
| 777 |
> |
self.dataExist=True |
| 778 |
> |
common.logger.debug(5,"data "+entry+" to be tarred") |
| 779 |
> |
tar.add(swArea+"/src/"+entry,"src/"+entry) |
| 780 |
> |
pass |
| 781 |
> |
pass |
| 782 |
|
|
| 783 |
|
### CMSSW ParameterSet |
| 784 |
|
if not self.pset is None: |
| 788 |
|
|
| 789 |
|
|
| 790 |
|
## Add ProdCommon dir to tar |
| 791 |
< |
prodcommonDir = 'ProdCommon' |
| 792 |
< |
prodcommonPath = os.environ['CRABDIR'] + '/' + 'ProdCommon' |
| 793 |
< |
if os.path.isdir(prodcommonPath): |
| 794 |
< |
tar.add(prodcommonPath,prodcommonDir) |
| 791 |
> |
prodcommonDir = './' |
| 792 |
> |
prodcommonPath = os.environ['CRABDIR'] + '/' + 'external/' |
| 793 |
> |
neededStuff = ['ProdCommon/__init__.py','ProdCommon/FwkJobRep', 'ProdCommon/CMSConfigTools','ProdCommon/Core','ProdCommon/MCPayloads', 'IMProv'] |
| 794 |
> |
for file in neededStuff: |
| 795 |
> |
tar.add(prodcommonPath+file,prodcommonDir+file) |
| 796 |
|
common.logger.debug(5,"Files added to "+self.tgzNameWithPath+" : "+str(tar.getnames())) |
| 797 |
|
|
| 798 |
|
##### ML stuff |
| 803 |
|
common.logger.debug(5,"Files added to "+self.tgzNameWithPath+" : "+str(tar.getnames())) |
| 804 |
|
|
| 805 |
|
##### Utils |
| 806 |
< |
Utils_file_list=['parseCrabFjr.py','writeCfg.py', 'JobReportErrorCode.py'] |
| 806 |
> |
Utils_file_list=['parseCrabFjr.py','writeCfg.py', 'fillCrabFjr.py'] |
| 807 |
|
for file in Utils_file_list: |
| 808 |
|
tar.add(path+file,file) |
| 809 |
|
common.logger.debug(5,"Files added to "+self.tgzNameWithPath+" : "+str(tar.getnames())) |
| 814 |
|
common.logger.debug(5,"Files added to "+self.tgzNameWithPath+" : "+str(tar.getnames())) |
| 815 |
|
|
| 816 |
|
tar.close() |
| 817 |
< |
except : |
| 818 |
< |
raise CrabException('Could not create tar-ball') |
| 817 |
> |
except IOError: |
| 818 |
> |
raise CrabException('Could not create tar-ball '+self.tgzNameWithPath) |
| 819 |
> |
except tarfile.TarError: |
| 820 |
> |
raise CrabException('Could not create tar-ball '+self.tgzNameWithPath) |
| 821 |
|
|
| 822 |
|
## check for tarball size |
| 823 |
|
tarballinfo = os.stat(self.tgzNameWithPath) |
| 912 |
|
txt += 'cp $RUNTIME_AREA/'+pset+' .\n' |
| 913 |
|
if (self.datasetPath): # standard job |
| 914 |
|
txt += 'InputFiles=${args[1]}; export InputFiles\n' |
| 915 |
< |
txt += 'MaxEvents=${args[2]}; export MaxEvents\n' |
| 916 |
< |
txt += 'SkipEvents=${args[3]}; export SkipEvents\n' |
| 915 |
> |
if (self.useParent): |
| 916 |
> |
txt += 'ParentFiles=${args[2]}; export ParentFiles\n' |
| 917 |
> |
txt += 'MaxEvents=${args[3]}; export MaxEvents\n' |
| 918 |
> |
txt += 'SkipEvents=${args[4]}; export SkipEvents\n' |
| 919 |
> |
else: |
| 920 |
> |
txt += 'MaxEvents=${args[2]}; export MaxEvents\n' |
| 921 |
> |
txt += 'SkipEvents=${args[3]}; export SkipEvents\n' |
| 922 |
|
txt += 'echo "Inputfiles:<$InputFiles>"\n' |
| 923 |
+ |
if (self.useParent): txt += 'echo "ParentFiles:<$ParentFiles>"\n' |
| 924 |
|
txt += 'echo "MaxEvents:<$MaxEvents>"\n' |
| 925 |
|
txt += 'echo "SkipEvents:<$SkipEvents>"\n' |
| 926 |
|
else: # pythia like job |
| 938 |
|
if self.pset != None: |
| 939 |
|
# FUTURE: Can simply for 2_1_x and higher |
| 940 |
|
txt += '\n' |
| 941 |
< |
if self.debug_pset==True: |
| 941 |
> |
if self.debug_wrapper==True: |
| 942 |
|
txt += 'echo "***** cat ' + psetName + ' *********"\n' |
| 943 |
|
txt += 'cat ' + psetName + '\n' |
| 944 |
|
txt += 'echo "****** end ' + psetName + ' ********"\n' |
| 959 |
|
if os.path.isfile(self.tgzNameWithPath): |
| 960 |
|
txt += 'echo ">>> tar xzvf $RUNTIME_AREA/'+os.path.basename(self.tgzNameWithPath)+' :" \n' |
| 961 |
|
txt += 'tar xzvf $RUNTIME_AREA/'+os.path.basename(self.tgzNameWithPath)+'\n' |
| 962 |
< |
txt += 'ls -Al \n' |
| 962 |
> |
if self.debug_wrapper: |
| 963 |
> |
txt += 'ls -Al \n' |
| 964 |
|
txt += 'untar_status=$? \n' |
| 965 |
|
txt += 'if [ $untar_status -ne 0 ]; then \n' |
| 966 |
|
txt += ' echo "ERROR ==> Untarring .tgz file failed"\n' |
| 970 |
|
txt += ' echo "Successful untar" \n' |
| 971 |
|
txt += 'fi \n' |
| 972 |
|
txt += '\n' |
| 973 |
< |
txt += 'echo ">>> Include ProdCommon in PYTHONPATH:"\n' |
| 973 |
> |
txt += 'echo ">>> Include $RUNTIME_AREA in PYTHONPATH:"\n' |
| 974 |
|
txt += 'if [ -z "$PYTHONPATH" ]; then\n' |
| 975 |
< |
txt += ' export PYTHONPATH=$RUNTIME_AREA/ProdCommon\n' |
| 975 |
> |
txt += ' export PYTHONPATH=$RUNTIME_AREA/\n' |
| 976 |
|
txt += 'else\n' |
| 977 |
< |
txt += ' export PYTHONPATH=$RUNTIME_AREA/ProdCommon:${PYTHONPATH}\n' |
| 977 |
> |
txt += ' export PYTHONPATH=$RUNTIME_AREA/:${PYTHONPATH}\n' |
| 978 |
|
txt += 'echo "PYTHONPATH=$PYTHONPATH"\n' |
| 979 |
|
txt += 'fi\n' |
| 980 |
|
txt += '\n' |
| 1001 |
|
if len(self.additional_inbox_files)>0: |
| 1002 |
|
for file in self.additional_inbox_files: |
| 1003 |
|
txt += 'mv $RUNTIME_AREA/'+os.path.basename(file)+' . \n' |
| 1004 |
< |
txt += 'mv $RUNTIME_AREA/ProdCommon/ . \n' |
| 1004 |
> |
# txt += 'mv $RUNTIME_AREA/ProdCommon/ . \n' |
| 1005 |
> |
# txt += 'mv $RUNTIME_AREA/IMProv/ . \n' |
| 1006 |
|
|
| 1007 |
+ |
txt += 'echo ">>> Include $RUNTIME_AREA in PYTHONPATH:"\n' |
| 1008 |
|
txt += 'if [ -z "$PYTHONPATH" ]; then\n' |
| 1009 |
< |
txt += ' export PYTHONPATH=$SOFTWARE_DIR/ProdCommon\n' |
| 1009 |
> |
txt += ' export PYTHONPATH=$RUNTIME_AREA/\n' |
| 1010 |
|
txt += 'else\n' |
| 1011 |
< |
txt += ' export PYTHONPATH=$SOFTWARE_DIR/ProdCommon:${PYTHONPATH}\n' |
| 1011 |
> |
txt += ' export PYTHONPATH=$RUNTIME_AREA/:${PYTHONPATH}\n' |
| 1012 |
|
txt += 'echo "PYTHONPATH=$PYTHONPATH"\n' |
| 1013 |
|
txt += 'fi\n' |
| 1014 |
|
txt += '\n' |
| 1015 |
|
|
| 1016 |
|
return txt |
| 1017 |
|
|
| 943 |
– |
def modifySteeringCards(self, nj): |
| 944 |
– |
""" |
| 945 |
– |
modify the card provided by the user, |
| 946 |
– |
writing a new card into share dir |
| 947 |
– |
""" |
| 1018 |
|
|
| 1019 |
|
def executableName(self): |
| 1020 |
|
if self.scriptExe: |
| 1059 |
|
## User Declared output files |
| 1060 |
|
for out in (self.output_file+self.output_file_sandbox): |
| 1061 |
|
n_out = nj + 1 |
| 1062 |
< |
out_box.append(self.numberFile_(out,str(n_out))) |
| 1062 |
> |
out_box.append(numberFile(out,str(n_out))) |
| 1063 |
|
return out_box |
| 1064 |
|
|
| 995 |
– |
def prepareSteeringCards(self): |
| 996 |
– |
""" |
| 997 |
– |
Make initial modifications of the user's steering card file. |
| 998 |
– |
""" |
| 999 |
– |
return |
| 1065 |
|
|
| 1066 |
|
def wsRenameOutput(self, nj): |
| 1067 |
|
""" |
| 1071 |
|
txt = '\n#Written by cms_cmssw::wsRenameOutput\n' |
| 1072 |
|
txt += 'echo ">>> current directory (SOFTWARE_DIR): $SOFTWARE_DIR" \n' |
| 1073 |
|
txt += 'echo ">>> current directory content:"\n' |
| 1074 |
< |
txt += 'ls \n' |
| 1074 |
> |
if self.debug_wrapper: |
| 1075 |
> |
txt += 'ls -Al\n' |
| 1076 |
|
txt += '\n' |
| 1077 |
|
|
| 1078 |
|
for fileWithSuffix in (self.output_file): |
| 1079 |
< |
output_file_num = self.numberFile_(fileWithSuffix, '$NJob') |
| 1079 |
> |
output_file_num = numberFile(fileWithSuffix, '$NJob') |
| 1080 |
|
txt += '\n' |
| 1081 |
|
txt += '# check output file\n' |
| 1082 |
|
txt += 'if [ -e ./'+fileWithSuffix+' ] ; then\n' |
| 1097 |
|
txt += 'fi\n' |
| 1098 |
|
file_list = [] |
| 1099 |
|
for fileWithSuffix in (self.output_file): |
| 1100 |
< |
file_list.append(self.numberFile_(fileWithSuffix, '$NJob')) |
| 1100 |
> |
file_list.append(numberFile(fileWithSuffix, '$NJob')) |
| 1101 |
|
|
| 1102 |
|
txt += 'file_list="'+string.join(file_list,' ')+'"\n' |
| 1103 |
|
txt += '\n' |
| 1104 |
|
txt += 'echo ">>> current directory (SOFTWARE_DIR): $SOFTWARE_DIR" \n' |
| 1105 |
|
txt += 'echo ">>> current directory content:"\n' |
| 1106 |
< |
txt += 'ls \n' |
| 1106 |
> |
if self.debug_wrapper: |
| 1107 |
> |
txt += 'ls -Al\n' |
| 1108 |
|
txt += '\n' |
| 1109 |
|
txt += 'cd $RUNTIME_AREA\n' |
| 1110 |
|
txt += 'echo ">>> current directory (RUNTIME_AREA): $RUNTIME_AREA"\n' |
| 1111 |
|
return txt |
| 1112 |
|
|
| 1046 |
– |
def numberFile_(self, file, txt): |
| 1047 |
– |
""" |
| 1048 |
– |
append _'txt' before last extension of a file |
| 1049 |
– |
""" |
| 1050 |
– |
p = string.split(file,".") |
| 1051 |
– |
# take away last extension |
| 1052 |
– |
name = p[0] |
| 1053 |
– |
for x in p[1:-1]: |
| 1054 |
– |
name=name+"."+x |
| 1055 |
– |
# add "_txt" |
| 1056 |
– |
if len(p)>1: |
| 1057 |
– |
ext = p[len(p)-1] |
| 1058 |
– |
result = name + '_' + txt + "." + ext |
| 1059 |
– |
else: |
| 1060 |
– |
result = name + '_' + txt |
| 1061 |
– |
|
| 1062 |
– |
return result |
| 1063 |
– |
|
| 1113 |
|
def getRequirements(self, nj=[]): |
| 1114 |
|
""" |
| 1115 |
|
return job requirements to add to jdl files |
| 1215 |
|
txt += 'fi\n' |
| 1216 |
|
|
| 1217 |
|
txt += 'echo ">>> Modify Job Report:" \n' |
| 1218 |
< |
txt += 'chmod a+x $SOFTWARE_DIR/ProdCommon/ProdCommon/FwkJobRep/ModifyJobReport.py\n' |
| 1218 |
> |
txt += 'chmod a+x $RUNTIME_AREA/ProdCommon/FwkJobRep/ModifyJobReport.py\n' |
| 1219 |
|
txt += 'ProcessedDataset='+processedDataset+'\n' |
| 1220 |
|
txt += 'echo "ProcessedDataset = $ProcessedDataset"\n' |
| 1221 |
|
txt += 'echo "SE = $SE"\n' |
| 1222 |
|
txt += 'echo "SE_PATH = $SE_PATH"\n' |
| 1223 |
|
txt += 'echo "FOR_LFN = $FOR_LFN" \n' |
| 1224 |
|
txt += 'echo "CMSSW_VERSION = $CMSSW_VERSION"\n\n' |
| 1225 |
< |
txt += 'echo "$SOFTWARE_DIR/ProdCommon/ProdCommon/FwkJobRep/ModifyJobReport.py $RUNTIME_AREA/crab_fjr_$NJob.xml $NJob $FOR_LFN $PrimaryDataset $DataTier $ProcessedDataset $ApplicationFamily $executable $CMSSW_VERSION $PSETHASH $SE $SE_PATH"\n' |
| 1226 |
< |
txt += '$SOFTWARE_DIR/ProdCommon/ProdCommon/FwkJobRep/ModifyJobReport.py $RUNTIME_AREA/crab_fjr_$NJob.xml $NJob $FOR_LFN $PrimaryDataset $DataTier $ProcessedDataset $ApplicationFamily $executable $CMSSW_VERSION $PSETHASH $SE $SE_PATH\n' |
| 1225 |
> |
txt += 'echo "$RUNTIME_AREA/ProdCommon/FwkJobRep/ModifyJobReport.py $RUNTIME_AREA/crab_fjr_$NJob.xml $NJob $FOR_LFN $PrimaryDataset $DataTier $ProcessedDataset $ApplicationFamily $executable $CMSSW_VERSION $PSETHASH $SE $SE_PATH"\n' |
| 1226 |
> |
txt += '$RUNTIME_AREA/ProdCommon/FwkJobRep/ModifyJobReport.py $RUNTIME_AREA/crab_fjr_$NJob.xml $NJob $FOR_LFN $PrimaryDataset $DataTier $ProcessedDataset $ApplicationFamily $executable $CMSSW_VERSION $PSETHASH $SE $SE_PATH\n' |
| 1227 |
|
txt += 'modifyReport_result=$?\n' |
| 1228 |
|
txt += 'if [ $modifyReport_result -ne 0 ]; then\n' |
| 1229 |
|
txt += ' modifyReport_result=70500\n' |
| 1243 |
|
txt += 'echo ">>> Parse FrameworkJobReport crab_fjr.xml"\n' |
| 1244 |
|
txt += 'if [ -s $RUNTIME_AREA/crab_fjr_$NJob.xml ]; then\n' |
| 1245 |
|
txt += ' if [ -s $RUNTIME_AREA/parseCrabFjr.py ]; then\n' |
| 1246 |
< |
txt += ' cmd_out=`python $RUNTIME_AREA/parseCrabFjr.py --input $RUNTIME_AREA/crab_fjr_$NJob.xml --MonitorID $MonitorID --MonitorJobID $MonitorJobID`\n' |
| 1247 |
< |
txt += ' echo "Result of parsing the FrameworkJobReport crab_fjr.xml: $cmd_out"\n' |
| 1248 |
< |
txt += ' tmp_executable_exit_status=`echo $cmd_out | awk -F\; \'{print $1}\' | awk -F \' \' \'{print $NF}\'`\n' |
| 1249 |
< |
txt += ' if [ -n $tmp_executable_exit_status ];then\n' |
| 1201 |
< |
txt += ' executable_exit_status=$tmp_executable_exit_status\n' |
| 1202 |
< |
txt += ' fi\n' |
| 1246 |
> |
txt += ' cmd_out=`python $RUNTIME_AREA/parseCrabFjr.py --input $RUNTIME_AREA/crab_fjr_$NJob.xml --dashboard $MonitorID,$MonitorJobID '+self.debugWrap+'`\n' |
| 1247 |
> |
if self.debug_wrapper : |
| 1248 |
> |
txt += ' echo "Result of parsing the FrameworkJobReport crab_fjr.xml: $cmd_out"\n' |
| 1249 |
> |
txt += ' executable_exit_status=`python $RUNTIME_AREA/parseCrabFjr.py --input $RUNTIME_AREA/crab_fjr_$NJob.xml --exitcode`\n' |
| 1250 |
|
txt += ' if [ $executable_exit_status -eq 50115 ];then\n' |
| 1251 |
|
txt += ' echo ">>> crab_fjr.xml contents: "\n' |
| 1252 |
|
txt += ' cat $RUNTIME_AREA/crab_fjr_NJob.xml\n' |
| 1253 |
|
txt += ' echo "Wrong FrameworkJobReport --> does not contain useful info. ExitStatus: $executable_exit_status"\n' |
| 1254 |
+ |
txt += ' elif [ $executable_exit_status -eq -999 ];then\n' |
| 1255 |
+ |
txt += ' echo "ExitStatus from FrameworkJobReport not available. not available. Using exit code of executable from command line."\n' |
| 1256 |
|
txt += ' else\n' |
| 1257 |
|
txt += ' echo "Extracted ExitStatus from FrameworkJobReport parsing output: $executable_exit_status"\n' |
| 1258 |
|
txt += ' fi\n' |
| 1261 |
|
txt += ' fi\n' |
| 1262 |
|
#### Patch to check input data reading for CMSSW16x Hopefully we-ll remove it asap |
| 1263 |
|
|
| 1264 |
< |
if self.datasetPath: |
| 1264 |
> |
if (self.datasetPath and self.dataset_pu == 'NONE'): |
| 1265 |
|
# VERIFY PROCESSED DATA |
| 1266 |
|
txt += ' if [ $executable_exit_status -eq 0 ];then\n' |
| 1267 |
|
txt += ' echo ">>> Verify list of processed files:"\n' |
| 1268 |
< |
txt += ' echo $InputFiles |tr -d "\\\\" |tr "," "\\n"|tr -d "\\"" > input-files.txt\n' |
| 1269 |
< |
txt += ' grep LFN $RUNTIME_AREA/crab_fjr_$NJob.xml |cut -d">" -f2|cut -d"<" -f1|grep "/" > processed-files.txt\n' |
| 1268 |
> |
txt += ' echo $InputFiles |tr -d \'\\\\\' |tr \',\' \'\\n\'|tr -d \'"\' > input-files.txt\n' |
| 1269 |
> |
txt += ' python $RUNTIME_AREA/parseCrabFjr.py --input $RUNTIME_AREA/crab_fjr_$NJob.xml --lfn > processed-files.txt\n' |
| 1270 |
|
txt += ' cat input-files.txt | sort | uniq > tmp.txt\n' |
| 1271 |
|
txt += ' mv tmp.txt input-files.txt\n' |
| 1272 |
|
txt += ' echo "cat input-files.txt"\n' |
| 1325 |
|
stderr = 'CMSSW_$NJob.stderr' |
| 1326 |
|
if (self.return_data == 1): |
| 1327 |
|
for file in (self.output_file+self.output_file_sandbox): |
| 1328 |
< |
listOutFiles.append(self.numberFile_(file, '$NJob')) |
| 1328 |
> |
listOutFiles.append(numberFile(file, '$NJob')) |
| 1329 |
|
listOutFiles.append(stdout) |
| 1330 |
|
listOutFiles.append(stderr) |
| 1331 |
|
else: |
| 1332 |
|
for file in (self.output_file_sandbox): |
| 1333 |
< |
listOutFiles.append(self.numberFile_(file, '$NJob')) |
| 1333 |
> |
listOutFiles.append(numberFile(file, '$NJob')) |
| 1334 |
|
listOutFiles.append(stdout) |
| 1335 |
|
listOutFiles.append(stderr) |
| 1336 |
|
txt += 'echo "output files: '+string.join(listOutFiles,' ')+'"\n' |
