Settings for NEC SDK corrected
This commit is contained in:
parent
d3e03daded
commit
c6a4d9f909
|
@ -6,11 +6,17 @@ from lib.shell import get_from_command
|
||||||
def get_compiler_version(compiler):
|
def get_compiler_version(compiler):
|
||||||
if compiler == "gnu":
|
if compiler == "gnu":
|
||||||
cc = "gcc"
|
cc = "gcc"
|
||||||
|
compstr = get_from_command([cc, "-dumpversion"]).strip()
|
||||||
elif compiler == "intel":
|
elif compiler == "intel":
|
||||||
cc = "icc"
|
cc = "icc"
|
||||||
|
compstr = get_from_command([cc, "-dumpversion"]).strip()
|
||||||
elif compiler == "aocc":
|
elif compiler == "aocc":
|
||||||
cc = "clang"
|
cc = "clang"
|
||||||
compstr = get_from_command([cc, "-dumpversion"]).strip()
|
compstr = get_from_command([cc, "-dumpversion"]).strip()
|
||||||
|
elif compiler == "nec":
|
||||||
|
cc = "ncc"
|
||||||
|
rawstr = get_from_command([cc, "--version"])
|
||||||
|
compstr = rawstr.split()[2]
|
||||||
return compstr
|
return compstr
|
||||||
|
|
||||||
|
|
||||||
|
@ -30,6 +36,9 @@ def get_mpi_version(mpi):
|
||||||
elif mpi == "mpich":
|
elif mpi == "mpich":
|
||||||
rawstr = get_from_command(["mpirun", "--version"])
|
rawstr = get_from_command(["mpirun", "--version"])
|
||||||
mpistr = rawstr.split()[4]
|
mpistr = rawstr.split()[4]
|
||||||
|
elif mpi == "necmpi":
|
||||||
|
rawstr = get_from_command(["mpirun", "--version"])
|
||||||
|
mpistr = rawstr.split()[4]
|
||||||
return mpistr
|
return mpistr
|
||||||
|
|
||||||
|
|
||||||
|
@ -97,7 +106,7 @@ def set_toolchain(compiler, mpi):
|
||||||
cc = "mpincc"
|
cc = "mpincc"
|
||||||
cxx = "mpinc++"
|
cxx = "mpinc++"
|
||||||
fc = "mpinfort"
|
fc = "mpinfort"
|
||||||
|
|
||||||
# set environment variables
|
# set environment variables
|
||||||
os.environ["CC"] = cc
|
os.environ["CC"] = cc
|
||||||
os.environ["CXX"] = cxx
|
os.environ["CXX"] = cxx
|
||||||
|
|
Loading…
Reference in New Issue