Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Introduce local-pgi machine #169

Merged
merged 1 commit into from
Jun 19, 2017
Merged

Introduce local-pgi machine #169

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions tests/python_for_tests/machines.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@

# Supported machines for running MARBL tests
supported_machines = ['local-gnu',
'local-pgi',
'yellowstone',
'cheyenne',
'hobart',
Expand Down Expand Up @@ -94,4 +95,10 @@ def machine_specific(mach, supported_compilers):
supported_compilers.append('gnu')
return

if mach == 'local-pgi':
# Not a specific machine, but a flag to specify
# "run with pgi without loading any modules"
supported_compilers.append('pgi')
return

# -----------------------------------------------
6 changes: 3 additions & 3 deletions tests/python_for_tests/marbl_testing_class.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ def parse_args(self, desc, HaveCompiler=True, HaveNamelist=True,
parser.add_argument('--clean', action='store_true',
help='remove object, module, and library files for MARBL driver')

parser.add_argument('-m', '--mach', action='store', dest='mach',
parser.add_argument('-m', '--mach', '--machine', action='store', dest='mach',
help='machine to build on', choices=machs.supported_machines)

parser.add_argument('--mpitasks', action='store', dest='mpitasks',
Expand Down Expand Up @@ -121,7 +121,7 @@ def build_lib(self, loc_compiler=None):

src_dir = '%s/src' % self._marbl_dir

if self._machine != 'local-gnu':
if self._machine not in ['local-gnu','local-pgi']:
machs.load_module(self._machine, loc_compiler)

makecmd = 'make %s' % loc_compiler
Expand All @@ -139,7 +139,7 @@ def build_exe(self, loc_compiler=None):

drv_dir = '%s/tests/driver_src' % self._marbl_dir

if self._machine != 'local-gnu':
if self._machine not in ['local-gnu','local-pgi']:
machs.load_module(self._machine, loc_compiler)

makecmd = 'make %s' % loc_compiler
Expand Down