Skip to content

Commit

Permalink
Support intel-mpi when it is specified as external package via modules (
Browse files Browse the repository at this point in the history
spack#58)

Also handle prefix/bin correctly
  • Loading branch information
pramodk authored Aug 15, 2018
1 parent 18b310d commit c6d4a94
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 2 deletions.
4 changes: 2 additions & 2 deletions sysconfig/bb5/users/packages.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -71,8 +71,8 @@ packages:
intel-mkl@2018.1.163: /gpfs/bbp.cscs.ch/apps/tools/install/linux-rhel7-x86_64/gcc-4.8.5/intel-mkl-2018.1.163-l32qhs
version: [2018.1.163]
intel-mpi:
paths:
intel-mpi@2018.1.163: /gpfs/bbp.cscs.ch/apps/tools/install/linux-rhel7-x86_64/gcc-4.8.5/intel-mpi-2018.1.163-p7q2uq
modules:
intel-mpi@2018.1.163: intel-mpi/2018.1.163
version: [2018.1.163]
intel-parallel-studio:
modules:
Expand Down
5 changes: 5 additions & 0 deletions var/spack/repos/builtin/packages/intel-mpi/package.py
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,12 @@ def setup_dependent_package(self, module, dep_spec):
# and friends are set to point to the Intel compilers, but in
# practice, mpicc fails to compile some applications while
# mpiicc works.
#
# Also, if intel mpi is an external package then bin directory
# exist in prefix directory already
bindir = self.prefix.compilers_and_libraries.linux.mpi.intel64.bin
if not os.path.exists(bindir):
bindir = self.prefix.bin

if self.compiler.name == 'intel':
self.spec.mpicc = bindir.mpiicc
Expand Down

0 comments on commit c6d4a94

Please sign in to comment.