Skip to content
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

fix parallellisation typo #4352

Merged
merged 5 commits into from
Oct 18, 2023
Merged

fix parallellisation typo #4352

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
23778be
fix parallellisation typo
branfosj Oct 12, 2023
13370c1
parallelism
branfosj Oct 12, 2023
c2a8c55
parallelism
branfosj Oct 12, 2023
5370a66
parallelism
branfosj Oct 12, 2023
dcf9bb3
parallelism
branfosj Oct 12, 2023
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/toolchains/compiler/gcc.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ class Gcc(Compiler):

COMPILER_FAMILY = TC_CONSTANT_GCC
COMPILER_UNIQUE_OPTS = {
'loop': (False, "Automatic loop parallellisation"),
'loop': (False, "Automatic loop parallelisation"),
'f2c': (False, "Generate code compatible with f2c and f77"),
'lto': (False, "Enable Link Time Optimization"),
}
Expand Down
2 changes: 1 addition & 1 deletion easybuild/tools/options.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -473,7 +473,7 @@ def override_options(self):
'output-style': ("Control output style; auto implies using Rich if available to produce rich output, "
"with fallback to basic colored output",
'choice', 'store', OUTPUT_STYLE_AUTO, OUTPUT_STYLES),
'parallel': ("Specify (maximum) level of parallellism used during build procedure",
'parallel': ("Specify (maximum) level of parallelism used during build procedure",
'int', 'store', None),
'parallel-extensions-install': ("Install list of extensions in parallel (if supported)",
None, 'store_true', False),
Expand Down
2 changes: 1 addition & 1 deletion easybuild/tools/systemtools.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1212,7 +1212,7 @@ def get_default_parallelism():
raise EasyBuildError("Specified level of parallelism '%s' is not an integer value: %s", par, err)

if maxpar is not None and maxpar < par:
_log.info("Limiting parallellism from %s to %s", par, maxpar)
_log.info("Limiting parallelism from %s to %s", par, maxpar)
par = maxpar

return par
Expand Down
4 changes: 2 additions & 2 deletions test/framework/easyblock.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2080,7 +2080,7 @@ def test_extensions_sanity_check(self):
eb.run_all_steps(True)

def test_parallel(self):
"""Test defining of parallellism."""
"""Test defining of parallelism."""
topdir = os.path.abspath(os.path.dirname(__file__))
toy_ec = os.path.join(topdir, 'easyconfigs', 'test_ecs', 't', 'toy', 'toy-0.0.eb')
toytxt = read_file(toy_ec)
Expand All @@ -2097,7 +2097,7 @@ def test_parallel(self):
os.close(handle)
write_file(toy_ec3, toytxt + "\nparallel = False")

# default: parallellism is derived from # available cores + ulimit
# default: parallelism is derived from # available cores + ulimit
test_eb = EasyBlock(EasyConfig(toy_ec))
test_eb.check_readiness_step()
self.assertTrue(isinstance(test_eb.cfg['parallel'], int) and test_eb.cfg['parallel'] > 0)
Expand Down
4 changes: 2 additions & 2 deletions test/framework/systemtools.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -835,9 +835,9 @@ def test_system_info(self):
def test_det_parallelism_native(self):
"""Test det_parallelism function (native calls)."""
self.assertTrue(det_parallelism() > 0)
# specified parallellism
# specified parallelism
self.assertEqual(det_parallelism(par=5), 5)
# max parallellism caps
# max parallelism caps
self.assertEqual(det_parallelism(maxpar=1), 1)
self.assertEqual(det_parallelism(16, 1), 1)
self.assertEqual(det_parallelism(par=5, maxpar=2), 2)
Expand Down