From 531921f2c86679aba7c2fb047ac634dc6a4ee05e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ole=20Sch=C3=BCtt?= Date: Thu, 10 Mar 2016 12:38:52 +0000 Subject: [PATCH] Ready all python scripts for self-testing svn-origin-rev: 16681 --- src/dbcsr/libsmm_acc/libcusmm/collect.py | 6 +++-- src/dbcsr/libsmm_acc/libcusmm/generate.py | 6 +++-- src/dbcsr/libsmm_acc/libcusmm/merge.py | 9 +++++++- src/dbcsr/libsmm_acc/libcusmm/submit.py | 6 +++-- src/dbcsr/libsmm_acc/libcusmm/tune.py | 6 +++-- tools/formatting/addSynopsis.py | 11 +-------- tools/formatting/normalizeExtended.py | 28 +---------------------- tools/formatting/normalizeFortranFile.py | 28 +---------------------- tools/formatting/replacer.py | 22 ++++-------------- tools/maple2f90/maple2f90.py | 14 ++++++++---- tools/prettify.py | 15 +++++++++--- 11 files changed, 53 insertions(+), 98 deletions(-) mode change 100755 => 100644 tools/formatting/addSynopsis.py mode change 100755 => 100644 tools/formatting/normalizeExtended.py mode change 100755 => 100644 tools/formatting/normalizeFortranFile.py mode change 100755 => 100644 tools/formatting/replacer.py diff --git a/src/dbcsr/libsmm_acc/libcusmm/collect.py b/src/dbcsr/libsmm_acc/libcusmm/collect.py index d34dd9acef..f3fa5c03b3 100755 --- a/src/dbcsr/libsmm_acc/libcusmm/collect.py +++ b/src/dbcsr/libsmm_acc/libcusmm/collect.py @@ -83,7 +83,9 @@ def process_log(log_fn, mnk, winners): #=============================================================================== - -main() +if(len(sys.argv)==2 and sys.argv[-1]=="--selftest"): + pass #TODO implement selftest +else: + main() #EOF diff --git a/src/dbcsr/libsmm_acc/libcusmm/generate.py b/src/dbcsr/libsmm_acc/libcusmm/generate.py index 40ec36947b..2e1b806ce9 100755 --- a/src/dbcsr/libsmm_acc/libcusmm/generate.py +++ b/src/dbcsr/libsmm_acc/libcusmm/generate.py @@ -300,8 +300,10 @@ def combinations(*sizes): return(list(product(sizes, sizes, sizes))) #=============================================================================== - -main() +if(len(sys.argv)==2 and sys.argv[-1]=="--selftest"): + pass #TODO implement selftest +else: + main() #EOF diff --git a/src/dbcsr/libsmm_acc/libcusmm/merge.py b/src/dbcsr/libsmm_acc/libcusmm/merge.py index 9bf48b14b8..40f73a3f0c 100755 --- a/src/dbcsr/libsmm_acc/libcusmm/merge.py +++ b/src/dbcsr/libsmm_acc/libcusmm/merge.py @@ -77,4 +77,11 @@ def main(): f.close() print("Wrote parameters.new") -main() + +#=============================================================================== +if(len(sys.argv)==2 and sys.argv[-1]=="--selftest"): + pass #TODO implement selftest +else: + main() + +#EOF diff --git a/src/dbcsr/libsmm_acc/libcusmm/submit.py b/src/dbcsr/libsmm_acc/libcusmm/submit.py index f3dba3536a..9e3de0deae 100755 --- a/src/dbcsr/libsmm_acc/libcusmm/submit.py +++ b/src/dbcsr/libsmm_acc/libcusmm/submit.py @@ -39,7 +39,9 @@ def main(): print("Number of jobs submitted: %d"%n_submits) #=============================================================================== - -main() +if(len(sys.argv)==2 and sys.argv[-1]=="--selftest"): + pass #TODO implement selftest +else: + main() #EOF diff --git a/src/dbcsr/libsmm_acc/libcusmm/tune.py b/src/dbcsr/libsmm_acc/libcusmm/tune.py index f00f06d320..76c2f9e64d 100755 --- a/src/dbcsr/libsmm_acc/libcusmm/tune.py +++ b/src/dbcsr/libsmm_acc/libcusmm/tune.py @@ -223,8 +223,10 @@ def combinations(*sizes): return(list(product(sizes, sizes, sizes))) #=============================================================================== - -main() +if(len(sys.argv)==2 and sys.argv[-1]=="--selftest"): + pass #TODO implement selftest +else: + main() #EOF diff --git a/tools/formatting/addSynopsis.py b/tools/formatting/addSynopsis.py old mode 100755 new mode 100644 index ff3d2952c7..d143ad63ed --- a/tools/formatting/addSynopsis.py +++ b/tools/formatting/addSynopsis.py @@ -1,5 +1,3 @@ -#! /usr/bin/env python - import sys from sys import argv @@ -260,11 +258,4 @@ def addSynopsisInDir(interfaceDir, outDir,filePaths,logFile=sys.stdout): logFile.write("+++ error renaming"+outFilePath+"\n") return fileMapping -if __name__ == '__main__': - if len(sys.argv)<4: - print "usage:", sys.argv[0]," interface_dir out_dir sourcefile1.F [sourcefile2.F ...]" - else: - interfaceDir=sys.argv[1] - outDir=sys.argv[2] - addSynopsisInDir(interfaceDir, outDir,sys.argv[3:],sys.stdout) - +#EOF diff --git a/tools/formatting/normalizeExtended.py b/tools/formatting/normalizeExtended.py old mode 100755 new mode 100644 index 4fa2cb5a5d..759d359874 --- a/tools/formatting/normalizeExtended.py +++ b/tools/formatting/normalizeExtended.py @@ -1,5 +1,3 @@ -#!/usr/bin/env python - """ Impose white space conventions and indentation based on scopes / subunits @@ -779,28 +777,4 @@ def format_extended_ffile(infile, outfile, logFile=sys.stdout, indent_size=2, or # rm subsequent blank lines skip_blank = is_empty and not comments -#========================================================================= - -if __name__ == '__main__': - import os.path - - if len(sys.argv) < 2: - print "usage:", sys.argv[0], " out_dir file1 [file2 ...]" - sys.exit(1) - - outDir = sys.argv[1] - if not os.path.isdir(outDir): - print "out_dir must be a directory" - print "usage:", sys.argv[0], " out_dir file1 [file2 ...]" - sys.exit(1) - - for fileName in sys.argv[2:]: - try: - print "normalizing body of", fileName - - with open(fileName, 'r') as infile: - with open(os.path.join(outDir, os.path.basename(fileName)), 'w') as outfile: - format_extended_ffile(infile, outfile) - except: - print "error for file", fileName - raise +#EOF diff --git a/tools/formatting/normalizeFortranFile.py b/tools/formatting/normalizeFortranFile.py old mode 100755 new mode 100644 index 80fed4fada..7e9f795969 --- a/tools/formatting/normalizeFortranFile.py +++ b/tools/formatting/normalizeFortranFile.py @@ -1,5 +1,3 @@ -#! /usr/bin/env python - import sys import re import string @@ -996,28 +994,4 @@ def rewriteFortranFile(inFile,outFile,logFile=sys.stdout,orig_filename=None): logFile.write("Processing file '"+inFile.name+"'\n") raise -if __name__ == '__main__': - import os.path - if len(sys.argv)<2: - print "usage:", sys.argv[0]," out_dir file1 [file2 ...]" - else: - outDir=sys.argv[1] - if not os.path.isdir(outDir): - print "out_dir must be a directory" - print "usage:", sys.argv[0]," out_dir file1 [file2 ...]" - else: - for fileName in sys.argv[2:]: - try: - print "normalizing",fileName - infile=open(fileName,'r') - outfile=open(os.path.join(outDir, - os.path.basename(fileName)),'w') - rewriteFortranFile(infile,outfile) - infile.close() - outfile.close() - except: - print "error for file", fileName - print "*** "*6 - print "removedUse=",rUse - print "removedVar=",rVar - # print "done" +#EOF diff --git a/tools/formatting/replacer.py b/tools/formatting/replacer.py old mode 100755 new mode 100644 index f2fa168350..b7dcfa823e --- a/tools/formatting/replacer.py +++ b/tools/formatting/replacer.py @@ -1,5 +1,3 @@ -#! /usr/bin/env python - import re import sys @@ -14,38 +12,28 @@ def replaceWords(infile,outfile,replacements=repl, specialReplacements=specialRepl, logFile=sys.stdout): """Replaces the words in infile writing the output to outfile. - + replacements is a dictionary with the words to replace. specialReplacements is a dictionary with general regexp replacements. """ lineNr=0 nonWordRe=re.compile(r"(\W+)") - + while 1: line= infile.readline() lineNr=lineNr+1 if not line: break - + if specialReplacements: for subs in specialReplacements.keys(): line=subs.sub(specialReplacements[subs],line) - + tokens=nonWordRe.split(line) for token in tokens: if replacements.has_key(token): outfile.write(replacements[token]) else: outfile.write(token) - +#EOF -if __name__ == '__main__': - if len(sys.argv)<2: - print "usage:", sys.argv[0]," file_in file_out" - elif(len(sys.argv)==2 and sys.argv[-1]=="--selftest"): - pass #TODO implement selftest - else: - infile=open(sys.argv[1],'r') - outfile=open(sys.argv[2],'w') - replaceWords(infile,outfile,replacements=repl, - specialReplacements=specialRepl) diff --git a/tools/maple2f90/maple2f90.py b/tools/maple2f90/maple2f90.py index 71c163812e..6aa254b9c8 100755 --- a/tools/maple2f90/maple2f90.py +++ b/tools/maple2f90/maple2f90.py @@ -791,9 +791,13 @@ def maple2f90(code,replacements={}): c1="\n".join(lc1)+"\n" return c1 +#=============================================================================== if __name__=="__main__": - replacements={} - for i in range(len(renamedVar)): - replacements[renamedVar[i]]=origNames[i] - print maple2f90(code,replacements) - + if(len(sys.argv)==2 and sys.argv[-1]=="--selftest"): + pass #TODO implement selftest + else: + replacements={} + for i in range(len(renamedVar)): + replacements[renamedVar[i]]=origNames[i] + print maple2f90(code,replacements) +#EOF diff --git a/tools/prettify.py b/tools/prettify.py index 4cc7c995ce..f9a76ebfea 100755 --- a/tools/prettify.py +++ b/tools/prettify.py @@ -176,8 +176,8 @@ def prettfyInplace(fileName,bkDir="preprettify",normalize_use=1, infile.close() outfile.close() - -if __name__ == '__main__': + +def main(): defaultsDict={'upcase':1,'normalize-use':1,'extended':0,'indent':2,'replace':1, 'interface-dir':None, 'backup-dir':'preprettify'} @@ -192,7 +192,7 @@ if __name__ == '__main__': If requested the replacements performed by the replacer.py script are also preformed. """+str(defaultsDict)) - + replace=None if "--help" in sys.argv: print usageDesc @@ -248,3 +248,12 @@ if __name__ == '__main__': sys.stdout.write('-'*60+"\n") sys.stdout.write("Processing file '"+fileName+"'\n") sys.exit(failure>0) + + +#=============================================================================== +if(len(sys.argv)==2 and sys.argv[-1]=="--selftest"): + pass #TODO implement selftest +else: + main() + +#EOF