added cori machinefile; added compiler section in machinefile

sjsprecious · Apr 11, 2017 · b9ecd4f · b9ecd4f
1 parent 94a8e87
commit b9ecd4f
Show file tree

Hide file tree

Showing 6 changed files with 32 additions and 61 deletions.
diff --git a/machines/cori_nersc b/machines/cori_nersc
@@ -0,0 +1,18 @@
+[general]
+name = Cori
+id = cori
+
+[shell]
+command = hostname
+startswith = cori
+pattern = nid\d+
+
+[compiler]
+gnu = module swap PrgEnv-intel PrgEnv-gnu
+
+[variable]
+prerun_build =
+prerun_run =
+prerun_kernel_build =
+prerun_kernel_run =
+work_directory = $SCRATCH
diff --git a/machines/yellowstone_ncar b/machines/yellowstone_ncar
@@ -7,6 +7,9 @@ command = hostname
 startswith = yslogin,pronghorn,caldera
 pattern = ys\d+
 
+[compiler]
+gnu = module purge; module load gnu
+
 [variable]
 prerun_build =
 prerun_run =

diff --git a/tests/functional/compflag/test_basic.py b/tests/functional/compflag/test_basic.py
@@ -32,7 +32,9 @@ def test_strace():
     # create a kgen command
     cmds = []
     cmds.append(KGEN_APP)
-    cmds.append('--prerun build="%(cmd)s",run="%(cmd)s",kernel_build="%(cmd)s",kernel_run="%(cmd)s"'%{'cmd': 'module purge; module load gnu'})
+    if inc.has_section('compiler') and inc.has_option('compiler', 'gnu') and inc.get('compiler', 'gnu'):
+        cmds.extend(['--prerun', 'build="%(cmd)s",run="%(cmd)s",kernel_build="%(cmd)s",kernel_run="%(cmd)s"'%\
+            {'cmd': inc.get('compiler', 'gnu')}])
     cmds.append('--cmd-clean "cd %s; make clean"'%outdir)
     cmds.append('--cmd-build "cd %s; make build"'%outdir)
     cmds.append('--cmd-run "cd %s; make run"'%outdir)

diff --git a/tests/unit/extract/test_basic.py b/tests/unit/extract/test_basic.py
@@ -33,8 +33,9 @@ def extractor():
         shutil.copy(filename, outdir)
 
     args = []
-    args.extend(['--prerun', 'build="%(cmd)s",run="%(cmd)s",kernel_build="%(cmd)s",kernel_run="%(cmd)s"'%\
-        {'cmd': 'module purge; module load gnu'}])
+    if inc.has_section('compiler') and inc.has_option('compiler', 'gnu') and inc.get('compiler', 'gnu'):
+        args.extend(['--prerun', 'build="%(cmd)s",run="%(cmd)s",kernel_build="%(cmd)s",kernel_run="%(cmd)s"'%\
+            {'cmd': inc.get('compiler', 'gnu')}])
     args.extend(['--cmd-clean', 'cd %s; make clean'%outdir])
     args.extend(['--cmd-build', 'cd %s; make build'%outdir])
     args.extend(['--cmd-run', 'cd %s; make run'%outdir])
@@ -76,6 +77,8 @@ def test_run(extractor):
 
         assert True
     else:
+        print ('ERROR: stdout', out)
+        print ('ERROR: stderr', err)
         assert False
 
 

diff --git a/tests/unit/extract/test_tolerance.py b/tests/unit/extract/test_tolerance.py
@@ -34,8 +34,9 @@ def extractor():
         shutil.copy(filename, outdir)
 
     args = []
-    args.extend(['--prerun', 'build="%(cmd)s",run="%(cmd)s",kernel_build="%(cmd)s",kernel_run="%(cmd)s"'%\
-        {'cmd': 'module purge; module load gnu'}])
+    if inc.has_section('compiler') and inc.has_option('compiler', 'gnu') and inc.get('compiler', 'gnu'):
+        args.extend(['--prerun', 'build="%(cmd)s",run="%(cmd)s",kernel_build="%(cmd)s",kernel_run="%(cmd)s"'%\
+            {'cmd': inc.get('compiler', 'gnu')}])
     args.extend(['--cmd-clean', 'cd %s; make clean'%outdir])
     args.extend(['--cmd-build', 'cd %s; make build'%outdir])
     args.extend(['--cmd-run', 'cd %s; make run'%outdir])

diff --git a/tests/unit/extract/test_tolerance.py.bak b/tests/unit/extract/test_tolerance.py.bak