Skip to content

replace setenv commands with environment variables in module footers with modextravars in easyconfigs for HIP, JupyterLab, mujoco-py, Triton #22801

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
May 22, 2025
Merged

replace setenv commands with environment variables in module footers with modextravars in easyconfigs for HIP, JupyterLab, mujoco-py, Triton #22801

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
2a21e4a
replace setenv commands with environment variables in module footer o…
lexming Apr 24, 2025
de81366
replace setenv commands with environment variables in module footer o…
lexming Apr 24, 2025
7fd9a60
replace setenv commands with environment variables in module footer o…
lexming Apr 24, 2025
efa2da3
replace setenv commands with environment variables in module footer o…
lexming Apr 24, 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
18 changes: 4 additions & 14 deletions easybuild/easyconfigs/h/HIP/HIP-4.5.0-GCCcore-11.2.0-amd.eb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,20 +97,10 @@ modextravars = {
'HIP_PATH': '%(installdir)s',
'HIP_RUNTIME': 'rocclr',
'ROCM_PATH': '%(installdir)s',
'DEVICE_LIB_PATH': '$EBROOTCLANGMINAOMP/amdgcn/bitcode',
'HIP_CLANG_INCLUDE_PATH': '$EBROOTCLANGMINAOMP/include',
'HIP_CLANG_PATH': '$EBROOTCLANGMINAOMP/bin',
'HSA_PATH': '$EBROOTROCRMINRUNTIME',
}

modluafooter = """
setenv("DEVICE_LIB_PATH", os.getenv("EBROOTCLANGMINAOMP") .. "/amdgcn/bitcode")
setenv("HIP_CLANG_INCLUDE_PATH", os.getenv("EBROOTCLANGMINAOMP") .. "/include")
setenv("HIP_CLANG_PATH", os.getenv("EBROOTCLANGMINAOMP") .. "/bin")
setenv("HSA_PATH", os.getenv("EBROOTROCRMINRUNTIME"))
"""

modtclfooter = """
setenv DEVICE_LIB_PATH $::env(EBROOTCLANGMINAOMP)/amdgcn/bitcode
setenv HIP_CLANG_INCLUDE_PATH $::env(EBROOTCLANGMINAOMP)/include
setenv HIP_CLANG_PATH $::env(EBROOTCLANGMINAOMP)/bin
setenv HSA_PATH $::env(EBROOTROCRMINRUNTIME)
"""

