Browse Source

Do glob expansion in Python, as Windows doesn't do this either

Yentl Van Tendeloo 9 years ago
parent
commit
ae640e4370
2 changed files with 8 additions and 6 deletions
  1. 2 1
      scripts/make_all.py
  2. 6 5
      scripts/make_parallel.py

+ 2 - 1
scripts/make_all.py

@@ -3,10 +3,11 @@ import sys
 from compile import do_compile
 from link_and_load import link_and_load
 import random
+import glob
 
 address = sys.argv[1]
 username = sys.argv[2]
-files = sys.argv[3:]
+files = sum([glob.glob(f) for f in sys.argv[3:]], [])
 
 for f in files:
     do_compile(address, f, str(random.random()), f, "CO")

+ 6 - 5
scripts/make_parallel.py

@@ -4,16 +4,17 @@ from compile import do_compile
 from link_and_load import link_and_load
 import random
 import multiprocessing
+import glob
 
 address = sys.argv[1]
 username = sys.argv[2]
-files = sys.argv[3:]
-
+files = sum([glob.glob(f) for f in sys.argv[3:]], [])
 
 def do_compile_wrapper(filename):
     do_compile(address, filename, str(random.random()), filename, "PO")
 
-p = multiprocessing.Pool(multiprocessing.cpu_count())
-p.map(do_compile_wrapper, files)
+if __name__ == "__main__":
+    p = multiprocessing.Pool(multiprocessing.cpu_count())
+    p.map(do_compile_wrapper, files)
 
-link_and_load(address, username, files, True)
+    link_and_load(address, username, files, True)