Skip to content

deprecate use of True in favour of SYSTEM for system-toolchain dependencies in easyconfigs using a recent toolchain version (>2019b) #16384

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
merged 9 commits into from
Oct 13, 2022
Merged

deprecate use of True in favour of SYSTEM for system-toolchain dependencies in easyconfigs using a recent toolchain version (>2019b) #16384

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
a6fe5e9
deprecate use of True to indicate system-toolchain dependency in favo…
jfgrimm Oct 11, 2022
9fc3b9b
remove unused import
jfgrimm Oct 11, 2022
3e5c13c
Merge branch 'develop' of https://github.com/easybuilders/easybuild-e…
boegel Oct 12, 2022
84d47b9
exclude older toolchain easyconfigs from SYSTEM template constant check
jfgrimm Oct 12, 2022
a9afaa4
linting
jfgrimm Oct 12, 2022
f99a929
fix logic and re-instate original test for easyconfigs excluded from …
jfgrimm Oct 12, 2022
f441f62
also exempt old toolchains of the form 201X.YZ
jfgrimm Oct 12, 2022
9dfd270
switch to SYSTEM template constant in the remaining easyconfigs overl…
jfgrimm Oct 12, 2022
681e726
line length
jfgrimm Oct 12, 2022
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
2 changes: 1 addition & 1 deletion easybuild/easyconfigs/a/AlphaFold/AlphaFold-2.1.2-foss-2021a-CUDA-11.3.1.eb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ dependencies = [
('Kalign', '3.3.1'),
('jax', '0.2.24', versionsuffix), # also provides absl-py
('UCX-CUDA', '1.10.0', versionsuffix),
('cuDNN', '8.2.1.32', versionsuffix, True),
('cuDNN', '8.2.1.32', versionsuffix, SYSTEM),
('NCCL', '2.10.3', versionsuffix),
('OpenMM', '7.5.1', '-DeepMind-patch'),
]
Expand Down
2 changes: 1 addition & 1 deletion easybuild/easyconfigs/a/AlphaFold/AlphaFold-2.2.2-foss-2021a-CUDA-11.3.1.eb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ dependencies = [
('Kalign', '3.3.1'),
('jax', '0.3.9', versionsuffix), # also provides absl-py
('UCX-CUDA', '1.10.0', versionsuffix),
('cuDNN', '8.2.1.32', versionsuffix, True),
('cuDNN', '8.2.1.32', versionsuffix, SYSTEM),
('NCCL', '2.10.3', versionsuffix),
('OpenMM', '7.5.1', '-DeepMind-patch'),
]
Expand Down
2 changes: 1 addition & 1 deletion easybuild/easyconfigs/d/dlib/dlib-19.22-foss-2021a-CUDA-11.3.1.eb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ builddependencies = [
]
dependencies = [
('CUDA', '11.3.1', '', SYSTEM),
('cuDNN', '8.2.1.32', versionsuffix, True),
('cuDNN', '8.2.1.32', versionsuffix, SYSTEM),
]

