zhangyiss/spack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Changes as discussed in PR review

Browse Source 
- removed unneeded entry for `debugger/gdb/intel64_mic`
- set `+mpi` directory name to impi
This commit is contained in:
Glenn Johnson 2016-07-12 07:37:36 -05:00
parent 5e5e36a659
commit 0be4c7dfbd
1 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
var/spack/repos/builtin/packages/intel-parallel-studio/package.py
View File

@ -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',