drop useless definition of NLSPATH in IntelBase, fix ipp library paths #1442
Conversation
This file contains 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
akesandgren
reviewed
Aug 28, 2018
| else: | ||
| nlspath = os.path.join('idb', 'intel64', 'locale', '%l_%t', '%N') | ||
| txt += self.module_generator.prepend_paths('NLSPATH', nlspath) | ||
|
|
akesandgren
previously requested changes
Aug 28, 2018
easybuild/easyblocks/i/ipp.py
Outdated
| @@ -109,12 +109,12 @@ def make_module_req_guess(self): | |||
| guesses = super(EB_ipp, self).make_module_req_guess() | |||
|
|
|||
| if LooseVersion(self.version) >= LooseVersion('9.0'): | |||
| lib_path = os.path.join('lib', self.arch) | |||
| lib_path = [os.path.join('ipp/lib', self.arch), os.path.join('lib', self.arch)] | |||
| include_path = 'ipp/include' | |||
There was a problem hiding this comment.
While we're at it. Use os.path.join all the way, i.e.
lib_path = [os.path.join('ipp', 'lib', self.arch), os.path.join('lib', self.arch)]
include_path = os.path.join('ipp', 'include')
houndci-bot
reviewed
Aug 28, 2018
easybuild/easyblocks/i/ipp.py
Outdated
| 'files': ['ipp/lib/intel64/libipp%s' % y for x in ipp_libs for y in ['%s.a' % x, '%s.%s' % (x, shlib_ext)]], | ||
| 'files': [ | ||
| os.path.join('ipp', 'lib', 'intel64', 'libipp%s') % y for x in ipp_libs | ||
| for y in ['%s.a' % x, '%s.%s' % (x, shlib_ext)] |
There was a problem hiding this comment.
continuation line unaligned for hanging indent
akesandgren
reviewed
Aug 28, 2018
easybuild/easyblocks/i/ipp.py
Outdated
| os.path.join('ipp', 'bin'), | ||
| os.path.join('ipp', 'include'), | ||
| os.path.join('ipp', 'tools', 'intel64') | ||
| ] |
There was a problem hiding this comment.
I would write this slightly different. Something like
dirs = []
ipp_dir_list = ['bin', 'include', os.path.join('tools', 'intel64')]
if LooseVersion ...
add the version specific ones to dirs and ipp_dir_list
dirs.extend(os.path.join('ipp', d)) for d in ipp_dir_list
(At least i think it is extend one should use, but i usually never get that right)
houndci-bot
reviewed
Aug 28, 2018
easybuild/easyblocks/i/ipp.py
Outdated
| @@ -82,21 +83,26 @@ def sanity_check_step(self): | |||
| """Custom sanity check paths for IPP.""" | |||
| shlib_ext = get_shared_lib_ext() | |||
|
|
|||
| dirs = [ os.path.join('ipp', x) for x in ['bin', 'include', os.path.join('tools', 'intel64')]] | |||
akesandgren
dismissed
their stale review
Agreement reached about removing NLSPATH
boegel
changed the title
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
NLSPATHwith idb has been an useless variable for a long time. At least since 2015. More importantly, theippeasyblock has never set correctly the library paths, as the ipp libraries are inipp/lib/intel64, not inlib/intel64(which also exists and has some extra libraries)