Skip to content
Snippets Groups Projects
Commit 5e5e36a6 authored by Glenn Johnson's avatar Glenn Johnson
Browse files

Fix flake8 errors.

parent 16f67b5b
No related branches found
No related tags found
No related merge requests found
......@@ -184,9 +184,9 @@ def setup_environment(self, spack_env, run_env):
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 @@ 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', '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 @@ def setup_environment(self, spack_env, run_env):
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 @@ def setup_environment(self, spack_env, run_env):
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'))
......@@ -66,7 +66,7 @@ def install(self, spec, prefix):
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 @@ def install(self, spec, prefix):
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 @@ def setup_environment(self, spack_env, run_env):
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'))
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment