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.

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

Update to LLVM 19, CUDA 12.6, and NVHPC 24.7 #379

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "NVIDIA RAPIDS devcontainer build utilities",
"id": "rapids-build-utils",
"version": "24.10.3",
"version": "24.10.4",
"description": "A feature to install the RAPIDS devcontainer build utilities",
"containerEnv": {
"BASH_ENV": "/etc/bash.bash_env"
Expand Down
19 changes: 14 additions & 5 deletions features/src/rapids-build-utils/install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -33,13 +33,22 @@ fi

source /etc/lsb-release;

if [[ ! "23.04" > "${DISTRIB_RELEASE}" ]]; then
BREAK_PACKAGES="--break-system-packages";
declare -a _PIP_INSTALL_ARGS=()
declare -a _PIP_UPGRADE_ARGS=(--upgrade)

if [[ "${DISTRIB_RELEASE}" > "22.04" ]]; then
_PIP_INSTALL_ARGS+=(--break-system-packages);
if [[ "${DISTRIB_RELEASE}" > "23.04" ]]; then
_PIP_UPGRADE_ARGS+=(--ignore-installed);
fi
fi

# Install the rapids dependency file generator and conda-merge
/usr/bin/python3 -m pip install $BREAK_PACKAGES -U pip;
/usr/bin/python3 -m pip install $BREAK_PACKAGES 'rapids-dependency-file-generator<1.14' conda-merge toml;
/usr/bin/python3 -m pip install "${_PIP_INSTALL_ARGS[@]}" "${_PIP_UPGRADE_ARGS[@]}" pip;
# Install RAPIDS dependency file generator, conda-merge, and toml
/usr/bin/python3 -m pip install "${_PIP_INSTALL_ARGS[@]}" \
'rapids-dependency-file-generator<1.14' \
conda-merge \
toml;

# Install RAPIDS build utility scripts to /opt/

Expand Down
2 changes: 1 addition & 1 deletion features/src/utils/devcontainer-feature.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "devcontainer-utils",
"id": "utils",
"version": "24.10.0",
"version": "24.10.1",
"description": "A feature to install RAPIDS devcontainer utility scripts",
"containerEnv": {
"BASH_ENV": "/etc/bash.bash_env"
Expand Down
14 changes: 10 additions & 4 deletions features/src/utils/install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -31,12 +31,18 @@ check_packages "${PKGS[@]}";

source /etc/lsb-release;

if [[ ! "23.04" > "${DISTRIB_RELEASE}" ]]; then
BREAK_PACKAGES="--break-system-packages";
# Upgrade system pip
declare -a _PIP_INSTALL_ARGS=()
declare -a _PIP_UPGRADE_ARGS=(--upgrade)

if [[ "${DISTRIB_RELEASE}" > "22.04" ]]; then
_PIP_INSTALL_ARGS+=(--break-system-packages);
if [[ "${DISTRIB_RELEASE}" > "23.04" ]]; then
_PIP_UPGRADE_ARGS+=(--ignore-installed);
fi
fi

# upgrade pip
/usr/bin/python3 -m pip install $BREAK_PACKAGES -U pip;
/usr/bin/python3 -m pip install "${_PIP_INSTALL_ARGS[@]}" "${_PIP_UPGRADE_ARGS[@]}" pip;

# Install yq if not installed
if ! type yq >/dev/null 2>&1; then
Expand Down
Loading