From 8b1173a3854e481da421cb83ea8fd8105de325da Mon Sep 17 00:00:00 2001 From: Michael Demoret Date: Thu, 8 Sep 2022 14:10:49 -0600 Subject: [PATCH 1/2] Upgrading 22.08 versions to 22.09 --- README.md | 4 ++-- cmake/dependencies.cmake | 2 +- docker/conda/environments/cuda11.5_dev.yml | 2 +- docs/source/index.rst | 4 ++-- docs/source/morpheus_quickstart_guide.md | 12 ++++++------ 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/README.md b/README.md index 39e57f514d..f9ae8772a9 100644 --- a/README.md +++ b/README.md @@ -86,10 +86,10 @@ To run the built "release" container, use the following: ./docker/run_container_release.sh ``` -You can specify different Docker images and tags by passing the script the `DOCKER_IMAGE_TAG`, and `DOCKER_IMAGE_TAG` variables respectively. For example, to run version `v22.08.00a` use the following: +You can specify different Docker images and tags by passing the script the `DOCKER_IMAGE_TAG`, and `DOCKER_IMAGE_TAG` variables respectively. For example, to run version `v22.09.00a` use the following: ```bash -DOCKER_IMAGE_TAG="v22.08.00a-runtime" ./docker/run_container_release.sh +DOCKER_IMAGE_TAG="v22.09.00a-runtime" ./docker/run_container_release.sh ``` ### Build from Source diff --git a/cmake/dependencies.cmake b/cmake/dependencies.cmake index d0d34873a6..ee66363987 100644 --- a/cmake/dependencies.cmake +++ b/cmake/dependencies.cmake @@ -104,7 +104,7 @@ include(deps/Configure_rdkafka) # SRF (Should come after all third party but before NVIDIA repos) # ===== -set(SRF_VERSION 22.08 CACHE STRING "Which version of SRF to use") +set(SRF_VERSION 22.09 CACHE STRING "Which version of SRF to use") include(deps/Configure_srf) # CuDF diff --git a/docker/conda/environments/cuda11.5_dev.yml b/docker/conda/environments/cuda11.5_dev.yml index 87741f1838..9aa8ed80f7 100644 --- a/docker/conda/environments/cuda11.5_dev.yml +++ b/docker/conda/environments/cuda11.5_dev.yml @@ -69,7 +69,7 @@ dependencies: - scikit-build=0.13 - sphinx - sphinx_rtd_theme - - srf 22.08.* + - srf 22.09.* - sysroot_linux-64=2.17 - tqdm - yapf=0.32.0 diff --git a/docs/source/index.rst b/docs/source/index.rst index be478135e9..f6f75259c0 100644 --- a/docs/source/index.rst +++ b/docs/source/index.rst @@ -71,13 +71,13 @@ To get started, first pull the NGC container: .. code-block:: console - $ docker pull nvcr.io/nvidia/morpheus/morpheus:22.08-runtime + $ docker pull nvcr.io/nvidia/morpheus/morpheus:22.09-runtime Launch an interactive container to start using Morpheus: .. code-block:: console - $ docker run --rm -ti --net=host --gpus=all nvcr.io/nvidia/morpheus/morpheus:22.08-runtime bash + $ docker run --rm -ti --net=host --gpus=all nvcr.io/nvidia/morpheus/morpheus:22.09-runtime bash (morpheus) root@958a683a8a26:/workspace# morpheus --help Usage: morpheus [OPTIONS] COMMAND [ARGS]...Options: --debug / --no-debug [default: False] diff --git a/docs/source/morpheus_quickstart_guide.md b/docs/source/morpheus_quickstart_guide.md index 4fc73755e2..6ce5c4447f 100644 --- a/docs/source/morpheus_quickstart_guide.md +++ b/docs/source/morpheus_quickstart_guide.md @@ -165,7 +165,7 @@ The Morpheus AI Engine consists of the following components: Follow the below steps to install Morpheus AI Engine: ```bash -$ helm fetch https://helm.ngc.nvidia.com/nvidia/morpheus/charts/morpheus-ai-engine-22.08.tgz --username='$oauthtoken' --password=$API_KEY --untar +$ helm fetch https://helm.ngc.nvidia.com/nvidia/morpheus/charts/morpheus-ai-engine-22.09.tgz --username='$oauthtoken' --password=$API_KEY --untar ``` ```bash $ helm install --set ngc.apiKey="$API_KEY" \ @@ -207,7 +207,7 @@ replicaset.apps/zookeeper-87f9f4dd 1 1 1 54s Run the following command to pull the Morpheus SDK Client chart on to your instance: ```bash -$ helm fetch https://helm.ngc.nvidia.com/nvidia/morpheus/charts/morpheus-sdk-client-22.08.tgz --username='$oauthtoken' --password=$API_KEY --untar +$ helm fetch https://helm.ngc.nvidia.com/nvidia/morpheus/charts/morpheus-sdk-client-22.09.tgz --username='$oauthtoken' --password=$API_KEY --untar ``` #### Morpheus SDK Client in Sleep Mode @@ -245,7 +245,7 @@ $ kubectl -n $NAMESPACE exec sdk-cli-helper -- cp -RL /workspace/models /common The Morpheus MLflow Triton Plugin is used to deploy, update, and remove models from the Morpheus AI Engine. The MLflow server UI can be accessed using NodePort 30500. Follow the below steps to install the Morpheus MLflow Triton Plugin: ```bash -$ helm fetch https://helm.ngc.nvidia.com/nvidia/morpheus/charts/morpheus-mlflow-22.08.tgz --username='$oauthtoken' --password=$API_KEY --untar +$ helm fetch https://helm.ngc.nvidia.com/nvidia/morpheus/charts/morpheus-mlflow-22.09.tgz --username='$oauthtoken' --password=$API_KEY --untar ``` ```bash $ helm install --set ngc.apiKey="$API_KEY" \ @@ -1146,9 +1146,9 @@ This section lists solutions to problems you might encounter with Morpheus or fr -[Morpheus Pipeline Examples]: https://github.com/NVIDIA/Morpheus/tree/branch-22.08/examples -[Morpheus Contribution]: https://github.com/NVIDIA/Morpheus/blob/branch-22.08/CONTRIBUTING.md -[Morpheus Developer Guide]: https://github.com/NVIDIA/Morpheus/tree/branch-22.08/docs/source/developer_guide/guides +[Morpheus Pipeline Examples]: https://github.com/NVIDIA/Morpheus/tree/branch-22.09/examples +[Morpheus Contribution]: https://github.com/NVIDIA/Morpheus/blob/branch-22.09/CONTRIBUTING.md +[Morpheus Developer Guide]: https://github.com/NVIDIA/Morpheus/tree/branch-22.09/docs/source/developer_guide/guides [Triton Inference Server Model Configuration]: https://github.com/triton-inference-server/server/blob/main/docs/model_configuration.md [NVIDIA’s Cloud Native Core Stack]: https://github.com/NVIDIA/cloud-native-core [NGC Registry CLI User Guide]: https://docs.nvidia.com/dgx/ngc-registry-cli-user-guide/index.html#topic_4_1 From 750eaeeac5cfa8023ff3c94663f6fbf2a1684472 Mon Sep 17 00:00:00 2001 From: Michael Demoret Date: Fri, 9 Sep 2022 17:28:42 -0600 Subject: [PATCH 2/2] Prefixing RAPIDS_VERSION with the project name --- cmake/dependencies.cmake | 4 ++-- cmake/deps/Configure_srf.cmake | 2 +- cmake/import-rapids-cmake.cmake | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/cmake/dependencies.cmake b/cmake/dependencies.cmake index ee66363987..844d487b8b 100644 --- a/cmake/dependencies.cmake +++ b/cmake/dependencies.cmake @@ -109,12 +109,12 @@ include(deps/Configure_srf) # CuDF # ===== -set(CUDF_VERSION "${RAPIDS_VERSION}" CACHE STRING "Which version of cuDF to use") +set(CUDF_VERSION "${MORPHEUS_RAPIDS_VERSION}" CACHE STRING "Which version of cuDF to use") include(deps/Configure_cudf) # Triton-client # ===== -set(TRITONCLIENT_VERSION "${RAPIDS_VERSION}" CACHE STRING "Which version of TritonClient to use") +set(TRITONCLIENT_VERSION "${MORPHEUS_RAPIDS_VERSION}" CACHE STRING "Which version of TritonClient to use") include(deps/Configure_TritonClient) list(POP_BACK CMAKE_MESSAGE_CONTEXT) diff --git a/cmake/deps/Configure_srf.cmake b/cmake/deps/Configure_srf.cmake index 9a7967e61c..fc3a7c2b0f 100644 --- a/cmake/deps/Configure_srf.cmake +++ b/cmake/deps/Configure_srf.cmake @@ -41,7 +41,7 @@ function(find_and_configure_srf version) "SRF_PYTHON_INPLACE_BUILD OFF" "SRF_PYTHON_PERFORM_INSTALL ON" "SRF_PYTHON_BUILD_STUBS ${MORPHEUS_BUILD_PYTHON_STUBS}" - "RMM_VERSION ${RAPIDS_VERSION}" + "RMM_VERSION ${MORPHEUS_RAPIDS_VERSION}" ) endfunction() diff --git a/cmake/import-rapids-cmake.cmake b/cmake/import-rapids-cmake.cmake index 99c51d96da..a072cc2bba 100644 --- a/cmake/import-rapids-cmake.cmake +++ b/cmake/import-rapids-cmake.cmake @@ -14,8 +14,8 @@ # limitations under the License. -set(RAPIDS_VERSION "22.08" CACHE STRING "Global default version for all Rapids project dependencies") -set(RAPIDS_CMAKE_VERSION "${RAPIDS_VERSION}" CACHE STRING "Version of rapids-cmake to use") +set(MORPHEUS_RAPIDS_VERSION "22.08" CACHE STRING "Global default version for all Rapids project dependencies") +set(RAPIDS_CMAKE_VERSION "${MORPHEUS_RAPIDS_VERSION}" CACHE STRING "Version of rapids-cmake to use") # Download and load the repo according to the rapids-cmake instructions if it does not exist # NOTE: Use a different file than RAPIDS.cmake because MatX will just override it: https://github.com/NVIDIA/MatX/pull/192