Merge branch 'yentl' of msdl.uantwerpen.be:yentl/modelverse into yentl

scripts/execute_model.py

@@ -50,7 +50,4 @@ for m in models:
     print("[MODEL] %s" % m)
     do_compile_wrapper(m, "MO", "grammars/modelling.g")
 
-#p = multiprocessing.Pool(multiprocessing.cpu_count() * 2)
-#p.map(lambda i: do_compile_wrapper(i, "PO", grammar="grammars/actionlanguage.g"), code)
-#link_and_load(address, username, code)
 main(address, username, code)

scripts/make_parallel.py

@@ -7,13 +7,14 @@ import random
 import multiprocessing
 import glob
 
-def main(address, username, files):
-    def do_compile_wrapper(filename):
-        do_compile(address, filename, str(random.random()), filename, "PO", ["--debug"])
+def do_compile_wrapper(args):
+    address, username, filename = args
+    do_compile(address, filename, str(random.random()), filename, "PO", ["--debug"])
 
+def main(address, username, files):
     p = multiprocessing.Pool(multiprocessing.cpu_count() * 2)
     new_files = to_recompile(address, files)
-    p.map(do_compile_wrapper, new_files)
+    p.map(do_compile_wrapper, [[address, username, f] for f in new_files])
     link_and_load(address, username, files)
 
 if __name__ == "__main__":