Skip to content

Commit

Permalink
[FEA] bump versions to 22.8.0 (#420)
Browse files Browse the repository at this point in the history
* bump versions to -> 22.08.00

* update CMake modules for rapids 22.08

* update to new cudf 22.08 APIs

* update to new cugraph 22.08 APIs

* allow overriding linux distro, cpu arch, and gpu arch

* statically link all the cudatoolkit libs

* fix ctk static lib links for alias targets
  • Loading branch information
trxcllnt authored Aug 25, 2022
1 parent 1784f72 commit b100f6b
Show file tree
Hide file tree
Showing 86 changed files with 967 additions and 273 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
10 changes: 5 additions & 5 deletions USAGE.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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 \
Expand All @@ -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 \
Expand All @@ -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
Expand Down
14 changes: 7 additions & 7 deletions docker-compose.devel.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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:
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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:
Expand Down
48 changes: 24 additions & 24 deletions docker-compose.runtime.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -34,121 +34,121 @@ 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
args:
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
args:
<<: *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
args:
<<: *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
args:
<<: *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"
Expand Down
2 changes: 1 addition & 1 deletion lerna.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"version": "22.6.3",
"version": "22.8.0",
"npmClient": "yarn",
"skipGit": true,
"useWorkspaces": true,
Expand Down
48 changes: 35 additions & 13 deletions modules/core/bin/rapidsai_install_native_module.js
Original file line number Diff line number Diff line change
Expand Up @@ -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') {
Expand Down
Loading

0 comments on commit b100f6b

Please sign in to comment.