Skip to content

add renamed alternative constants/templates/parameters #4514

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 6 commits into from
Jun 5, 2024
Merged

add renamed alternative constants/templates/parameters #4514

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
d215764
add renamed easyconfig params to ALTERNATE_PARAMTERS
jfgrimm Apr 23, 2024
9dc9239
add renamed templates to ALTERNATE_TEMPLATES
jfgrimm Apr 23, 2024
707d8b2
add renamed template constants to ALTERNATE_TEMPLATE_CONSTANTS
jfgrimm Apr 23, 2024
f5122c7
add alternate template for cuda_compute_capabilities -> cuda_cc_comma…
jfgrimm May 29, 2024
de0f815
Merge branch '5.0.x' into add-renamed-alternates
jfgrimm May 30, 2024
1bdc939
Apply suggestions from code review
jfgrimm Jun 5, 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
53 changes: 53 additions & 0 deletions easybuild/framework/easyconfig/parser.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,59 @@
# alternate easyconfig parameters, and their non-deprecated equivalents
ALTERNATE_PARAMETERS = {
# <new_param>: <equivalent_param>,
'build_deps': 'builddependencies',
'build_in_install_dir': 'buildininstalldir',
'build_opts': 'buildopts',
'build_stats': 'buildstats',
'clean_up_old_build': 'cleanupoldbuild',
'clean_up_old_install': 'cleanupoldinstall',
'configure_opts': 'configopts',
'deps': 'dependencies',
'doc_paths': 'docpaths',
'doc_urls': 'docurls',
'dont_create_install_dir': 'dontcreateinstalldir',
'exts_class_map': 'exts_classmap',
'exts_default_class': 'exts_default_class',
'exts_default_opts': 'exts_default_options',
'hidden_deps': 'hiddendependencies',
'include_modulepath_exts': 'include_modpath_extensions',
'install_opts': 'installopts',
'keep_previous_install': 'keeppreviousinstall',
'keep_symlinks': 'keepsymlinks',
'max_parallel': 'maxparallel',
'env_mod_aliases': 'modaliases',
'env_mod_alt_soft_name': 'modaltsoftname',
'modulepath_prepend_paths': 'moddependpaths',
'env_mod_extra_paths_append': 'modextrapaths_append',
'env_mod_extra_paths': 'modextrapaths',
'env_mod_extra_vars': 'modextravars',
'env_mod_load_msg': 'modloadmsg',
'env_mod_lua_footer': 'modluafooter',
'env_mod_tcl_footer': 'modtclfooter',
'env_mod_class': 'moduleclass',
'env_mod_depends_on': 'module_depends_on',
'env_mod_force_unload': 'moduleforceunload',
'env_mod_load_no_conflict': 'moduleloadnoconflict',
'env_mod_unload_msg': 'modunloadmsg',
'only_toolchain_mod_env': 'onlytcmod',
'os_deps': 'osdependencies',
'post_install_cmds': 'postinstallcmds',
'post_install_msgs': 'postinstallmsgs',
'post_install_patches': 'postinstallpatches',
'pre_build_opts': 'prebuildopts',
'pre_configure_opts': 'preconfigopts',
Copy link
Member

@boegel boegel Jun 5, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
'pre_configure_opts': 'preconfigopts',
'pre_config_opts': 'preconfigopts',

Copy link
Member

@boegel boegel Jun 5, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As discussed, let's stick to pre_configure_opts (to align with configure step)

'pre_install_opts': 'preinstallopts',
'pre_test_opts': 'pretestopts',
'recursive_env_mod_unload': 'recursive_module_unload',
'run_test': 'runtest',
'sanity_check_cmds': 'sanity_check_commands',
'skip_fortran_mod_files_sanity_check': 'skip_mod_files_sanity_check',
'skip_steps': 'skipsteps',
'test_opts': 'testopts',
'toolchain_opts': 'toolchainopts',
'unpack_opts': 'unpack_options',
'version_prefix': 'versionprefix',
'version_suffix': 'versionsuffix',
}

