Skip to content

enhance Bundle easyblock to allow installation of bundle components with additional easyblocks + build components in parallel #1598

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
vanzod merged 2 commits into from
Dec 7, 2018
Merged

enhance Bundle easyblock to allow installation of bundle components with additional easyblocks + build components in parallel #1598

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
dc87756
enhance Bundle easyblock to allow installation of bundle components w…
boegel Dec 7, 2018
aea7b54
call set_parallel method in Bundle easyblock to build components in p…
boegel Dec 7, 2018
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
25 changes: 18 additions & 7 deletions easybuild/easyblocks/generic/bundle.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
@author: Pieter De Baets (Ghent University)
@author: Jens Timmerman (Ghent University)
"""
import copy
import os

import easybuild.tools.environment as env
Expand Down Expand Up @@ -86,6 +87,18 @@ def __init__(self, *args, **kwargs):

cfg = self.cfg.copy()

easyblock = comp_specs.get('easyblock') or self.cfg['default_easyblock']
if easyblock is None:
raise EasyBuildError("No easyblock specified for component %s v%s", cfg['name'], cfg['version'])
elif easyblock == 'Bundle':
raise EasyBuildError("The Bundle easyblock can not be used to install components in a bundle")

cfg.easyblock = get_easyblock_class(easyblock, name=cfg['name'])

# make sure that extra easyconfig parameters are known, so they can be set
extra_opts = cfg.easyblock.extra_options()
cfg.extend_params(copy.deepcopy(extra_opts))

cfg['name'] = comp_name
cfg['version'] = comp_version
cfg.generate_template_values()
Expand Down Expand Up @@ -162,21 +175,19 @@ def install_step(self):
"""Install components, if specified."""
comp_cnt = len(self.cfg['components'])
for idx, cfg in enumerate(self.comp_cfgs):
easyblock = cfg.get('easyblock') or self.cfg['default_easyblock']
if easyblock is None:
raise EasyBuildError("No easyblock specified for component %s v%s", cfg['name'], cfg['version'])
elif easyblock == 'Bundle':
raise EasyBuildError("The '%s' easyblock can not be used to install components in a bundle", easyblock)

print_msg("installing bundle component %s v%s (%d/%d)..." % (cfg['name'], cfg['version'], idx+1, comp_cnt))
self.log.info("Installing component %s v%s using easyblock %s", cfg['name'], cfg['version'], easyblock)
self.log.info("Installing component %s v%s using easyblock %s", cfg['name'], cfg['version'], cfg.easyblock)

comp = get_easyblock_class(easyblock, name=cfg['name'])(cfg)
comp = cfg.easyblock(cfg)

# correct build/install dirs
comp.builddir = self.builddir
comp.install_subdir, comp.installdir = self.install_subdir, self.installdir

# make sure we can build in parallel
comp.set_parallel()

# figure out correct start directory
comp.guess_start_dir()

Expand Down
3 changes: 3 additions & 0 deletions easybuild/easyblocks/generic/pythonpackage.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -404,6 +404,9 @@ def prepare_step(self, *args, **kwargs):
def configure_step(self):
"""Configure Python package build/install."""

if self.python_cmd is None:
self.prepare_python()

if self.sitecfg is not None:
# used by some extensions, like numpy, to find certain libs

Expand Down