diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile new file mode 100644 index 000000000..d1ffbce77 --- /dev/null +++ b/.devcontainer/Dockerfile @@ -0,0 +1,18 @@ +# SPDX-FileCopyrightText: Copyright (c) 2022-2023, NVIDIA CORPORATION & AFFILIATES. All rights reserved. +# SPDX-License-Identifier: Apache-2.0 +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +FROM rapidsai/devcontainers:23.04-cuda11.8-mambaforge-ubuntu22.04 AS base + +ENV PATH="${PATH}:/workspaces/mrc/.devcontainer/bin" diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 704e4519b..6046d60a1 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -1,12 +1,68 @@ +// SPDX-FileCopyrightText: Copyright (c) 2022, NVIDIA CORPORATION & AFFILIATES. All rights reserved. +// SPDX-License-Identifier: Apache-2.0 +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. { + "name": "mrc-dev", "build": { - "args": { - "USERNAME": "${localEnv:USER}", - "USER_ID": "${localEnv:UID}" + "dockerfile": "Dockerfile" + }, + "hostRequirements": { + "gpu": true + }, + "capAdd":[ + "SYS_NICE", + "SYS_PTRACE" + ], + "securityOpt": [ + "seccomp=unconfined" + ], + "runArgs": [ + "--network=host" + ], + "containerEnv": { + "HOST_MRC_ROOT": "${localWorkspaceFolder}", + "MRC_ROOT": "${containerWorkspaceFolder}", + "DEFAULT_CONDA_ENV": "mrc", + "MAMBA_NO_BANNER": "1", + "VAULT_HOST": "https://vault.ops.k8s.rapids.ai" + }, + "initializeCommand": [ "${localWorkspaceFolder}/.devcontainer/initialize-command.sh" ], + "remoteUser": "coder", + "mounts": [ + { + "type": "bind", + "source": "${localWorkspaceFolder}/.cache/conda/envs", + "target": "/home/coder/.conda/envs" + }, + { + "type": "bind", + "source": "${localWorkspaceFolder}/../.conda/pkgs", + "target": "/home/coder/.conda/pkgs" }, - "context": "..", - "dockerfile": "${localWorkspaceFolder}/Dockerfile", - "target": "development" + { + "type": "bind", + "source": "${localWorkspaceFolder}/../.config", // parent folder because sister repos are sibling dirs + "target": "/home/coder/.config" + }, + { + "type": "bind", + "source": "${localWorkspaceFolder}/.devcontainer/opt/mrc", + "target": "/opt/mrc" + }, + ], + "features": { + "ghcr.io/devcontainers/features/dotnet:1": {} }, "customizations": { "vscode": { @@ -26,34 +82,11 @@ "xaver.clang-format" ], "settings": { - "cmake.cmakePath": "cmake", // Ensure we use the default from the conda environment - // Fix for https://github.com/dotnet/vscode-dotnet-runtime/issues/159 - // Once version 1.6.1 of the extension has been release, this can be removed + "cmake.cmakePath": "/tmp/.current-conda-env/bin/cmake", "cmake.languageSupport.dotnetPath": "/usr/bin/dotnet", + "C_Cpp.intelliSenseEngine": "disabled", + "python.terminal.activateEnvironment": false } } }, - "hostRequirements": { - "gpu": true - }, - "mounts": [ - // Mount the necessary files for GDB pretty-printing to work - "source=${localWorkspaceFolder}/.devcontainer/home/.gdbinit,target=/home/${localEnv:USER}/.gdbinit,type=bind", - "source=${localWorkspaceFolder}/.devcontainer/home/.config/gdb,target=/home/${localEnv:USER}/.config/gdb,type=bind", - // Mount the Github CLI config directory to allow using the Github CLI - "source=${localEnv:HOME}/.config/gh,target=/home/${localEnv:USER}/.config/gh,type=bind", - ], - "name": "mrc-dev", - "overrideCommand": true, // infinite loop of sleeps, - "remoteUser": "${localEnv:USER}", - "runArgs": [ - "--network=host", - "--cap-add=SYS_PTRACE", - "--cap-add=SYS_NICE", - "--security-opt", - "seccomp=unconfined" - ], - "updateRemoteUserUID": true, - "workspaceFolder": "/work", - "workspaceMount": "source=${localWorkspaceFolder},target=/work,type=bind,consistency=cached" } diff --git a/.devcontainer/home/.gdbinit b/.devcontainer/home/.gdbinit deleted file mode 100644 index 43e108353..000000000 --- a/.devcontainer/home/.gdbinit +++ /dev/null @@ -1,3 +0,0 @@ -add-auto-load-safe-path /opt/conda - -source ~/.config/gdb/enable_conda_libstd_pretty_print.py diff --git a/.devcontainer/initialize-command.sh b/.devcontainer/initialize-command.sh new file mode 100755 index 000000000..807451923 --- /dev/null +++ b/.devcontainer/initialize-command.sh @@ -0,0 +1,21 @@ +#!/bin/bash +# SPDX-FileCopyrightText: Copyright (c) 2022-2023, NVIDIA CORPORATION & AFFILIATES. All rights reserved. +# SPDX-License-Identifier: Apache-2.0 +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +# create the parent conda folder so it's found when mounting +mkdir -p ../.conda + +# create a config directory if it does not exist so it's found when mounting +mkdir -p ../.config diff --git a/.devcontainer/opt/mrc/bin/post-attach-command.sh b/.devcontainer/opt/mrc/bin/post-attach-command.sh new file mode 100755 index 000000000..eb00a5061 --- /dev/null +++ b/.devcontainer/opt/mrc/bin/post-attach-command.sh @@ -0,0 +1,33 @@ +#!/bin/bash +# SPDX-FileCopyrightText: Copyright (c) 2023, NVIDIA CORPORATION & AFFILIATES. All rights reserved. +# SPDX-License-Identifier: Apache-2.0 +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +# Ensure our ~/.config directory has the correct permissions. If ~/.config did +# not exist, and you mount ~/.config/gh from the host, then ~/.config will be +# created with root permissions which can break things + +conda_env_find(){ + conda env list | grep "${@}" >/dev/null 2>/dev/null +} + +ENV_NAME=${ENV_NAME:-mrc} + +sed -ri "s/conda activate base/conda activate $ENV_NAME/g" ~/.bashrc; + +if conda_env_find "${ENV_NAME}" ; \ + +then mamba env update --name ${ENV_NAME} -f ${MRC_ROOT}/ci/conda/environments/dev_env.yml --prune; \ +else mamba env create --name ${ENV_NAME} -f ${MRC_ROOT}/ci/conda/environments/dev_env.yml; \ +fi diff --git a/.devcontainer/opt/mrc/bin/update-content-command.sh b/.devcontainer/opt/mrc/bin/update-content-command.sh new file mode 100755 index 000000000..2e025db79 --- /dev/null +++ b/.devcontainer/opt/mrc/bin/update-content-command.sh @@ -0,0 +1,23 @@ +#!/bin/bash +# SPDX-FileCopyrightText: Copyright (c) 2023, NVIDIA CORPORATION & AFFILIATES. All rights reserved. +# SPDX-License-Identifier: Apache-2.0 +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +# Ensure our ~/.config directory has the correct permissions. If ~/.config did +# not exist, and you mount ~/.config/gh from the host, then ~/.config will be +# created with root permissions which can break things + +if [[ ! -f ~/.config/.gdbinit ]]; then + cp /opt/mrc/etc/.gdbinit ~/.config/.gdbinit +fi diff --git a/.devcontainer/opt/mrc/etc/.gdbinit b/.devcontainer/opt/mrc/etc/.gdbinit new file mode 100644 index 000000000..0fa2be45f --- /dev/null +++ b/.devcontainer/opt/mrc/etc/.gdbinit @@ -0,0 +1,3 @@ +add-auto-load-safe-path /opt/conda + +source /opt/mrc/etc/enable_conda_libstd_pretty_print.py diff --git a/.devcontainer/home/.config/gdb/enable_conda_libstd_pretty_print.py b/.devcontainer/opt/mrc/etc/enable_conda_libstd_pretty_print.py similarity index 100% rename from .devcontainer/home/.config/gdb/enable_conda_libstd_pretty_print.py rename to .devcontainer/opt/mrc/etc/enable_conda_libstd_pretty_print.py diff --git a/CMakeLists.txt b/CMakeLists.txt index e19c3a8ba..45a080fe7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -36,7 +36,7 @@ option(MRC_USE_CONDA "Enables finding dependencies via conda. All dependencies m environment" ON) option(MRC_USE_IWYU "Enable running include-what-you-use as part of the build process" OFF) -set(MRC_RAPIDS_VERSION "22.10" CACHE STRING "Which version of RAPIDS to build for. Sets default versions for RAPIDS CMake and RMM.") +set(MRC_RAPIDS_VERSION "23.02" CACHE STRING "Which version of RAPIDS to build for. Sets default versions for RAPIDS CMake and RMM.") set(MRC_CACHE_DIR "${CMAKE_SOURCE_DIR}/.cache" CACHE PATH "Directory to contain all CPM and CCache data") mark_as_advanced(MRC_CACHE_DIR) @@ -63,7 +63,7 @@ list(PREPEND CMAKE_MODULE_PATH "${MRC_CMAKE_MODULE_PATH_EXTENSIONS}") list(PREPEND CMAKE_PREFIX_PATH "${MRC_CMAKE_PREFIX_PATH_EXTENSIONS}") # Load morpheus utils and update CMake paths -set(MORPHEUS_UTILS_RAPIDS_CMAKE_VERSION ${MRC_RAPIDS_VERSION}) +set(MORPHEUS_UTILS_RAPIDS_VERSION ${MRC_RAPIDS_VERSION}) set(MORPHEUS_UTILS_RAPIDS_CPM_INIT_OVERRIDE "${CMAKE_CURRENT_SOURCE_DIR}/cmake/rapids_cpm_package_overrides.json") include(morpheus_utils/load) @@ -78,7 +78,7 @@ morpheus_utils_initialize_package_manager( morpheus_utils_initialize_cuda_arch(mrc) project(mrc - VERSION 23.03.00 + VERSION 23.07.00 LANGUAGES C CXX ) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 08281aae7..529d501d5 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -77,41 +77,41 @@ Some options: #### Clone MRC repository ```bash -export MRC_HOME=$(pwd)/mrc -git clone --recurse-submodules git@github.com:nv-morpheus/mrc.git $MRC_HOME -cd $MRC_HOME +export MRC_ROOT=$(pwd)/mrc +git clone --recurse-submodules git@github.com:nv-morpheus/mrc.git $MRC_ROOT +cd $MRC_ROOT ``` #### Create MRC Conda environment ```bash # note: `mamba` may be used in place of `conda` for better performance. -conda env create -n mrc --file $MRC_HOME/ci/conda/environments/dev_env.yml +conda env create -n mrc --file $MRC_ROOT/ci/conda/environments/dev_env.yml conda activate mrc ``` #### Build MRC ```bash -mkdir $MRC_HOME/build -cd $MRC_HOME/build +mkdir $MRC_ROOT/build +cd $MRC_ROOT/build cmake .. make -j $(nproc) ``` #### Run MRC C++ Tests ```bash -export MRC_TEST_INTERNAL_DATA_PATH=$MRC_HOME/src/tests -$MRC_HOME/build/src/tests/test_mrc_private.x -$MRC_HOME/build/tests/test_mrc.x -$MRC_HOME/build/tests/logging/test_mrc_logging.x +export MRC_TEST_INTERNAL_DATA_PATH=$MRC_ROOT/cpp/mrc/src/tests +$MRC_ROOT/build/cpp/mrcsrc/tests/test_mrc_private.x +$MRC_ROOT/build/cpp/mrctests/test_mrc.x +$MRC_ROOT/build/cpp/mrctests/logging/test_mrc_logging.x ``` ### Install MRC Python ```bash -pip install -e $MRC_HOME/build/python +pip install -e $MRC_ROOT/build/python ``` #### Run MRC Python Tests ```bash -pytest $MRC_HOME/python +pytest $MRC_ROOT/python ``` ### Building API Documentation diff --git a/Dockerfile b/Dockerfile index 266d514c4..c82fb7a3b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -17,13 +17,13 @@ ARG FROM_IMAGE="rapidsai/ci" -ARG CUDA_VER=11.4.1 +ARG CUDA_VER=11.8.0 ARG LINUX_DISTRO=ubuntu ARG LINUX_VER=20.04 ARG PYTHON_VER=3.8 # ============= base =================== -FROM ${FROM_IMAGE}:cuda11.4.1-ubuntu20.04-py3.8 AS base +FROM ${FROM_IMAGE}:cuda11.8.0-ubuntu20.04-py3.8 AS base ARG PROJ_NAME=mrc diff --git a/README.md b/README.md index 69e559c65..d830b4c46 100644 --- a/README.md +++ b/README.md @@ -110,46 +110,46 @@ Installing via source is for more advanced users and is necessary to try MRC fea #### Clone MRC repository ```bash -export MRC_HOME=$(pwd)/mrc -git clone --recurse-submodules git@github.com:nv-morpheus/mrc.git $MRC_HOME -cd $MRC_HOME +export MRC_ROOT=$(pwd)/mrc +git clone --recurse-submodules git@github.com:nv-morpheus/mrc.git $MRC_ROOT +cd $MRC_ROOT ``` #### Create MRC Conda Environment ```bash # note: `mamba` may be used in place of `conda` for better performance. -conda env create -n mrc-dev --file $MRC_HOME/ci/conda/environments/dev_env.yml +conda env create -n mrc-dev --file $MRC_ROOT/ci/conda/environments/dev_env.yml conda activate mrc-dev ``` #### Build MRC ```bash -mkdir $MRC_HOME/build -cd $MRC_HOME/build +mkdir $MRC_ROOT/build +cd $MRC_ROOT/build cmake .. make -j $(nproc) ``` #### Run MRC C++ Tests ```bash -export MRC_TEST_INTERNAL_DATA_PATH=$MRC_HOME/src/tests -$MRC_HOME/build/src/tests/test_mrc_private.x -$MRC_HOME/build/tests/test_mrc.x -$MRC_HOME/build/tests/logging/test_mrc_logging.x +export MRC_TEST_INTERNAL_DATA_PATH=$MRC_ROOT/cpp/mrc/src/tests +$MRC_ROOT/build/cpp/mrc/src/tests/test_mrc_private.x +$MRC_ROOT/build/cpp/mrc/tests/test_mrc.x +$MRC_ROOT/build/cpp/mrc/tests/logging/test_mrc_logging.x ``` #### Install MRC Python Bindings ```bash -pip install -e $MRC_HOME/build/python +pip install -e $MRC_ROOT/build/python ``` #### Run MRC Python Tests ```bash -pytest $MRC_HOME/python +pytest $MRC_ROOT/python ``` ### Docker Installation -A Dockerfile is provided at `$MRC_HOME` and can be built with +A Dockerfile is provided at `$MRC_ROOT` and can be built with ```bash docker build -t mrc:latest . ``` diff --git a/ci/conda/README.md b/ci/conda/README.md index afef29543..56e6045fb 100644 --- a/ci/conda/README.md +++ b/ci/conda/README.md @@ -3,7 +3,7 @@ To build the Conda packages, it's recommended to run the provided scripts from a docker container. To build the container, `mrc-conda-build`, run the following: ```bash -cd ${MRC_HOME} +cd ${MRC_ROOT} docker buildx build --target developement -t mrc-conda-build . ``` @@ -20,10 +20,10 @@ docker run --rm -ti -v $PWD:/work \ mrc-conda-build ./ci/conda/recipes/run_conda_build.sh ``` -This will save the conda packages to `${MRC_HOME}/.conda-bld`. To install from this location, use the following: +This will save the conda packages to `${MRC_ROOT}/.conda-bld`. To install from this location, use the following: ```bash -conda install -c file://${MRC_HOME}/.conda-bld mrc +conda install -c file://${MRC_ROOT}/.conda-bld mrc ``` ## Uploading the Conda Package diff --git a/ci/conda/environments/dev_env.yml b/ci/conda/environments/dev_env.yml index 5bc4f0498..c0d3e590f 100644 --- a/ci/conda/environments/dev_env.yml +++ b/ci/conda/environments/dev_env.yml @@ -10,8 +10,8 @@ dependencies: - boost-cpp=1.74 - ccache - cmake=3.24 - - cuda-nvml-dev=11.4 - - cudatoolkit=11.4 + - cuda-nvml-dev=11.8 + - cudatoolkit=11.8 - cython=0.29.24 - doxygen=1.9.2 - flatbuffers=2.0 @@ -23,21 +23,21 @@ dependencies: - glog=0.6 - gmock=1.10 - graphviz=3.0 - - grpc-cpp=1.46 + - grpc-cpp=1.48 - gtest=1.10 - gxx_linux-64=11.2 - isort - jinja2=3.0 - lcov=1.15 - libhwloc=2.5 - - libprotobuf=3.20 - - librmm=22.10 + - libprotobuf=3.21 + - librmm=23.02 - libtool - ninja=1.10 - nlohmann_json=3.9 - numactl-libs-cos7-x86_64 - numpy=1.21.2 - - nvcc_linux-64=11.4 + - nvcc_linux-64=11.8 - pip - pkg-config=0.29 - pybind11-stubgen=0.10 diff --git a/ci/conda/recipes/libmrc/conda_build_config.yaml b/ci/conda/recipes/libmrc/conda_build_config.yaml index 11ef76893..dc355e756 100644 --- a/ci/conda/recipes/libmrc/conda_build_config.yaml +++ b/ci/conda/recipes/libmrc/conda_build_config.yaml @@ -23,7 +23,7 @@ cuda_compiler: - nvcc cuda_compiler_version: - - 11.4 + - 11.8 python: - 3.8 @@ -31,24 +31,23 @@ python: # Setup the dependencies to build with multiple versions of RAPIDS rapids_version: # Keep around compatibility with current version -1 - - 22.08 - 22.08 - 22.10 - + - 23.02 # Multiple versions of abseil are required to satisfy the solver for some # environments. RAPIDS 22.06 only works with gRPC 1.45 and 22.08 only works with # 1.46. For each version of gRPC, support 2 abseil versions. Zip all of the keys # together to avoid impossible combinations -abseil_cpp: - - 20211102.0 +libabseil: - 20220623.0 - 20220623.0 + - 20230125.0 grpc_cpp: - 1.46 - 1.46 - - 1.46 + - 1.51 # UCX 1.12 is required for RAPIDS 22.06 ucx: @@ -56,12 +55,12 @@ ucx: - 1.13 - 1.13 - zip_keys: - rapids_version - - abseil_cpp + - libabseil - grpc_cpp - ucx + - libprotobuf # The following mimic what is available in the pinning feedstock: # https://github.com/conda-forge/conda-forge-pinning-feedstock/blob/main/recipe/conda_build_config.yaml @@ -75,6 +74,8 @@ glog: - 0.6 libprotobuf: - 3.20 + - 3.20 + - 3.21 pin_run_as_build: diff --git a/ci/conda/recipes/libmrc/meta.yaml b/ci/conda/recipes/libmrc/meta.yaml index 60b0e7545..fb742a60a 100644 --- a/ci/conda/recipes/libmrc/meta.yaml +++ b/ci/conda/recipes/libmrc/meta.yaml @@ -16,7 +16,7 @@ {% set version = environ.get('GIT_VERSION', '0.0.0.dev').lstrip('v') + environ.get('VERSION_SUFFIX', '') %} {% set minor_version = version.split('.')[0] + '.' + version.split('.')[1] %} {% set py_version = environ.get('CONDA_PY', '3.8') %} -{% set cuda_version = '.'.join(environ.get('CUDA', '11.4').split('.')[:2]) %} +{% set cuda_version = '.'.join(environ.get('CUDA', '11.8').split('.')[:2]) %} {% set cuda_major = cuda_version.split('.')[0] %} package: @@ -50,7 +50,7 @@ requirements: - sysroot_linux-64 >=2.17 host: # Libraries necessary to build. Keep sorted! - - abseil-cpp + - libabseil - boost-cpp - cuda-nvml-dev {{ cuda_version }}.* - cudatoolkit {{ cuda_version }}.* @@ -92,7 +92,7 @@ outputs: - sysroot_linux-64 2.17 host: # Any libraries with weak run_exports need to go here to be added to the run. Keep sorted! - - abseil-cpp # Needed for transitive run_exports from grpc-cpp. Does not need a version + - libabseil # Needed for transitive run_exports from grpc-cpp. Does not need a version - boost-cpp - flatbuffers 2.0.* - gflags @@ -127,7 +127,7 @@ outputs: host: # Only should need libmrc and python. Keep sorted! - {{ pin_subpackage('libmrc', exact=True) }} - - abseil-cpp # mrc does not require abseil at build time. See https://github.com/conda-forge/arrow-cpp-feedstock/issues/814 + - libabseil # mrc does not require abseil at build time. See https://github.com/conda-forge/arrow-cpp-feedstock/issues/814 - python {{ python }} run: - {{ pin_subpackage('libmrc', exact=True) }} @@ -146,7 +146,7 @@ outputs: - numpy - nvtx - pytest - - cuml {{ rapids_version }}.* # Ensure we can install cuml. This can cause issues solving abseil-cpp + - cuml {{ rapids_version }}.* # Ensure we can install cuml. This can cause issues solving libabseil about: home: https://www.nvidia.com/ diff --git a/ci/conda/recipes/run_conda_build.sh b/ci/conda/recipes/run_conda_build.sh index 3b3d65727..e0ed9ab94 100755 --- a/ci/conda/recipes/run_conda_build.sh +++ b/ci/conda/recipes/run_conda_build.sh @@ -42,7 +42,7 @@ export MRC_ROOT=${MRC_ROOT:-$(git rev-parse --show-toplevel)} export CUDA="$(conda list | grep cudatoolkit | egrep -o "[[:digit:]]+\.[[:digit:]]+\.[[:digit:]]+")" export PYTHON_VER="$(python -c "import sys; print('.'.join(map(str, sys.version_info[:2])))")" -export CUDA=11.4.1 +export CUDA=11.8.0 echo "CUDA : ${CUDA}" echo "PYTHON_VER : ${PYTHON_VER}" echo "" @@ -99,7 +99,7 @@ fi # Choose default variants if hasArg quick; then # For quick build, just do most recent version of rapids - CONDA_ARGS_ARRAY+=("--variants" "{python: 3.8, rapids_version: 22.10}") + CONDA_ARGS_ARRAY+=("--variants" "{python: 3.8, rapids_version: 23.02}") else CONDA_ARGS_ARRAY+=("--variants" "{python: 3.8}") fi diff --git a/docs/quickstart/CMakeLists.txt b/docs/quickstart/CMakeLists.txt index 98271b9d6..d577e2960 100644 --- a/docs/quickstart/CMakeLists.txt +++ b/docs/quickstart/CMakeLists.txt @@ -28,7 +28,7 @@ list(PREPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../../external/utili include(morpheus_utils/load) project(mrc-quickstart - VERSION 23.03 + VERSION 23.07 LANGUAGES C CXX ) diff --git a/docs/quickstart/README.md b/docs/quickstart/README.md index ac6f01b99..1000ae9d8 100644 --- a/docs/quickstart/README.md +++ b/docs/quickstart/README.md @@ -23,7 +23,7 @@ If you've alredy followed the MRC library installation instructions in the [main ```bash # Change directory to the quickstart root -cd ${MRC_HOME}/docs/quickstart/ +cd ${MRC_ROOT}/docs/quickstart/ # Update the existing MRC conda environment. Here, we assume the environment is named `mrc`, but you can change this to the environment name you used, if different conda env update -n mrc -f environment_cpp.yml @@ -39,7 +39,7 @@ pip install -e python If you haven't installed MRC or would like to create an entirely new Conda environment for the Quick Start Guide, run: ```bash # Change directory to the quickstart root -cd ${MRC_HOME}/docs/quickstart/ +cd ${MRC_ROOT}/docs/quickstart/ # Create a new MRC conda environment. Here, we assume the environment is named `mrc-quickstart` conda env create -n mrc-quickstart -f environment_cpp.yml @@ -62,7 +62,7 @@ If you encounter errors building the examples, this is mostly likely caused for A comprehensive overview of building MRC from source is provided in the [MRC README](../../README.md#source-installation). To build the Quick Start Guide examples, simply run ```bash -cd ${MRC_HOME}/docs/quickstart +cd ${MRC_ROOT}/docs/quickstart # Build the QSG including the C++ examples ./compile.sh diff --git a/external/utilities b/external/utilities index 0fb0b0aab..846c3a72f 160000 --- a/external/utilities +++ b/external/utilities @@ -1 +1 @@ -Subproject commit 0fb0b0aab16f758adf28d1626945544172406585 +Subproject commit 846c3a72f1ba4b867476c318b6e719bcf9423ffd