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 CUDF 23.06 #1020

Merged
merged 4 commits into from
Jul 7, 2023
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
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ option(MORPHEUS_USE_IWYU "Enable running include-what-you-use as part of the bui

set(MORPHEUS_PY_INSTALL_DIR "${CMAKE_CURRENT_BINARY_DIR}/wheel" CACHE STRING "Location to install the python directory")

set(MORPHEUS_RAPIDS_VERSION "23.02" CACHE STRING "Sets default versions for RAPIDS libraries.")
set(MORPHEUS_RAPIDS_VERSION "23.06" CACHE STRING "Sets default versions for RAPIDS libraries.")
set(MORPHEUS_CACHE_DIR "${CMAKE_SOURCE_DIR}/.cache" CACHE PATH "Directory to contain all CPM and CCache data")
mark_as_advanced(MORPHEUS_CACHE_DIR)

Expand Down
2 changes: 1 addition & 1 deletion ci/conda/recipes/morpheus/conda_build_config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -32,4 +32,4 @@ boost:
- 1.74

rapids_version:
- 23.02
- 23.06
2 changes: 1 addition & 1 deletion ci/conda/recipes/morpheus/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
{% set py_version=environ.get('CONDA_PY', '3.10') %}
{% set cuda_version='.'.join(environ.get('CUDA', '11.8').split('.')[:2]) %}
{% set cuda_major=cuda_version.split('.')[0] %}
{% set rapids_version = "23.02" %}
{% set rapids_version = "23.06" %}

package:
name: morpheus-split
Expand Down
2 changes: 1 addition & 1 deletion docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ FROM ${FROM_IMAGE}:${CUDA_MAJOR_VER}.${CUDA_MINOR_VER}.${CUDA_REV_VER}-base-${LI
ARG PYTHON_VER
ARG IMAGE_TYPE=base
ARG RAPIDS_CHANNEL=rapidsai-nightly
ARG RAPIDS_VER=23.02
ARG RAPIDS_VER=23.06
ARG CONDA_CHANNEL=rapidsai
ARG CUDA_MAJOR_VER
ARG CUDA_MINOR_VER
Expand Down
2 changes: 1 addition & 1 deletion docker/build_container.sh
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ LINUX_DISTRO=${LINUX_DISTRO:-ubuntu}
LINUX_VER=${LINUX_VER:-22.04}
MORPHEUS_SUPPORT_DOCA=${MORPHEUS_SUPPORT_DOCA:-"OFF"}
PYTHON_VER=${PYTHON_VER:-3.10}
RAPIDS_VER=${RAPIDS_VER:-23.02}
RAPIDS_VER=${RAPIDS_VER:-23.06}
TENSORRT_VERSION=${TENSORRT_VERSION:-8.2.1.3}

DOCKER_ARGS="-t ${DOCKER_IMAGE_NAME}:${DOCKER_IMAGE_TAG}"
Expand Down
8 changes: 4 additions & 4 deletions docker/conda/environments/cuda11.8_dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,8 @@ dependencies:
- cuda-compiler=11.8
- cuda-nvml-dev=11.8
- cuda-toolkit=11.8
- cudf=23.02
- cupy=11.6.0
- cudf=23.06
- cupy>=12.0.0
- cxx-compiler
- cython=0.29.24
- datacompy=0.8
Expand All @@ -51,11 +51,11 @@ dependencies:
- git-lfs=3.2
- git>=2.35.3 # Needed for wildcards on safe.directory
- glog=0.6
- gmock=1.10
- gmock>=1.13.0
- gputil
- grpc-cpp>=1.43
- grpcio
- gtest=1.10
- gtest>=1.13.0
- gxx_linux-64=11.2
- include-what-you-use=0.18
- isort
Expand Down
6 changes: 3 additions & 3 deletions docker/conda/environments/cuda11.8_examples.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,10 @@ channels:
dependencies:
- boto3=1.24.59
- chardet=5.0.0
- cuml=23.02
- dask==2023.1.1
- cuml=23.06
- dask>=2023.1.1
- dill=0.3.6
- distributed==2023.1.1
- distributed>=2023.1.1
- mlflow>=2.2.1,<3
- papermill=2.3.4
- s3fs==2022.8.2
Expand Down
8 changes: 4 additions & 4 deletions docs/source/developer_guide/contributing.md
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ The following instructions are for developers who are getting started with the M
All of the following instructions assume several variables have been set:
- `MORPHEUS_ROOT`: The Morpheus repository has been checked out at a location specified by this variable. Any non-absolute paths are relative to `MORPHEUS_ROOT`.
- `PYTHON_VER`: The desired Python version. Minimum required is `3.10`
- `RAPIDS_VER`: The desired RAPIDS version for all RAPIDS libraries including cuDF and RMM. If in doubt use `23.02`
- `RAPIDS_VER`: The desired RAPIDS version for all RAPIDS libraries including cuDF and RMM. If in doubt use `23.06`
- `TRITONCLIENT_VERSION`: The desired Triton client. If in doubt use `22.10`
- `CUDA_VER`: The desired CUDA version to use. If in doubt use `11.8`

Expand All @@ -75,7 +75,7 @@ All of the following instructions assume several variables have been set:

```bash
export PYTHON_VER=3.10
export RAPIDS_VER=23.02
export RAPIDS_VER=23.06
export TRITONCLIENT_VERSION=22.10
export CUDA_VER=11.8
export MORPHEUS_ROOT=$(pwd)/morpheus
Expand Down Expand Up @@ -190,7 +190,7 @@ Note: These instructions assume the user is using `mamba` instead of `conda` sin
1. Set up env variables and clone the repo:
```bash
export PYTHON_VER=3.10
export RAPIDS_VER=23.02
export RAPIDS_VER=23.06
export CUDA_VER=11.8
export MORPHEUS_ROOT=$(pwd)/morpheus
git clone https://github.com/nv-morpheus/Morpheus.git $MORPHEUS_ROOT
Expand Down Expand Up @@ -246,7 +246,7 @@ git submodule update --init --recursive
1. Optional: Install cuML
- Many users may wish to install cuML. Due to the complex dependency structure and versioning requirements, we need to specify exact versions of each package. The command to accomplish this is:
```bash
mamba install -c rapidsai -c nvidia -c conda-forge cuml=23.02
mamba install -c rapidsai -c nvidia -c conda-forge cuml=23.06
```
1. Run Morpheus
```bash
Expand Down
2 changes: 1 addition & 1 deletion examples/digital_fingerprinting/production/conda_env.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ dependencies:
- distributed
- kfp
- librdkafka
- mlflow>1.29.0,<2
- mlflow>=2.2.1,<3
- nodejs=17.4.0
- papermill
- s3fs==2022.8.2
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ To set up and run the benchmarks on production DFP pipeline, follow the instruct
> **Note**: Make sure `gputil`, `dask` and `distributed` are installed in your Conda environment before running the benchmarks. Run the installation command specified below if not.
```bash
conda install gputil dask==2022.7.0 distributed==2022.7.0
conda install gputil 'dask>=2023.1.1' 'distributed>=2023.1.1'
```

### Run E2E Benchmarks
Expand Down
6 changes: 3 additions & 3 deletions examples/gnn_fraud_detection_pipeline/requirements.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@ channels:
- conda-forge
dependencies:
- chardet=5.0.0
- cuml=23.02
- dask==2023.1.1
- distributed==2023.1.1
- cuml=23.06
- dask>=2023.1.1
- distributed>=2023.1.1
- pip
- pip:
# tensorflow exists in conda-forge but is tied to CUDA-11.3
Expand Down
2 changes: 1 addition & 1 deletion examples/ransomware_detection/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ Once Triton server finishes starting up, it will display the status of all loade
> **Note**: Make sure `dask` and `distributed` are installed in your Conda environment before running the ransomware detection pipeline. Run the installation command specified below if not.

```bash
mamba install dask==2023.1.1 distributed==2023.1.1
mamba install 'dask>=2023.1.1' 'distributed>=2023.1.1'
```

## Run Ransomware Detection Pipeline
Expand Down
2 changes: 1 addition & 1 deletion morpheus/_lib/src/io/serializers.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -205,7 +205,7 @@ void table_to_parquet(
auto destination = cudf::io::sink_info(&sink);
auto options_builder = cudf::io::parquet_writer_options_builder(destination, tbl_view);

cudf::io::write_parquet(options_builder.build(), rmm::mr::get_current_device_resource());
cudf::io::write_parquet(options_builder.build());

if (flush)
{
Expand Down