diff options
| author | Glenn Johnson <glenn-johnson@uiowa.edu> | 2016-07-12 07:37:36 -0500 |
|---|---|---|
| committer | Glenn Johnson <glenn-johnson@uiowa.edu> | 2016-07-20 20:03:05 -0500 |
| commit | 0be4c7dfbdfd1c84a8d2ed97cdb649fdf4e84ed7 (patch) | |
| tree | 8cc31339afc15c87307f5838d6101d37d2312aa1 | |
| parent | 5e5e36a6596e13c60330b674adf1237fc06f512d (diff) | |
| download | spack-0be4c7dfbdfd1c84a8d2ed97cdb649fdf4e84ed7.tar.gz spack-0be4c7dfbdfd1c84a8d2ed97cdb649fdf4e84ed7.tar.bz2 spack-0be4c7dfbdfd1c84a8d2ed97cdb649fdf4e84ed7.tar.xz spack-0be4c7dfbdfd1c84a8d2ed97cdb649fdf4e84ed7.zip | |
Changes as discussed in PR review
- removed unneeded entry for `debugger/gdb/intel64_mic`
- set `+mpi` directory name to impi
| -rw-r--r-- | var/spack/repos/builtin/packages/intel-parallel-studio/package.py | 18 |
1 files 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 @@ class IntelParallelStudio(IntelInstaller): 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 @@ class IntelParallelStudio(IntelInstaller): 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', |