Skip to content

add cuda compute capability integer format templates #4463

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 4 commits into from
Feb 27, 2024
Merged

add cuda compute capability integer format templates #4463

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
560d395
re-order test_cuda_compute_capabilities {pre,}{config,build,install}opts
jfgrimm Feb 22, 2024
aff7482
add support for cuda compute capabilities templates in the form of:
jfgrimm Feb 22, 2024
f2d53d1
fix missing end quote
jfgrimm Feb 22, 2024
b65771f
fix missing space
jfgrimm Feb 22, 2024
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
7 changes: 7 additions & 0 deletions easybuild/framework/easyconfig/templates.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,9 @@
('cuda_cc_cmake', "List of CUDA compute capabilities suitable for use with $CUDAARCHS in CMake 3.18+"),
('cuda_cc_space_sep', "Space-separated list of CUDA compute capabilities"),
('cuda_cc_semicolon_sep', "Semicolon-separated list of CUDA compute capabilities"),
('cuda_int_comma_sep', "Comma-separated list of integer CUDA compute capabilities"),
('cuda_int_space_sep', "Space-separated list of integer CUDA compute capabilities"),
('cuda_int_semicolon_sep', "Semicolon-separated list of integer CUDA compute capabilities"),
('cuda_sm_comma_sep', "Comma-separated list of sm_* values that correspond with CUDA compute capabilities"),
('cuda_sm_space_sep', "Space-separated list of sm_* values that correspond with CUDA compute capabilities"),
]
Expand Down Expand Up @@ -365,6 +368,10 @@ def template_constant_dict(config, ignore=None, toolchain=None):
template_values['cuda_cc_space_sep'] = ' '.join(cuda_compute_capabilities)
template_values['cuda_cc_semicolon_sep'] = ';'.join(cuda_compute_capabilities)
template_values['cuda_cc_cmake'] = ';'.join(cc.replace('.', '') for cc in cuda_compute_capabilities)
int_values = [cc.replace('.', '') for cc in cuda_compute_capabilities]
template_values['cuda_int_comma_sep'] = ','.join(int_values)
template_values['cuda_int_space_sep'] = ' '.join(int_values)
template_values['cuda_int_semicolon_sep'] = ';'.join(int_values)
sm_values = ['sm_' + cc.replace('.', '') for cc in cuda_compute_capabilities]
template_values['cuda_sm_comma_sep'] = ','.join(sm_values)
template_values['cuda_sm_space_sep'] = ' '.join(sm_values)
Expand Down
35 changes: 23 additions & 12 deletions test/framework/easyconfig.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4438,31 +4438,39 @@ def test_cuda_compute_capabilities(self):
description = 'test'
toolchain = SYSTEM
cuda_compute_capabilities = ['5.1', '7.0', '7.1']
installopts = '%(cuda_compute_capabilities)s'
preinstallopts = '%(cuda_cc_space_sep)s'
prebuildopts = '%(cuda_cc_semicolon_sep)s'
configopts = 'comma="%(cuda_sm_comma_sep)s" space="%(cuda_sm_space_sep)s"'
preconfigopts = 'CUDAARCHS="%(cuda_cc_cmake)s"'
configopts = 'comma="%(cuda_sm_comma_sep)s" space="%(cuda_sm_space_sep)s"'
prebuildopts = '%(cuda_cc_semicolon_sep)s'
buildopts = ('comma="%(cuda_int_comma_sep)s" space="%(cuda_int_space_sep)s" '
'semi="%(cuda_int_semicolon_sep)s"')
preinstallopts = '%(cuda_cc_space_sep)s'
installopts = '%(cuda_compute_capabilities)s'
""")
self.prep()

ec = EasyConfig(self.eb_file)
self.assertEqual(ec['installopts'], '5.1,7.0,7.1')
self.assertEqual(ec['preinstallopts'], '5.1 7.0 7.1')
self.assertEqual(ec['prebuildopts'], '5.1;7.0;7.1')
self.assertEqual(ec['preconfigopts'], 'CUDAARCHS="51;70;71"')
self.assertEqual(ec['configopts'], 'comma="sm_51,sm_70,sm_71" '
'space="sm_51 sm_70 sm_71"')
self.assertEqual(ec['preconfigopts'], 'CUDAARCHS="51;70;71"')
self.assertEqual(ec['prebuildopts'], '5.1;7.0;7.1')
self.assertEqual(ec['buildopts'], 'comma="51,70,71" '
'space="51 70 71" '
'semi="51;70;71"')
self.assertEqual(ec['preinstallopts'], '5.1 7.0 7.1')
self.assertEqual(ec['installopts'], '5.1,7.0,7.1')

# build options overwrite it
init_config(build_options={'cuda_compute_capabilities': ['4.2', '6.3']})
ec = EasyConfig(self.eb_file)
self.assertEqual(ec['installopts'], '4.2,6.3')
self.assertEqual(ec['preinstallopts'], '4.2 6.3')
self.assertEqual(ec['prebuildopts'], '4.2;6.3')
self.assertEqual(ec['preconfigopts'], 'CUDAARCHS="42;63"')
self.assertEqual(ec['configopts'], 'comma="sm_42,sm_63" '
'space="sm_42 sm_63"')
self.assertEqual(ec['preconfigopts'], 'CUDAARCHS="42;63"')
self.assertEqual(ec['buildopts'], 'comma="42,63" '
'space="42 63" '
'semi="42;63"')
self.assertEqual(ec['prebuildopts'], '4.2;6.3')
self.assertEqual(ec['preinstallopts'], '4.2 6.3')
self.assertEqual(ec['installopts'], '4.2,6.3')

def test_det_copy_ec_specs(self):
"""Test det_copy_ec_specs function."""
Expand Down Expand Up @@ -4725,6 +4733,9 @@ def test_get_cuda_cc_template_value(self):
'cuda_compute_capabilities': '6.5,7.0',
'cuda_cc_space_sep': '6.5 7.0',
'cuda_cc_semicolon_sep': '6.5;7.0',
'cuda_int_comma_sep': '65,70',
'cuda_int_space_sep': '65 70',
'cuda_int_semicolon_sep': '65;70',
'cuda_sm_comma_sep': 'sm_65,sm_70',
'cuda_sm_space_sep': 'sm_65 sm_70',
}
Expand Down