moduleclass = 'tools'
15 changes: 4 additions & 11 deletions easybuild/easyconfigs/j/JupyterLab/JupyterLab-3.5.0-GCCcore-11.3.0.eb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,17 +48,10 @@ modextrapaths = {
modextravars = {
# only one path allowed as JUPYTERLAB_DIR
'JUPYTERLAB_DIR': '%(installdir)s/share/jupyter/lab',
# keep user's configuration in their home directory
# note: '~' is not expanded by JupyterLab
'JUPYTERLAB_SETTINGS_DIR': '$HOME/.jupyter/lab/user-settings',
'JUPYTERLAB_WORKSPACES_DIR': '$HOME/.jupyter/lab/workspaces',
}

# keep user's configuration in their home directory
# note: '~' is not expanded by JupyterLab
modluafooter = """
setenv("JUPYTERLAB_SETTINGS_DIR", pathJoin(os.getenv("HOME"), ".jupyter", "lab", "user-settings"))
setenv("JUPYTERLAB_WORKSPACES_DIR", pathJoin(os.getenv("HOME"), ".jupyter", "lab", "workspaces"))
"""
modtclfooter = """
setenv JUPYTERLAB_SETTINGS_DIR "$::env(HOME)/.jupyter/lab/user-settings"
setenv JUPYTERLAB_WORKSPACES_DIR "$::env(HOME)/.jupyter/lab/workspaces"
"""

moduleclass = 'tools'
15 changes: 4 additions & 11 deletions easybuild/easyconfigs/j/JupyterLab/JupyterLab-4.0.3-GCCcore-12.2.0.eb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,17 +69,10 @@ modextrapaths = {'EB_ENV_JUPYTER_ROOT': ''}
modextravars = {
# only one path allowed as JUPYTERLAB_DIR
'JUPYTERLAB_DIR': '%(installdir)s/share/jupyter/lab',
# keep user's configuration in their home directory
# note: '~' is not expanded by JupyterLab
'JUPYTERLAB_SETTINGS_DIR': '$HOME/.jupyter/lab/user-settings',
'JUPYTERLAB_WORKSPACES_DIR': '$HOME/.jupyter/lab/workspaces',
}

# keep user's configuration in their home directory
# note: '~' is not expanded by JupyterLab
modluafooter = """
setenv("JUPYTERLAB_SETTINGS_DIR", pathJoin(os.getenv("HOME"), ".jupyter", "lab", "user-settings"))
setenv("JUPYTERLAB_WORKSPACES_DIR", pathJoin(os.getenv("HOME"), ".jupyter", "lab", "workspaces"))
"""
modtclfooter = """
setenv JUPYTERLAB_SETTINGS_DIR "$::env(HOME)/.jupyter/lab/user-settings"
setenv JUPYTERLAB_WORKSPACES_DIR "$::env(HOME)/.jupyter/lab/workspaces"
"""

moduleclass = 'tools'
15 changes: 4 additions & 11 deletions easybuild/easyconfigs/j/JupyterLab/JupyterLab-4.0.5-GCCcore-12.3.0.eb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,17 +49,10 @@ modextrapaths = {'EB_ENV_JUPYTER_ROOT': ''}
modextravars = {
# only one path allowed as JUPYTERLAB_DIR
'JUPYTERLAB_DIR': '%(installdir)s/share/jupyter/lab',
# keep user's configuration in their home directory
# note: '~' is not expanded by JupyterLab
'JUPYTERLAB_SETTINGS_DIR': '$HOME/.jupyter/lab/user-settings',
'JUPYTERLAB_WORKSPACES_DIR': '$HOME/.jupyter/lab/workspaces',
}

# keep user's configuration in their home directory
# note: '~' is not expanded by JupyterLab
modluafooter = """
setenv("JUPYTERLAB_SETTINGS_DIR", pathJoin(os.getenv("HOME"), ".jupyter", "lab", "user-settings"))
setenv("JUPYTERLAB_WORKSPACES_DIR", pathJoin(os.getenv("HOME"), ".jupyter", "lab", "workspaces"))
"""
modtclfooter = """
setenv JUPYTERLAB_SETTINGS_DIR "$::env(HOME)/.jupyter/lab/user-settings"
setenv JUPYTERLAB_WORKSPACES_DIR "$::env(HOME)/.jupyter/lab/workspaces"
"""

moduleclass = 'tools'
15 changes: 4 additions & 11 deletions easybuild/easyconfigs/j/JupyterLab/JupyterLab-4.2.0-GCCcore-13.2.0.eb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,17 +59,10 @@ modextrapaths = {'EB_ENV_JUPYTER_ROOT': ''}
modextravars = {
# only one path allowed as JUPYTERLAB_DIR
'JUPYTERLAB_DIR': '%(installdir)s/share/jupyter/lab',
# keep user's configuration in their home directory
# note: '~' is not expanded by JupyterLab
'JUPYTERLAB_SETTINGS_DIR': '$HOME/.jupyter/lab/user-settings',
'JUPYTERLAB_WORKSPACES_DIR': '$HOME/.jupyter/lab/workspaces',
}

# keep user's configuration in their home directory
# note: '~' is not expanded by JupyterLab
modluafooter = """
setenv("JUPYTERLAB_SETTINGS_DIR", pathJoin(os.getenv("HOME"), ".jupyter", "lab", "user-settings"))
setenv("JUPYTERLAB_WORKSPACES_DIR", pathJoin(os.getenv("HOME"), ".jupyter", "lab", "workspaces"))
"""
modtclfooter = """
setenv JUPYTERLAB_SETTINGS_DIR "$::env(HOME)/.jupyter/lab/user-settings"
setenv JUPYTERLAB_WORKSPACES_DIR "$::env(HOME)/.jupyter/lab/workspaces"
"""

moduleclass = 'tools'
15 changes: 4 additions & 11 deletions easybuild/easyconfigs/j/JupyterLab/JupyterLab-4.2.5-GCCcore-13.3.0.eb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,17 +59,10 @@ modextrapaths = {'EB_ENV_JUPYTER_ROOT': ''}
modextravars = {
# only one path allowed as JUPYTERLAB_DIR
'JUPYTERLAB_DIR': '%(installdir)s/share/jupyter/lab',
# keep user's configuration in their home directory
# note: '~' is not expanded by JupyterLab
'JUPYTERLAB_SETTINGS_DIR': '$HOME/.jupyter/lab/user-settings',
'JUPYTERLAB_WORKSPACES_DIR': '$HOME/.jupyter/lab/workspaces',
}

# keep user's configuration in their home directory
# note: '~' is not expanded by JupyterLab
modluafooter = """
setenv("JUPYTERLAB_SETTINGS_DIR", pathJoin(os.getenv("HOME"), ".jupyter", "lab", "user-settings"))
setenv("JUPYTERLAB_WORKSPACES_DIR", pathJoin(os.getenv("HOME"), ".jupyter", "lab", "workspaces"))
"""
modtclfooter = """
setenv JUPYTERLAB_SETTINGS_DIR "$::env(HOME)/.jupyter/lab/user-settings"
setenv JUPYTERLAB_WORKSPACES_DIR "$::env(HOME)/.jupyter/lab/workspaces"
"""

moduleclass = 'tools'
5 changes: 1 addition & 4 deletions easybuild/easyconfigs/m/mujoco-py/mujoco-py-2.1.2.14-foss-2021b.eb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,10 +46,7 @@ exts_list = [

modextravars = {
'MUJOCO_PY_FORCE_CPU': '1',
'MUJOCO_PY_MUJOCO_PATH': '$EBROOTMUJOCO',
}

modluafooter = """
setenv("MUJOCO_PY_MUJOCO_PATH", os.getenv("EBROOTMUJOCO"))
"""

moduleclass = 'lib'
4 changes: 3 additions & 1 deletion easybuild/easyconfigs/t/Triton/Triton-2.1.0-foss-2023a-CUDA-12.1.1.eb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,8 @@ preinstallopts += 'export TRITON_BUILD_WITH_CLANG_LLD=1 && '
# make pip print output of cmake
installopts = "-v "

modluafooter = 'setenv("TRITON_PTXAS_PATH", pathJoin(os.getenv("CUDA_HOME"), "bin", "ptxas"))'
modextravars = {
'TRITON_PTXAS_PATH': '$CUDA_HOME/bin/ptxas',
}

moduleclass = 'devel'