Skip to content

swicth GCC-system and GCCcore-system to SystemCompilerGCC easyblock #22174

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
branfosj merged 6 commits into from
Mar 9, 2025
Merged

swicth GCC-system and GCCcore-system to SystemCompilerGCC easyblock #22174

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
882f8e3
swicth GCCcore-system.eb to SystemCompilerGCC easyblock
lexming Jan 17, 2025
26c370b
swicth GCC-system.eb to SystemCompilerGCC easyblock
lexming Jan 17, 2025
facf82a
Merge branch '5.0.x' into modload-syscomp
lexming Feb 14, 2025
56a9e0e
add SystemCompilers to whitelist of test_pr_sanity_check_paths as the…
lexming Feb 14, 2025
cdbaf0d
Merge branch '5.0.x' into modload-syscomp
lexming Mar 3, 2025
8931e4f
exclude SystemCompileGCC easyblock from tests on downloable instructions
lexming Mar 8, 2025
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/g/GCC/GCC-system.eb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
# License:: 3-clause BSD
##

easyblock = 'SystemCompiler'
easyblock = 'SystemCompilerGCC'

name = 'GCC'
# using 'system' as a version instructs the SystemCompiler easyblock to derive the actual compiler version,
Expand Down
2 changes: 1 addition & 1 deletion easybuild/easyconfigs/g/GCCcore/GCCcore-system.eb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
# License:: 3-clause BSD
##

easyblock = 'SystemCompiler'
easyblock = 'SystemCompilerGCC'

name = 'GCCcore'
# using 'system' as a version instructs the SystemCompiler easyblock to derive the actual compiler version,
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 @@ -994,8 +994,16 @@ def test_downloadable_or_instructions(self):
for easyconfig in self.parsed_easyconfigs:
ec = easyconfig['ec']
# easyblocks where there'll be no sources
if ec['easyblock'] in ['BuildEnv', 'Bundle', 'CrayToolchain', 'ModuleRC', 'SystemCompiler', 'SystemMPI',
'Toolchain']:
if ec['easyblock'] in [
'BuildEnv',
'Bundle',
'CrayToolchain',
'ModuleRC',
'SystemCompiler',
'SystemCompilerGCC',
'SystemMPI',
'Toolchain',
]:
continue

# easyconfigs where a dep provides the source
Expand Down Expand Up @@ -1313,10 +1321,12 @@ def test_pr_sanity_check_paths(self):
# some generic easyblocks already have a decent customised sanity_check_paths,
# including CargoPythonPackage, CMakePythonPackage, GoPackage, JuliaBundle & JuliaPackage, PerlBundle,
# PythonBundle & PythonPackage;
# BuildEnv, ModuleRC and Toolchain easyblocks doesn't install anything so there is nothing to check.
# BuildEnv, ModuleRC SystemCompiler and Toolchain easyblocks do not install anything so there is nothing
# to check.
whitelist = ['BuildEnv', 'CargoPythonBundle', 'CargoPythonPackage', 'CMakePythonPackage',
'ConfigureMakePythonPackage', 'CrayToolchain', 'GoPackage', 'JuliaBundle', 'JuliaPackage',
'ModuleRC', 'PerlBundle', 'PythonBundle', 'PythonPackage', 'Toolchain']
'ModuleRC', 'PerlBundle', 'PythonBundle', 'PythonPackage', 'SystemCompiler', 'SystemCompilerGCC',
'Toolchain']
# Bundles of dependencies without files of their own
# Autotools: Autoconf + Automake + libtool, (recent) GCC: GCCcore + binutils, CUDA: GCC + CUDAcore,
# CESM-deps: Python + Perl + netCDF + ESMF + git, FEniCS: DOLFIN and co,
Expand Down