Skip to content

Split exts_filter and custom_commands #2

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

Open
Flamefire wants to merge 1 commit into
base: feature-julia_reusedeps
Choose a base branch
from
Open

Split exts_filter and custom_commands #2

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
36 changes: 13 additions & 23 deletions easybuild/easyblocks/generic/juliapackage.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,6 +160,7 @@ def __init__(self, *args, **kwargs):
self._pkgs_to_test_offline = []
self._tmp_test_dir = None
self._installdir_created = False
self.cfg['exts_filter'] = ("julia -e 'using %(ext_name)s'", "")

@property
def julia_version(self) -> str:
Expand Down Expand Up @@ -637,36 +638,25 @@ def sanity_check_step(self, *args, **kwargs):
return (True, "Test dependency, skipping sanity check")

cc_check = LooseVersion(self.julia_version) >= LooseVersion('1.8')
custom_commands = []
if cc_check:
custom_commands.append(_COMPILECACHE_CHECK % {'ext_name': self.name, 'grep_loc': self.name})
custom_paths = {
'files': [],
'dirs': [os.path.join('packages', self.name)],
}

if self.is_extension:
pkg_dir = os.path.join('packages', self.name)

custom_paths = {
'files': [],
'dirs': [pkg_dir],
}

exts_filter = []
if cc_check:
exts_filter.append(_COMPILECACHE_CHECK % {'ext_name': self.name, 'grep_loc': self.name})
exts_filter.append("julia -e 'using %(ext_name)s'")
exts_filter = " && ".join(exts_filter)
self.cfg['exts_filter'] = (exts_filter, "")
else:
# Ensure `pkg_deps` is populated also in `--sanity-check-only` or similar modes
self.include_pkg_dependencies(add_subdeps=False)
custom_paths = {
'files': [],
'dirs': ['packages', 'environments'],
}
custom_commands = []
if not self.is_extension:
custom_paths['dirs'].append('environments')
if cc_check:
# Ensure `pkg_deps` is populated also in `--sanity-check-only` or similar modes
self.include_pkg_dependencies(add_subdeps=False)
for dep, _ in self.pkg_deps:
custom_commands.append(
_COMPILECACHE_CHECK % {'ext_name': dep, 'grep_loc': dep}
)
kwargs.setdefault('custom_commands', []).extend(custom_commands)

kwargs.setdefault('custom_commands', []).extend(custom_commands)
kwargs.update({'custom_paths': custom_paths})

return super().sanity_check_step(*args, **kwargs)
Expand Down