sanity_check_paths = {
Expand Down
2 changes: 1 addition & 1 deletion easybuild/easyconfigs/f/FastFold/FastFold-20220729-foss-2021a-CUDA-11.3.1.eb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ dependencies = [
('HMMER', '3.3.2'),
('Kalign', '3.3.1'),
('UCX-CUDA', '1.10.0', versionsuffix),
('cuDNN', '8.2.1.32', versionsuffix, True),
('cuDNN', '8.2.1.32', versionsuffix, SYSTEM),
('NCCL', '2.10.3', versionsuffix),
('dm-tree', '0.1.6'),
('einops', '0.4.1'),
Expand Down
2 changes: 1 addition & 1 deletion easybuild/easyconfigs/j/jax/jax-0.2.24-foss-2021a-CUDA-11.3.1.eb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ builddependencies = [

dependencies = [
('CUDA', '11.3.1', '', SYSTEM),
('cuDNN', '8.2.1.32', versionsuffix, True),
('cuDNN', '8.2.1.32', versionsuffix, SYSTEM),
('NCCL', '2.10.3', versionsuffix),
('Python', '3.9.5'),
('SciPy-bundle', '2021.05'),
Expand Down
2 changes: 1 addition & 1 deletion easybuild/easyconfigs/j/jax/jax-0.3.14-foss-2022a-CUDA-11.7.0.eb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ builddependencies = [

dependencies = [
('CUDA', '11.7.0', '', SYSTEM),
('cuDNN', '8.4.1.50', versionsuffix, True),
('cuDNN', '8.4.1.50', versionsuffix, SYSTEM),
('NCCL', '2.12.12', versionsuffix),
('Python', '3.10.4'),
('SciPy-bundle', '2022.05'),
Expand Down
2 changes: 1 addition & 1 deletion easybuild/easyconfigs/j/jax/jax-0.3.9-foss-2021a-CUDA-11.3.1.eb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ builddependencies = [

dependencies = [
('CUDA', '11.3.1', '', SYSTEM),
('cuDNN', '8.2.1.32', versionsuffix, True),
('cuDNN', '8.2.1.32', versionsuffix, SYSTEM),
('NCCL', '2.10.3', versionsuffix),
('Python', '3.9.5'),
('SciPy-bundle', '2021.05'),
Expand Down
2 changes: 1 addition & 1 deletion easybuild/easyconfigs/l/LDC/LDC-1.30.0-GCCcore-11.3.0.eb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ builddependencies = [
('CMake', '3.23.1'),
('Ninja', '1.10.2'),
# building LDC from source requires LDC
('LDC', '1.24.0', '-%(arch)s', True),
('LDC', '1.24.0', '-%(arch)s', SYSTEM),
]

dependencies = [
Expand Down
2 changes: 1 addition & 1 deletion easybuild/easyconfigs/o/OpenFold/OpenFold-1.0.0-foss-2021a-CUDA-11.3.1.eb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ dependencies = [
('HMMER', '3.3.2'),
('Kalign', '3.3.1'),
('UCX-CUDA', '1.10.0', versionsuffix),
('cuDNN', '8.2.1.32', versionsuffix, True),
('cuDNN', '8.2.1.32', versionsuffix, SYSTEM),
('NCCL', '2.10.3', versionsuffix),
('dm-tree', '0.1.6'),
('einops', '0.4.1'),
Expand Down
4 changes: 2 additions & 2 deletions easybuild/easyconfigs/p/PyTorch/PyTorch-1.12.0-foss-2022a-CUDA-11.7.0.eb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ builddependencies = [
('hypothesis', '6.46.7'),
]
dependencies = [
('CUDA', '11.7.0', '', True),
('CUDA', '11.7.0', '', SYSTEM),
('Ninja', '1.10.2'), # Required for JIT compilation of C++ extensions
('Python', '3.10.4'),
('protobuf', '3.19.4'),
Expand All @@ -64,7 +64,7 @@ dependencies = [
('numactl', '2.0.14'),
('FFmpeg', '4.4.2'),
('Pillow', '9.1.1'),
('cuDNN', '8.4.1.50', '-CUDA-%(cudaver)s', True),
('cuDNN', '8.4.1.50', '-CUDA-%(cudaver)s', SYSTEM),
('magma', '2.6.2', '-CUDA-%(cudaver)s'),
('NCCL', '2.12.12', '-CUDA-%(cudaver)s'),
('expecttest', '0.1.3'),
Expand Down
2 changes: 1 addition & 1 deletion easybuild/easyconfigs/t/TensorFlow/TensorFlow-2.5.3-foss-2021a-CUDA-11.3.1.eb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ builddependencies = [
]
dependencies = [
('CUDA', '11.3.1', '', SYSTEM),
('cuDNN', '8.2.1.32', versionsuffix, True),
('cuDNN', '8.2.1.32', versionsuffix, SYSTEM),
('NCCL', '2.10.3', versionsuffix),
('Python', '3.9.5'),
('h5py', '3.2.1'),
Expand Down
2 changes: 1 addition & 1 deletion easybuild/easyconfigs/t/TensorFlow/TensorFlow-2.6.0-foss-2021a-CUDA-11.3.1.eb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ builddependencies = [
]
dependencies = [
('CUDA', '11.3.1', '', SYSTEM),
('cuDNN', '8.2.1.32', versionsuffix, True),
('cuDNN', '8.2.1.32', versionsuffix, SYSTEM),
('NCCL', '2.10.3', versionsuffix),
('Python', '3.9.5'),
('h5py', '3.2.1'),
Expand Down
2 changes: 1 addition & 1 deletion easybuild/easyconfigs/t/TensorFlow/TensorFlow-2.7.1-foss-2021b-CUDA-11.4.1.eb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ builddependencies = [
]
dependencies = [
('CUDA', '11.4.1', '', SYSTEM),
('cuDNN', '8.2.2.26', versionsuffix, True),
('cuDNN', '8.2.2.26', versionsuffix, SYSTEM),
('NCCL', '2.10.3', versionsuffix),
('Python', '3.9.6'),
('h5py', '3.6.0'),
Expand Down
2 changes: 1 addition & 1 deletion ...ild/easyconfigs/t/torchvision/torchvision-0.12.0-foss-2021a-PyTorch-1.11.0-CUDA-11.3.1.eb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ checksums = ['99e6d3d304184895ff4f6152e2d2ec1cbec89b3e057d9c940ae0125546b04e91']
builddependencies = [('CMake', '3.20.1')]

dependencies = [
('CUDA', '11.3.1', '', True),
('CUDA', '11.3.1', '', SYSTEM),
('Python', '3.9.5'),
('Pillow-SIMD', '8.2.0'),
('PyTorch', local_pytorch_version, '-CUDA-%(cudaver)s'),
Expand Down
18 changes: 14 additions & 4 deletions test/easyconfigs/easyconfigs.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1425,6 +1425,11 @@ def template_easyconfig_test(self, spec):
orig_val = resolve_template(ec_dict[key], ec.template_values)
dumped_val = resolve_template(dumped_ec[key], ec.template_values)

# skip SYSTEM template constant check for 2019b and older toolchain generation easyconfigs
# since these fail other CI checks when updated
regex = re.compile(r'(201\d([ab]|\.\d+))|(^[1-8]\.\d+\.\d+)')
skip_system_template_check = regex.match(ec['toolchain']['version'])

# take into account that dumped value for *dependencies may include hard-coded subtoolchains
# if no easyconfig was found for the dependency with the 'parent' toolchain,
# if may get resolved using a subtoolchain, which is then hardcoded in the dumped easyconfig
Expand Down Expand Up @@ -1452,11 +1457,16 @@ def template_easyconfig_test(self, spec):
# 4th value is toolchain spec
if len(dumped_dep) >= 4:
if len(orig_dep) >= 4:
# if True was used to indicate that dependency should use system toolchain,
# then we need to compare the value for the dumped easyconfig more carefully;
# see also https://github.com/easybuilders/easybuild-framework/pull/4069
# use of `True` is deprecated in favour of the more intuitive `SYSTEM` template
if orig_dep[3] is True:
self.assertEqual(dumped_dep[3], EASYCONFIG_CONSTANTS['SYSTEM'][0])
if skip_system_template_check:
self.assertEqual(dumped_dep[3], EASYCONFIG_CONSTANTS['SYSTEM'][0])
else:
error_msg = (
"use of `True` to indicate the system toolchain for dependency "
"%s is deprecated, use the `SYSTEM` template constant instead" % dumped_dep[0]
)
self.fail(error_msg)
else:
self.assertEqual(dumped_dep[3], orig_dep[3])
else:
Expand Down