diff options
| author | Pramod S Kumbhar <pramod.r.s.kumbhar@gmail.com> | 2017-09-18 22:35:42 +0200 |
|---|---|---|
| committer | becker33 <becker33@llnl.gov> | 2017-09-18 13:35:42 -0700 |
| commit | 832791a2bbfeed9af761105cf84b75879d19ca8b (patch) | |
| tree | 87c92f924f62f4362ec04b4903c9c7d71244510c | |
| parent | 2f269c391987c2fc7129c92acc0c1c4fede347d1 (diff) | |
| download | spack-832791a2bbfeed9af761105cf84b75879d19ca8b.tar.gz spack-832791a2bbfeed9af761105cf84b75879d19ca8b.tar.bz2 spack-832791a2bbfeed9af761105cf84b75879d19ca8b.tar.xz spack-832791a2bbfeed9af761105cf84b75879d19ca8b.zip | |
Improve scorep package with different compilers and mpi providers (#5386)
* Add --with-mpi=spec['mpi'].name at configure step to avoid error when finding 2 MPI implementations
* Improve scorep package with different compilers and mpi providers
| -rw-r--r-- | var/spack/repos/builtin/packages/scorep/package.py | 20 |
1 files changed, 17 insertions, 3 deletions
diff --git a/var/spack/repos/builtin/packages/scorep/package.py b/var/spack/repos/builtin/packages/scorep/package.py index 8471b70f8a..830935f15f 100644 --- a/var/spack/repos/builtin/packages/scorep/package.py +++ b/var/spack/repos/builtin/packages/scorep/package.py @@ -84,14 +84,28 @@ class Scorep(AutotoolsPackage): "--with-papi-header=%s" % spec['papi'].prefix.include, "--with-papi-lib=%s" % spec['papi'].prefix.lib, "--with-pdt=%s" % spec['pdt'].prefix.bin, - "--enable-shared", - ] + "--enable-shared"] + + cname = spec.compiler.name + config_args.append('--with-nocross-compiler-suite={0}'.format(cname)) + + if spec.satisfies('^intel-mpi'): + config_args.append('--with-mpi=intel3') + elif spec.satisfies('^mpich') or spec.satisfies('^mvapich2'): + config_args.append('--with-mpi=mpich3') + elif spec.satisfies('^openmpi'): + config_args.append('--with-mpi=openmpi') if '~shmem' in spec: config_args.append("--without-shmem") config_args.extend([ 'CFLAGS={0}'.format(self.compiler.pic_flag), - 'CXXFLAGS={0}'.format(self.compiler.pic_flag) + 'CXXFLAGS={0}'.format(self.compiler.pic_flag), + 'MPICC={0}'.format(spec['mpi'].mpicc), + 'MPICXX={0}'.format(spec['mpi'].mpicxx), + 'MPIF77={0}'.format(spec['mpi'].mpif77), + 'MPIFC={0}'.format(spec['mpi'].mpifc) ]) + return config_args |