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

Fix flake8 errors.

Browse Source
This commit is contained in:
Glenn Johnson
2016-07-10 21:59:46 -05:00
parent 16f67b5bb1
commit 5e5e36a659
2 changed files with 23 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -184,9 +184,9 @@ def setup_environment(self, spack_env, run_env):
run_env.prepend_path('MIC_LD_LIBRARY_PATH', run_env.prepend_path('MIC_LD_LIBRARY_PATH',
join_path(self.prefix, 'lib', 'mic')) join_path(self.prefix, 'lib', 'mic'))
run_env.prepend_path('MIC_LIBRARY_PATH', 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', 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'): if self.spec.satisfies('+all'):
run_env.prepend_path('PATH', 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 \ if (self.spec.satisfies('+all') or self.spec.satisfies('+mpi')) and \
self.spec.satisfies('@cluster'): self.spec.satisfies('@cluster'):
run_env.prepend_path('PATH', 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', 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', 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', run_env.prepend_path('LD_LIBRARY_PATH',
join_path(self.prefix, 'mpi', 'mic', 'lib')) join_path(self.prefix, 'mpi', 'mic', 'lib'))
run_env.prepend_path('MIC_LIBRARY_PATH', 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'): if self.spec.satisfies('+all') or self.spec.satisfies('+mkl'):
run_env.prepend_path('LD_LIBRARY_PATH', 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', 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', run_env.prepend_path('CPATH',
join_path(self.prefix, 'mkl', 'include')) join_path(self.prefix, 'mkl', 'include'))
run_env.prepend_path('MIC_LD_LIBRARY_PATH', 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')) run_env.set('MKLROOT', join_path(self.prefix, 'mkl'))
if self.spec.satisfies('+all') or self.spec.satisfies('+daal'): 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'): if self.spec.satisfies('+all') or self.spec.satisfies('+ipp'):
run_env.prepend_path('LD_LIBRARY_PATH', 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', 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', run_env.prepend_path('CPATH',
join_path(self.prefix, 'ipp', 'include')) join_path(self.prefix, 'ipp', 'include'))
run_env.prepend_path('MIC_LD_LIBRARY_PATH', 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')) run_env.set('IPPROOT', join_path(self.prefix, 'ipp'))

11
var/spack/repos/builtin/packages/intel/package.py
View File

@@ -66,7 +66,7 @@ def install(self, spec, prefix):
CONTINUE_WITH_OPTIONAL_ERROR=yes CONTINUE_WITH_OPTIONAL_ERROR=yes
COMPONENTS=%s COMPONENTS=%s
""" % (self.intel_prefix, self.intel_prefix, self.global_license_file, """ % (self.intel_prefix, self.intel_prefix, self.global_license_file,
self.intel_components)) self.intel_components))
install_script = Executable("./install.sh") install_script = Executable("./install.sh")
install_script('--silent', silent_config_filename) install_script('--silent', silent_config_filename)
@@ -106,8 +106,8 @@ def install(self, spec, prefix):
self.prefix.lib, "intel64", "libimf.a")))[0] self.prefix.lib, "intel64", "libimf.a")))[0]
# symlink or copy? # symlink or copy?
os.symlink(self.global_license_file, os.path.join(absbindir, os.symlink(self.global_license_file,
"license.lic")) os.path.join(absbindir, "license.lic"))
if spec.satisfies('+rpath'): if spec.satisfies('+rpath'):
for compiler_command in ["icc", "icpc", "ifort"]: 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', run_env.prepend_path('MIC_LD_LIBRARY_PATH',
join_path(self.prefix, 'lib', 'mic')) join_path(self.prefix, 'lib', 'mic'))
run_env.prepend_path('MIC_LIBRARY_PATH', 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', run_env.prepend_path('MIC_LD_LIBRARY_PATH',
join_path(self.prefix, 'tbb','lib', 'mic')) join_path(self.prefix, 'tbb', 'lib', 'mic'))