Skip to content

fix setting of $INTEL_LICENSE_FILE for port@server values #635

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
boegel merged 2 commits into from
Jul 2, 2015
Merged

fix setting of $INTEL_LICENSE_FILE for port@server values #635

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b8e14d2
move common parts of make_module_extra to IntelBase easyblock
boegel Jul 1, 2015
8f630e8
disable expand_relpaths for license file env var prepend-path stateme…
boegel Jul 2, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 15 additions & 0 deletions easybuild/easyblocks/generic/intelbase.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -345,6 +345,21 @@ def move_after_install(self):
except OSError, err:
raise EasyBuildError("Failed to move contents of %s to %s: %s", subdir, self.installdir, err)

def make_module_extra(self):
"""Custom variable definitions in module file."""
txt = super(IntelBase, self).make_module_extra()

txt += self.module_generator.prepend_paths(self.license_env_var, [self.license_file],
allow_abs=True, expand_relpaths=False)

if self.cfg['m32']:
nlspath = os.path.join('idb', '32', 'locale', '%l_%t', '%N')
else:
nlspath = os.path.join('idb', 'intel64', 'locale', '%l_%t', '%N')
txt += self.module_generator.prepend_paths('NLSPATH', nlspath)

return txt

def cleanup_step(self):
"""Cleanup leftover mess

Expand Down
7 changes: 0 additions & 7 deletions easybuild/easyblocks/i/icc.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,10 +155,3 @@ def make_module_req_guess(self):
dirmap[k].append(v2)

return dirmap

def make_module_extra(self):
"""Add extra environment variables for icc, for license file and NLS path."""
txt = super(EB_icc, self).make_module_extra()
txt += self.module_generator.prepend_paths(self.license_env_var, [self.license_file], allow_abs=True)
txt += self.module_generator.prepend_paths('NLSPATH', os.path.join('idb', 'intel64', 'locale', '%l_%t', '%N'))
return txt
6 changes: 0 additions & 6 deletions easybuild/easyblocks/i/imkl.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,12 +139,6 @@ def make_module_req_guess(self):
def make_module_extra(self):
"""Overwritten from Application to add extra txt"""
txt = super(EB_imkl, self).make_module_extra()
txt += self.module_generator.prepend_paths(self.license_env_var, [self.license_file], allow_abs=True)
if self.cfg['m32']:
nlspath = os.path.join('idb', '32', 'locale', '%l_%t', '%N')
else:
nlspath = os.path.join('idb', 'intel64', 'locale', '%l_%t', '%N')
txt += self.module_generator.prepend_paths('NLSPATH', nlspath)
txt += self.module_generator.set_environment('MKLROOT', os.path.join(self.installdir, 'mkl'))
return txt

Expand Down
1 change: 0 additions & 1 deletion easybuild/easyblocks/i/impi.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,6 @@ def make_module_req_guess(self):
def make_module_extra(self):
"""Overwritten from Application to add extra txt"""
txt = super(EB_impi, self).make_module_extra()
txt += self.module_generator.prepend_paths(self.license_env_var, [self.license_file], allow_abs=True)
txt += self.module_generator.set_environment('I_MPI_ROOT', self.installdir)
if self.cfg['set_mpi_wrappers_compiler'] or self.cfg['set_mpi_wrappers_all']:
for var in ['CC', 'CXX', 'F77', 'F90', 'FC']:
Expand Down
8 changes: 0 additions & 8 deletions easybuild/easyblocks/i/inspector.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,14 +79,6 @@ def make_module_req_guess(self):

return guesses

def make_module_extra(self):
"""Custom variable definitions in module file."""

txt = super(EB_Inspector, self).make_module_extra()
txt += self.module_generator.prepend_paths(self.license_env_var, self.license_file, allow_abs=True)

return txt

def sanity_check_step(self):
"""Custom sanity check paths for Intel Inspector."""

Expand Down
1 change: 0 additions & 1 deletion easybuild/easyblocks/i/itac.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,6 @@ def make_module_req_guess(self):
def make_module_extra(self):
"""Overwritten from IntelBase to add extra txt"""
txt = super(EB_itac, self).make_module_extra()
txt += self.module_generator.prepend_paths(self.license_env_var, [self.license_file], allow_abs=True)
txt += self.module_generator.set_environment('VT_ROOT', self.installdir)
txt += self.module_generator.set_environment('VT_MPI', self.cfg['preferredmpi'])
txt += self.module_generator.set_environment('VT_ADD_LIBS', "-ldwarf -lelf -lvtunwind -lnsl -lm -ldl -lpthread")
Expand Down
8 changes: 0 additions & 8 deletions easybuild/easyblocks/v/vtune.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,14 +80,6 @@ def make_module_req_guess(self):

return guesses

def make_module_extra(self):
"""Custom variable definitions in module file."""

txt = super(EB_VTune, self).make_module_extra()
txt += self.module_generator.prepend_paths(self.license_env_var, self.license_file, allow_abs=True)

return txt

def sanity_check_step(self):
"""Custom sanity check paths for Intel VTune."""

Expand Down