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.
This commit is contained in:
David Wootton 2018-05-02 09:12:08 -04:00 committed by Adam J. Stewart
parent 9d1456393f
commit c23387e89b

View File

@ -46,6 +46,11 @@ def setup_dependent_package(self, module, dependent_spec):
self.spec.mpicxx = join_path(self.prefix.bin, 'mpixlC') self.spec.mpicxx = join_path(self.prefix.bin, 'mpixlC')
self.spec.mpif77 = join_path(self.prefix.bin, 'mpixlf') self.spec.mpif77 = join_path(self.prefix.bin, 'mpixlf')
self.spec.mpifc = 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: else:
self.spec.mpicc = join_path(self.prefix.bin, 'mpicc') self.spec.mpicc = join_path(self.prefix.bin, 'mpicc')
self.spec.mpicxx = join_path(self.prefix.bin, 'mpicxx') self.spec.mpicxx = join_path(self.prefix.bin, 'mpicxx')
@ -58,6 +63,11 @@ def setup_dependent_environment(self, spack_env, run_env, dependent_spec):
spack_env.set('MPICXX', join_path(self.prefix.bin, 'mpixlC')) spack_env.set('MPICXX', join_path(self.prefix.bin, 'mpixlC'))
spack_env.set('MPIF77', join_path(self.prefix.bin, 'mpixlf')) spack_env.set('MPIF77', join_path(self.prefix.bin, 'mpixlf'))
spack_env.set('MPIF90', 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: else:
spack_env.set('MPICC', join_path(self.prefix.bin, 'mpicc')) spack_env.set('MPICC', join_path(self.prefix.bin, 'mpicc'))
spack_env.set('MPICXX', join_path(self.prefix.bin, 'mpic++')) spack_env.set('MPICXX', join_path(self.prefix.bin, 'mpic++'))