summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--var/spack/repos/builtin/packages/intel-parallel-studio/package.py30
-rw-r--r--var/spack/repos/builtin/packages/intel/package.py11
2 files changed, 23 insertions, 18 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 068306985f..223b0ce666 100644
--- a/var/spack/repos/builtin/packages/intel-parallel-studio/package.py
+++ b/var/spack/repos/builtin/packages/intel-parallel-studio/package.py
@@ -184,9 +184,9 @@ class IntelParallelStudio(IntelInstaller):
run_env.prepend_path('MIC_LD_LIBRARY_PATH',
join_path(self.prefix, 'lib', 'mic'))
run_env.prepend_path('MIC_LIBRARY_PATH',
- join_path(self.prefix, 'tbb','lib', 'mic'))
+ join_path(self.prefix, 'tbb', 'lib', 'mic'))
run_env.prepend_path('MIC_LD_LIBRARY_PATH',
- join_path(self.prefix, 'tbb','lib', 'mic'))
+ join_path(self.prefix, 'tbb', 'lib', 'mic'))
if self.spec.satisfies('+all'):
run_env.prepend_path('PATH',
@@ -218,11 +218,14 @@ 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', 'bin'))
+ join_path(self.prefix, 'mpi', 'intel64',
+ 'bin'))
run_env.prepend_path('LD_LIBRARY_PATH',
- join_path(self.prefix, 'mpi', 'intel64', 'lib'))
+ join_path(self.prefix, 'mpi', 'intel64',
+ 'lib'))
run_env.prepend_path('LIBRARY_PATH',
- join_path(self.prefix, 'mpi', 'intel64', 'lib'))
+ join_path(self.prefix, 'mpi', 'intel64',
+ 'lib'))
run_env.prepend_path('LD_LIBRARY_PATH',
join_path(self.prefix, 'mpi', 'mic', 'lib'))
run_env.prepend_path('MIC_LIBRARY_PATH',
@@ -233,13 +236,15 @@ class IntelParallelStudio(IntelInstaller):
if self.spec.satisfies('+all') or self.spec.satisfies('+mkl'):
run_env.prepend_path('LD_LIBRARY_PATH',
- join_path(self.prefix, 'mkl', 'lib', 'intel64'))
+ join_path(self.prefix, 'mkl', 'lib',
+ 'intel64'))
run_env.prepend_path('LIBRARY_PATH',
- join_path(self.prefix, 'mkl', 'lib', 'intel64'))
+ join_path(self.prefix, 'mkl', 'lib',
+ 'intel64'))
run_env.prepend_path('CPATH',
join_path(self.prefix, 'mkl', 'include'))
run_env.prepend_path('MIC_LD_LIBRARY_PATH',
- join_path(self.prefix, 'mkl','lib', 'mic'))
+ join_path(self.prefix, 'mkl', 'lib', 'mic'))
run_env.set('MKLROOT', join_path(self.prefix, 'mkl'))
if self.spec.satisfies('+all') or self.spec.satisfies('+daal'):
@@ -258,12 +263,13 @@ class IntelParallelStudio(IntelInstaller):
if self.spec.satisfies('+all') or self.spec.satisfies('+ipp'):
run_env.prepend_path('LD_LIBRARY_PATH',
- join_path(self.prefix, 'ipp', 'lib', 'intel64'))
+ join_path(self.prefix, 'ipp', 'lib',
+ 'intel64'))
run_env.prepend_path('LIBRARY_PATH',
- join_path(self.prefix, 'ipp', 'lib', 'intel64'))
+ join_path(self.prefix, 'ipp', 'lib',
+ 'intel64'))
run_env.prepend_path('CPATH',
join_path(self.prefix, 'ipp', 'include'))
run_env.prepend_path('MIC_LD_LIBRARY_PATH',
- join_path(self.prefix, 'ipp','lib', 'mic'))
+ join_path(self.prefix, 'ipp', 'lib', 'mic'))
run_env.set('IPPROOT', join_path(self.prefix, 'ipp'))
-
diff --git a/var/spack/repos/builtin/packages/intel/package.py b/var/spack/repos/builtin/packages/intel/package.py
index 7988926e6d..d171411946 100644
--- a/var/spack/repos/builtin/packages/intel/package.py
+++ b/var/spack/repos/builtin/packages/intel/package.py
@@ -66,7 +66,7 @@ PHONEHOME_SEND_USAGE_DATA=no
CONTINUE_WITH_OPTIONAL_ERROR=yes
COMPONENTS=%s
""" % (self.intel_prefix, self.intel_prefix, self.global_license_file,
- self.intel_components))
+ self.intel_components))
install_script = Executable("./install.sh")
install_script('--silent', silent_config_filename)
@@ -106,8 +106,8 @@ class Intel(IntelInstaller):
self.prefix.lib, "intel64", "libimf.a")))[0]
# symlink or copy?
- os.symlink(self.global_license_file, os.path.join(absbindir,
- "license.lic"))
+ os.symlink(self.global_license_file,
+ os.path.join(absbindir, "license.lic"))
if spec.satisfies('+rpath'):
for compiler_command in ["icc", "icpc", "ifort"]:
@@ -147,7 +147,6 @@ class Intel(IntelInstaller):
run_env.prepend_path('MIC_LD_LIBRARY_PATH',
join_path(self.prefix, 'lib', 'mic'))
run_env.prepend_path('MIC_LIBRARY_PATH',
- join_path(self.prefix, 'tbb','lib', 'mic'))
+ join_path(self.prefix, 'tbb', 'lib', 'mic'))
run_env.prepend_path('MIC_LD_LIBRARY_PATH',
- join_path(self.prefix, 'tbb','lib', 'mic'))
-
+ join_path(self.prefix, 'tbb', 'lib', 'mic'))