Skip to content

Commit b100f6b

Browse files
trxcllnttrxcllnt
authored
[FEA] bump versions to 22.8.0 (#420)
* 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
1 parent 1784f72 commit b100f6b

File tree

86 files changed

+967
-273
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

86 files changed

+967
-273
lines changed

‎.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ on:
55
inputs:
66
rapids-version:
77
type: string
8-
default: "22.6.3"
8+
default: "22.8.0"
99
description: "RAPIDS version"
1010
make-release:
1111
type: boolean

‎USAGE.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,13 +28,13 @@ The following will retrieve the docker image with each library (+ its native and
2828
```bash
2929
REPO=ghcr.io/rapidsai/node
3030

31-
VERSIONS="22.6.3-runtime-node16.15.1-cuda11-ubuntu20.04"
31+
VERSIONS="22.8.0-runtime-node16.15.1-cuda11-ubuntu20.04"
3232
docker pull $REPO:$VERSIONS-cudf
3333
docker pull $REPO:$VERSIONS-cuml
3434
docker pull $REPO:$VERSIONS-cugraph
3535
docker pull $REPO:$VERSIONS-cuspatial
3636

37-
VERSIONS="22.6.3-runtime-node16.15.1-cuda11-ubuntu20.04"
37+
VERSIONS="22.8.0-runtime-node16.15.1-cuda11-ubuntu20.04"
3838
docker pull $REPO:$VERSIONS-glfw
3939

4040
# 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
5050

5151
```bash
5252
REPO=ghcr.io/rapidsai/node
53-
VERSIONS="22.6.3-runtime-node16.15.1-cuda11-ubuntu20.04"
53+
VERSIONS="22.8.0-runtime-node16.15.1-cuda11-ubuntu20.04"
5454

5555
# Be sure to pass either the `--runtime=nvidia` or `--gpus` flag!
5656
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
6767

6868
```bash
6969
REPO=ghcr.io/rapidsai/node
70-
VERSIONS="22.6.3-runtime-node16.15.1-cuda11-ubuntu20.04"
70+
VERSIONS="22.8.0-runtime-node16.15.1-cuda11-ubuntu20.04"
7171

7272
# Be sure to pass either the `--runtime=nvidia` or `--gpus` flag!
7373
docker run --rm \
@@ -94,7 +94,7 @@ You can use the following technique to install the npm-packed modules into anoth
9494

9595
```bash
9696
REPO=ghcr.io/rapidsai/node
97-
VERSIONS="22.6.3-devel-node16.15.1-cuda11-ubuntu20.04"
97+
VERSIONS="22.8.0-devel-node16.15.1-cuda11-ubuntu20.04"
9898

9999
# Pull the latest image of the packaged .tgz artifacts
100100
docker pull $REPO:$VERSIONS-packages

‎docker-compose.devel.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ x-main-service-settings: &main_service_settings
3333
XDG_SESSION_TYPE: "${XDG_SESSION_TYPE:-}"
3434
XDG_RUNTIME_DIR: "${XDG_RUNTIME_DIR:-/run/user/$UID}"
3535
LIBCUDF_KERNEL_CACHE_PATH: "/opt/rapids/node/.cache/jit"
36-
RAPIDS_VERSION: "${npm_package_config_rapids_version:-22.06.00}"
36+
RAPIDS_VERSION: "${npm_package_config_rapids_version:-22.08.00}"
3737
DBUS_SESSION_BUS_ADDRESS: "${DBUS_SESSION_BUS_ADDRESS:-unix:path=/run/user/$UID/bus}"
3838
cap_add:
3939
- SYS_ADMIN
@@ -45,7 +45,7 @@ services:
4545

4646
main:
4747
<<: *main_service_settings
48-
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
48+
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
4949
secrets:
5050
- sccache_credentials
5151
build:
@@ -75,12 +75,12 @@ services:
7575

7676
notebook:
7777
<<: *main_service_settings
78-
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
78+
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
7979
build:
8080
<<: *base_build_settings
8181
dockerfile: dev/dockerfiles/devel/notebook.Dockerfile
8282
args:
83-
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
83+
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
8484
environment:
8585
<<: *main_environment_settings
8686
QT_AUTO_SCREEN_SCALE_FACTOR: 0
@@ -97,7 +97,7 @@ services:
9797

9898
packages:
9999
<<: *base_service_settings
100-
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
100+
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
101101
build:
102102
<<: *base_build_settings
103103
dockerfile: dev/dockerfiles/devel/package.Dockerfile
@@ -112,8 +112,8 @@ services:
112112
SCCACHE_REGION: "${SCCACHE_REGION:-us-west-2}"
113113
SCCACHE_BUCKET: "${SCCACHE_BUCKET:-node-rapids-sccache}"
114114
SCCACHE_IDLE_TIMEOUT: "${SCCACHE_IDLE_TIMEOUT:-32768}"
115-
RAPIDS_VERSION: "${npm_package_config_rapids_version:-22.06.00}"
116-
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
115+
RAPIDS_VERSION: "${npm_package_config_rapids_version:-22.08.00}"
116+
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
117117

118118
secrets:
119119
sccache_credentials:

‎docker-compose.runtime.yml

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ x-main-service-settings: &main_service_settings
2121
build: &main_build_settings
2222
<<: *base_build_settings
2323
args: &main_build_args
24-
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
25-
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
24+
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
25+
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
2626
environment: &main_environment_settings
2727
<<: *base_environment_settings
2828
# Use the host's X11 display
@@ -34,121 +34,121 @@ services:
3434

3535
base:
3636
<<: *base_service_settings
37-
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
37+
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
3838
build:
3939
<<: *base_build_settings
4040
dockerfile: dev/dockerfiles/runtime/base.Dockerfile
4141
args:
4242
UID: ${UID:-1000}
4343
AMD64_BASE: nvidia/cuda:${CUDA_VERSION:-11.6.2}-runtime-${LINUX_VERSION:-ubuntu20.04}
4444
ARM64_BASE: nvidia/cuda:${CUDA_VERSION:-11.6.2}-runtime-${LINUX_VERSION:-ubuntu20.04}
45-
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
45+
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
4646

4747
main:
4848
<<: *main_service_settings
49-
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
49+
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
5050
build:
5151
<<: *main_build_settings
5252
dockerfile: dev/dockerfiles/runtime/main.Dockerfile
5353
args:
5454
<<: *main_build_args
5555
UCX_VERSION: ${UCX_VERSION:-1.12.1}
5656
LINUX_VERSION: ${LINUX_VERSION:-ubuntu20.04}
57-
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
57+
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
5858

5959
demo:
6060
<<: *main_service_settings
61-
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
61+
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
6262
build:
6363
<<: *main_build_settings
6464
dockerfile: dev/dockerfiles/runtime/demo.Dockerfile
6565
args:
6666
<<: *main_build_args
6767
UCX_VERSION: ${UCX_VERSION:-1.12.1}
6868
LINUX_VERSION: ${LINUX_VERSION:-ubuntu20.04}
69-
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
69+
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
7070

7171
glfw:
7272
<<: *main_service_settings
73-
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
73+
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
7474
build:
7575
<<: *main_build_settings
7676
dockerfile: dev/dockerfiles/runtime/glfw.Dockerfile
7777
args:
7878
<<: *main_build_args
79-
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
79+
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
8080

8181
cudf:
8282
<<: *main_service_settings
83-
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
83+
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
8484
build:
8585
<<: *main_build_settings
8686
dockerfile: dev/dockerfiles/runtime/cudf.Dockerfile
8787
args:
8888
<<: *main_build_args
89-
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
89+
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
9090

9191
sql:
9292
<<: *main_service_settings
93-
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
93+
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
9494
build:
9595
<<: *main_build_settings
9696
dockerfile: dev/dockerfiles/runtime/sql.Dockerfile
9797
args:
9898
<<: *main_build_args
9999
UCX_VERSION: ${UCX_VERSION:-1.12.1}
100100
LINUX_VERSION: ${LINUX_VERSION:-ubuntu20.04}
101-
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
101+
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
102102

103103
cuml:
104104
<<: *main_service_settings
105-
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
105+
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
106106
build:
107107
<<: *main_build_settings
108108
dockerfile: dev/dockerfiles/runtime/cuml.Dockerfile
109109
args:
110110
<<: *main_build_args
111-
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
111+
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
112112

113113
cugraph:
114114
<<: *main_service_settings
115-
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
115+
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
116116
build:
117117
<<: *main_build_settings
118118
dockerfile: dev/dockerfiles/runtime/cugraph.Dockerfile
119119
args:
120120
<<: *main_build_args
121-
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
121+
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
122122

123123
cuspatial:
124124
<<: *main_service_settings
125-
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
125+
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
126126
build:
127127
<<: *main_build_settings
128128
dockerfile: dev/dockerfiles/runtime/cuspatial.Dockerfile
129129
args:
130130
<<: *main_build_args
131-
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
131+
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
132132

133133
io:
134134
<<: *main_service_settings
135-
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
135+
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
136136
build:
137137
<<: *main_build_settings
138138
dockerfile: dockerfiles/runtime/io.Dockerfile
139139
args:
140140
<<: *main_build_args
141-
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
141+
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
142142

143143
notebook:
144144
<<: *main_service_settings
145-
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
145+
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
146146
build:
147147
<<: *main_build_settings
148148
dockerfile: dev/dockerfiles/runtime/notebook.Dockerfile
149149
args:
150150
<<: *main_build_args
151-
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
151+
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
152152
volumes:
153153
- "/etc/fonts:/etc/fonts:ro"
154154
- "/tmp/.X11-unix:/tmp/.X11-unix:rw"

‎lerna.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"version": "22.6.3",
2+
"version": "22.8.0",
33
"npmClient": "yarn",
44
"skipGit": true,
55
"useWorkspaces": true,

‎modules/core/bin/rapidsai_install_native_module.js

Lines changed: 35 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -51,19 +51,41 @@ const extraFiles = process.argv.slice(2);
5151
const binary_dir = Path.join(Path.dirname(require.resolve(pkg_name)), 'build', 'Release');
5252

5353
(async () => {
54-
const distro = await (async () => {
55-
const {dist = '', release = ''} = await getOS();
56-
return dist.toLowerCase() + release;
57-
})();
58-
const cpu_arch = (() => {
59-
switch (require('os').arch()) {
60-
case 'x64': return 'amd64';
61-
case 'arm': return 'aarch64';
62-
case 'arm64': return 'aarch64';
63-
default: return 'amd64';
64-
}
65-
})();
66-
const gpu_arch = getArchFromComputeCapabilities();
54+
const distro = typeof process.env.RAPIDSAI_LINUX_DISTRO !== 'undefined'
55+
? process.env.RAPIDSAI_LINUX_DISTRO
56+
: await (async () => {
57+
const {dist = '', release = ''} = await getOS();
58+
switch (dist.toLowerCase()) {
59+
case 'debian':
60+
if ((+release) >= 11) { return 'ubuntu20.04'; }
61+
break;
62+
case 'ubuntu':
63+
if (release.split('.')[0] >= 20) { return 'ubuntu20.04'; }
64+
break;
65+
default: break;
66+
}
67+
throw new Error(
68+
`${pkg_name}:` +
69+
`Detected unsupported Linux distro "${dist} ${release}".\n` +
70+
`Currently only Debian 11+ and Ubuntu 20.04+ are supported.\n` +
71+
`If you think you've encountered this message in error, set\n` +
72+
`the \`RAPIDSAI_LINUX_DISTRO\` environment variable to one of\n` +
73+
`the distributions listed in https://github.com/rapidsai/node/releases\n` +
74+
`and reinstall ${pkg_name}`);
75+
})();
76+
const cpu_arch = typeof process.env.RAPIDSAI_CPU_ARCHITECTURE !== 'undefined'
77+
? process.env.RAPIDSAI_CPU_ARCHITECTURE
78+
: (() => {
79+
switch (require('os').arch()) {
80+
case 'x64': return 'amd64';
81+
case 'arm': return 'aarch64';
82+
case 'arm64': return 'aarch64';
83+
default: return 'amd64';
84+
}
85+
})();
86+
const gpu_arch = typeof process.env.RAPIDSAI_GPU_ARCHITECTURE !== 'undefined'
87+
? process.env.RAPIDSAI_GPU_ARCHITECTURE
88+
: getArchFromComputeCapabilities();
6789
const cuda_ver = `cuda${
6890
(() => {
6991
if (typeof process.env.RAPIDSAI_CUDA_VERSION !== 'undefined') {

0 commit comments

Comments
 (0)