From 0be4c7dfbdfd1c84a8d2ed97cdb649fdf4e84ed7 Mon Sep 17 00:00:00 2001
From: Glenn Johnson <glenn-johnson@uiowa.edu>
Date: Tue, 12 Jul 2016 07:37:36 -0500
Subject: [PATCH] Changes as discussed in PR review
- removed unneeded entry for `debugger/gdb/intel64_mic`
- set `+mpi` directory name to impi
---
.../packages/intel-parallel-studio/package.py | 18 +++++++-----------
1 file changed, 7 insertions(+), 11 deletions(-)
diff --git a/var/spack/repos/builtin/packages/intel-parallel-studio/package.py b/var/spack/repos/builtin/packages/intel-parallel-studio/package.py
index 223b0ce666..57f03d247f 100644
--- a/var/spack/repos/builtin/packages/intel-parallel-studio/package.py
+++ b/var/spack/repos/builtin/packages/intel-parallel-studio/package.py
@@ -189,10 +189,6 @@ def setup_environment(self, spack_env, run_env):
join_path(self.prefix, 'tbb', 'lib', 'mic'))
if self.spec.satisfies('+all'):
- run_env.prepend_path('PATH',
- join_path(self.prefix,
- 'debugger_{0}'.format(major_ver),
- 'gdb', 'intel64_mic', 'bin'))
run_env.prepend_path('LD_LIBRARY_PATH',
join_path(self.prefix,
'debugger_{0}'.format(major_ver),
@@ -218,21 +214,21 @@ def setup_environment(self, spack_env, run_env):
if (self.spec.satisfies('+all') or self.spec.satisfies('+mpi')) and \
self.spec.satisfies('@cluster'):
run_env.prepend_path('PATH',
- join_path(self.prefix, 'mpi', 'intel64',
+ join_path(self.prefix, 'impi', 'intel64',
'bin'))
run_env.prepend_path('LD_LIBRARY_PATH',
- join_path(self.prefix, 'mpi', 'intel64',
+ join_path(self.prefix, 'impi', 'intel64',
'lib'))
run_env.prepend_path('LIBRARY_PATH',
- join_path(self.prefix, 'mpi', 'intel64',
+ join_path(self.prefix, 'impi', 'intel64',
'lib'))
run_env.prepend_path('LD_LIBRARY_PATH',
- join_path(self.prefix, 'mpi', 'mic', 'lib'))
+ join_path(self.prefix, 'impi', 'mic', 'lib'))
run_env.prepend_path('MIC_LIBRARY_PATH',
- join_path(self.prefix, 'mpi', 'mic', 'lib'))
+ join_path(self.prefix, 'impi', 'mic', 'lib'))
run_env.prepend_path('MIC_LD_LIBRARY_PATH',
- join_path(self.prefix, 'mpi', 'mic', 'lib'))
- run_env.set('I_MPI_ROOT', join_path(self.prefix, 'mpi'))
+ join_path(self.prefix, 'impi', 'mic', 'lib'))
+ run_env.set('I_MPI_ROOT', join_path(self.prefix, 'impi'))
if self.spec.satisfies('+all') or self.spec.satisfies('+mkl'):
run_env.prepend_path('LD_LIBRARY_PATH',
--
GitLab