Shear Wave Scenario Updates

cpu/cpujit.py

@@ -210,8 +210,8 @@ def readConfig():
         createFolder(configPath, True)
         json.dump(config, open(configPath, 'w'), indent=4)
 
-    config['cache']['sharedLibrary'] = os.path.expanduser(config['cache']['sharedLibrary'])
-    config['cache']['objectCache'] = os.path.expanduser(config['cache']['objectCache'])
+    config['cache']['sharedLibrary'] = os.path.expanduser(config['cache']['sharedLibrary']).format(pid=os.getpid())
+    config['cache']['objectCache'] = os.path.expanduser(config['cache']['objectCache']).format(pid=os.getpid())
 
     if config['cache']['clearCacheOnStart']:
         shutil.rmtree(config['cache']['objectCache'], ignore_errors=True)

cpu/kernelcreation.py

@@ -139,7 +139,7 @@ def addOpenMP(astNode, schedule="static", numThreads=True):
 
     assert type(astNode) is ast.KernelFunction
     body = astNode.body
-    threadsClause = "" if numThreads else " num_threads(%s)" % (numThreads,)
+    threadsClause = "" if numThreads and isinstance(numThreads,bool) else " num_threads(%s)" % (numThreads,)
     wrapperBlock = ast.PragmaBlock('#pragma omp parallel' + threadsClause, body.takeChildNodes())
     body.append(wrapperBlock)