diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index e8b7c5b84..4379fdade 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -5,7 +5,7 @@ on: inputs: rapids-version: type: string - default: "22.6.3" + default: "22.8.0" description: "RAPIDS version" make-release: type: boolean diff --git a/USAGE.md b/USAGE.md index 61e4ebe43..4284309d9 100644 --- a/USAGE.md +++ b/USAGE.md @@ -28,13 +28,13 @@ The following will retrieve the docker image with each library (+ its native and ```bash REPO=ghcr.io/rapidsai/node -VERSIONS="22.6.3-runtime-node16.15.1-cuda11-ubuntu20.04" +VERSIONS="22.8.0-runtime-node16.15.1-cuda11-ubuntu20.04" docker pull $REPO:$VERSIONS-cudf docker pull $REPO:$VERSIONS-cuml docker pull $REPO:$VERSIONS-cugraph docker pull $REPO:$VERSIONS-cuspatial -VERSIONS="22.6.3-runtime-node16.15.1-cuda11-ubuntu20.04" +VERSIONS="22.8.0-runtime-node16.15.1-cuda11-ubuntu20.04" docker pull $REPO:$VERSIONS-glfw # Includes all the above RAPIDS libraries in a single image @@ -50,7 +50,7 @@ Like the official node images, the default command in the runtime images is `nod ```bash REPO=ghcr.io/rapidsai/node -VERSIONS="22.6.3-runtime-node16.15.1-cuda11-ubuntu20.04" +VERSIONS="22.8.0-runtime-node16.15.1-cuda11-ubuntu20.04" # Be sure to pass either the `--runtime=nvidia` or `--gpus` flag! docker run --rm --gpus=0 $REPO:$VERSIONS-cudf \ @@ -67,7 +67,7 @@ You can mount your host's X11 socket and `$DISPLAY` envvar, then launch demos th ```bash REPO=ghcr.io/rapidsai/node -VERSIONS="22.6.3-runtime-node16.15.1-cuda11-ubuntu20.04" +VERSIONS="22.8.0-runtime-node16.15.1-cuda11-ubuntu20.04" # Be sure to pass either the `--runtime=nvidia` or `--gpus` flag! docker run --rm \ @@ -94,7 +94,7 @@ You can use the following technique to install the npm-packed modules into anoth ```bash REPO=ghcr.io/rapidsai/node -VERSIONS="22.6.3-devel-node16.15.1-cuda11-ubuntu20.04" +VERSIONS="22.8.0-devel-node16.15.1-cuda11-ubuntu20.04" # Pull the latest image of the packaged .tgz artifacts docker pull $REPO:$VERSIONS-packages diff --git a/docker-compose.devel.yml b/docker-compose.devel.yml index 105d4aabb..7b77c416e 100644 --- a/docker-compose.devel.yml +++ b/docker-compose.devel.yml @@ -33,7 +33,7 @@ x-main-service-settings: &main_service_settings XDG_SESSION_TYPE: "${XDG_SESSION_TYPE:-}" XDG_RUNTIME_DIR: "${XDG_RUNTIME_DIR:-/run/user/$UID}" LIBCUDF_KERNEL_CACHE_PATH: "/opt/rapids/node/.cache/jit" - RAPIDS_VERSION: "${npm_package_config_rapids_version:-22.06.00}" + RAPIDS_VERSION: "${npm_package_config_rapids_version:-22.08.00}" DBUS_SESSION_BUS_ADDRESS: "${DBUS_SESSION_BUS_ADDRESS:-unix:path=/run/user/$UID/bus}" cap_add: - SYS_ADMIN @@ -45,7 +45,7 @@ services: main: <<: *main_service_settings - image: ${REPOSITORY:-ghcr.io/rapidsai/node}:${npm_package_version:-22.6.3}-devel-node${NODE_VERSION:-16.15.1}-cuda${CUDA_VERSION_MAJOR:-11}-${LINUX_VERSION:-ubuntu20.04}-main + image: ${REPOSITORY:-ghcr.io/rapidsai/node}:${npm_package_version:-22.8.0}-devel-node${NODE_VERSION:-16.15.1}-cuda${CUDA_VERSION_MAJOR:-11}-${LINUX_VERSION:-ubuntu20.04}-main secrets: - sccache_credentials build: @@ -75,12 +75,12 @@ services: notebook: <<: *main_service_settings - image: ${REPOSITORY:-ghcr.io/rapidsai/node}:${npm_package_version:-22.6.3}-devel-node${NODE_VERSION:-16.15.1}-cuda${CUDA_VERSION_MAJOR:-11}-${LINUX_VERSION:-ubuntu20.04}-notebook + image: ${REPOSITORY:-ghcr.io/rapidsai/node}:${npm_package_version:-22.8.0}-devel-node${NODE_VERSION:-16.15.1}-cuda${CUDA_VERSION_MAJOR:-11}-${LINUX_VERSION:-ubuntu20.04}-notebook build: <<: *base_build_settings dockerfile: dev/dockerfiles/devel/notebook.Dockerfile args: - FROM_IMAGE: ${REPOSITORY:-ghcr.io/rapidsai/node}:${npm_package_version:-22.6.3}-devel-node${NODE_VERSION:-16.15.1}-cuda${CUDA_VERSION_MAJOR:-11}-${LINUX_VERSION:-ubuntu20.04}-main + FROM_IMAGE: ${REPOSITORY:-ghcr.io/rapidsai/node}:${npm_package_version:-22.8.0}-devel-node${NODE_VERSION:-16.15.1}-cuda${CUDA_VERSION_MAJOR:-11}-${LINUX_VERSION:-ubuntu20.04}-main environment: <<: *main_environment_settings QT_AUTO_SCREEN_SCALE_FACTOR: 0 @@ -97,7 +97,7 @@ services: packages: <<: *base_service_settings - image: ${REPOSITORY:-ghcr.io/rapidsai/node}:${npm_package_version:-22.6.3}-devel-node${NODE_VERSION:-16.15.1}-cuda${CUDA_VERSION_MAJOR:-11}-${LINUX_VERSION:-ubuntu20.04}-packages + image: ${REPOSITORY:-ghcr.io/rapidsai/node}:${npm_package_version:-22.8.0}-devel-node${NODE_VERSION:-16.15.1}-cuda${CUDA_VERSION_MAJOR:-11}-${LINUX_VERSION:-ubuntu20.04}-packages build: <<: *base_build_settings dockerfile: dev/dockerfiles/devel/package.Dockerfile @@ -112,8 +112,8 @@ services: SCCACHE_REGION: "${SCCACHE_REGION:-us-west-2}" SCCACHE_BUCKET: "${SCCACHE_BUCKET:-node-rapids-sccache}" SCCACHE_IDLE_TIMEOUT: "${SCCACHE_IDLE_TIMEOUT:-32768}" - RAPIDS_VERSION: "${npm_package_config_rapids_version:-22.06.00}" - FROM_IMAGE: ${REPOSITORY:-ghcr.io/rapidsai/node}:${npm_package_version:-22.6.3}-devel-node${NODE_VERSION:-16.15.1}-cuda${CUDA_VERSION_MAJOR:-11}-${LINUX_VERSION:-ubuntu20.04}-main + RAPIDS_VERSION: "${npm_package_config_rapids_version:-22.08.00}" + FROM_IMAGE: ${REPOSITORY:-ghcr.io/rapidsai/node}:${npm_package_version:-22.8.0}-devel-node${NODE_VERSION:-16.15.1}-cuda${CUDA_VERSION_MAJOR:-11}-${LINUX_VERSION:-ubuntu20.04}-main secrets: sccache_credentials: diff --git a/docker-compose.runtime.yml b/docker-compose.runtime.yml index d3fc411c2..0c8f133e6 100644 --- a/docker-compose.runtime.yml +++ b/docker-compose.runtime.yml @@ -21,8 +21,8 @@ x-main-service-settings: &main_service_settings build: &main_build_settings <<: *base_build_settings args: &main_build_args - DEVEL_IMAGE: ${REPOSITORY:-ghcr.io/rapidsai/node}:${npm_package_version:-22.6.3}-devel-node${NODE_VERSION:-16.15.1}-cuda${CUDA_VERSION_MAJOR:-11}-${LINUX_VERSION:-ubuntu20.04}-main - BUILD_IMAGE: ${REPOSITORY:-ghcr.io/rapidsai/node}:${npm_package_version:-22.6.3}-devel-node${NODE_VERSION:-16.15.1}-cuda${CUDA_VERSION_MAJOR:-11}-${LINUX_VERSION:-ubuntu20.04}-packages + DEVEL_IMAGE: ${REPOSITORY:-ghcr.io/rapidsai/node}:${npm_package_version:-22.8.0}-devel-node${NODE_VERSION:-16.15.1}-cuda${CUDA_VERSION_MAJOR:-11}-${LINUX_VERSION:-ubuntu20.04}-main + BUILD_IMAGE: ${REPOSITORY:-ghcr.io/rapidsai/node}:${npm_package_version:-22.8.0}-devel-node${NODE_VERSION:-16.15.1}-cuda${CUDA_VERSION_MAJOR:-11}-${LINUX_VERSION:-ubuntu20.04}-packages environment: &main_environment_settings <<: *base_environment_settings # Use the host's X11 display @@ -34,7 +34,7 @@ services: base: <<: *base_service_settings - image: ${REPOSITORY:-ghcr.io/rapidsai/node}:${npm_package_version:-22.6.3}-runtime-node${NODE_VERSION:-16.15.1}-cuda${CUDA_VERSION_MAJOR:-11}-${LINUX_VERSION:-ubuntu20.04}-base + image: ${REPOSITORY:-ghcr.io/rapidsai/node}:${npm_package_version:-22.8.0}-runtime-node${NODE_VERSION:-16.15.1}-cuda${CUDA_VERSION_MAJOR:-11}-${LINUX_VERSION:-ubuntu20.04}-base build: <<: *base_build_settings dockerfile: dev/dockerfiles/runtime/base.Dockerfile @@ -42,11 +42,11 @@ services: UID: ${UID:-1000} AMD64_BASE: nvidia/cuda:${CUDA_VERSION:-11.6.2}-runtime-${LINUX_VERSION:-ubuntu20.04} ARM64_BASE: nvidia/cuda:${CUDA_VERSION:-11.6.2}-runtime-${LINUX_VERSION:-ubuntu20.04} - DEVEL_IMAGE: ${REPOSITORY:-ghcr.io/rapidsai/node}:${npm_package_version:-22.6.3}-devel-node${NODE_VERSION:-16.15.1}-cuda${CUDA_VERSION_MAJOR:-11}-${LINUX_VERSION:-ubuntu20.04}-main + DEVEL_IMAGE: ${REPOSITORY:-ghcr.io/rapidsai/node}:${npm_package_version:-22.8.0}-devel-node${NODE_VERSION:-16.15.1}-cuda${CUDA_VERSION_MAJOR:-11}-${LINUX_VERSION:-ubuntu20.04}-main main: <<: *main_service_settings - image: ${REPOSITORY:-ghcr.io/rapidsai/node}:${npm_package_version:-22.6.3}-runtime-node${NODE_VERSION:-16.15.1}-cuda${CUDA_VERSION_MAJOR:-11}-${LINUX_VERSION:-ubuntu20.04}-main + image: ${REPOSITORY:-ghcr.io/rapidsai/node}:${npm_package_version:-22.8.0}-runtime-node${NODE_VERSION:-16.15.1}-cuda${CUDA_VERSION_MAJOR:-11}-${LINUX_VERSION:-ubuntu20.04}-main build: <<: *main_build_settings dockerfile: dev/dockerfiles/runtime/main.Dockerfile @@ -54,11 +54,11 @@ services: <<: *main_build_args UCX_VERSION: ${UCX_VERSION:-1.12.1} LINUX_VERSION: ${LINUX_VERSION:-ubuntu20.04} - FROM_IMAGE: ${REPOSITORY:-ghcr.io/rapidsai/node}:${npm_package_version:-22.6.3}-runtime-node${NODE_VERSION:-16.15.1}-cuda${CUDA_VERSION_MAJOR:-11}-${LINUX_VERSION:-ubuntu20.04}-base + FROM_IMAGE: ${REPOSITORY:-ghcr.io/rapidsai/node}:${npm_package_version:-22.8.0}-runtime-node${NODE_VERSION:-16.15.1}-cuda${CUDA_VERSION_MAJOR:-11}-${LINUX_VERSION:-ubuntu20.04}-base demo: <<: *main_service_settings - image: ${REPOSITORY:-ghcr.io/rapidsai/node}:${npm_package_version:-22.6.3}-runtime-node${NODE_VERSION:-16.15.1}-cuda${CUDA_VERSION_MAJOR:-11}-${LINUX_VERSION:-ubuntu20.04}-demo + image: ${REPOSITORY:-ghcr.io/rapidsai/node}:${npm_package_version:-22.8.0}-runtime-node${NODE_VERSION:-16.15.1}-cuda${CUDA_VERSION_MAJOR:-11}-${LINUX_VERSION:-ubuntu20.04}-demo build: <<: *main_build_settings dockerfile: dev/dockerfiles/runtime/demo.Dockerfile @@ -66,31 +66,31 @@ services: <<: *main_build_args UCX_VERSION: ${UCX_VERSION:-1.12.1} LINUX_VERSION: ${LINUX_VERSION:-ubuntu20.04} - FROM_IMAGE: ${REPOSITORY:-ghcr.io/rapidsai/node}:${npm_package_version:-22.6.3}-runtime-node${NODE_VERSION:-16.15.1}-cuda${CUDA_VERSION_MAJOR:-11}-${LINUX_VERSION:-ubuntu20.04}-base + FROM_IMAGE: ${REPOSITORY:-ghcr.io/rapidsai/node}:${npm_package_version:-22.8.0}-runtime-node${NODE_VERSION:-16.15.1}-cuda${CUDA_VERSION_MAJOR:-11}-${LINUX_VERSION:-ubuntu20.04}-base glfw: <<: *main_service_settings - image: ${REPOSITORY:-ghcr.io/rapidsai/node}:${npm_package_version:-22.6.3}-runtime-node${NODE_VERSION:-16.15.1}-cuda${CUDA_VERSION_MAJOR:-11}-${LINUX_VERSION:-ubuntu20.04}-glfw + image: ${REPOSITORY:-ghcr.io/rapidsai/node}:${npm_package_version:-22.8.0}-runtime-node${NODE_VERSION:-16.15.1}-cuda${CUDA_VERSION_MAJOR:-11}-${LINUX_VERSION:-ubuntu20.04}-glfw build: <<: *main_build_settings dockerfile: dev/dockerfiles/runtime/glfw.Dockerfile args: <<: *main_build_args - FROM_IMAGE: ${REPOSITORY:-ghcr.io/rapidsai/node}:${npm_package_version:-22.6.3}-runtime-node${NODE_VERSION:-16.15.1}-cuda${CUDA_VERSION_MAJOR:-11}-${LINUX_VERSION:-ubuntu20.04}-base + FROM_IMAGE: ${REPOSITORY:-ghcr.io/rapidsai/node}:${npm_package_version:-22.8.0}-runtime-node${NODE_VERSION:-16.15.1}-cuda${CUDA_VERSION_MAJOR:-11}-${LINUX_VERSION:-ubuntu20.04}-base cudf: <<: *main_service_settings - image: ${REPOSITORY:-ghcr.io/rapidsai/node}:${npm_package_version:-22.6.3}-runtime-node${NODE_VERSION:-16.15.1}-cuda${CUDA_VERSION_MAJOR:-11}-${LINUX_VERSION:-ubuntu20.04}-cudf + image: ${REPOSITORY:-ghcr.io/rapidsai/node}:${npm_package_version:-22.8.0}-runtime-node${NODE_VERSION:-16.15.1}-cuda${CUDA_VERSION_MAJOR:-11}-${LINUX_VERSION:-ubuntu20.04}-cudf build: <<: *main_build_settings dockerfile: dev/dockerfiles/runtime/cudf.Dockerfile args: <<: *main_build_args - FROM_IMAGE: ${REPOSITORY:-ghcr.io/rapidsai/node}:${npm_package_version:-22.6.3}-runtime-node${NODE_VERSION:-16.15.1}-cuda${CUDA_VERSION_MAJOR:-11}-${LINUX_VERSION:-ubuntu20.04}-base + FROM_IMAGE: ${REPOSITORY:-ghcr.io/rapidsai/node}:${npm_package_version:-22.8.0}-runtime-node${NODE_VERSION:-16.15.1}-cuda${CUDA_VERSION_MAJOR:-11}-${LINUX_VERSION:-ubuntu20.04}-base sql: <<: *main_service_settings - image: ${REPOSITORY:-ghcr.io/rapidsai/node}:${npm_package_version:-22.6.3}-runtime-node${NODE_VERSION:-16.15.1}-cuda${CUDA_VERSION_MAJOR:-11}-${LINUX_VERSION:-ubuntu20.04}-sql + image: ${REPOSITORY:-ghcr.io/rapidsai/node}:${npm_package_version:-22.8.0}-runtime-node${NODE_VERSION:-16.15.1}-cuda${CUDA_VERSION_MAJOR:-11}-${LINUX_VERSION:-ubuntu20.04}-sql build: <<: *main_build_settings dockerfile: dev/dockerfiles/runtime/sql.Dockerfile @@ -98,57 +98,57 @@ services: <<: *main_build_args UCX_VERSION: ${UCX_VERSION:-1.12.1} LINUX_VERSION: ${LINUX_VERSION:-ubuntu20.04} - FROM_IMAGE: ${REPOSITORY:-ghcr.io/rapidsai/node}:${npm_package_version:-22.6.3}-runtime-node${NODE_VERSION:-16.15.1}-cuda${CUDA_VERSION_MAJOR:-11}-${LINUX_VERSION:-ubuntu20.04}-base + FROM_IMAGE: ${REPOSITORY:-ghcr.io/rapidsai/node}:${npm_package_version:-22.8.0}-runtime-node${NODE_VERSION:-16.15.1}-cuda${CUDA_VERSION_MAJOR:-11}-${LINUX_VERSION:-ubuntu20.04}-base cuml: <<: *main_service_settings - image: ${REPOSITORY:-ghcr.io/rapidsai/node}:${npm_package_version:-22.6.3}-runtime-node${NODE_VERSION:-16.15.1}-cuda${CUDA_VERSION_MAJOR:-11}-${LINUX_VERSION:-ubuntu20.04}-cuml + image: ${REPOSITORY:-ghcr.io/rapidsai/node}:${npm_package_version:-22.8.0}-runtime-node${NODE_VERSION:-16.15.1}-cuda${CUDA_VERSION_MAJOR:-11}-${LINUX_VERSION:-ubuntu20.04}-cuml build: <<: *main_build_settings dockerfile: dev/dockerfiles/runtime/cuml.Dockerfile args: <<: *main_build_args - FROM_IMAGE: ${REPOSITORY:-ghcr.io/rapidsai/node}:${npm_package_version:-22.6.3}-runtime-node${NODE_VERSION:-16.15.1}-cuda${CUDA_VERSION_MAJOR:-11}-${LINUX_VERSION:-ubuntu20.04}-base + FROM_IMAGE: ${REPOSITORY:-ghcr.io/rapidsai/node}:${npm_package_version:-22.8.0}-runtime-node${NODE_VERSION:-16.15.1}-cuda${CUDA_VERSION_MAJOR:-11}-${LINUX_VERSION:-ubuntu20.04}-base cugraph: <<: *main_service_settings - image: ${REPOSITORY:-ghcr.io/rapidsai/node}:${npm_package_version:-22.6.3}-runtime-node${NODE_VERSION:-16.15.1}-cuda${CUDA_VERSION_MAJOR:-11}-${LINUX_VERSION:-ubuntu20.04}-cugraph + image: ${REPOSITORY:-ghcr.io/rapidsai/node}:${npm_package_version:-22.8.0}-runtime-node${NODE_VERSION:-16.15.1}-cuda${CUDA_VERSION_MAJOR:-11}-${LINUX_VERSION:-ubuntu20.04}-cugraph build: <<: *main_build_settings dockerfile: dev/dockerfiles/runtime/cugraph.Dockerfile args: <<: *main_build_args - FROM_IMAGE: ${REPOSITORY:-ghcr.io/rapidsai/node}:${npm_package_version:-22.6.3}-runtime-node${NODE_VERSION:-16.15.1}-cuda${CUDA_VERSION_MAJOR:-11}-${LINUX_VERSION:-ubuntu20.04}-base + FROM_IMAGE: ${REPOSITORY:-ghcr.io/rapidsai/node}:${npm_package_version:-22.8.0}-runtime-node${NODE_VERSION:-16.15.1}-cuda${CUDA_VERSION_MAJOR:-11}-${LINUX_VERSION:-ubuntu20.04}-base cuspatial: <<: *main_service_settings - image: ${REPOSITORY:-ghcr.io/rapidsai/node}:${npm_package_version:-22.6.3}-runtime-node${NODE_VERSION:-16.15.1}-cuda${CUDA_VERSION_MAJOR:-11}-${LINUX_VERSION:-ubuntu20.04}-cuspatial + image: ${REPOSITORY:-ghcr.io/rapidsai/node}:${npm_package_version:-22.8.0}-runtime-node${NODE_VERSION:-16.15.1}-cuda${CUDA_VERSION_MAJOR:-11}-${LINUX_VERSION:-ubuntu20.04}-cuspatial build: <<: *main_build_settings dockerfile: dev/dockerfiles/runtime/cuspatial.Dockerfile args: <<: *main_build_args - FROM_IMAGE: ${REPOSITORY:-ghcr.io/rapidsai/node}:${npm_package_version:-22.6.3}-runtime-node${NODE_VERSION:-16.15.1}-cuda${CUDA_VERSION_MAJOR:-11}-${LINUX_VERSION:-ubuntu20.04}-base + FROM_IMAGE: ${REPOSITORY:-ghcr.io/rapidsai/node}:${npm_package_version:-22.8.0}-runtime-node${NODE_VERSION:-16.15.1}-cuda${CUDA_VERSION_MAJOR:-11}-${LINUX_VERSION:-ubuntu20.04}-base io: <<: *main_service_settings - image: ${REPOSITORY:-ghcr.io/rapidsai/node}:${npm_package_version:-22.6.3}-runtime-node${NODE_VERSION:-16.10.0}-cuda${CUDA_VERSION:-11.4.2}-${LINUX_VERSION:-ubuntu20.04}-io + image: ${REPOSITORY:-ghcr.io/rapidsai/node}:${npm_package_version:-22.8.0}-runtime-node${NODE_VERSION:-16.10.0}-cuda${CUDA_VERSION:-11.4.2}-${LINUX_VERSION:-ubuntu20.04}-io build: <<: *main_build_settings dockerfile: dockerfiles/runtime/io.Dockerfile args: <<: *main_build_args - FROM_IMAGE: ${REPOSITORY:-ghcr.io/rapidsai/node}:${npm_package_version:-22.6.3}-runtime-node${NODE_VERSION:-16.10.0}-cuda${CUDA_VERSION:-11.4.2}-${LINUX_VERSION:-ubuntu20.04}-base + FROM_IMAGE: ${REPOSITORY:-ghcr.io/rapidsai/node}:${npm_package_version:-22.8.0}-runtime-node${NODE_VERSION:-16.10.0}-cuda${CUDA_VERSION:-11.4.2}-${LINUX_VERSION:-ubuntu20.04}-base notebook: <<: *main_service_settings - image: ${REPOSITORY:-ghcr.io/rapidsai/node}:${npm_package_version:-22.6.3}-runtime-node${NODE_VERSION:-16.15.1}-cuda${CUDA_VERSION_MAJOR:-11}-${LINUX_VERSION:-ubuntu20.04}-notebook + image: ${REPOSITORY:-ghcr.io/rapidsai/node}:${npm_package_version:-22.8.0}-runtime-node${NODE_VERSION:-16.15.1}-cuda${CUDA_VERSION_MAJOR:-11}-${LINUX_VERSION:-ubuntu20.04}-notebook build: <<: *main_build_settings dockerfile: dev/dockerfiles/runtime/notebook.Dockerfile args: <<: *main_build_args - FROM_IMAGE: ${REPOSITORY:-ghcr.io/rapidsai/node}:${npm_package_version:-22.6.3}-runtime-node${NODE_VERSION:-16.15.1}-cuda${CUDA_VERSION_MAJOR:-11}-${LINUX_VERSION:-ubuntu20.04}-demo + FROM_IMAGE: ${REPOSITORY:-ghcr.io/rapidsai/node}:${npm_package_version:-22.8.0}-runtime-node${NODE_VERSION:-16.15.1}-cuda${CUDA_VERSION_MAJOR:-11}-${LINUX_VERSION:-ubuntu20.04}-demo volumes: - "/etc/fonts:/etc/fonts:ro" - "/tmp/.X11-unix:/tmp/.X11-unix:rw" diff --git a/lerna.json b/lerna.json index d8d9ed3f9..8b7ca275e 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "22.6.3", + "version": "22.8.0", "npmClient": "yarn", "skipGit": true, "useWorkspaces": true, diff --git a/modules/core/bin/rapidsai_install_native_module.js b/modules/core/bin/rapidsai_install_native_module.js index fdc957a1c..d41550869 100755 --- a/modules/core/bin/rapidsai_install_native_module.js +++ b/modules/core/bin/rapidsai_install_native_module.js @@ -51,19 +51,41 @@ const extraFiles = process.argv.slice(2); const binary_dir = Path.join(Path.dirname(require.resolve(pkg_name)), 'build', 'Release'); (async () => { - const distro = await (async () => { - const {dist = '', release = ''} = await getOS(); - return dist.toLowerCase() + release; - })(); - const cpu_arch = (() => { - switch (require('os').arch()) { - case 'x64': return 'amd64'; - case 'arm': return 'aarch64'; - case 'arm64': return 'aarch64'; - default: return 'amd64'; - } - })(); - const gpu_arch = getArchFromComputeCapabilities(); + const distro = typeof process.env.RAPIDSAI_LINUX_DISTRO !== 'undefined' + ? process.env.RAPIDSAI_LINUX_DISTRO + : await (async () => { + const {dist = '', release = ''} = await getOS(); + switch (dist.toLowerCase()) { + case 'debian': + if ((+release) >= 11) { return 'ubuntu20.04'; } + break; + case 'ubuntu': + if (release.split('.')[0] >= 20) { return 'ubuntu20.04'; } + break; + default: break; + } + throw new Error( + `${pkg_name}:` + + `Detected unsupported Linux distro "${dist} ${release}".\n` + + `Currently only Debian 11+ and Ubuntu 20.04+ are supported.\n` + + `If you think you've encountered this message in error, set\n` + + `the \`RAPIDSAI_LINUX_DISTRO\` environment variable to one of\n` + + `the distributions listed in https://github.com/rapidsai/node/releases\n` + + `and reinstall ${pkg_name}`); + })(); + const cpu_arch = typeof process.env.RAPIDSAI_CPU_ARCHITECTURE !== 'undefined' + ? process.env.RAPIDSAI_CPU_ARCHITECTURE + : (() => { + switch (require('os').arch()) { + case 'x64': return 'amd64'; + case 'arm': return 'aarch64'; + case 'arm64': return 'aarch64'; + default: return 'amd64'; + } + })(); + const gpu_arch = typeof process.env.RAPIDSAI_GPU_ARCHITECTURE !== 'undefined' + ? process.env.RAPIDSAI_GPU_ARCHITECTURE + : getArchFromComputeCapabilities(); const cuda_ver = `cuda${ (() => { if (typeof process.env.RAPIDSAI_CUDA_VERSION !== 'undefined') { diff --git a/modules/core/cmake/Modules/ConfigureArrow.cmake b/modules/core/cmake/Modules/ConfigureArrow.cmake new file mode 100644 index 000000000..97dc4cfba --- /dev/null +++ b/modules/core/cmake/Modules/ConfigureArrow.cmake @@ -0,0 +1,395 @@ +# ============================================================================= +# Copyright (c) 2020-2022, NVIDIA CORPORATION. +# +# 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. +# ============================================================================= +include_guard(GLOBAL) + +# Finding arrow is far more complex than it should be, and as a result we violate multiple linting +# rules aiming to limit complexity. Since all our other CMake scripts conform to expectations +# without undue difficulty, disabling those rules for just this function is our best approach for +# now. The spacing between this comment, the cmake-lint directives, and the function docstring is +# necessary to prevent cmake-format from trying to combine the lines. + +# cmake-lint: disable=R0912,R0913,R0915 + +# This function finds arrow and sets any additional necessary environment variables. +function(find_and_configure_arrow VERSION BUILD_STATIC ENABLE_S3 ENABLE_ORC ENABLE_PYTHON + ENABLE_PARQUET +) + include(${CMAKE_CURRENT_FUNCTION_LIST_DIR}/get_cpm.cmake) + + string(TOLOWER "${CMAKE_BUILD_TYPE}" _build_type) + _clean_build_dirs_if_not_fully_built(arrow "${_build_type}/libarrow") + _clean_build_dirs_if_not_fully_built(arrow "${_build_type}/libparquet") + _clean_build_dirs_if_not_fully_built(arrow "${_build_type}/libarrow_cuda") + _clean_build_dirs_if_not_fully_built(arrow "${_build_type}/libarrow_dataset") + + _set_package_dir_if_exists(Arrow arrow) + _set_package_dir_if_exists(Parquet arrow) + _set_package_dir_if_exists(ArrowCUDA arrow) + _set_package_dir_if_exists(ArrowDataset arrow) + + set(ARROW_BUILD_SHARED ON) + set(ARROW_BUILD_STATIC OFF) + + if(NOT ARROW_ARMV8_ARCH) + set(ARROW_ARMV8_ARCH "armv8-a") + endif() + + if(NOT ARROW_SIMD_LEVEL) + set(ARROW_SIMD_LEVEL "NONE") + endif() + + if(BUILD_STATIC) + set(ARROW_BUILD_STATIC ON) + set(ARROW_BUILD_SHARED OFF) + # Turn off CPM using `find_package` so we always download and make sure we get proper static + # library + # set(CPM_DOWNLOAD_ALL TRUE) + endif() + + set(ARROW_PYTHON_OPTIONS "") + if(ENABLE_PYTHON) + list(APPEND ARROW_PYTHON_OPTIONS "ARROW_PYTHON ON") + # Arrow's logic to build Boost from source is busted, so we have to get it from the system. + list(APPEND ARROW_PYTHON_OPTIONS "BOOST_SOURCE SYSTEM") + list(APPEND ARROW_PYTHON_OPTIONS "ARROW_DEPENDENCY_SOURCE AUTO") + endif() + + set(ARROW_PARQUET_OPTIONS "") + if(ENABLE_PARQUET) + # Arrow's logic to build Boost from source is busted, so we have to get it from the system. + list(APPEND ARROW_PARQUET_OPTIONS "BOOST_SOURCE SYSTEM") + list(APPEND ARROW_PARQUET_OPTIONS "Thrift_SOURCE BUNDLED") + list(APPEND ARROW_PARQUET_OPTIONS "ARROW_DEPENDENCY_SOURCE AUTO") + endif() + + # Set this so Arrow correctly finds the CUDA toolkit when the build machine does not have the CUDA + # driver installed. This must be an env var. + set(ENV{CUDA_LIB_PATH} "${CUDAToolkit_LIBRARY_DIR}/stubs") + + include(${CMAKE_CURRENT_FUNCTION_LIST_DIR}/get_cpm.cmake) + include(${CMAKE_CURRENT_FUNCTION_LIST_DIR}/get_version.cmake) + + # Set this so Arrow doesn't add `-Werror` to + # CMAKE_CXX_FLAGS when CMAKE_BUILD_TYPE=Debug + set(BUILD_WARNING_LEVEL "PRODUCTION") + set(BUILD_WARNING_LEVEL "PRODUCTION" PARENT_SCOPE) + set(BUILD_WARNING_LEVEL "PRODUCTION" CACHE STRING "" FORCE) + + rapids_cpm_find( + Arrow ${VERSION} + GLOBAL_TARGETS arrow_shared arrow_static + parquet_shared parquet_static + arrow_cuda_shared arrow_cuda_static + arrow_dataset_shared arrow_dataset_static + CPM_ARGS + GIT_REPOSITORY https://github.com/apache/arrow.git + GIT_TAG apache-arrow-${VERSION} + GIT_SHALLOW TRUE SOURCE_SUBDIR cpp + OPTIONS "CMAKE_VERBOSE_MAKEFILE ON" + "CUDA_USE_STATIC_CUDA_RUNTIME OFF" + "ARROW_IPC ON" + "ARROW_CUDA ON" + "ARROW_DATASET ON" + "ARROW_WITH_BACKTRACE ON" + "ARROW_CXXFLAGS -w" + "ARROW_JEMALLOC OFF" + "ARROW_S3 ${ENABLE_S3}" + "ARROW_ORC ${ENABLE_ORC}" + # e.g. needed by blazingsql-io + ${ARROW_PARQUET_OPTIONS} + "ARROW_PARQUET ${ENABLE_PARQUET}" + ${ARROW_PYTHON_OPTIONS} + # Arrow modifies CMake's GLOBAL RULE_LAUNCH_COMPILE unless this is off + "ARROW_USE_CCACHE OFF" + "ARROW_POSITION_INDEPENDENT_CODE ON" + "ARROW_ARMV8_ARCH ${ARROW_ARMV8_ARCH}" + "ARROW_SIMD_LEVEL ${ARROW_SIMD_LEVEL}" + "ARROW_BUILD_STATIC ${ARROW_BUILD_STATIC}" + "ARROW_BUILD_SHARED ${ARROW_BUILD_SHARED}" + "ARROW_DEPENDENCY_USE_SHARED ${ARROW_BUILD_SHARED}" + "ARROW_BOOST_USE_SHARED ${ARROW_BUILD_SHARED}" + "ARROW_BROTLI_USE_SHARED ${ARROW_BUILD_SHARED}" + "ARROW_GFLAGS_USE_SHARED ${ARROW_BUILD_SHARED}" + "ARROW_GRPC_USE_SHARED ${ARROW_BUILD_SHARED}" + "ARROW_PROTOBUF_USE_SHARED ${ARROW_BUILD_SHARED}" + "ARROW_ZSTD_USE_SHARED ${ARROW_BUILD_SHARED}" + "xsimd_SOURCE AUTO" + ) + + set(ARROW_FOUND TRUE) + set(ARROW_LIBRARIES "") + + # Arrow_ADDED: set if CPM downloaded Arrow from Github Arrow_DIR: set if CPM found Arrow on the + # system/conda/etc. + if(Arrow_ADDED OR Arrow_DIR) + if(BUILD_STATIC) + list(APPEND ARROW_LIBRARIES arrow_static) + list(APPEND ARROW_LIBRARIES arrow_cuda_static) + else() + list(APPEND ARROW_LIBRARIES arrow_shared) + list(APPEND ARROW_LIBRARIES arrow_cuda_shared) + endif() + + if(Arrow_DIR) + # Set this to enable `find_package(ArrowCUDA)` + set(ArrowCUDA_DIR "${Arrow_DIR}") + find_package(Arrow REQUIRED QUIET) + find_package(ArrowCUDA REQUIRED QUIET) + if(ENABLE_PARQUET) + if(NOT Parquet_DIR) + # Set this to enable `find_package(Parquet)` + set(Parquet_DIR "${Arrow_DIR}") + endif() + # Set this to enable `find_package(ArrowDataset)` + set(ArrowDataset_DIR "${Arrow_DIR}") + find_package(ArrowDataset REQUIRED QUIET) + endif() + elseif(Arrow_ADDED) + # Copy these files so we can avoid adding paths in Arrow_BINARY_DIR to + # target_include_directories. That defeats ccache. + file(INSTALL "${Arrow_BINARY_DIR}/src/arrow/util/config.h" + DESTINATION "${Arrow_SOURCE_DIR}/cpp/src/arrow/util" + ) + file(INSTALL "${Arrow_BINARY_DIR}/src/arrow/gpu/cuda_version.h" + DESTINATION "${Arrow_SOURCE_DIR}/cpp/src/arrow/gpu" + ) + if(ENABLE_PARQUET) + file(INSTALL "${Arrow_BINARY_DIR}/src/parquet/parquet_version.h" + DESTINATION "${Arrow_SOURCE_DIR}/cpp/src/parquet" + ) + endif() + # + # This shouldn't be necessary! + # + # Arrow populates INTERFACE_INCLUDE_DIRECTORIES for the `arrow_static` and `arrow_shared` + # targets in FindArrow and FindArrowCUDA respectively, so for static source-builds, we have to + # do it after-the-fact. + # + # This only works because we know exactly which components we're using. Don't forget to update + # this list if we add more! + # + foreach(ARROW_LIBRARY ${ARROW_LIBRARIES}) + target_include_directories( + ${ARROW_LIBRARY} + INTERFACE "$" + "$" + "$" + "$" + ) + endforeach() + endif() + else() + set(ARROW_FOUND FALSE) + message(FATAL_ERROR "CUDF: Arrow library not found or downloaded.") + endif() + + if(Arrow_ADDED) + + set(arrow_code_string + [=[ + if (TARGET cudf::arrow_shared AND (NOT TARGET arrow_shared)) + add_library(arrow_shared ALIAS cudf::arrow_shared) + endif() + if (TARGET arrow_shared AND (NOT TARGET cudf::arrow_shared)) + add_library(cudf::arrow_shared ALIAS arrow_shared) + endif() + if (TARGET cudf::arrow_static AND (NOT TARGET arrow_static)) + add_library(arrow_static ALIAS cudf::arrow_static) + endif() + if (TARGET arrow_static AND (NOT TARGET cudf::arrow_static)) + add_library(cudf::arrow_static ALIAS arrow_static) + endif() + if (NOT TARGET arrow::flatbuffers) + add_library(arrow::flatbuffers INTERFACE IMPORTED) + endif() + if (NOT TARGET arrow::hadoop) + add_library(arrow::hadoop INTERFACE IMPORTED) + endif() + ]=] + ) + + if(ENABLE_PARQUET) + string( + APPEND + arrow_code_string + [=[ + find_package(Boost) + if (NOT TARGET Boost::headers) + add_library(Boost::headers INTERFACE IMPORTED) + endif() + ]=] + ) + endif() + + if(NOT TARGET xsimd) + string( + APPEND + arrow_code_string + " + if(NOT TARGET xsimd) + add_library(xsimd INTERFACE IMPORTED) + target_include_directories(xsimd INTERFACE \"${Arrow_BINARY_DIR}/xsimd_ep/src/xsimd_ep-install/include\") + endif() + " + ) + endif() + + set(PROJECT_BINARY_DIR_prev "${PROJECT_BINARY_DIR}") + set(PROJECT_BINARY_DIR "${Arrow_BINARY_DIR}") + + rapids_export( + BUILD Arrow + VERSION ${VERSION} + EXPORT_SET arrow_targets + GLOBAL_TARGETS arrow_shared arrow_static + NAMESPACE cudf:: + FINAL_CODE_BLOCK arrow_code_string + ) + + set(arrow_cuda_code_string + [=[ + if (TARGET cudf::arrow_cuda_shared AND (NOT TARGET arrow_cuda_shared)) + add_library(arrow_cuda_shared ALIAS cudf::arrow_cuda_shared) + endif() + if (TARGET arrow_cuda_shared AND (NOT TARGET cudf::arrow_cuda_shared)) + add_library(cudf::arrow_cuda_shared ALIAS arrow_cuda_shared) + endif() + if (TARGET cudf::arrow_cuda_static AND (NOT TARGET arrow_cuda_static)) + add_library(arrow_cuda_static ALIAS cudf::arrow_cuda_static) + endif() + if (TARGET arrow_cuda_static AND (NOT TARGET cudf::arrow_cuda_static)) + add_library(cudf::arrow_cuda_static ALIAS arrow_cuda_static) + endif() + ]=] + ) + + rapids_export( + BUILD ArrowCUDA + VERSION ${VERSION} + EXPORT_SET arrow_cuda_targets + GLOBAL_TARGETS arrow_cuda_shared arrow_cuda_static + NAMESPACE cudf:: + FINAL_CODE_BLOCK arrow_cuda_code_string + ) + + if(ENABLE_PARQUET) + + set(arrow_dataset_code_string + [=[ + if (TARGET cudf::arrow_dataset_shared AND (NOT TARGET arrow_dataset_shared)) + add_library(arrow_dataset_shared ALIAS cudf::arrow_dataset_shared) + endif() + if (TARGET arrow_dataset_shared AND (NOT TARGET cudf::arrow_dataset_shared)) + add_library(cudf::arrow_dataset_shared ALIAS arrow_dataset_shared) + endif() + if (TARGET cudf::arrow_dataset_static AND (NOT TARGET arrow_dataset_static)) + add_library(arrow_dataset_static ALIAS cudf::arrow_dataset_static) + endif() + if (TARGET arrow_dataset_static AND (NOT TARGET cudf::arrow_dataset_static)) + add_library(cudf::arrow_dataset_static ALIAS arrow_dataset_static) + endif() + ]=] + ) + + rapids_export( + BUILD ArrowDataset + VERSION ${VERSION} + EXPORT_SET arrow_dataset_targets + GLOBAL_TARGETS arrow_dataset_shared arrow_dataset_static + NAMESPACE cudf:: + FINAL_CODE_BLOCK arrow_dataset_code_string + ) + + set(parquet_code_string + [=[ + if (TARGET cudf::parquet_shared AND (NOT TARGET parquet_shared)) + add_library(parquet_shared ALIAS cudf::parquet_shared) + endif() + if (TARGET parquet_shared AND (NOT TARGET cudf::parquet_shared)) + add_library(cudf::parquet_shared ALIAS parquet_shared) + endif() + if (TARGET cudf::parquet_static AND (NOT TARGET parquet_static)) + add_library(parquet_static ALIAS cudf::parquet_static) + endif() + if (TARGET parquet_static AND (NOT TARGET cudf::parquet_static)) + add_library(cudf::parquet_static ALIAS parquet_static) + endif() + ]=] + ) + + rapids_export( + BUILD Parquet + VERSION ${VERSION} + EXPORT_SET parquet_targets + GLOBAL_TARGETS parquet_shared parquet_static + NAMESPACE cudf:: + FINAL_CODE_BLOCK parquet_code_string + ) + + set(PROJECT_BINARY_DIR "${PROJECT_BINARY_DIR_prev}") + endif() + endif() + # We generate the arrow-config and arrowcuda-config files when we built arrow locally, so always + # do `find_dependency` + rapids_export_package(BUILD Arrow cudf-exports) + rapids_export_package(INSTALL Arrow cudf-exports) + + # We have to generate the find_dependency(ArrowCUDA) ourselves since we need to specify + # ArrowCUDA_DIR to be where Arrow was found, since Arrow packages ArrowCUDA.config in a + # non-standard location + rapids_export_package(BUILD ArrowCUDA cudf-exports) + if(ENABLE_PARQUET) + rapids_export_package(BUILD Parquet cudf-exports) + rapids_export_package(BUILD ArrowDataset cudf-exports) + endif() + + include("${rapids-cmake-dir}/export/find_package_root.cmake") + rapids_export_find_package_root(BUILD Arrow "${Arrow_BINARY_DIR}" cudf-exports) + rapids_export_find_package_root(BUILD ArrowCUDA "${Arrow_BINARY_DIR}" cudf-exports) + if(ENABLE_PARQUET) + rapids_export_find_package_root(BUILD Parquet "${Arrow_BINARY_DIR}" cudf-exports) + rapids_export_find_package_root(BUILD ArrowDataset "${Arrow_BINARY_DIR}" cudf-exports) + endif() + + set(ARROW_FOUND + "${ARROW_FOUND}" + PARENT_SCOPE + ) + set(ARROW_LIBRARIES + "${ARROW_LIBRARIES}" + PARENT_SCOPE + ) + + # Make sure consumers of our libs can see arrow libs + _fix_cmake_global_defaults(arrow_shared) + _fix_cmake_global_defaults(arrow_static) + _fix_cmake_global_defaults(parquet_shared) + _fix_cmake_global_defaults(parquet_static) + _fix_cmake_global_defaults(arrow_cuda_shared) + _fix_cmake_global_defaults(arrow_cuda_static) + _fix_cmake_global_defaults(arrow_dataset_shared) + _fix_cmake_global_defaults(arrow_dataset_static) + +endfunction() + +set(CUDF_VERSION_Arrow 8.0.0) + +find_and_configure_arrow( + ${CUDF_VERSION_Arrow} + ON # BUILD_STATIC + OFF # ENABLE_S3 + OFF # ENABLE_ORC + OFF # ENABLE_PYTHON + ON # ENABLE_PARQUET +) diff --git a/modules/core/cmake/Modules/ConfigureBlazingSQL.cmake b/modules/core/cmake/Modules/ConfigureBlazingSQL.cmake index bc2fbe6fd..8c0e18d2a 100644 --- a/modules/core/cmake/Modules/ConfigureBlazingSQL.cmake +++ b/modules/core/cmake/Modules/ConfigureBlazingSQL.cmake @@ -27,13 +27,13 @@ function(find_and_configure_blazingsql) _clean_build_dirs_if_not_fully_built(blazingsql-io libblazingsql-io) _clean_build_dirs_if_not_fully_built(blazingsql-engine libblazingsql-engine) + _set_thrust_dir_if_exists() _set_package_dir_if_exists(absl absl) _set_package_dir_if_exists(cudf cudf) _set_package_dir_if_exists(cuco cuco) _set_package_dir_if_exists(dlpack dlpack) _set_package_dir_if_exists(jitify jitify) _set_package_dir_if_exists(nvcomp nvcomp) - _set_package_dir_if_exists(Thrust thrust) _set_package_dir_if_exists(blazingsql-io blazingsql-io) _set_package_dir_if_exists(blazingsql-engine blazingsql-engine) @@ -80,7 +80,7 @@ function(find_and_configure_blazingsql) "MYSQL_SUPPORT OFF" "SQLITE_SUPPORT OFF" "POSTGRESQL_SUPPORT OFF" - "CUDA_STATIC_RUNTIME OFF" + "CUDA_STATIC_RUNTIME ON" # "ARROW_DEPENDENCY_SOURCE AUTO" "BLAZINGSQL_ENGINE_USE_ARROW_STATIC ON" "DISABLE_DEPRECATION_WARNING ON" @@ -134,6 +134,12 @@ function(find_and_configure_blazingsql) configure_file("${blazingsql-engine_BINARY_DIR}/blazingsql-algebra-core.jar" "${CMAKE_CURRENT_BINARY_DIR}/blazingsql-algebra-core.jar" COPYONLY) + + + include(${CMAKE_CURRENT_FUNCTION_LIST_DIR}/link_utils.cmake) + _statically_link_cuda_toolkit_libs(blazingdb::blazingsql-io) + _statically_link_cuda_toolkit_libs(blazingdb::blazingsql-engine) + endfunction() find_and_configure_blazingsql() diff --git a/modules/core/cmake/Modules/ConfigureCUDA.cmake b/modules/core/cmake/Modules/ConfigureCUDA.cmake index d1126b3f0..7070f5402 100644 --- a/modules/core/cmake/Modules/ConfigureCUDA.cmake +++ b/modules/core/cmake/Modules/ConfigureCUDA.cmake @@ -60,16 +60,7 @@ endif() # Build the list of supported architectures -set(SUPPORTED_CUDA_ARCHITECTURES "60" "62" "70" "72" "75" "80" "86") - -# Check for embedded vs workstation architectures -if(CMAKE_SYSTEM_PROCESSOR MATCHES "aarch64") - # This is being built for Linux4Tegra or SBSA ARM64 - list(REMOVE_ITEM SUPPORTED_CUDA_ARCHITECTURES "60" "70" "80" "86") -else() - # This is being built for an x86 or x86_64 architecture - list(REMOVE_ITEM SUPPORTED_CUDA_ARCHITECTURES "62" "72") -endif() +set(SUPPORTED_CUDA_ARCHITECTURES "60" "70" "75" "80" "86") find_package(CUDAToolkit REQUIRED) @@ -126,11 +117,13 @@ message(STATUS "CMAKE_CUDA_ARCHITECTURES: ${CMAKE_CUDA_ARCHITECTURES}") # Override the cached version from enable_language(CUDA) set(CMAKE_CUDA_ARCHITECTURES "${CMAKE_CUDA_ARCHITECTURES}" CACHE STRING "" FORCE) +set(CUDA_STATIC_RUNTIME ON) +set(CUDA_USE_STATIC_CUDA_RUNTIME ON) +set(CMAKE_CUDA_RUNTIME_LIBRARY STATIC) + # Enable the CUDA language enable_language(CUDA) list(APPEND NODE_RAPIDS_CMAKE_CUDA_FLAGS -Werror=cross-execution-space-call) list(APPEND NODE_RAPIDS_CMAKE_CUDA_FLAGS --expt-extended-lambda --expt-relaxed-constexpr) list(APPEND NODE_RAPIDS_CMAKE_CUDA_FLAGS -Xcompiler=-Wall,-Werror,-Wno-error=deprecated-declarations) - -set(CMAKE_CUDA_RUNTIME_LIBRARY Shared) diff --git a/modules/core/cmake/Modules/ConfigureCUDF.cmake b/modules/core/cmake/Modules/ConfigureCUDF.cmake index 7a2b303a8..cb40d6859 100644 --- a/modules/core/cmake/Modules/ConfigureCUDF.cmake +++ b/modules/core/cmake/Modules/ConfigureCUDF.cmake @@ -20,24 +20,23 @@ function(find_and_configure_cudf) include(${CMAKE_CURRENT_FUNCTION_LIST_DIR}/get_cpm.cmake) include(${CMAKE_CURRENT_FUNCTION_LIST_DIR}/get_version.cmake) include(${CMAKE_CURRENT_FUNCTION_LIST_DIR}/ConfigureRMM.cmake) + include(${CMAKE_CURRENT_FUNCTION_LIST_DIR}/ConfigureArrow.cmake) _get_rapidsai_module_version(cudf VERSION) _clean_build_dirs_if_not_fully_built(cudf libcudf) _clean_build_dirs_if_not_fully_built(nvcomp libnvcomp) + _set_thrust_dir_if_exists() _set_package_dir_if_exists(cudf cudf) _set_package_dir_if_exists(cuco cuco) _set_package_dir_if_exists(dlpack dlpack) _set_package_dir_if_exists(jitify jitify) _set_package_dir_if_exists(nvcomp nvcomp) - _set_package_dir_if_exists(Thrust thrust) - - # Set this so Arrow doesn't add `-Werror` to - # CMAKE_CXX_FLAGS when CMAKE_BUILD_TYPE=Debug - set(BUILD_WARNING_LEVEL "PRODUCTION") - set(BUILD_WARNING_LEVEL "PRODUCTION" PARENT_SCOPE) - set(BUILD_WARNING_LEVEL "PRODUCTION" CACHE STRING "" FORCE) + _set_package_dir_if_exists(Arrow arrow) + _set_package_dir_if_exists(Parquet arrow) + _set_package_dir_if_exists(ArrowCUDA arrow) + _set_package_dir_if_exists(ArrowDataset arrow) if(NOT TARGET cudf::cudf) _get_major_minor_version(${VERSION} MAJOR_AND_MINOR) @@ -55,7 +54,7 @@ function(find_and_configure_cudf) "JITIFY_USE_CACHE ON" "BOOST_SOURCE SYSTEM" "Thrift_SOURCE BUNDLED" - "CUDA_STATIC_RUNTIME OFF" + "CUDA_STATIC_RUNTIME ON" "CUDF_USE_ARROW_STATIC ON" "CUDF_ENABLE_ARROW_S3 OFF" # "CUDF_ENABLE_ARROW_S3 ON" @@ -78,6 +77,7 @@ function(find_and_configure_cudf) set(cudf_VERSION "${cudf_VERSION}" PARENT_SCOPE) _set_package_dir_if_exists(nvcomp nvcomp) + find_package(nvcomp) set_target_properties(nvcomp PROPERTIES ARCHIVE_OUTPUT_DIRECTORY "${nvcomp_ROOT}" LIBRARY_OUTPUT_DIRECTORY "${nvcomp_ROOT}") @@ -88,6 +88,10 @@ function(find_and_configure_cudf) VERSION 2.3 COMPATIBILITY ExactVersion) + include(${CMAKE_CURRENT_FUNCTION_LIST_DIR}/link_utils.cmake) + _statically_link_cuda_toolkit_libs(cudf::cudf) + _statically_link_cuda_toolkit_libs(cudf::cudftestutil) + endfunction() find_and_configure_cudf() diff --git a/modules/core/cmake/Modules/ConfigureCUGRAPH.cmake b/modules/core/cmake/Modules/ConfigureCUGRAPH.cmake index 6c1908102..bf2a1ef57 100644 --- a/modules/core/cmake/Modules/ConfigureCUGRAPH.cmake +++ b/modules/core/cmake/Modules/ConfigureCUGRAPH.cmake @@ -26,9 +26,9 @@ function(find_and_configure_cugraph) _clean_build_dirs_if_not_fully_built(cugraph libcugraph) + _set_thrust_dir_if_exists() _set_package_dir_if_exists(cuco cuco) _set_package_dir_if_exists(raft raft) - _set_package_dir_if_exists(Thrust thrust) _set_package_dir_if_exists(cugraph cugraph) _set_package_dir_if_exists(cuhornet cuhornet) _set_package_dir_if_exists(cugraph-ops cugraph-ops) @@ -46,6 +46,7 @@ function(find_and_configure_cugraph) OPTIONS "BUILD_TESTS OFF" "BUILD_BENCHMARKS OFF" "BUILD_SHARED_LIBS OFF" + "CUDA_STATIC_RUNTIME ON" "BUILD_CUGRAPH_MG_TESTS OFF" ) endif() @@ -66,6 +67,9 @@ function(find_and_configure_cugraph) endif() endif() + include(${CMAKE_CURRENT_FUNCTION_LIST_DIR}/link_utils.cmake) + _statically_link_cuda_toolkit_libs(cugraph::cugraph) + set(cugraph_VERSION "${cugraph_VERSION}" PARENT_SCOPE) endfunction() diff --git a/modules/core/cmake/Modules/ConfigureCUGRAPHOPS.cmake b/modules/core/cmake/Modules/ConfigureCUGRAPHOPS.cmake index 9844aca8c..56102fffd 100644 --- a/modules/core/cmake/Modules/ConfigureCUGRAPHOPS.cmake +++ b/modules/core/cmake/Modules/ConfigureCUGRAPHOPS.cmake @@ -25,8 +25,8 @@ function(find_and_configure_cugraph_ops) _clean_build_dirs_if_not_fully_built(cugraph-ops libcugraph-ops++) + _set_thrust_dir_if_exists() _set_package_dir_if_exists(raft raft) - _set_package_dir_if_exists(Thrust thrust) _set_package_dir_if_exists(cugraph-ops cugraph-ops) if(NOT TARGET cugraph-ops::cugraph-ops++) @@ -41,6 +41,7 @@ function(find_and_configure_cugraph_ops) SOURCE_SUBDIR cpp OPTIONS "DETECT_CONDA_ENV OFF" "BUILD_SHARED_LIBS OFF" + "CUDA_STATIC_RUNTIME ON" "BUILD_CUGRAPH_OPS_CPP_TESTS OFF") endif() # Make sure consumers of our libs can see cugraph-ops::Thrust @@ -48,6 +49,9 @@ function(find_and_configure_cugraph_ops) # Make sure consumers of our libs can see cugraph-ops::cugraph-ops++ _fix_cmake_global_defaults(cugraph-ops::cugraph-ops++) + include(${CMAKE_CURRENT_FUNCTION_LIST_DIR}/link_utils.cmake) + _statically_link_cuda_toolkit_libs(cugraph-ops++) + set(cugraph-ops_VERSION "${cugraph-ops_VERSION}" PARENT_SCOPE) endfunction() diff --git a/modules/core/cmake/Modules/ConfigureCUML.cmake b/modules/core/cmake/Modules/ConfigureCUML.cmake index f9bf01412..1cf36b265 100644 --- a/modules/core/cmake/Modules/ConfigureCUML.cmake +++ b/modules/core/cmake/Modules/ConfigureCUML.cmake @@ -25,10 +25,10 @@ function(find_and_configure_cuml) _clean_build_dirs_if_not_fully_built(cuml libcuml++) + _set_thrust_dir_if_exists() _set_package_dir_if_exists(cuml cuml) _set_package_dir_if_exists(raft raft) _set_package_dir_if_exists(faiss faiss) - _set_package_dir_if_exists(Thrust thrust) _set_package_dir_if_exists(Treelite cuml) _set_package_dir_if_exists(GPUTreeShap cuml) _set_package_dir_if_exists(cumlprims_mg cumlprims_mg) @@ -45,6 +45,7 @@ function(find_and_configure_cuml) SOURCE_SUBDIR cpp OPTIONS "SINGLEGPU ON" "WITH_UCX OFF" + "CUDA_STATIC_RUNTIME ON" "BUILD_TESTS OFF" "BUILD_BENCHMARKS OFF" "DISABLE_OPENMP OFF" @@ -70,6 +71,9 @@ function(find_and_configure_cuml) # Make sure consumers of our libs can see cuml::cuml++ _fix_cmake_global_defaults(cuml::cuml++) + include(${CMAKE_CURRENT_FUNCTION_LIST_DIR}/link_utils.cmake) + _statically_link_cuda_toolkit_libs(cuml::cuml++) + set(cuml_VERSION "${cuml_VERSION}" PARENT_SCOPE) endfunction() diff --git a/modules/core/cmake/Modules/ConfigureCUMLPRIMS.cmake b/modules/core/cmake/Modules/ConfigureCUMLPRIMS.cmake index 225285fad..b1d4f7d0f 100644 --- a/modules/core/cmake/Modules/ConfigureCUMLPRIMS.cmake +++ b/modules/core/cmake/Modules/ConfigureCUMLPRIMS.cmake @@ -45,6 +45,9 @@ function(find_and_configure_cumlprims_mg) # Make sure consumers of our libs can see cumlprims_mg::cumlprims_mg _fix_cmake_global_defaults(cumlprims_mg::cumlprims_mg) + include(${CMAKE_CURRENT_FUNCTION_LIST_DIR}/link_utils.cmake) + _statically_link_cuda_toolkit_libs(cumlprims_mg::cumlprims_mg) + set(cumlprims_mg_VERSION "${cumlprims_mg_VERSION}" PARENT_SCOPE) endfunction() diff --git a/modules/core/cmake/Modules/ConfigureCUSPATIAL.cmake b/modules/core/cmake/Modules/ConfigureCUSPATIAL.cmake index ba3856c29..8997f629a 100644 --- a/modules/core/cmake/Modules/ConfigureCUSPATIAL.cmake +++ b/modules/core/cmake/Modules/ConfigureCUSPATIAL.cmake @@ -25,12 +25,12 @@ function(find_and_configure_cuspatial) _clean_build_dirs_if_not_fully_built(cuspatial libcuspatial) + _set_thrust_dir_if_exists() _set_package_dir_if_exists(cudf cudf) _set_package_dir_if_exists(cuco cuco) _set_package_dir_if_exists(dlpack dlpack) _set_package_dir_if_exists(jitify jitify) _set_package_dir_if_exists(nvcomp nvcomp) - _set_package_dir_if_exists(Thrust thrust) _set_package_dir_if_exists(cuspatial cuspatial) if(NOT TARGET cuspatial::cuspatial) @@ -46,13 +46,16 @@ function(find_and_configure_cuspatial) OPTIONS "BUILD_TESTS OFF" "BUILD_BENCHMARKS OFF" "BUILD_SHARED_LIBS OFF" - "CUDA_STATIC_RUNTIME OFF" + "CUDA_STATIC_RUNTIME ON" "PER_THREAD_DEFAULT_STREAM ON" "DISABLE_DEPRECATION_WARNING ON") endif() # Make sure consumers of our libs can see cuspatial::cuspatial _fix_cmake_global_defaults(cuspatial::cuspatial) + include(${CMAKE_CURRENT_FUNCTION_LIST_DIR}/link_utils.cmake) + _statically_link_cuda_toolkit_libs(cuspatial::cuspatial) + set(cuspatial_VERSION "${cuspatial_VERSION}" PARENT_SCOPE) endfunction() diff --git a/modules/core/cmake/Modules/ConfigureRAFT.cmake b/modules/core/cmake/Modules/ConfigureRAFT.cmake index 10c791be1..c37bb156c 100644 --- a/modules/core/cmake/Modules/ConfigureRAFT.cmake +++ b/modules/core/cmake/Modules/ConfigureRAFT.cmake @@ -26,10 +26,10 @@ function(find_and_configure_raft) _clean_build_dirs_if_not_fully_built(raft libraft_nn) _clean_build_dirs_if_not_fully_built(raft libraft_distance) + _set_thrust_dir_if_exists() _set_package_dir_if_exists(rmm rmm) _set_package_dir_if_exists(raft raft) _set_package_dir_if_exists(faiss faiss) - _set_package_dir_if_exists(Thrust thrust) if(NOT TARGET raft::raft) _get_major_minor_version(${VERSION} MAJOR_AND_MINOR) @@ -44,7 +44,7 @@ function(find_and_configure_raft) ${UPDATE_DISCONNECTED} OPTIONS "BUILD_TESTS OFF" "BUILD_SHARED_LIBS OFF" - "CUDA_STATIC_RUNTIME OFF" + "CUDA_STATIC_RUNTIME ON" "RAFT_USE_FAISS_STATIC ON" "RAFT_COMPILE_LIBRARIES ON") endif() @@ -53,6 +53,10 @@ function(find_and_configure_raft) # Make these -isystem so -Werror doesn't fail their builds _set_interface_include_dirs_as_system(faiss::faiss) + include(${CMAKE_CURRENT_FUNCTION_LIST_DIR}/link_utils.cmake) + _statically_link_cuda_toolkit_libs(raft::raft) + _statically_link_cuda_toolkit_libs(faiss::faiss) + set(raft_VERSION "${raft_VERSION}" PARENT_SCOPE) endfunction() diff --git a/modules/core/cmake/Modules/ConfigureRMM.cmake b/modules/core/cmake/Modules/ConfigureRMM.cmake index 6269ae5b6..9cd73af02 100644 --- a/modules/core/cmake/Modules/ConfigureRMM.cmake +++ b/modules/core/cmake/Modules/ConfigureRMM.cmake @@ -23,9 +23,9 @@ function(find_and_configure_rmm) _get_rapidsai_module_version(rmm VERSION) + _set_thrust_dir_if_exists() _set_package_dir_if_exists(rmm rmm) _set_package_dir_if_exists(spdlog spdlog) - _set_package_dir_if_exists(Thrust thrust) if(NOT TARGET rmm::rmm) _get_major_minor_version(${VERSION} MAJOR_AND_MINOR) diff --git a/modules/core/cmake/Modules/ConfigureThrust.cmake b/modules/core/cmake/Modules/ConfigureThrust.cmake index 4f91983bf..9c0963798 100644 --- a/modules/core/cmake/Modules/ConfigureThrust.cmake +++ b/modules/core/cmake/Modules/ConfigureThrust.cmake @@ -16,15 +16,21 @@ include_guard(GLOBAL) function(find_and_configure_thrust VERSION) - _get_update_disconnected_state(Thrust ${VERSION} UPDATE_DISCONNECTED) - CPMAddPackage(NAME Thrust - VERSION ${VERSION} - GIT_REPOSITORY https://github.com/NVIDIA/thrust.git - GIT_TAG ${VERSION} - GIT_SHALLOW TRUE - ${UPDATE_DISCONNECTED} - PATCH_COMMAND patch --reject-file=- -p1 -N < ${CMAKE_CURRENT_LIST_DIR}/thrust.patch || true - ) + include(${CMAKE_CURRENT_FUNCTION_LIST_DIR}/get_cpm.cmake) + _set_thrust_dir_if_exists() + find_package(Thrust "${VERSION}.0" EXACT QUIET) + if(NOT Thrust_FOUND) + _get_update_disconnected_state(Thrust ${VERSION} UPDATE_DISCONNECTED) + CPMAddPackage(NAME Thrust + VERSION ${VERSION} + GIT_REPOSITORY https://github.com/NVIDIA/thrust.git + GIT_TAG ${VERSION} + GIT_SHALLOW TRUE + ${UPDATE_DISCONNECTED} + PATCH_COMMAND patch --reject-file=- -p1 -N < ${CMAKE_CURRENT_LIST_DIR}/thrust.patch || true + ) + endif() + set(CPM_THRUST_CURRENT_VERSION ${VERSION} CACHE STRING "version of thrust we checked out" FORCE) endfunction() find_and_configure_thrust(1.15.0) diff --git a/modules/core/cmake/Modules/get_cpm.cmake b/modules/core/cmake/Modules/get_cpm.cmake index 8f12c195b..a88a0eb30 100644 --- a/modules/core/cmake/Modules/get_cpm.cmake +++ b/modules/core/cmake/Modules/get_cpm.cmake @@ -19,12 +19,12 @@ if(DEFINED CPM_SOURCE_CACHE AND (DEFINED CPM_DOWNLOAD_VERSION) AND (DEFINED CPM_DOWNLOAD_LOCATION)) if(DEFINED ENV{NODE_RAPIDS_USE_LOCAL_DEPS_BUILD_DIRS}) - message(STATUS "get_cpm: CPM already loaded") + message(VERBOSE "get_cpm: CPM already loaded") return() endif() if(DEFINED CPM_BINARY_CACHE AND (DEFINED ENV{CPM_BINARY_CACHE})) - message(STATUS "get_cpm: CPM already loaded") + message(VERBOSE "get_cpm: CPM already loaded") return() endif() endif() @@ -38,7 +38,7 @@ if (NOT DEFINED ENV{NODE_RAPIDS_USE_LOCAL_DEPS_BUILD_DIRS}) set(CPM_SOURCE_CACHE "${NODE_RAPIDS_CPM_SOURCE_CACHE}") set(ENV{CPM_SOURCE_CACHE} "${NODE_RAPIDS_CPM_SOURCE_CACHE}") - message(STATUS "get_cpm: Using CPM source cache: $ENV{CPM_SOURCE_CACHE}") + message(VERBOSE "get_cpm: Using CPM source cache: $ENV{CPM_SOURCE_CACHE}") execute_process(COMMAND node -p "require('@rapidsai/core').cpm_binary_cache_path" @@ -48,13 +48,13 @@ if (NOT DEFINED ENV{NODE_RAPIDS_USE_LOCAL_DEPS_BUILD_DIRS}) set(CPM_BINARY_CACHE "${NODE_RAPIDS_CPM_BINARY_CACHE}/${CMAKE_BUILD_TYPE}") set(ENV{CPM_BINARY_CACHE} "${CPM_BINARY_CACHE}") - message(STATUS "get_cpm: Using CPM BINARY cache: $ENV{CPM_BINARY_CACHE}") + message(VERBOSE "get_cpm: Using CPM BINARY cache: $ENV{CPM_BINARY_CACHE}") - message(STATUS "get_cpm: Using CMake FetchContent base dir: ${CPM_BINARY_CACHE}") + message(VERBOSE "get_cpm: Using CMake FetchContent base dir: ${CPM_BINARY_CACHE}") set(FETCHCONTENT_BASE_DIR "${CPM_BINARY_CACHE}" CACHE STRING "" FORCE) endif() -file(DOWNLOAD https://raw.githubusercontent.com/rapidsai/rapids-cmake/branch-22.06/RAPIDS.cmake ${CMAKE_BINARY_DIR}/RAPIDS.cmake) +file(DOWNLOAD https://raw.githubusercontent.com/rapidsai/rapids-cmake/branch-22.08/RAPIDS.cmake ${CMAKE_BINARY_DIR}/RAPIDS.cmake) include(${CMAKE_BINARY_DIR}/RAPIDS.cmake) include(rapids-export) include(rapids-cmake) @@ -69,11 +69,35 @@ execute_process(COMMAND node -p rapids_cpm_init(OVERRIDE "${NODE_RAPIDS_CMAKE_MODULES_PATH}/../versions.json") +function(_set_thrust_dir_if_exists) + if(Thrust_ROOT) + message(STATUS "get_cpm: Thrust_ROOT is '${Thrust_ROOT}'") + return() + endif() + if (NOT DEFINED ENV{NODE_RAPIDS_USE_LOCAL_DEPS_BUILD_DIRS}) + file(GLOB _thrust_srcs "${CPM_SOURCE_CACHE}/thrust/*/thrust" LIST_DIRECTORIES TRUE) + foreach(_thrust_src IN LISTS _thrust_srcs) + if(_thrust_src AND (EXISTS "${_thrust_src}/cmake")) + message(STATUS "get_cpm: setting Thrust_ROOT to '${_thrust_src}/cmake'") + set(Thrust_DIR "${_thrust_src}/cmake" PARENT_SCOPE) + set(Thrust_ROOT "${_thrust_src}/cmake" PARENT_SCOPE) + break() + else() + if(NOT _thrust_src) + set(_thrust_src "thrust/cmake") + endif() + message(STATUS "get_cpm: not setting Thrust_ROOT because '${_thrust_src}' does not exist") + endif() + endforeach() + endif() +endfunction() + function(_set_package_dir_if_exists pkg dir) if (NOT DEFINED ENV{NODE_RAPIDS_USE_LOCAL_DEPS_BUILD_DIRS}) set(_build_dir "${CPM_BINARY_CACHE}/${dir}-build") if(EXISTS "${_build_dir}") message(STATUS "get_cpm: setting ${pkg}_ROOT to '${_build_dir}'") + set(${pkg}_DIR "${_build_dir}" PARENT_SCOPE) set(${pkg}_ROOT "${_build_dir}" PARENT_SCOPE) else() message(STATUS "get_cpm: not setting ${pkg}_ROOT because '${_build_dir}' does not exist") diff --git a/modules/core/cmake/Modules/get_version.cmake b/modules/core/cmake/Modules/get_version.cmake index 4882a4417..5474f3de7 100644 --- a/modules/core/cmake/Modules/get_version.cmake +++ b/modules/core/cmake/Modules/get_version.cmake @@ -16,7 +16,7 @@ include_guard(GLOBAL) function(_get_rapidsai_module_version pkg out_var_) - set(ver_ "22.06.00") + set(ver_ "22.08.00") if(DEFINED ${pkg}_VERSION) set(ver_ "${${pkg}_VERSION}") elseif(DEFINED RAPIDS_VERSION) diff --git a/modules/core/cmake/Modules/link_utils.cmake b/modules/core/cmake/Modules/link_utils.cmake new file mode 100644 index 000000000..f6ccb2dec --- /dev/null +++ b/modules/core/cmake/Modules/link_utils.cmake @@ -0,0 +1,40 @@ +#============================================================================= +# Copyright (c) 2022, NVIDIA CORPORATION. +# +# 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. +#============================================================================= +include_guard(GLOBAL) + +function(_statically_link_cuda_toolkit_libs target) + if(TARGET ${target}) + + get_target_property(_aliased_target ${target} ALIASED_TARGET) + + if (_aliased_target) + _statically_link_cuda_toolkit_libs(${_aliased_target}) + return() + endif() + + get_target_property(_link_libs ${target} INTERFACE_LINK_LIBRARIES) + + foreach(_lib IN ITEMS cublas cublasLt cudart cufft cufft cufftw cupti curand cusolver + cusolver_lapack cusolver_metis cusparse nppc nppial nppicc nppicom + nppidei nppif nppig nppim nppist nppisu nppitc npps nvgraph) + string(REPLACE "CUDA::${_lib};" "CUDA::${_lib}_static;" _link_libs "${_link_libs}") + string(REPLACE "CUDA::${_lib}>" "CUDA::${_lib}_static>" _link_libs "${_link_libs}") + string(REPLACE "CUDA::${_lib}\"" "CUDA::${_lib}_static\"" _link_libs "${_link_libs}") + endforeach() + + set_target_properties(${target} PROPERTIES INTERFACE_LINK_LIBRARIES "${_link_libs}") + endif() +endfunction() diff --git a/modules/core/cmake/versions.json b/modules/core/cmake/versions.json index 723ad71c8..c2c912bf4 100644 --- a/modules/core/cmake/versions.json +++ b/modules/core/cmake/versions.json @@ -9,9 +9,10 @@ } }, "Thrust": { - "version": "1.15.0", + "version": "1.15.0.0", "git_url": "https://github.com/NVIDIA/thrust.git", - "git_tag": "${version}" + "git_tag": "${version}", + "always_download": "NO" } } } diff --git a/modules/core/package.json b/modules/core/package.json index ac21409b9..fff961109 100644 --- a/modules/core/package.json +++ b/modules/core/package.json @@ -1,6 +1,6 @@ { "name": "@rapidsai/core", - "version": "22.6.3", + "version": "22.8.0", "description": "Shared CMake modules, TypeScript configurations, and C++ headers for RAPIDS node native modules", "main": "index.js", "types": "build/js", diff --git a/modules/cuda/CMakeLists.txt b/modules/cuda/CMakeLists.txt index 48721e0f1..55b7df244 100644 --- a/modules/cuda/CMakeLists.txt +++ b/modules/cuda/CMakeLists.txt @@ -83,9 +83,9 @@ target_compile_definitions(${PROJECT_NAME} target_link_libraries(${PROJECT_NAME} PUBLIC ${CMAKE_JS_LIB} CUDA::nvrtc - CUDA::cudart - CUDA::nppig - CUDA::nppicc + CUDA::cudart_static + CUDA::nppig_static + CUDA::nppicc_static "${NODE_RAPIDS_CORE_MODULE_PATH}/build/${CMAKE_BUILD_TYPE}/rapidsai_core.node") include("${NODE_RAPIDS_CMAKE_MODULES_PATH}/cuda_arch_helpers.cmake") diff --git a/modules/cuda/package.json b/modules/cuda/package.json index fc5105201..e77a283aa 100644 --- a/modules/cuda/package.json +++ b/modules/cuda/package.json @@ -1,6 +1,6 @@ { "name": "@rapidsai/cuda", - "version": "22.6.3", + "version": "22.8.0", "description": "NVIDIA CUDA driver and runtime API bindings", "main": "index.js", "types": "build/js", @@ -45,7 +45,7 @@ "dev:cpack": "cd build/Release && cpack -G TGZ >/dev/null && echo \"$(realpath -m ./rapidsai_*-*-*.tar.gz)\"" }, "dependencies": { - "@rapidsai/core": "~22.6.3" + "@rapidsai/core": "~22.8.0" }, "files": [ "LICENSE", diff --git a/modules/cudf/CMakeLists.txt b/modules/cudf/CMakeLists.txt index b22c76c45..86c0a5446 100644 --- a/modules/cudf/CMakeLists.txt +++ b/modules/cudf/CMakeLists.txt @@ -100,7 +100,8 @@ target_link_libraries(${PROJECT_NAME} cudf::cudf "${NODE_RAPIDS_RMM_MODULE_PATH}/build/${CMAKE_BUILD_TYPE}/rapidsai_rmm.node" "${NODE_RAPIDS_CUDA_MODULE_PATH}/build/${CMAKE_BUILD_TYPE}/rapidsai_cuda.node" - "${NODE_RAPIDS_CORE_MODULE_PATH}/build/${CMAKE_BUILD_TYPE}/rapidsai_core.node") + "${NODE_RAPIDS_CORE_MODULE_PATH}/build/${CMAKE_BUILD_TYPE}/rapidsai_core.node" + PRIVATE ${ARROW_LIBRARIES}) include("${NODE_RAPIDS_CMAKE_MODULES_PATH}/cuda_arch_helpers.cmake") generate_arch_specific_custom_targets( diff --git a/modules/cudf/package.json b/modules/cudf/package.json index a1a658ef0..6c9f4eede 100644 --- a/modules/cudf/package.json +++ b/modules/cudf/package.json @@ -1,6 +1,6 @@ { "name": "@rapidsai/cudf", - "version": "22.6.3", + "version": "22.8.0", "description": "cuDF - NVIDIA RAPIDS GPU DataFrame Library", "license": "Apache-2.0", "main": "index.js", @@ -45,8 +45,8 @@ "dev:cpack": "cd build/Release && cpack -G TGZ >/dev/null && echo \"$(realpath -m ./rapidsai_*-*-*.tar.gz)\"" }, "dependencies": { - "@rapidsai/cuda": "~22.6.3", - "@rapidsai/rmm": "~22.6.3", + "@rapidsai/cuda": "~22.8.0", + "@rapidsai/rmm": "~22.8.0", "apache-arrow": "^8.0.0" }, "devDependencies": { diff --git a/modules/cudf/src/data_frame.ts b/modules/cudf/src/data_frame.ts index f4ae0b16d..0209e7b42 100644 --- a/modules/cudf/src/data_frame.ts +++ b/modules/cudf/src/data_frame.ts @@ -182,9 +182,22 @@ export class DataFrame { memory = new Uint8Buffer(memory); } if (memory instanceof MemoryView) { memory = memory.buffer; } - const {names, table} = Table.fromArrow(memory); - return new DataFrame(new ColumnAccessor(names.reduce( - (map, name, i) => ({...map, [name]: table.getColumnByIndex(i)}), {} as ColumnsMap))); + const {table, fields} = Table.fromArrow(memory); + const colToSeries = (field: arrow.Field, col: Column): Series => { + return Series.new({ + type: field.type, + data: col.data, + offset: col.offset, + length: col.length, + nullMask: col.mask, + nullCount: col.nullCount, + children: (field.type.children as arrow.Field[] ?? []) + .map((f, i) => colToSeries(f, col.getChild(i))), + }); + }; + return new DataFrame(fields.reduce((seriesMap, f, i) => { + return ({...seriesMap, [f.name]: colToSeries(f, table.getColumnByIndex(i))}); + }, {} as SeriesMap)); } declare private _accessor: ColumnAccessor; diff --git a/modules/cudf/src/node_cudf/utilities/dtypes.hpp b/modules/cudf/src/node_cudf/utilities/dtypes.hpp index 57c637fc2..01653414f 100644 --- a/modules/cudf/src/node_cudf/utilities/dtypes.hpp +++ b/modules/cudf/src/node_cudf/utilities/dtypes.hpp @@ -18,6 +18,8 @@ #include +#include + namespace nv { cudf::type_id get_common_type(cudf::data_type const& lhs, cudf::data_type const& rhs); @@ -43,4 +45,125 @@ inline Value Value::From(napi_env env, cudf::data_type const& type) { return nv::cudf_to_arrow_type(env, type); } +template <> +inline Value Value::From(napi_env env, arrow::DataType const& type); + +template <> +inline Value Value::From(napi_env env, std::vector> const& fields) { + auto n = fields.size(); + auto fs = Array::New(env, n); + for (std::size_t i = 0; i < n; ++i) { + auto f = fields[i]; + auto o = Object::New(env); + o["name"] = String::New(env, f->name()); + o["type"] = Value::From(env, *f->type()); + o["nullable"] = Boolean::New(env, f->nullable()); + fs[i] = o; + } + return fs; +} + +template <> +inline Value Value::From(napi_env env, arrow::DataType const& type) { + auto o = Napi::Object::New(env); + switch (type.id()) { + case arrow::Type::DICTIONARY: { // + o["typeId"] = -1; + o["idOrdered"] = dynamic_cast(type).ordered(); + o["indices"] = + Value::From(env, *dynamic_cast(type).index_type()); + o["dictionary"] = + Value::From(env, *dynamic_cast(type).value_type()); + return o; + } + case arrow::Type::INT8: { + o["typeId"] = 2; + o["bitWidth"] = 8; + o["isSigned"] = true; + return o; + } + case arrow::Type::INT16: { + o["typeId"] = 2; + o["bitWidth"] = 16; + o["isSigned"] = true; + return o; + } + case arrow::Type::INT32: { + o["typeId"] = 2; + o["bitWidth"] = 32; + o["isSigned"] = true; + return o; + } + case arrow::Type::INT64: { + o["typeId"] = 2; + o["bitWidth"] = 64; + o["isSigned"] = true; + return o; + } + case arrow::Type::UINT8: { + o["typeId"] = 2; + o["bitWidth"] = 8; + o["isSigned"] = false; + return o; + } + case arrow::Type::UINT16: { + o["typeId"] = 2; + o["bitWidth"] = 16; + o["isSigned"] = false; + return o; + } + case arrow::Type::UINT32: { + o["typeId"] = 2; + o["bitWidth"] = 32; + o["isSigned"] = false; + return o; + } + case arrow::Type::UINT64: { + o["typeId"] = 2; + o["bitWidth"] = 64; + o["isSigned"] = false; + return o; + } + case arrow::Type::FLOAT: { + o["typeId"] = 3; + o["precision"] = 1; + return o; + } + case arrow::Type::DOUBLE: { + o["typeId"] = 3; + o["precision"] = 2; + return o; + } + case arrow::Type::STRING: { + o["typeId"] = 5; + return o; + } + case arrow::Type::BOOL: { + o["typeId"] = 6; + return o; + } + case arrow::Type::TIMESTAMP: { + o["typeId"] = 10; + o["unit"] = static_cast(dynamic_cast(type).unit()); + o["bitWidth"] = + static_cast(dynamic_cast(type).bit_width()); + return o; + } + case arrow::Type::LIST: { + o["typeId"] = 12; + o["children"] = Value::From(env, dynamic_cast(type).fields()); + return o; + } + case arrow::Type::STRUCT: { + o["typeId"] = 13; + o["children"] = Value::From(env, dynamic_cast(type).fields()); + return o; + } + default: { + throw Napi::Error::New(env, "Unrecognized Arrow type '" + type.ToString() + ""); + } + } + return o; +} + } // namespace Napi diff --git a/modules/cudf/src/table.ts b/modules/cudf/src/table.ts index a23053456..cf92f2c43 100644 --- a/modules/cudf/src/table.ts +++ b/modules/cudf/src/table.ts @@ -14,6 +14,7 @@ import {MemoryData} from '@rapidsai/cuda'; import {DeviceBuffer, MemoryResource} from '@rapidsai/rmm'; +import {Field} from 'apache-arrow'; import CUDF from './addon'; import {Column} from './column'; @@ -63,7 +64,7 @@ export interface TableConstructor { * @param memory A buffer holding Arrow table * @return The Arrow data as a Table and a list of column names. */ - fromArrow(memory: DeviceBuffer|MemoryData): {names: string[], table: Table}; + fromArrow(memory: DeviceBuffer|MemoryData): {table: Table, fields: Field[]}; /** * Returns tables concatenated to each other. diff --git a/modules/cudf/src/table/arrow.cpp b/modules/cudf/src/table/arrow.cpp index 25c5a6c12..b3eccfa38 100644 --- a/modules/cudf/src/table/arrow.cpp +++ b/modules/cudf/src/table/arrow.cpp @@ -14,12 +14,15 @@ #include #include +#include +#include #include +#include #include +#include #include -#include #include @@ -27,6 +30,31 @@ namespace nv { namespace { +class CudaMessageReader : arrow::ipc::MessageReader { + public: + CudaMessageReader(arrow::cuda::CudaBufferReader* stream, arrow::io::BufferReader* schema) + : stream_(stream), host_schema_reader_(schema){}; + + static std::unique_ptr Open(arrow::cuda::CudaBufferReader* stream, + arrow::io::BufferReader* schema) { + return std::unique_ptr(new CudaMessageReader(stream, schema)); + } + + arrow::Result> ReadNextMessage() override { + if (host_schema_reader_ != nullptr) { + auto message = arrow::ipc::ReadMessage(host_schema_reader_); + host_schema_reader_ = nullptr; + if (message.ok() && *message != nullptr) { return message; } + } + return arrow::ipc::ReadMessage(stream_, arrow::default_memory_pool()); + } + + private: + arrow::cuda::CudaBufferReader* stream_; + arrow::io::BufferReader* host_schema_reader_ = nullptr; + std::shared_ptr owned_stream_; +}; + std::vector gather_metadata(Napi::Array const& names) { std::vector metadata; metadata.reserve(names.Length()); @@ -80,8 +108,8 @@ Napi::Value Table::from_arrow(Napi::CallbackInfo const& info) { auto device_context = device_manager->GetContext(Device::active_device_id()).ValueOrDie(); buffer_reader.reset(new CudaBufferReader(std::make_shared( span.data(), span.size(), device_context, false, IpcMemory::IsInstance(source)))); - return CudaMessageReader::Open(static_cast(buffer_reader.get()), - nullptr); + return nv::CudaMessageReader::Open(static_cast(buffer_reader.get()), + nullptr); } // If the memory was not allocated via CUDA, assume host buffer_reader.reset( @@ -90,24 +118,15 @@ Napi::Value Table::from_arrow(Napi::CallbackInfo const& info) { }()) .ValueOrDie(); - std::shared_ptr arrow_table{}; - auto status = stream_reader->ReadAll(&arrow_table); - - if (!status.ok()) { NAPI_THROW(Napi::Error::New(env, status.message())); } - - auto output = Napi::Object::New(env); + try { + auto arrow_table = stream_reader->ToTable().ValueOrDie(); - auto fields = stream_reader->schema()->fields(); - auto names = Napi::Array::New(env, fields.size()); - for (std::size_t i = 0; i < fields.size(); ++i) { names.Set(i, fields[i]->name()); } - output.Set("names", names); + auto output = Napi::Object::New(env); + output.Set("table", Table::New(env, cudf::from_arrow(*arrow_table))); + output.Set("fields", Napi::Value::From(env, stream_reader->schema()->fields())); - try { - auto table = cudf::from_arrow(*arrow_table); - output.Set("table", Table::New(env, std::move(table))); + return output; } catch (std::exception const& e) { NAPI_THROW(Napi::Error::New(env, e.what())); } - - return output; } } // namespace nv diff --git a/modules/cudf/src/table/stream_compaction.cpp b/modules/cudf/src/table/stream_compaction.cpp index 16a482ce8..18d1d1647 100644 --- a/modules/cudf/src/table/stream_compaction.cpp +++ b/modules/cudf/src/table/stream_compaction.cpp @@ -83,9 +83,14 @@ Table::wrapper_t Table::distinct(std::vector keys, rmm::mr::device_memory_resource* mr) const { cudf::null_equality nulls_equal = is_nulls_equal ? cudf::null_equality::EQUAL : cudf::null_equality::UNEQUAL; + cudf::nan_equality nans_equal = + is_nulls_equal ? cudf::nan_equality::ALL_EQUAL : cudf::nan_equality::UNEQUAL; try { - return Table::New(Env(), cudf::distinct(*this, keys, nulls_equal, mr)); + return Table::New( + Env(), + cudf::distinct( + *this, keys, cudf::duplicate_keep_option::KEEP_ANY, nulls_equal, nans_equal, mr)); } catch (std::exception const& e) { throw Napi::Error::New(Env(), e.what()); } } diff --git a/modules/cudf/test/dataframe/arrow-tests.ts b/modules/cudf/test/dataframe/arrow-tests.ts index d83b15d8a..468a507a4 100644 --- a/modules/cudf/test/dataframe/arrow-tests.ts +++ b/modules/cudf/test/dataframe/arrow-tests.ts @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -import {DataFrame} from '@rapidsai/cudf'; +import {DataFrame, Float64, Int32, Struct} from '@rapidsai/cudf'; import * as arrow from 'apache-arrow'; import {ChildProcessByStdio, spawn} from 'child_process'; import {Readable, Writable} from 'stream'; @@ -21,15 +21,36 @@ jest.setTimeout(60 * 1000); test(`fromArrow works from host memory`, () => { const table = arrow.tableFromArrays({ - floats: new Float64Array([1.1, 2.2, 0, -3.3, -4.4]), ints: new Int32Array([1, 2, 0, -3, -4]), + floats: new Float64Array([1.1, 2.2, 0, -3.3, -4.4]), + points: [ + {x: 0, y: 4}, + {x: 1, y: 3}, + {x: 2, y: 2}, + {x: 3, y: 1}, + {x: 4, y: 0}, + ], }); const serialized_table = arrow.tableToIPC(table); // Uint8Array - const df = DataFrame.fromArrow(serialized_table); + const df = DataFrame.fromArrow<{ + ints: Int32, // + floats: Float64, // + points: Struct<{ + x: Float64, + y: Float64, + }>; + }>(serialized_table); - expect([...df.names]).toStrictEqual(['floats', 'ints']); - expect([...df.get('floats')]).toStrictEqual([1.1, 2.2, 0, -3.3, -4.4]); + expect([...df.names]).toStrictEqual(['ints', 'floats', 'points']); expect([...df.get('ints')]).toStrictEqual([1, 2, 0, -3, -4]); + expect([...df.get('floats')]).toStrictEqual([1.1, 2.2, 0, -3.3, -4.4]); + expect([...df.get('points')].map((x) => x?.toJSON())).toStrictEqual([ + {x: 0, y: 4}, + {x: 1, y: 3}, + {x: 2, y: 2}, + {x: 3, y: 1}, + {x: 4, y: 0}, + ]); }); test(`fromArrow works between subprocesses`, async () => { diff --git a/modules/cugraph/package.json b/modules/cugraph/package.json index fec3f9d70..0568e8904 100644 --- a/modules/cugraph/package.json +++ b/modules/cugraph/package.json @@ -1,6 +1,6 @@ { "name": "@rapidsai/cugraph", - "version": "22.6.3", + "version": "22.8.0", "description": "cuGraph - NVIDIA RAPIDS Graph Analytics Library", "license": "Apache-2.0", "main": "index.js", @@ -45,10 +45,10 @@ "dev:cpack": "cd build/Release && cpack -G TGZ >/dev/null && echo \"$(realpath -m ./rapidsai_*-*-*.tar.gz)\"" }, "dependencies": { - "@rapidsai/cudf": "~22.6.3" + "@rapidsai/cudf": "~22.8.0" }, "devDependencies": { - "@rapidsai/cuml": "~22.6.3" + "@rapidsai/cuml": "~22.8.0" }, "files": [ "LICENSE", diff --git a/modules/cugraph/src/graph.cpp b/modules/cugraph/src/graph.cpp index c321f6f20..8d3bc9646 100644 --- a/modules/cugraph/src/graph.cpp +++ b/modules/cugraph/src/graph.cpp @@ -21,7 +21,7 @@ #include #include -#include +#include #include #include diff --git a/modules/cuml/CMakeLists.txt b/modules/cuml/CMakeLists.txt index fe4582194..e2d090cee 100644 --- a/modules/cuml/CMakeLists.txt +++ b/modules/cuml/CMakeLists.txt @@ -141,8 +141,6 @@ generate_arch_specific_custom_targets( DEPENDENCIES "cudf::cudf" "cuml::cuml++" "faiss::faiss" - "raft_nn_lib" - "raft_distance_lib" "raft::raft_nn_lib" "raft::raft_distance_lib" ) diff --git a/modules/cuml/package.json b/modules/cuml/package.json index 4809f0e4c..44b478a5b 100644 --- a/modules/cuml/package.json +++ b/modules/cuml/package.json @@ -1,6 +1,6 @@ { "name": "@rapidsai/cuml", - "version": "22.6.3", + "version": "22.8.0", "description": "cuML - NVIDIA RAPIDS Machine Learning Library", "license": "Apache-2.0", "main": "index.js", @@ -45,7 +45,7 @@ "dev:cpack": "cd build/Release && cpack -G TGZ >/dev/null && echo \"$(realpath -m ./rapidsai_*-*-*.tar.gz)\"" }, "dependencies": { - "@rapidsai/cudf": "~22.6.3" + "@rapidsai/cudf": "~22.8.0" }, "files": [ "LICENSE", diff --git a/modules/cuspatial/package.json b/modules/cuspatial/package.json index 321962ba7..94072a68b 100644 --- a/modules/cuspatial/package.json +++ b/modules/cuspatial/package.json @@ -1,6 +1,6 @@ { "name": "@rapidsai/cuspatial", - "version": "22.6.3", + "version": "22.8.0", "description": "cuSpatial - NVIDIA RAPIDS GIS and Spatiotemporal Analytics Library", "license": "Apache-2.0", "main": "index.js", @@ -45,7 +45,7 @@ "dev:cpack": "cd build/Release && cpack -G TGZ >/dev/null && echo \"$(realpath -m ./rapidsai_*-*-*.tar.gz)\"" }, "dependencies": { - "@rapidsai/cudf": "~22.6.3" + "@rapidsai/cudf": "~22.8.0" }, "files": [ "LICENSE", diff --git a/modules/deck.gl/package.json b/modules/deck.gl/package.json index ceacbb914..28f030300 100644 --- a/modules/deck.gl/package.json +++ b/modules/deck.gl/package.json @@ -1,6 +1,6 @@ { "name": "@rapidsai/deck.gl", - "version": "22.6.3", + "version": "22.8.0", "description": "NVIDIA RAPIDS deck.gl components and utilities", "license": "Apache-2.0", "main": "index.js", @@ -33,9 +33,9 @@ "@luma.gl/core": "8.5.10", "@luma.gl/engine": "8.5.10", "@luma.gl/webgl": "8.5.10", - "@rapidsai/core": "~22.6.3", - "@rapidsai/cuda": "~22.6.3", - "@rapidsai/cudf": "~22.6.3", + "@rapidsai/core": "~22.8.0", + "@rapidsai/cuda": "~22.8.0", + "@rapidsai/cudf": "~22.8.0", "mjolnir.js": "2.6.0" }, "files": [ diff --git a/modules/demo/api-server/package.json b/modules/demo/api-server/package.json index 04c54f901..7b8f1743f 100644 --- a/modules/demo/api-server/package.json +++ b/modules/demo/api-server/package.json @@ -2,7 +2,7 @@ "private": true, "name": "@rapidsai/demo-api-server", "main": "index.js", - "version": "22.6.3", + "version": "22.8.0", "license": "Apache-2.0", "author": "NVIDIA, Inc. (https://nvidia.com/)", "maintainers": [ diff --git a/modules/demo/client-server/package.json b/modules/demo/client-server/package.json index f4befba4d..079563693 100644 --- a/modules/demo/client-server/package.json +++ b/modules/demo/client-server/package.json @@ -1,6 +1,6 @@ { "name": "@rapidsai/demo-client-server", - "version": "22.6.3", + "version": "22.8.0", "private": true, "author": "NVIDIA, Inc. (https://nvidia.com/)", "maintainers": [ diff --git a/modules/demo/deck/3d-heatmap/package.json b/modules/demo/deck/3d-heatmap/package.json index 77c9802a7..d5329fcf4 100644 --- a/modules/demo/deck/3d-heatmap/package.json +++ b/modules/demo/deck/3d-heatmap/package.json @@ -1,7 +1,7 @@ { "private": true, "name": "@rapidsai/demo-deck-3d-heatmap", - "version": "22.6.3", + "version": "22.8.0", "license": "Apache-2.0", "author": "NVIDIA, Inc. (https://nvidia.com/)", "maintainers": [ @@ -16,7 +16,7 @@ "@deck.gl/aggregation-layers": "8.6.6", "@deck.gl/core": "8.6.6", "@deck.gl/react": "8.6.6", - "@rapidsai/jsdom": "~22.6.3", + "@rapidsai/jsdom": "~22.8.0", "d3-request": "1.0.6", "mjolnir.js": "2.6.0", "react": "17.0.2", diff --git a/modules/demo/deck/3d-tiles/package.json b/modules/demo/deck/3d-tiles/package.json index a87badaf7..cd27a7693 100644 --- a/modules/demo/deck/3d-tiles/package.json +++ b/modules/demo/deck/3d-tiles/package.json @@ -1,7 +1,7 @@ { "private": true, "name": "@rapidsai/demo-deck-3d-tiles", - "version": "22.6.3", + "version": "22.8.0", "license": "Apache-2.0", "author": "NVIDIA, Inc. (https://nvidia.com/)", "maintainers": [ @@ -20,7 +20,7 @@ "@loaders.gl/3d-tiles": "3.1.6", "@loaders.gl/core": "3.1.6", "@loaders.gl/draco": "3.1.6", - "@rapidsai/jsdom": "~22.6.3", + "@rapidsai/jsdom": "~22.8.0", "mjolnir.js": "2.6.0", "react": "17.0.2", "react-dom": "17.0.2", diff --git a/modules/demo/deck/arc/package.json b/modules/demo/deck/arc/package.json index 2ce945006..6cc043a64 100644 --- a/modules/demo/deck/arc/package.json +++ b/modules/demo/deck/arc/package.json @@ -1,7 +1,7 @@ { "private": true, "name": "@rapidsai/demo-deck-arc", - "version": "22.6.3", + "version": "22.8.0", "license": "Apache-2.0", "author": "NVIDIA, Inc. (https://nvidia.com/)", "maintainers": [ @@ -16,7 +16,7 @@ "@deck.gl/core": "8.6.6", "@deck.gl/layers": "8.6.6", "@deck.gl/react": "8.6.6", - "@rapidsai/jsdom": "~22.6.3", + "@rapidsai/jsdom": "~22.8.0", "d3-scale": "2.2.2", "mjolnir.js": "2.6.0", "react": "17.0.2", diff --git a/modules/demo/deck/bezier/package.json b/modules/demo/deck/bezier/package.json index f54abf8d8..3dfaf5871 100644 --- a/modules/demo/deck/bezier/package.json +++ b/modules/demo/deck/bezier/package.json @@ -1,7 +1,7 @@ { "private": true, "name": "@rapidsai/demo-deck-bezier", - "version": "22.6.3", + "version": "22.8.0", "main": "index.js", "license": "Apache-2.0", "author": "NVIDIA, Inc. (https://nvidia.com/)", @@ -17,7 +17,7 @@ "@deck.gl/core": "8.6.6", "@deck.gl/layers": "8.6.6", "@deck.gl/react": "8.6.6", - "@rapidsai/jsdom": "~22.6.3", + "@rapidsai/jsdom": "~22.8.0", "mjolnir.js": "2.6.0", "react": "17.0.2", "react-dom": "17.0.2" diff --git a/modules/demo/deck/brushing/package.json b/modules/demo/deck/brushing/package.json index dad8c5a48..28ff1ee34 100644 --- a/modules/demo/deck/brushing/package.json +++ b/modules/demo/deck/brushing/package.json @@ -1,7 +1,7 @@ { "private": true, "name": "@rapidsai/demo-deck-brushing", - "version": "22.6.3", + "version": "22.8.0", "license": "Apache-2.0", "author": "NVIDIA, Inc. (https://nvidia.com/)", "maintainers": [ @@ -16,7 +16,7 @@ "@deck.gl/core": "8.6.6", "@deck.gl/extensions": "8.6.6", "@deck.gl/react": "8.6.6", - "@rapidsai/jsdom": "~22.6.3", + "@rapidsai/jsdom": "~22.8.0", "d3-scale": "2.2.2", "gl-matrix": "3.3.0", "mjolnir.js": "2.6.0", diff --git a/modules/demo/deck/geojson/package.json b/modules/demo/deck/geojson/package.json index d00246b1e..b2a7c369f 100644 --- a/modules/demo/deck/geojson/package.json +++ b/modules/demo/deck/geojson/package.json @@ -1,7 +1,7 @@ { "private": true, "name": "@rapidsai/demo-deck-geojson", - "version": "22.6.3", + "version": "22.8.0", "license": "Apache-2.0", "author": "NVIDIA, Inc. (https://nvidia.com/)", "maintainers": [ @@ -16,7 +16,7 @@ "@deck.gl/core": "8.6.6", "@deck.gl/layers": "8.6.6", "@deck.gl/react": "8.6.6", - "@rapidsai/jsdom": "~22.6.3", + "@rapidsai/jsdom": "~22.8.0", "d3-scale": "2.2.2", "mjolnir.js": "2.6.0", "react": "17.0.2", diff --git a/modules/demo/deck/heatmap/package.json b/modules/demo/deck/heatmap/package.json index 31c4e79cc..164a570cf 100644 --- a/modules/demo/deck/heatmap/package.json +++ b/modules/demo/deck/heatmap/package.json @@ -1,7 +1,7 @@ { "private": true, "name": "@rapidsai/demo-deck-heatmap", - "version": "22.6.3", + "version": "22.8.0", "license": "Apache-2.0", "author": "NVIDIA, Inc. (https://nvidia.com/)", "maintainers": [ @@ -16,7 +16,7 @@ "@deck.gl/aggregation-layers": "8.6.6", "@deck.gl/core": "8.6.6", "@deck.gl/react": "8.6.6", - "@rapidsai/jsdom": "~22.6.3", + "@rapidsai/jsdom": "~22.8.0", "mjolnir.js": "2.6.0", "react": "17.0.2", "react-dom": "17.0.2", diff --git a/modules/demo/deck/highway/package.json b/modules/demo/deck/highway/package.json index 183902dc0..37e27c607 100644 --- a/modules/demo/deck/highway/package.json +++ b/modules/demo/deck/highway/package.json @@ -1,7 +1,7 @@ { "private": true, "name": "@rapidsai/demo-deck-highway", - "version": "22.6.3", + "version": "22.8.0", "license": "Apache-2.0", "author": "NVIDIA, Inc. (https://nvidia.com/)", "maintainers": [ @@ -16,7 +16,7 @@ "@deck.gl/core": "8.6.6", "@deck.gl/layers": "8.6.6", "@deck.gl/react": "8.6.6", - "@rapidsai/jsdom": "~22.6.3", + "@rapidsai/jsdom": "~22.8.0", "d3-request": "1.0.6", "d3-scale": "2.2.2", "mjolnir.js": "2.6.0", diff --git a/modules/demo/deck/icon/package.json b/modules/demo/deck/icon/package.json index fec3e54ac..45c32820a 100644 --- a/modules/demo/deck/icon/package.json +++ b/modules/demo/deck/icon/package.json @@ -1,7 +1,7 @@ { "private": true, "name": "@rapidsai/demo-deck-icon", - "version": "22.6.3", + "version": "22.8.0", "license": "Apache-2.0", "author": "NVIDIA, Inc. (https://nvidia.com/)", "maintainers": [ @@ -16,7 +16,7 @@ "@deck.gl/core": "8.6.6", "@deck.gl/layers": "8.6.6", "@deck.gl/react": "8.6.6", - "@rapidsai/jsdom": "~22.6.3", + "@rapidsai/jsdom": "~22.8.0", "mjolnir.js": "2.6.0", "react": "17.0.2", "react-dom": "17.0.2", diff --git a/modules/demo/deck/image-tile/package.json b/modules/demo/deck/image-tile/package.json index 2d374b105..4d38fe042 100644 --- a/modules/demo/deck/image-tile/package.json +++ b/modules/demo/deck/image-tile/package.json @@ -1,7 +1,7 @@ { "private": true, "name": "@rapidsai/demo-deck-image-tile", - "version": "22.6.3", + "version": "22.8.0", "license": "Apache-2.0", "author": "NVIDIA, Inc. (https://nvidia.com/)", "maintainers": [ @@ -18,7 +18,7 @@ "@deck.gl/mesh-layers": "8.6.6", "@deck.gl/react": "8.6.6", "@loaders.gl/core": "3.1.6", - "@rapidsai/jsdom": "~22.6.3", + "@rapidsai/jsdom": "~22.8.0", "mjolnir.js": "2.6.0", "react": "17.0.2", "react-dom": "17.0.2" diff --git a/modules/demo/deck/interleaved-buffer/package.json b/modules/demo/deck/interleaved-buffer/package.json index d60ad991b..f16622ab3 100644 --- a/modules/demo/deck/interleaved-buffer/package.json +++ b/modules/demo/deck/interleaved-buffer/package.json @@ -1,7 +1,7 @@ { "private": true, "name": "@rapidsai/demo-deck-interleaved-buffer", - "version": "22.6.3", + "version": "22.8.0", "license": "Apache-2.0", "author": "NVIDIA, Inc. (https://nvidia.com/)", "maintainers": [ @@ -17,7 +17,7 @@ "@deck.gl/layers": "8.6.6", "@luma.gl/constants": "8.5.10", "@luma.gl/core": "8.5.10", - "@rapidsai/jsdom": "~22.6.3", + "@rapidsai/jsdom": "~22.8.0", "mjolnir.js": "2.6.0" }, "files": [ diff --git a/modules/demo/deck/line/package.json b/modules/demo/deck/line/package.json index b6ccb049f..533d7d0e9 100644 --- a/modules/demo/deck/line/package.json +++ b/modules/demo/deck/line/package.json @@ -1,7 +1,7 @@ { "private": true, "name": "@rapidsai/demo-deck-line", - "version": "22.6.3", + "version": "22.8.0", "license": "Apache-2.0", "author": "NVIDIA, Inc. (https://nvidia.com/)", "maintainers": [ @@ -17,7 +17,7 @@ "@deck.gl/layers": "8.6.6", "@deck.gl/react": "8.6.6", "@luma.gl/constants": "8.5.10", - "@rapidsai/jsdom": "~22.6.3", + "@rapidsai/jsdom": "~22.8.0", "mjolnir.js": "2.6.0", "react": "17.0.2", "react-dom": "17.0.2", diff --git a/modules/demo/deck/map-tile/package.json b/modules/demo/deck/map-tile/package.json index 1c178dd14..7e133c765 100644 --- a/modules/demo/deck/map-tile/package.json +++ b/modules/demo/deck/map-tile/package.json @@ -1,7 +1,7 @@ { "private": true, "name": "@rapidsai/demo-deck-map-tile", - "version": "22.6.3", + "version": "22.8.0", "license": "Apache-2.0", "author": "NVIDIA, Inc. (https://nvidia.com/)", "maintainers": [ @@ -17,7 +17,7 @@ "@deck.gl/layers": "8.6.6", "@deck.gl/mesh-layers": "8.6.6", "@deck.gl/react": "8.6.6", - "@rapidsai/jsdom": "~22.6.3", + "@rapidsai/jsdom": "~22.8.0", "react": "17.0.2", "react-dom": "17.0.2" }, diff --git a/modules/demo/deck/mesh/package.json b/modules/demo/deck/mesh/package.json index 7d4bd1054..a625efa30 100644 --- a/modules/demo/deck/mesh/package.json +++ b/modules/demo/deck/mesh/package.json @@ -1,7 +1,7 @@ { "private": true, "name": "@rapidsai/demo-deck-mesh-layer-example", - "version": "22.6.3", + "version": "22.8.0", "license": "Apache-2.0", "author": "NVIDIA, Inc. (https://nvidia.com/)", "maintainers": [ @@ -19,7 +19,7 @@ "@deck.gl/react": "8.6.6", "@loaders.gl/core": "3.1.6", "@loaders.gl/obj": "3.1.6", - "@rapidsai/jsdom": "~22.6.3", + "@rapidsai/jsdom": "~22.8.0", "mjolnir.js": "2.6.0", "react": "17.0.2", "react-dom": "17.0.2" diff --git a/modules/demo/deck/playground/package.json b/modules/demo/deck/playground/package.json index c67957cf4..2cfa7f033 100644 --- a/modules/demo/deck/playground/package.json +++ b/modules/demo/deck/playground/package.json @@ -1,7 +1,7 @@ { "private": true, "name": "@rapidsai/demo-deck-playground", - "version": "22.6.3", + "version": "22.8.0", "license": "Apache-2.0", "author": "NVIDIA, Inc. (https://nvidia.com/)", "maintainers": [ @@ -27,7 +27,7 @@ "@loaders.gl/draco": "3.1.6", "@loaders.gl/gltf": "3.1.6", "@luma.gl/constants": "8.5.10", - "@rapidsai/jsdom": "~22.6.3", + "@rapidsai/jsdom": "~22.8.0", "mjolnir.js": "2.6.0", "react": "17.0.2", "react-dom": "17.0.2", diff --git a/modules/demo/deck/plot/package.json b/modules/demo/deck/plot/package.json index 0c359545f..580e68190 100644 --- a/modules/demo/deck/plot/package.json +++ b/modules/demo/deck/plot/package.json @@ -1,7 +1,7 @@ { "private": true, "name": "@rapidsai/demo-deck-plot", - "version": "22.6.3", + "version": "22.8.0", "license": "Apache-2.0", "author": "NVIDIA, Inc. (https://nvidia.com/)", "maintainers": [ @@ -15,7 +15,7 @@ "dependencies": { "@deck.gl/core": "8.6.6", "@deck.gl/react": "8.6.6", - "@rapidsai/jsdom": "~22.6.3", + "@rapidsai/jsdom": "~22.8.0", "d3-scale": "2.2.2", "mjolnir.js": "2.6.0", "react": "17.0.2", diff --git a/modules/demo/deck/point-cloud/package.json b/modules/demo/deck/point-cloud/package.json index d4ec79c84..fe555cabc 100644 --- a/modules/demo/deck/point-cloud/package.json +++ b/modules/demo/deck/point-cloud/package.json @@ -1,7 +1,7 @@ { "private": true, "name": "@rapidsai/demo-deck-point-cloud-laz", - "version": "22.6.3", + "version": "22.8.0", "license": "Apache-2.0", "author": "NVIDIA, Inc. (https://nvidia.com/)", "maintainers": [ @@ -19,7 +19,7 @@ "@loaders.gl/core": "3.1.6", "@loaders.gl/las": "3.1.6", "@loaders.gl/ply": "3.1.6", - "@rapidsai/jsdom": "~22.6.3", + "@rapidsai/jsdom": "~22.8.0", "mjolnir.js": "2.6.0", "react": "17.0.2", "react-dom": "17.0.2" diff --git a/modules/demo/deck/scatterplot/package.json b/modules/demo/deck/scatterplot/package.json index 5fdeb7403..4f72b9ea3 100644 --- a/modules/demo/deck/scatterplot/package.json +++ b/modules/demo/deck/scatterplot/package.json @@ -1,7 +1,7 @@ { "private": true, "name": "@rapidsai/demo-deck-scatterplot", - "version": "22.6.3", + "version": "22.8.0", "license": "Apache-2.0", "author": "NVIDIA, Inc. (https://nvidia.com/)", "maintainers": [ @@ -16,7 +16,7 @@ "@deck.gl/core": "8.6.6", "@deck.gl/layers": "8.6.6", "@deck.gl/react": "8.6.6", - "@rapidsai/jsdom": "~22.6.3", + "@rapidsai/jsdom": "~22.8.0", "mjolnir.js": "2.6.0", "react": "17.0.2", "react-dom": "17.0.2", diff --git a/modules/demo/deck/scenegraph-layer/package.json b/modules/demo/deck/scenegraph-layer/package.json index d83fddf6e..092b7bc7c 100644 --- a/modules/demo/deck/scenegraph-layer/package.json +++ b/modules/demo/deck/scenegraph-layer/package.json @@ -1,7 +1,7 @@ { "private": true, "name": "@rapidsai/demo-deck-scenegraph-layer-demo", - "version": "22.6.3", + "version": "22.8.0", "license": "Apache-2.0", "author": "NVIDIA, Inc. (https://nvidia.com/)", "maintainers": [ @@ -17,7 +17,7 @@ "@deck.gl/react": "8.6.6", "@loaders.gl/core": "3.1.6", "@loaders.gl/gltf": "3.1.6", - "@rapidsai/jsdom": "~22.6.3", + "@rapidsai/jsdom": "~22.8.0", "react": "17.0.2", "react-dom": "17.0.2", "react-map-gl": "5.3.16" diff --git a/modules/demo/deck/screen-grid/package.json b/modules/demo/deck/screen-grid/package.json index e5454edcf..2ea05ceeb 100644 --- a/modules/demo/deck/screen-grid/package.json +++ b/modules/demo/deck/screen-grid/package.json @@ -1,7 +1,7 @@ { "private": true, "name": "@rapidsai/demo-deck-screengrid", - "version": "22.6.3", + "version": "22.8.0", "license": "Apache-2.0", "author": "NVIDIA, Inc. (https://nvidia.com/)", "maintainers": [ @@ -16,7 +16,7 @@ "@deck.gl/aggregation-layers": "8.6.6", "@deck.gl/react": "8.6.6", "@luma.gl/core": "8.5.10", - "@rapidsai/jsdom": "~22.6.3", + "@rapidsai/jsdom": "~22.8.0", "react": "17.0.2", "react-dom": "17.0.2", "react-map-gl": "5.3.16" diff --git a/modules/demo/deck/tagmap/package.json b/modules/demo/deck/tagmap/package.json index c224c5af3..ba1504339 100644 --- a/modules/demo/deck/tagmap/package.json +++ b/modules/demo/deck/tagmap/package.json @@ -1,7 +1,7 @@ { "private": true, "name": "@rapidsai/demo-deck-tagmap", - "version": "22.6.3", + "version": "22.8.0", "license": "Apache-2.0", "author": "NVIDIA, Inc. (https://nvidia.com/)", "maintainers": [ @@ -16,7 +16,7 @@ "@deck.gl/core": "8.6.6", "@deck.gl/layers": "8.6.6", "@deck.gl/react": "8.6.6", - "@rapidsai/jsdom": "~22.6.3", + "@rapidsai/jsdom": "~22.8.0", "d3-scale": "2.2.2", "mjolnir.js": "2.6.0", "react": "17.0.2", diff --git a/modules/demo/deck/text-layer/package.json b/modules/demo/deck/text-layer/package.json index 50ef271bb..ef1ed5430 100644 --- a/modules/demo/deck/text-layer/package.json +++ b/modules/demo/deck/text-layer/package.json @@ -1,7 +1,7 @@ { "private": true, "name": "@rapidsai/demo-deck-text-layer", - "version": "22.6.3", + "version": "22.8.0", "license": "Apache-2.0", "author": "NVIDIA, Inc. (https://nvidia.com/)", "maintainers": [ @@ -17,7 +17,7 @@ "@deck.gl/layers": "8.6.6", "@deck.gl/react": "8.6.6", "@luma.gl/constants": "8.5.10", - "@rapidsai/jsdom": "~22.6.3", + "@rapidsai/jsdom": "~22.8.0", "mjolnir.js": "2.6.0", "react": "17.0.2", "react-dom": "17.0.2", diff --git a/modules/demo/deck/trips/package.json b/modules/demo/deck/trips/package.json index cad6de312..13c4cf9e5 100644 --- a/modules/demo/deck/trips/package.json +++ b/modules/demo/deck/trips/package.json @@ -1,7 +1,7 @@ { "private": true, "name": "@rapidsai/demo-deck-trips", - "version": "22.6.3", + "version": "22.8.0", "license": "Apache-2.0", "author": "NVIDIA, Inc. (https://nvidia.com/)", "maintainers": [ @@ -18,7 +18,7 @@ "@deck.gl/layers": "8.6.6", "@deck.gl/mesh-layers": "8.6.6", "@deck.gl/react": "8.6.6", - "@rapidsai/jsdom": "~22.6.3", + "@rapidsai/jsdom": "~22.8.0", "mjolnir.js": "2.6.0", "react": "17.0.2", "react-dom": "17.0.2", diff --git a/modules/demo/deck/worldmap/package.json b/modules/demo/deck/worldmap/package.json index 2eac55b83..789d70243 100644 --- a/modules/demo/deck/worldmap/package.json +++ b/modules/demo/deck/worldmap/package.json @@ -1,7 +1,7 @@ { "private": true, "name": "@rapidsai/demo-deck-worldmap", - "version": "22.6.3", + "version": "22.8.0", "license": "Apache-2.0", "author": "NVIDIA, Inc. (https://nvidia.com/)", "maintainers": [ @@ -16,7 +16,7 @@ "@deck.gl/core": "8.6.6", "@deck.gl/layers": "8.6.6", "@deck.gl/react": "8.6.6", - "@rapidsai/jsdom": "~22.6.3", + "@rapidsai/jsdom": "~22.8.0", "mjolnir.js": "2.6.0", "react": "17.0.2", "react-dom": "17.0.2", diff --git a/modules/demo/graph/package.json b/modules/demo/graph/package.json index b1256061c..9223a1144 100644 --- a/modules/demo/graph/package.json +++ b/modules/demo/graph/package.json @@ -2,7 +2,7 @@ "private": true, "name": "@rapidsai/demo-graph", "main": "index.js", - "version": "22.6.3", + "version": "22.8.0", "license": "Apache-2.0", "author": "NVIDIA, Inc. (https://nvidia.com/)", "maintainers": [ @@ -17,12 +17,12 @@ "@deck.gl/core": "8.6.6", "@deck.gl/react": "8.6.6", "@luma.gl/core": "8.5.10", - "@rapidsai/cuda": "~22.6.3", - "@rapidsai/cudf": "~22.6.3", - "@rapidsai/cugraph": "~22.6.3", - "@rapidsai/deck.gl": "~22.6.3", - "@rapidsai/glfw": "~22.6.3", - "@rapidsai/jsdom": "~22.6.3", + "@rapidsai/cuda": "~22.8.0", + "@rapidsai/cudf": "~22.8.0", + "@rapidsai/cugraph": "~22.8.0", + "@rapidsai/deck.gl": "~22.8.0", + "@rapidsai/glfw": "~22.8.0", + "@rapidsai/jsdom": "~22.8.0", "ix": "4.4.1", "mjolnir.js": "2.6.0", "react": "17.0.2", diff --git a/modules/demo/ipc/graph/package.json b/modules/demo/ipc/graph/package.json index 931bd6aed..e5ca7ad53 100644 --- a/modules/demo/ipc/graph/package.json +++ b/modules/demo/ipc/graph/package.json @@ -2,7 +2,7 @@ "private": true, "name": "@rapidsai/demo-ipc-graph", "main": "index.js", - "version": "22.6.3", + "version": "22.8.0", "license": "Apache-2.0", "author": "NVIDIA, Inc. (https://nvidia.com/)", "maintainers": [ @@ -18,11 +18,11 @@ "@deck.gl/react": "8.6.6", "@luma.gl/core": "8.5.10", "@luma.gl/gltools": "8.5.10", - "@rapidsai/cuda": "~22.6.3", - "@rapidsai/cudf": "~22.6.3", - "@rapidsai/cugraph": "~22.6.3", - "@rapidsai/deck.gl": "~22.6.3", - "@rapidsai/glfw": "~22.6.3", + "@rapidsai/cuda": "~22.8.0", + "@rapidsai/cudf": "~22.8.0", + "@rapidsai/cugraph": "~22.8.0", + "@rapidsai/deck.gl": "~22.8.0", + "@rapidsai/glfw": "~22.8.0", "ix": "4.4.1", "mjolnir.js": "2.6.0", "react": "17.0.2", diff --git a/modules/demo/ipc/umap/package.json b/modules/demo/ipc/umap/package.json index 2a589d16b..9415e18e6 100644 --- a/modules/demo/ipc/umap/package.json +++ b/modules/demo/ipc/umap/package.json @@ -2,7 +2,7 @@ "private": true, "name": "@rapidsai/demo-ipc-umap", "main": "index.js", - "version": "22.6.3", + "version": "22.8.0", "license": "Apache-2.0", "author": "NVIDIA, Inc. (https://nvidia.com/)", "maintainers": [ @@ -18,8 +18,8 @@ "@deck.gl/layers": "8.6.6", "@luma.gl/constants": "8.5.10", "@luma.gl/core": "8.5.10", - "@rapidsai/cuda": "~22.6.3", - "@rapidsai/jsdom": "~22.6.3", + "@rapidsai/cuda": "~22.8.0", + "@rapidsai/jsdom": "~22.8.0", "mjolnir.js": "2.6.0", "zeromq": "6.0.0-beta.6" }, diff --git a/modules/demo/luma/package.json b/modules/demo/luma/package.json index 7494b9fe1..fd2272af1 100644 --- a/modules/demo/luma/package.json +++ b/modules/demo/luma/package.json @@ -2,7 +2,7 @@ "private": true, "name": "@rapidsai/demo-luma.gl-lessons", "main": "index.js", - "version": "22.6.3", + "version": "22.8.0", "license": "Apache-2.0", "author": "NVIDIA, Inc. (https://nvidia.com/)", "maintainers": [ @@ -14,8 +14,8 @@ "watch": "find -type f | entr -c -d -r node --experimental-vm-modules --trace-uncaught index.js" }, "dependencies": { - "@rapidsai/glfw": "~22.6.3", - "@rapidsai/jsdom": "~22.6.3" + "@rapidsai/glfw": "~22.8.0", + "@rapidsai/jsdom": "~22.8.0" }, "files": [ "lessons", diff --git a/modules/demo/spatial/package.json b/modules/demo/spatial/package.json index 8230c5c15..2152105f4 100644 --- a/modules/demo/spatial/package.json +++ b/modules/demo/spatial/package.json @@ -2,7 +2,7 @@ "private": true, "name": "@rapidsai/demo-spatial", "main": "index.js", - "version": "22.6.3", + "version": "22.8.0", "license": "Apache-2.0", "author": "NVIDIA, Inc. (https://nvidia.com/)", "maintainers": [ @@ -17,11 +17,11 @@ "@deck.gl/core": "8.6.6", "@deck.gl/react": "8.6.6", "@luma.gl/core": "8.5.10", - "@rapidsai/cuda": "~22.6.3", - "@rapidsai/cudf": "~22.6.3", - "@rapidsai/cuspatial": "~22.6.3", - "@rapidsai/glfw": "~22.6.3", - "@rapidsai/jsdom": "~22.6.3", + "@rapidsai/cuda": "~22.8.0", + "@rapidsai/cudf": "~22.8.0", + "@rapidsai/cuspatial": "~22.8.0", + "@rapidsai/glfw": "~22.8.0", + "@rapidsai/jsdom": "~22.8.0", "mjolnir.js": "2.6.0", "react": "17.0.2", "react-dom": "17.0.2" diff --git a/modules/demo/sql/sql-cluster-server/package.json b/modules/demo/sql/sql-cluster-server/package.json index abd7dfccb..bc4e8661e 100644 --- a/modules/demo/sql/sql-cluster-server/package.json +++ b/modules/demo/sql/sql-cluster-server/package.json @@ -1,7 +1,7 @@ { "private": true, "name": "@rapidsai/demo-sql-cluster-server", - "version": "22.6.3", + "version": "22.8.0", "license": "Apache-2.0", "author": "NVIDIA, Inc. (https://nvidia.com/)", "maintainers": [ @@ -18,8 +18,8 @@ "@material-ui/icons": "4.11.2", "@material-ui/lab": "4.0.0-alpha.60", "@material-ui/pickers": "3.3.10", - "@rapidsai/cudf": "~22.6.3", - "@rapidsai/sql": "~22.6.3", + "@rapidsai/cudf": "~22.8.0", + "@rapidsai/sql": "~22.8.0", "apache-arrow": "^8.0.0", "axios": "0.22.0", "bootstrap": "4.6.0", diff --git a/modules/demo/ssr/graph/package.json b/modules/demo/ssr/graph/package.json index c223b41e8..a83e692a8 100644 --- a/modules/demo/ssr/graph/package.json +++ b/modules/demo/ssr/graph/package.json @@ -2,7 +2,7 @@ "private": true, "name": "@rapidsai/demo-graph-ssr", "main": "index.js", - "version": "22.6.3", + "version": "22.8.0", "license": "Apache-2.0", "author": "NVIDIA, Inc. (https://nvidia.com/)", "maintainers": [ @@ -14,9 +14,9 @@ "watch": "find -type f | entr -c -d -r node --experimental-vm-modules --trace-uncaught index.js" }, "dependencies": { - "@rapidsai/cuda": "~22.6.3", - "@rapidsai/deck.gl": "~22.6.3", - "@rapidsai/jsdom": "~22.6.3", + "@rapidsai/cuda": "~22.8.0", + "@rapidsai/deck.gl": "~22.8.0", + "@rapidsai/jsdom": "~22.8.0", "fastify": "3.20.2", "fastify-plugin": "3.0.0", "fastify-socket.io": "2.0.0", diff --git a/modules/demo/ssr/luma/package.json b/modules/demo/ssr/luma/package.json index c88c71688..63438ad2d 100644 --- a/modules/demo/ssr/luma/package.json +++ b/modules/demo/ssr/luma/package.json @@ -2,7 +2,7 @@ "private": true, "name": "@rapidsai/demo-luma.gl-lessons-ssr", "main": "index.js", - "version": "22.6.3", + "version": "22.8.0", "license": "Apache-2.0", "author": "NVIDIA, Inc. (https://nvidia.com/)", "maintainers": [ @@ -14,10 +14,10 @@ "watch": "find -type f | entr -c -d -r node --experimental-vm-modules --trace-uncaught index.js" }, "dependencies": { - "@rapidsai/cuda": "~22.6.3", - "@rapidsai/deck.gl": "~22.6.3", - "@rapidsai/demo-luma.gl-lessons": "~22.6.3", - "@rapidsai/jsdom": "~22.6.3", + "@rapidsai/cuda": "~22.8.0", + "@rapidsai/deck.gl": "~22.8.0", + "@rapidsai/demo-luma.gl-lessons": "~22.8.0", + "@rapidsai/jsdom": "~22.8.0", "fastify": "3.20.2", "fastify-socket.io": "2.0.0", "fastify-static": "4.4.1", diff --git a/modules/demo/ssr/point-cloud/package.json b/modules/demo/ssr/point-cloud/package.json index f07de00d5..6b8ed696b 100644 --- a/modules/demo/ssr/point-cloud/package.json +++ b/modules/demo/ssr/point-cloud/package.json @@ -2,7 +2,7 @@ "private": true, "name": "@rapidsai/demo-point-cloud-ssr", "main": "index.js", - "version": "22.6.3", + "version": "22.8.0", "license": "Apache-2.0", "author": "NVIDIA, Inc. (https://nvidia.com/)", "maintainers": [ @@ -14,9 +14,9 @@ "watch": "find -type f | entr -c -d -r node --experimental-vm-modules --trace-uncaught index.js" }, "dependencies": { - "@rapidsai/cuda": "~22.6.3", - "@rapidsai/deck.gl": "~22.6.3", - "@rapidsai/jsdom": "~22.6.3", + "@rapidsai/cuda": "~22.8.0", + "@rapidsai/deck.gl": "~22.8.0", + "@rapidsai/jsdom": "~22.8.0", "fastify": "3.20.2", "fastify-plugin": "3.0.0", "fastify-socket.io": "2.0.0", diff --git a/modules/demo/tfjs/addition-rnn/package.json b/modules/demo/tfjs/addition-rnn/package.json index c8593e23a..d7cae6e95 100644 --- a/modules/demo/tfjs/addition-rnn/package.json +++ b/modules/demo/tfjs/addition-rnn/package.json @@ -2,7 +2,7 @@ "private": true, "name": "@rapidsai/demo-tfjs-addition-rnn", "main": "index.js", - "version": "22.6.3", + "version": "22.8.0", "license": "Apache-2.0", "author": "NVIDIA, Inc. (https://nvidia.com/)", "maintainers": [ @@ -14,7 +14,7 @@ "watch": "find -type f | entr -c -d -r node --experimental-vm-modules --trace-uncaught index.js" }, "dependencies": { - "@rapidsai/glfw": "~22.6.3", + "@rapidsai/glfw": "~22.8.0", "@tensorflow/tfjs": "2.8.6", "chalk": "^4.1.1" }, diff --git a/modules/demo/tfjs/webgl-tests/package.json b/modules/demo/tfjs/webgl-tests/package.json index ebe42461f..2409ac7b7 100644 --- a/modules/demo/tfjs/webgl-tests/package.json +++ b/modules/demo/tfjs/webgl-tests/package.json @@ -2,7 +2,7 @@ "private": true, "name": "@rapidsai/demo-tfjs-webgl-tests", "main": "index.js", - "version": "22.6.3", + "version": "22.8.0", "license": "Apache-2.0", "author": "NVIDIA, Inc. (https://nvidia.com/)", "maintainers": [ @@ -14,7 +14,7 @@ "watch": "find -type f | entr -c -d -r node --experimental-vm-modules --trace-uncaught index.js" }, "dependencies": { - "@rapidsai/glfw": "~22.6.3", + "@rapidsai/glfw": "~22.8.0", "@tensorflow/tfjs": "2.8.6", "jasmine": "3.1.0", "jasmine-core": "3.1.0" diff --git a/modules/demo/umap/package.json b/modules/demo/umap/package.json index 4ba82b18f..640c834c0 100644 --- a/modules/demo/umap/package.json +++ b/modules/demo/umap/package.json @@ -2,7 +2,7 @@ "private": true, "name": "@rapidsai/demo-umap", "main": "index.js", - "version": "22.6.3", + "version": "22.8.0", "license": "Apache-2.0", "author": "NVIDIA, Inc. (https://nvidia.com/)", "maintainers": [ @@ -17,12 +17,12 @@ "@deck.gl/core": "8.6.6", "@deck.gl/react": "8.6.6", "@luma.gl/core": "8.5.10", - "@rapidsai/cuda": "~22.6.3", - "@rapidsai/cudf": "~22.6.3", - "@rapidsai/cugraph": "~22.6.3", - "@rapidsai/deck.gl": "~22.6.3", - "@rapidsai/glfw": "~22.6.3", - "@rapidsai/jsdom": "~22.6.3", + "@rapidsai/cuda": "~22.8.0", + "@rapidsai/cudf": "~22.8.0", + "@rapidsai/cugraph": "~22.8.0", + "@rapidsai/deck.gl": "~22.8.0", + "@rapidsai/glfw": "~22.8.0", + "@rapidsai/jsdom": "~22.8.0", "ix": "4.4.1", "mjolnir.js": "2.6.0", "react": "17.0.2", diff --git a/modules/demo/viz-app/package.json b/modules/demo/viz-app/package.json index e2aedf364..06ad6779f 100644 --- a/modules/demo/viz-app/package.json +++ b/modules/demo/viz-app/package.json @@ -1,6 +1,6 @@ { "name": "@rapidsai/demo-viz-app", - "version": "22.6.3", + "version": "22.8.0", "private": true, "author": "NVIDIA, Inc. (https://nvidia.com/)", "maintainers": [ @@ -22,7 +22,7 @@ "@fortawesome/fontawesome-svg-core": "1.2.35", "@fortawesome/free-solid-svg-icons": "5.15.3", "@fortawesome/react-fontawesome": "0.1.14", - "@rapidsai/cudf": "~22.6.3", + "@rapidsai/cudf": "~22.8.0", "apache-arrow": "^8.0.0", "bootstrap": "4.6.0", "d3": "6.6.2", diff --git a/modules/demo/xterm/package.json b/modules/demo/xterm/package.json index 96c224657..cc8f83fab 100644 --- a/modules/demo/xterm/package.json +++ b/modules/demo/xterm/package.json @@ -2,7 +2,7 @@ "private": true, "name": "@rapidsai/demo-xterm", "main": "index.js", - "version": "22.6.3", + "version": "22.8.0", "license": "Apache-2.0", "author": "NVIDIA, Inc. (https://nvidia.com/)", "maintainers": [ @@ -14,7 +14,7 @@ "watch": "find -type f | entr -c -d -r node --experimental-vm-modules --trace-uncaught index.js" }, "dependencies": { - "@rapidsai/glfw": "~22.6.3", + "@rapidsai/glfw": "~22.8.0", "xterm": "4.3.0", "xterm-addon-webgl": "0.4.1" }, diff --git a/modules/glfw/package.json b/modules/glfw/package.json index 8fd5ff197..3487b1f9b 100644 --- a/modules/glfw/package.json +++ b/modules/glfw/package.json @@ -1,6 +1,6 @@ { "name": "@rapidsai/glfw", - "version": "22.6.3", + "version": "22.8.0", "description": "Platform-native (and headless) GPU-accelerated OpenGL windows", "license": "Apache-2.0", "main": "index.js", @@ -43,8 +43,8 @@ "tsc:watch": "rimraf build/js && tsc -p ./tsconfig.json -w" }, "dependencies": { - "@rapidsai/core": "~22.6.3", - "@rapidsai/webgl": "~22.6.3" + "@rapidsai/core": "~22.8.0", + "@rapidsai/webgl": "~22.8.0" }, "files": [ "LICENSE", diff --git a/modules/io/package.json b/modules/io/package.json index 8ce7e7bcc..dee4f430f 100644 --- a/modules/io/package.json +++ b/modules/io/package.json @@ -1,6 +1,6 @@ { "name": "@rapidsai/io", - "version": "22.6.3", + "version": "22.8.0", "description": "cuIO - NVIDIA RAPIDS I/O Library", "license": "Apache-2.0", "main": "index.js", @@ -45,7 +45,7 @@ "dev:cpack": "cd build/Release && cpack -G TGZ >/dev/null && echo \"$(realpath -m ./rapidsai_*-*-*.tar.gz)\"" }, "dependencies": { - "@rapidsai/cudf": "~22.6.3" + "@rapidsai/cudf": "~22.8.0" }, "files": [ "LICENSE", diff --git a/modules/jsdom/package.json b/modules/jsdom/package.json index a4816c6c6..035912118 100644 --- a/modules/jsdom/package.json +++ b/modules/jsdom/package.json @@ -1,6 +1,6 @@ { "name": "@rapidsai/jsdom", - "version": "22.6.3", + "version": "22.8.0", "description": "JSDOM extensions for running browser-ish code in platform-native (and headless) GPU-accelerated GLFW windows", "license": "Apache-2.0", "main": "index.js", @@ -32,8 +32,8 @@ "@babel/preset-env": "7.15.6", "@babel/preset-react": "7.14.5", "@babel/register": "7.15.3", - "@rapidsai/core": "~22.6.3", - "@rapidsai/glfw": "~22.6.3", + "@rapidsai/core": "~22.8.0", + "@rapidsai/glfw": "~22.8.0", "@types/jsdom": "16.2.13", "@types/parse5": "6.0.3", "btoa": "1.2.1", diff --git a/modules/rmm/package.json b/modules/rmm/package.json index 13953fff1..0287c8f44 100644 --- a/modules/rmm/package.json +++ b/modules/rmm/package.json @@ -1,6 +1,6 @@ { "name": "@rapidsai/rmm", - "version": "22.6.3", + "version": "22.8.0", "description": "RMM - NVIDIA RAPIDS Memory Manager", "main": "index.js", "types": "build/js", @@ -45,7 +45,7 @@ "dev:cpack": "cd build/Release && cpack -G TGZ >/dev/null && echo \"$(realpath -m ./rapidsai_*-*-*.tar.gz)\"" }, "dependencies": { - "@rapidsai/cuda": "~22.6.3" + "@rapidsai/cuda": "~22.8.0" }, "files": [ "LICENSE", diff --git a/modules/sql/package.json b/modules/sql/package.json index e4296c6e7..ac26aaaef 100644 --- a/modules/sql/package.json +++ b/modules/sql/package.json @@ -1,6 +1,6 @@ { "name": "@rapidsai/sql", - "version": "22.6.3", + "version": "22.8.0", "description": "NVIDIA RAPIDS In-memory GPU accelerated SQL Queries", "license": "Apache-2.0", "main": "index.js", @@ -45,7 +45,7 @@ "dev:cpack": "cd build/Release && cpack -G TGZ >/dev/null && echo \"$(realpath -m ./rapidsai_*-*-*.tar.gz)\"" }, "dependencies": { - "@rapidsai/cudf": "~22.6.3", + "@rapidsai/cudf": "~22.8.0", "@types/java": "0.9.1", "java": "0.12.2", "nanoid": "3.1.31" diff --git a/modules/webgl/package.json b/modules/webgl/package.json index 9ed6609d0..0bf8fb6c6 100644 --- a/modules/webgl/package.json +++ b/modules/webgl/package.json @@ -1,6 +1,6 @@ { "name": "@rapidsai/webgl", - "version": "22.6.3", + "version": "22.8.0", "description": "NVIDIA RAPIDS OpenGL bindings exposed to node as WebGL2 APIs", "license": "Apache-2.0", "main": "index.js", @@ -43,7 +43,7 @@ "tsc:watch": "rimraf build/js && tsc -p ./tsconfig.json -w" }, "dependencies": { - "@rapidsai/core": "~22.6.3" + "@rapidsai/core": "~22.8.0" }, "files": [ "LICENSE", diff --git a/package.json b/package.json index 644d6cced..48ed8a830 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "private": true, "name": "node-rapids", - "version": "22.6.3", + "version": "22.8.0", "license": "Apache-2.0", "author": "NVIDIA, Inc. (https://nvidia.com/)", "maintainers": [ @@ -110,7 +110,7 @@ "typedoc": "0.22.10" }, "config": { - "rapids_version": "22.06.00", + "rapids_version": "22.08.00", "pre-git": { "allow-untracked-files": true, "pre-commit": [