# deprecated easyconfig parameters, and their replacements
Expand Down
67 changes: 67 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 @@ -164,6 +164,36 @@
# alternate templates, and their equivalents
ALTERNATE_TEMPLATES = {
# <new>: <equivalent_template>,
'build_dir': 'builddir',
'cuda_cc_comma_sep': 'cuda_compute_capabilities',
'cuda_maj_ver': 'cudamajver',
'cuda_maj_ver': 'cudamajver',
'cuda_short_ver': 'cudashortver',
'cuda_short_ver': 'cudashortver',
'cuda_ver': 'cudaver',
'cuda_ver': 'cudaver',
'install_dir': 'installdir',
'java_maj_ver': 'javamajver',
'java_short_ver': 'javashortver',
'java_ver': 'javaver',
'name_letter_lower': 'nameletterlower',
'name_letter': 'nameletter',
'name_lower': 'namelower',
'perl_maj_ver': 'perlmajver',
'perl_short_ver': 'perlshortver',
'perl_ver': 'perlver',
'py_maj_ver': 'pymajver',
'py_short_ver': 'pyshortver',
'py_ver': 'pyver',
'r_maj_ver': 'rmajver',
'r_short_ver': 'rshortver',
'r_ver': 'rver',
'toolchain_ver': 'toolchain_version',
'ver_maj_min': 'version_major_minor',
'ver_maj': 'version_major',
'ver_min': 'version_minor',
'version_prefix': 'versionprefix',
'version_suffix': 'versionsuffix',
}

# deprecated templates, and their replacements
Expand All @@ -174,6 +204,43 @@
# alternate template constants, and their equivalents
ALTERNATE_TEMPLATE_CONSTANTS = {
# <new_template_constant>: <equivalent_template_constant>,
'APACHE_URL': 'APACHE_SOURCE',
'BITBUCKET_GET_URL': 'BITBUCKET_SOURCE',
'BITBUCKET_DOWNLOADS_URL': 'BITBUCKET_DOWNLOADS',
'CRAN_URL': 'CRAN_SOURCE',
'FTP_GNOME_URL': 'FTPGNOME_SOURCE',
'GITHUB_URL': 'GITHUB_SOURCE',
'GITHUB_URL_LOWER': 'GITHUB_LOWER_SOURCE',
'GITHUB_RELEASE_URL': 'GITHUB_RELEASE',
'GITHUB_RELEASE_URL_LOWER': 'GITHUB_LOWER_RELEASE',
'GNU_SAVANNAH_URL': 'GNU_SAVANNAH_SOURCE',
'GNU_URL': 'GNU_SOURCE',
'GOOGLECODE_URL': 'GOOGLECODE_SOURCE',
'LAUNCHPAD_URL': 'LAUNCHPAD_SOURCE',
'PYPI_URL': 'PYPI_SOURCE',
'PYPI_URL_LOWER': 'PYPI_LOWER_SOURCE',
'R_URL': 'R_SOURCE',
'SOURCEFORGE_URL': 'SOURCEFORGE_SOURCE',
'XORG_DATA_URL': 'XORG_DATA_SOURCE',
'XORG_LIB_URL': 'XORG_LIB_SOURCE',
'XORG_PROTO_URL': 'XORG_PROTO_SOURCE',
'XORG_UTIL_URL': 'XORG_UTIL_SOURCE',
'XORG_XCB_URL': 'XORG_XCB_SOURCE',
'SOURCE_LOWER_TAR_GZ': 'SOURCELOWER_TAR_GZ',
'SOURCE_LOWER_TAR_XZ': 'SOURCELOWER_TAR_XZ',
'SOURCE_LOWER_TAR_BZ2': 'SOURCELOWER_TAR_BZ2',
'SOURCE_LOWER_TGZ': 'SOURCELOWER_TGZ',
'SOURCE_LOWER_TXZ': 'SOURCELOWER_TXZ',
'SOURCE_LOWER_TBZ2': 'SOURCELOWER_TBZ2',
'SOURCE_LOWER_TB2': 'SOURCELOWER_TB2',
'SOURCE_LOWER_GTGZ': 'SOURCELOWER_GTGZ',
'SOURCE_LOWER_ZIP': 'SOURCELOWER_ZIP',
'SOURCE_LOWER_TAR': 'SOURCELOWER_TAR',
'SOURCE_LOWER_XZ': 'SOURCELOWER_XZ',
'SOURCE_LOWER_TAR_Z': 'SOURCELOWER_TAR_Z',
'SOURCE_LOWER_WHL': 'SOURCELOWER_WHL',
'SOURCE_LOWER_PY2_WHL': 'SOURCELOWER_PY2_WHL',
'SOURCE_LOWER_PY3_WHL': 'SOURCELOWER_PY3_WHL',
}

# deprecated template constants, and their replacements
Expand Down