From c23387e89b418e5baaa2334290faa1f8a072b69b Mon Sep 17 00:00:00 2001 From: David Wootton <38671868+dwootton-ny@users.noreply.github.com> Date: Wed, 2 May 2018 09:12:08 -0400 Subject: 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. --- var/spack/repos/builtin/packages/spectrum-mpi/package.py | 10 ++++++++++ 1 file changed, 10 insertions(+) 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++')) -- cgit v1.2.3-70-g09d2