From b599c4b18997cb0a9378aee38135f1dd4d25abcb Mon Sep 17 00:00:00 2001 From: James Lamb Date: Wed, 12 Jun 2024 15:09:48 -0500 Subject: [PATCH 1/4] resolve rapids-dependency-file-generator warning --- .pre-commit-config.yaml | 2 +- ci/check_style.sh | 2 +- ci/runner/Dockerfile | 4 ++-- ci/scripts/github/build.sh | 2 +- ci/scripts/github/checks.sh | 2 +- ci/scripts/github/docs.sh | 2 +- ci/scripts/github/test.sh | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index d2054c813d..2682c98fb7 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -15,7 +15,7 @@ repos: - repo: https://github.com/rapidsai/dependency-file-generator - rev: v1.7.1 + rev: v1.13.11 hooks: - id: rapids-dependency-file-generator args: ["--clean"] diff --git a/ci/check_style.sh b/ci/check_style.sh index beb561bb4f..66a99f00d6 100755 --- a/ci/check_style.sh +++ b/ci/check_style.sh @@ -13,7 +13,7 @@ rapids-logger "Create checks conda environment" rapids-dependency-file-generator \ --output conda \ - --file_key checks \ + --file-key checks \ --matrix "cuda=${RAPIDS_CUDA_VERSION%.*};arch=$(arch);py=${RAPIDS_PY_VERSION}" | tee env.yaml rapids-mamba-retry env create --yes -f env.yaml -n checks diff --git a/ci/runner/Dockerfile b/ci/runner/Dockerfile index df34c327d0..3927e49e0b 100644 --- a/ci/runner/Dockerfile +++ b/ci/runner/Dockerfile @@ -48,7 +48,7 @@ ARG PYTHON_VER RUN rapids-dependency-file-generator \ --config /tmp/conda/dependencies.yaml \ --output conda \ - --file_key build \ + --file-key build \ --matrix "cuda=${CUDA_SHORT_VER};arch=${ARCH};py=${PYTHON_VER}" > /tmp/conda/env.yaml && \ CONDA_ALWAYS_YES=true /opt/conda/bin/conda env create -n ${PROJ_NAME} -q --file /tmp/conda/env.yaml && \ sed -i "s/conda activate base/conda activate ${PROJ_NAME}/g" ~/.bashrc && \ @@ -89,7 +89,7 @@ RUN apt update && \ RUN rapids-dependency-file-generator \ --config /tmp/conda/dependencies.yaml \ --output conda \ - --file_key test \ + --file-key test \ --matrix "cuda=${CUDA_SHORT_VER};arch=${ARCH};py=${PYTHON_VER}" > /tmp/conda/env.yaml && \ CONDA_ALWAYS_YES=true /opt/conda/bin/conda env create -n ${PROJ_NAME} -q --file /tmp/conda/env.yaml && \ sed -i "s/conda activate base/conda activate ${PROJ_NAME}/g" ~/.bashrc && \ diff --git a/ci/scripts/github/build.sh b/ci/scripts/github/build.sh index 5941ca03bd..71870b1135 100755 --- a/ci/scripts/github/build.sh +++ b/ci/scripts/github/build.sh @@ -20,7 +20,7 @@ source ${WORKSPACE}/ci/scripts/github/common.sh rapids-dependency-file-generator \ --output conda \ - --file_key build \ + --file-key build \ --matrix "cuda=${RAPIDS_CUDA_VERSION%.*};arch=$(arch);py=${RAPIDS_PY_VERSION}" | tee "${WORKSPACE_TMP}/env.yaml" update_conda_env "${WORKSPACE_TMP}/env.yaml" diff --git a/ci/scripts/github/checks.sh b/ci/scripts/github/checks.sh index 22f06f1557..5f90a50828 100755 --- a/ci/scripts/github/checks.sh +++ b/ci/scripts/github/checks.sh @@ -20,7 +20,7 @@ source ${WORKSPACE}/ci/scripts/github/common.sh rapids-dependency-file-generator \ --output conda \ - --file_key build \ + --file-key build \ --matrix "cuda=${RAPIDS_CUDA_VERSION%.*};arch=$(arch);py=${RAPIDS_PY_VERSION}" | tee "${WORKSPACE_TMP}/env.yaml" update_conda_env "${WORKSPACE_TMP}/env.yaml" diff --git a/ci/scripts/github/docs.sh b/ci/scripts/github/docs.sh index f4a33b91b3..0a5696188d 100755 --- a/ci/scripts/github/docs.sh +++ b/ci/scripts/github/docs.sh @@ -20,7 +20,7 @@ source ${WORKSPACE}/ci/scripts/github/common.sh rapids-dependency-file-generator \ --output conda \ - --file_key docs \ + --file-key docs \ --matrix "cuda=${RAPIDS_CUDA_VERSION%.*};arch=$(arch);py=${RAPIDS_PY_VERSION}" | tee "${WORKSPACE_TMP}/env.yaml" update_conda_env "${WORKSPACE_TMP}/env.yaml" diff --git a/ci/scripts/github/test.sh b/ci/scripts/github/test.sh index e050895083..3b5d0a6356 100755 --- a/ci/scripts/github/test.sh +++ b/ci/scripts/github/test.sh @@ -21,7 +21,7 @@ source ${WORKSPACE}/ci/scripts/github/common.sh rapids-dependency-file-generator \ --output conda \ - --file_key test \ + --file-key test \ --matrix "cuda=${RAPIDS_CUDA_VERSION%.*};arch=$(arch);py=${RAPIDS_PY_VERSION}" | tee "${WORKSPACE_TMP}/env.yaml" update_conda_env "${WORKSPACE_TMP}/env.yaml" From 5c16b133a518bcb17068836f5b39fe57e86210fb Mon Sep 17 00:00:00 2001 From: Christopher Harris Date: Fri, 14 Jun 2024 15:49:50 -0500 Subject: [PATCH 2/4] update ci container version --- .github/workflows/pr.yaml | 4 ++-- ci/runner/Dockerfile | 4 +--- ci/scripts/run_ci_local.sh | 2 +- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml index 7fc58687e2..42a261fdc0 100644 --- a/.github/workflows/pr.yaml +++ b/.github/workflows/pr.yaml @@ -95,7 +95,7 @@ jobs: # Disable conda upload for now, once we have morpheus packages in conda forge set the value to # !fromJSON(needs.prepare.outputs.is_pr) && (fromJSON(needs.prepare.outputs.is_main_branch) && 'main' || 'dev') || '' conda_upload_label: "" - container: nvcr.io/ea-nvidia-morpheus/morpheus:morpheus-ci-build-240524 - test_container: nvcr.io/ea-nvidia-morpheus/morpheus:morpheus-ci-test-240524 + container: nvcr.io/ea-nvidia-morpheus/morpheus:morpheus-ci-build-240614 + test_container: nvcr.io/ea-nvidia-morpheus/morpheus:morpheus-ci-test-240614 secrets: NGC_API_KEY: ${{ secrets.NGC_API_KEY }} diff --git a/ci/runner/Dockerfile b/ci/runner/Dockerfile index 3927e49e0b..d4cc809f2b 100644 --- a/ci/runner/Dockerfile +++ b/ci/runner/Dockerfile @@ -1,5 +1,3 @@ -# syntax=docker/dockerfile:1.3 - # SPDX-FileCopyrightText: Copyright (c) 2022-2024, NVIDIA CORPORATION & AFFILIATES. All rights reserved. # SPDX-License-Identifier: Apache-2.0 # @@ -19,7 +17,7 @@ ARG FROM_IMAGE="rapidsai/ci-conda" ARG CUDA_PKG_VER=12-0 ARG CUDA_SHORT_VER=12.1 -ARG CUDA_VER=12.1.1 +ARG CUDA_VER=12.2.2 ARG LINUX_DISTRO=ubuntu ARG LINUX_VER=22.04 ARG PROJ_NAME=morpheus diff --git a/ci/scripts/run_ci_local.sh b/ci/scripts/run_ci_local.sh index 444d4a5ebb..1b6816f5d1 100755 --- a/ci/scripts/run_ci_local.sh +++ b/ci/scripts/run_ci_local.sh @@ -58,7 +58,7 @@ GIT_BRANCH=$(git branch --show-current) GIT_COMMIT=$(git log -n 1 --pretty=format:%H) LOCAL_CI_TMP=${LOCAL_CI_TMP:-${MORPHEUS_ROOT}/.tmp/local_ci_tmp} -CONTAINER_VER=${CONTAINER_VER:-240524} +CONTAINER_VER=${CONTAINER_VER:-240614} CUDA_VER=${CUDA_VER:-12.1} DOCKER_EXTRA_ARGS=${DOCKER_EXTRA_ARGS:-""} From 6b07019808e05f6946b6e9dd36500e2b64ebc986 Mon Sep 17 00:00:00 2001 From: Christopher Harris Date: Fri, 14 Jun 2024 22:54:08 +0000 Subject: [PATCH 3/4] . --- ci/runner/Dockerfile | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/ci/runner/Dockerfile b/ci/runner/Dockerfile index d4cc809f2b..02e065ac47 100644 --- a/ci/runner/Dockerfile +++ b/ci/runner/Dockerfile @@ -17,7 +17,7 @@ ARG FROM_IMAGE="rapidsai/ci-conda" ARG CUDA_PKG_VER=12-0 ARG CUDA_SHORT_VER=12.1 -ARG CUDA_VER=12.2.2 +ARG CUDA_VER=12.1.1 ARG LINUX_DISTRO=ubuntu ARG LINUX_VER=22.04 ARG PROJ_NAME=morpheus @@ -43,6 +43,12 @@ ARG CUDA_SHORT_VER ARG PROJ_NAME ARG PYTHON_VER +RUN <=1.13.*" +conda clean -aipty +EOF + RUN rapids-dependency-file-generator \ --config /tmp/conda/dependencies.yaml \ --output conda \ From 8269f52e4679b7091dd3e1605b4cd9ba02cbfd7e Mon Sep 17 00:00:00 2001 From: Christopher Harris Date: Sat, 15 Jun 2024 03:30:17 +0000 Subject: [PATCH 4/4] move rapids-dependency-file-generator update to correct part of Dockerfile --- ci/runner/Dockerfile | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/ci/runner/Dockerfile b/ci/runner/Dockerfile index 02e065ac47..3404e9a4e6 100644 --- a/ci/runner/Dockerfile +++ b/ci/runner/Dockerfile @@ -35,6 +35,12 @@ SHELL ["/bin/bash", "-c"] # Create conda environment COPY ./dependencies.yaml /tmp/conda/ +RUN <=1.13.*" +conda clean -aipty +EOF + # ============ build ================== FROM base as build @@ -43,12 +49,6 @@ ARG CUDA_SHORT_VER ARG PROJ_NAME ARG PYTHON_VER -RUN <=1.13.*" -conda clean -aipty -EOF - RUN rapids-dependency-file-generator \ --config /tmp/conda/dependencies.yaml \ --output conda \