update easyblocks for Intel tools to support 2016 versions #756
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -30,13 +30,17 @@ | |
| @author: Kenneth Hoste (Ghent University) | ||
| @author: Pieter De Baets (Ghent University) | ||
| @author: Jens Timmerman (Ghent University) | ||
| @author: Ward Poelmans (Ghent University) | ||
|
Member
Author
There was a problem hiding this comment. @DirkdeDraak You didn't add yourself to the list of authors. What should I add? |
||
| @author: Fokko Masselink | ||
| """ | ||
|
|
||
| import os | ||
| import re | ||
| from distutils.version import LooseVersion | ||
|
|
||
| from easybuild.easyblocks.generic.intelbase import IntelBase, ACTIVATION_NAME_2012, COMP_ALL | ||
| from easybuild.easyblocks.generic.intelbase import LICENSE_FILE_NAME_2012 | ||
| from easybuild.easyblocks.t.tbb import get_tbb_gccprefix | ||
| from easybuild.tools.run import run_cmd | ||
|
|
||
|
|
||
|
|
@@ -58,6 +62,18 @@ class EB_icc(IntelBase): | |
| - will fail for all older versions (due to newer silent installer) | ||
| """ | ||
|
|
||
| def __init__(self, *args, **kwargs): | ||
| """Constructor, initialize class variables.""" | ||
| super(EB_icc, self).__init__(*args, **kwargs) | ||
|
|
||
| self.debuggerpath = None | ||
|
|
||
| if LooseVersion(self.version) >= LooseVersion('2016') and self.cfg['components'] is None: | ||
| # we need to use 'ALL' by default, using 'DEFAULTS' results in key things not being installed (e.g. bin/icc) | ||
| self.cfg['components'] = [COMP_ALL] | ||
| self.log.debug("Nothing specified for components, but required for version 2016, using %s instead", | ||
| self.cfg['components']) | ||
|
|
||
| def install_step(self): | ||
| """ | ||
| Actual installation | ||
|
|
@@ -79,79 +95,128 @@ def install_step(self): | |
| def sanity_check_step(self): | ||
| """Custom sanity check paths for icc.""" | ||
|
|
||
| binprefix = 'bin/intel64' | ||
| libprefix = 'lib/intel64' | ||
| if LooseVersion(self.version) >= LooseVersion('2011'): | ||
| if LooseVersion(self.version) <= LooseVersion('2011.3.174'): | ||
| binprefix = 'bin' | ||
| elif LooseVersion(self.version) >= LooseVersion('2013_sp1'): | ||
| binprefix = 'bin' | ||
| else: | ||
| libprefix = 'compiler/lib/intel64' | ||
|
|
||
| binfiles = ['icc', 'icpc'] | ||
| if LooseVersion(self.version) < LooseVersion('2014'): | ||
| binfiles += ['idb'] | ||
|
|
||
| binaries = [os.path.join(binprefix, f) for f in binfiles] | ||
| libraries = [os.path.join(libprefix, 'lib%s' % l) for l in ['iomp5.a', 'iomp5.so']] | ||
| sanity_check_files = binaries + libraries | ||
| if LooseVersion(self.version) > LooseVersion('2015'): | ||
| sanity_check_files.append('include/omp.h') | ||
|
|
||
| custom_paths = { | ||
| 'files': sanity_check_files, | ||
| 'dirs': [], | ||
| } | ||
|
|
||
| super(EB_icc, self).sanity_check_step(custom_paths=custom_paths) | ||
|
|
||
| def make_module_req_guess(self): | ||
| """ | ||
| Additional paths to consider for prepend-paths statements in module file | ||
| """ | ||
| prefix = None | ||
|
|
||
| # guesses per environment variables | ||
| # some of these paths only apply to certain versions, but that doesn't really matter | ||
| # existence of paths is checked by module generator before 'prepend-paths' statements are included | ||
| guesses = { | ||
| 'CLASSPATH': ['daal/lib/daal.jar'], | ||
| # 'include' is deliberately omitted, including it causes problems, e.g. with complex.h and std::complex | ||
| # cfr. https://software.intel.com/en-us/forums/intel-c-compiler/topic/338378 | ||
| 'CPATH': ['daal/include', 'ipp/include', 'mkl/include', 'tbb/include'], | ||
| 'DAALROOT': ['daal'], | ||
| 'IDB_HOME': ['bin/intel64'], | ||
| 'IPPROOT': ['ipp'], | ||
| 'LD_LIBRARY_PATH': ['lib'], | ||
| 'LIBRARY_PATH': ['lib'], | ||
| 'MANPATH': ['debugger/gdb/intel64/share/man', 'man', 'man/common', 'man/en_US', 'share/man'], | ||
| 'PATH': ['bin'], | ||
| 'TBBROOT': ['tbb'], | ||
| } | ||
|
|
||
| if self.cfg['m32']: | ||
| # 32-bit toolchain | ||
| guesses['PATH'].extend(['bin/ia32', 'tbb/bin/ia32']) | ||
| # in the end we set 'LIBRARY_PATH' equal to 'LD_LIBRARY_PATH' | ||
| guesses['LD_LIBRARY_PATH'].append('lib/ia32') | ||
|
|
||
| else: | ||
| # 64-bit toolkit | ||
| guesses['PATH'].extend([ | ||
| 'bin/intel64', | ||
| 'debugger/gdb/intel64/bin', | ||
| 'ipp/bin/intel64', | ||
| 'mpi/intel64/bin', | ||
| 'tbb/bin/emt64', | ||
| 'tbb/bin/intel64', | ||
| ]) | ||
|
|
||
| # in the end we set 'LIBRARY_PATH' equal to 'LD_LIBRARY_PATH' | ||
| guesses['LD_LIBRARY_PATH'].extend([ | ||
| 'compiler/lib/intel64', | ||
| 'debugger/ipt/intel64/lib', | ||
| 'ipp/lib/intel64', | ||
| 'mkl/lib/intel64', | ||
| 'mpi/intel64', | ||
| 'tbb/lib/intel64/%s' % get_tbb_gccprefix(), | ||
| ]) | ||
|
|
||
| if LooseVersion(self.version) < LooseVersion('2016'): | ||
| prefix = 'composer-xe-%s' % self.version | ||
|
|
||
| # debugger is dependent on $INTEL_PYTHONHOME since version 2015 and newer | ||
| if LooseVersion(self.version) >= LooseVersion('2015'): | ||
| self.debuggerpath = os.path.join('composer-xe-%s' % self.version.split('.')[0], 'debugger') | ||
|
|
||
| else: | ||
| # new directory layout for Intel Parallel Studio XE 2016 | ||
| # https://software.intel.com/en-us/articles/new-directory-layout-for-intel-parallel-studio-xe-2016 | ||
| prefix = 'compilers_and_libraries_%s/linux' % self.version | ||
| # Debugger requires INTEL_PYTHONHOME, which only allows for a single value | ||
| self.debuggerpath = 'debugger_%s' % self.version.split('.')[0] | ||
|
|
||
| guesses['LD_LIBRARY_PATH'].extend([ | ||
| os.path.join(self.debuggerpath, 'libipt/intel64/lib'), | ||
| 'daal/lib/intel64_lin', | ||
| ]) | ||
|
|
||
| # 'lib/intel64' is deliberately listed last, so it gets precedence over subdirs | ||
| guesses['LD_LIBRARY_PATH'].append('lib/intel64') | ||
|
|
||
| guesses['LIBRARY_PATH'] = guesses['LD_LIBRARY_PATH'] | ||
|
|
||
| # set debugger path | ||
| if self.debuggerpath: | ||
| guesses['PATH'].append(os.path.join(self.debuggerpath, 'gdb', 'intel64', 'bin')) | ||
|
|
||
| # in recent Intel compiler distributions, the actual binaries are | ||
| # in deeper directories, and symlinked in top-level directories | ||
| # however, not all binaries are symlinked (e.g. mcpcom is not) | ||
| if prefix and os.path.isdir(os.path.join(self.installdir, prefix)): | ||
| for key, subdirs in guesses.items(): | ||
| guesses[key].extend([os.path.join(prefix, subdir) for subdir in subdirs]) | ||
|
|
||
| return guesses | ||
|
|
||
| def make_module_extra(self): | ||
| """Additional custom variables for icc: $INTEL_PYTHONHOME.""" | ||
| txt = super(EB_icc, self).make_module_extra() | ||
|
|
||
| if self.debuggerpath: | ||
| intel_pythonhome = os.path.join(self.installdir, self.debuggerpath, 'python', 'intel64') | ||
| if os.path.isdir(intel_pythonhome): | ||
| txt += self.module_generator.set_environment('INTEL_PYTHONHOME', intel_pythonhome) | ||
|
|
||
| return txt | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
only here we need to actually parse
mediaconfig.xml, so only do it here?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Now I can print the list of components available when using
ALLin debug mode. Lets keep that.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
ok, sure, but it does mean there's no way around if mediaconfig.xml is not available for some reason...
unless you allow that mediaconfig.xml is not available above, and only complain here if
available_componentsisNoneThere was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'm going to
raiseifmediaconfig.xmlis not found. It has no point specifying components if it's not there.