From 1a2d9e516ab128589d30cff3997fd79c237cdbd6 Mon Sep 17 00:00:00 2001
From: Martin Bauer <martin.bauer@fau.de>
Date: Mon, 24 Apr 2017 17:34:37 +0200
Subject: [PATCH] Shear Wave Scenario Updates
---
cpu/cpujit.py | 4 ++--
cpu/kernelcreation.py | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/cpu/cpujit.py b/cpu/cpujit.py
index 5542d0d93..0578654ea 100644
--- a/cpu/cpujit.py
+++ b/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)
diff --git a/cpu/kernelcreation.py b/cpu/kernelcreation.py
index dab631a97..897cbb6a4 100644
--- a/cpu/kernelcreation.py
+++ b/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)
--
GitLab