git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@15168 f3b2605a-c512-4ea7-a41b-209d697bcdaa

This commit is contained in:
sjplimp 2016-06-14 16:40:10 +00:00
parent 422dfdc1f7
commit ffbce3c10c
1 changed files with 4 additions and 4 deletions

View File

@ -5,7 +5,7 @@
# Syntax: Make.py -h (for help)
# Notes: needs python 2.7 (not Python 3)
import sys,os,commands,re,copy,subprocess
import sys,os,commands,re,copy,subprocess,platform
# switch abbrevs
# switch classes = created class for each switch
@ -571,7 +571,7 @@ class Actions:
# this is b/c Cuda libs are not all available on host
make = "make"
if "shannon" in os.environ.get("HOST") and packages.final["gpu"]:
if "shannon" == platform.node() and packages.final["gpu"]:
make = "srun make"
if jmake: str = "cd %s; %s -j %d auto" % (dir.src,make,jmake.n)
@ -1298,8 +1298,8 @@ class GPU:
# this is b/c Cuda libs are not all available on host
make = "make"
if "shannon" in os.environ.get("HOST"): make = "srun make"
if "shannon" == platform.node(): make = "srun make"
commands.getoutput("cd %s; %s -f Makefile.auto clean" % (libdir,make))
if jmake: str = "cd %s; %s -j %d -f Makefile.auto" % (libdir,make,jmake.n)
else: str = "cd %s; %s -f Makefile.auto" % (libdir,make)