diff options
| author | Tomoki, Karatsu <49965247+t-karatsu@users.noreply.github.com> | 2020-06-05 20:25:02 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-05 13:25:02 +0200 |
| commit | c3be6d903aef539e54320f35d8d3b18fca830c25 (patch) | |
| tree | 604a17ecfa926b69ee48803e2934dc4f8c000adb /var | |
| parent | 8be7823cc5b7147880f7c8107519b4f24f434d8f (diff) | |
| download | spack-c3be6d903aef539e54320f35d8d3b18fca830c25.tar.gz spack-c3be6d903aef539e54320f35d8d3b18fca830c25.tar.bz2 spack-c3be6d903aef539e54320f35d8d3b18fca830c25.tar.xz spack-c3be6d903aef539e54320f35d8d3b18fca830c25.zip | |
cmake: modify FindMPI.cmake to treat Fujitsu MPI correctly (#16864)
Diffstat (limited to 'var')
| -rw-r--r-- | var/spack/repos/builtin/packages/cmake/package.py | 6 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/netlib-scalapack/package.py | 9 |
2 files changed, 6 insertions, 9 deletions
diff --git a/var/spack/repos/builtin/packages/cmake/package.py b/var/spack/repos/builtin/packages/cmake/package.py index cfc13c436d..fe19bdb404 100644 --- a/var/spack/repos/builtin/packages/cmake/package.py +++ b/var/spack/repos/builtin/packages/cmake/package.py @@ -238,3 +238,9 @@ class Cmake(Package): def install(self, spec, prefix): make('install') + + if spec.satisfies('%fj'): + for f in find(self.prefix, 'FindMPI.cmake', recursive=True): + filter_file('mpcc_r)', 'mpcc_r mpifcc)', f, string=True) + filter_file('mpc++_r)', 'mpc++_r mpiFCC)', f, string=True) + filter_file('mpifc)', 'mpifc mpifrt)', f, string=True) diff --git a/var/spack/repos/builtin/packages/netlib-scalapack/package.py b/var/spack/repos/builtin/packages/netlib-scalapack/package.py index 2acc06e6bb..75993c4701 100644 --- a/var/spack/repos/builtin/packages/netlib-scalapack/package.py +++ b/var/spack/repos/builtin/packages/netlib-scalapack/package.py @@ -82,15 +82,6 @@ class NetlibScalapack(CMakePackage): "-DCMAKE_Fortran_FLAGS=%s" % self.compiler.fc_pic_flag ]) - # Specify Fujitsu-MPI's location - if spec.satisfies('%fj') and '^fujitsu-mpi' in spec: - options.extend([ - '-DMPI_C_COMPILER=%s' % spec['mpi'].mpicc, - '-DMPI_CXX_COMPILER=%s' % spec['mpi'].mpicxx, - '-DMPI_Fortran_COMPILER=%s' % spec['mpi'].mpifc, - '-DMPI_BASE_DIR=%s' % spec['mpi'].prefix - ]) - return options @run_after('install') |