summaryrefslogtreecommitdiff
path: root/var
diff options
context:
space:
mode:
authorDavid Wootton <38671868+dwootton-ny@users.noreply.github.com>2018-05-02 09:12:08 -0400
committerAdam J. Stewart <ajstewart426@gmail.com>2018-05-02 08:12:08 -0500
commitc23387e89b418e5baaa2334290faa1f8a072b69b (patch)
treed4926ddb201920679b0c0f9fb6bf9a773d738f49 /var
parent9d1456393f3f2f0b0b0358b5d6c69642ec84d56a (diff)
downloadspack-c23387e89b418e5baaa2334290faa1f8a072b69b.tar.gz
spack-c23387e89b418e5baaa2334290faa1f8a072b69b.tar.bz2
spack-c23387e89b418e5baaa2334290faa1f8a072b69b.tar.xz
spack-c23387e89b418e5baaa2334290faa1f8a072b69b.zip
Fix Spectrum MPI package spec file for PGI compilers (#7964)
* Added magma package * Incorporated Serban's change * Remove deleted files * argparse.py * Sync forked Spack repo in github * Use reported version of IBM XL Fortran compiler for compiler versions >= 16.0. Starting with the April 2018 release, the IBM XL C and Fortran compilers report the same version, 16.0. Consequently, there is no need to downgrade the Fortran compiler version to match that of the C compiler. * Eliminate blank lines. * Update the Spectrum MPI package.py file to specify the correct compilation scripts for the PGI compilers.
Diffstat (limited to 'var')
-rw-r--r--var/spack/repos/builtin/packages/spectrum-mpi/package.py10
1 files changed, 10 insertions, 0 deletions
diff --git a/var/spack/repos/builtin/packages/spectrum-mpi/package.py b/var/spack/repos/builtin/packages/spectrum-mpi/package.py
index 2ada9c593e..e094f1c3ad 100644
--- a/var/spack/repos/builtin/packages/spectrum-mpi/package.py
+++ b/var/spack/repos/builtin/packages/spectrum-mpi/package.py
@@ -46,6 +46,11 @@ class SpectrumMpi(Package):
self.spec.mpicxx = join_path(self.prefix.bin, 'mpixlC')
self.spec.mpif77 = join_path(self.prefix.bin, 'mpixlf')
self.spec.mpifc = join_path(self.prefix.bin, 'mpixlf')
+ elif '%pgi' in dependent_spec:
+ self.spec.mpicc = join_path(self.prefix.bin, 'mpipgicc')
+ self.spec.mpicxx = join_path(self.prefix.bin, 'mpipgic++')
+ self.spec.mpif77 = join_path(self.prefix.bin, 'mpipgifort')
+ self.spec.mpifc = join_path(self.prefix.bin, 'mpipgifort')
else:
self.spec.mpicc = join_path(self.prefix.bin, 'mpicc')
self.spec.mpicxx = join_path(self.prefix.bin, 'mpicxx')
@@ -58,6 +63,11 @@ class SpectrumMpi(Package):
spack_env.set('MPICXX', join_path(self.prefix.bin, 'mpixlC'))
spack_env.set('MPIF77', join_path(self.prefix.bin, 'mpixlf'))
spack_env.set('MPIF90', join_path(self.prefix.bin, 'mpixlf'))
+ elif '%pgi' in dependent_spec:
+ spack_env.set('MPICC', join_path(self.prefix.bin, 'mpipgicc'))
+ spack_env.set('MPICXX', join_path(self.prefix.bin, 'mpipgic++'))
+ spack_env.set('MPIF77', join_path(self.prefix.bin, 'mpipgifort'))
+ spack_env.set('MPIF90', join_path(self.prefix.bin, 'mpipgifort'))
else:
spack_env.set('MPICC', join_path(self.prefix.bin, 'mpicc'))
spack_env.set('MPICXX', join_path(self.prefix.bin, 'mpic++'))