[FEA] bump version to 22.6.3 (#418)

* update .env.sample

* attempt to pull the devel-main image and build it if it doesn't exist

* run Build docker images job on merges to branch-*

* rename arch -> sm

* ensure all images are using npm_package_version and npm_package_config_rapids_version

* exec `docker-compose run` with additional envvars in case it needs to build the image first

* replace the old version w/ the new version in more files

* bump version to 22.6.3

* revert building docker images on push to branch-*

.env.sample

@@ -12,8 +12,11 @@ PARALLEL_LEVEL=4
 # `nvidia/cuda` base image Ubuntu version
 # LINUX_VERSION=ubuntu20.04
 
-# RAPIDS version to use
-# RAPIDS_VERSION=22.06.00
+# List of CUDA device architectures to target.
+# CUDAARCHS=60-real;70-real;75-real;80-real;86
+#
+# Or set to `ALL` to compile for all supported.
+# CUDAARCHS=ALL
 
 # How long sccache should wait until it considers a compile job timed out.
 # This number should be large, because C++ and CUDA can take a long time to compile.

.github/workflows/main.pr.yml

@@ -79,12 +79,7 @@ jobs:
           path: node
           base_sha: ${{ steps.last_main_commit.outputs.commit_hash }}
           files: |
-            lerna\.json
-            package\.json
             dev/dockerfiles/devel/main\.Dockerfile
-            \.github/workflows/main\.pr\.yml
-            \.github/workflows/merge\.pr\.yml
-            \.github/actions/build-and-publish-image/action\.yml
 
       - name: Update runner env
         env:
@@ -175,7 +170,8 @@ jobs:
         if: env.dev_changed == 'true' || env.src_changed == 'true'
         shell: bash
         run: |
-          if [[ ${dev_changed} == 'true' ]]; then
+          has_image="$(docker pull -q --platform linux/amd64 ${MAIN_IMG} && echo 1 || echo 0)";
+          if [[ ${has_image} == '0' || ${dev_changed} == 'true' ]]; then
             DOCKER_BUILDKIT=1 \
             DOCKER_SCAN_SUGGEST=false \
             docker build --pull --force-rm \

.github/workflows/release.yml

@@ -5,7 +5,7 @@ on:
     inputs:
       rapids-version:
         type: string
-        default: "22.6.2"
+        default: "22.6.3"
         description: "RAPIDS version"
       make-release:
         type: boolean
@@ -24,7 +24,7 @@ env:
   RAPIDS: "${{ inputs.rapids-version }}"
 
 concurrency:
-  group: create_github_release
+  group: release-${{ inputs.rapids-version }}
   cancel-in-progress: true
 
 permissions:
@@ -64,11 +64,11 @@ jobs:
                   --wildcards --strip-components=2 \
                   -C build -x "*/rapidsai_${x}*.node" \
                   --transform="s/rapidsai_${x}.node/rapidsai_${x}-${RAPIDS}-${CUDA}-${LINUX}-${ARCH}.node/" \
-                  --transform="s/rapidsai_${x}_60/rapidsai_${x}-${RAPIDS}-${CUDA}-${LINUX}-${ARCH}-arch60/" \
-                  --transform="s/rapidsai_${x}_70/rapidsai_${x}-${RAPIDS}-${CUDA}-${LINUX}-${ARCH}-arch70/" \
-                  --transform="s/rapidsai_${x}_75/rapidsai_${x}-${RAPIDS}-${CUDA}-${LINUX}-${ARCH}-arch75/" \
-                  --transform="s/rapidsai_${x}_80/rapidsai_${x}-${RAPIDS}-${CUDA}-${LINUX}-${ARCH}-arch80/" \
-                  --transform="s/rapidsai_${x}_86/rapidsai_${x}-${RAPIDS}-${CUDA}-${LINUX}-${ARCH}-arch86/" ;
+                  --transform="s/rapidsai_${x}_60/rapidsai_${x}-${RAPIDS}-${CUDA}-${LINUX}-${ARCH}-sm60/" \
+                  --transform="s/rapidsai_${x}_70/rapidsai_${x}-${RAPIDS}-${CUDA}-${LINUX}-${ARCH}-sm70/" \
+                  --transform="s/rapidsai_${x}_75/rapidsai_${x}-${RAPIDS}-${CUDA}-${LINUX}-${ARCH}-sm75/" \
+                  --transform="s/rapidsai_${x}_80/rapidsai_${x}-${RAPIDS}-${CUDA}-${LINUX}-${ARCH}-sm80/" \
+                  --transform="s/rapidsai_${x}_86/rapidsai_${x}-${RAPIDS}-${CUDA}-${LINUX}-${ARCH}-sm86/" ;
           done;
 
           tar -zf build/rapidsai_sql-*.tar.gz \
@@ -99,6 +99,7 @@ jobs:
           draft: ${{ inputs.draft-release == true }}
 
   publish-npm-packages:
+    if: ${{ inputs.make-release == true && inputs.npm-publish == true }}
     name: Publish npm packages
     runs-on: ubuntu-20.04
     strategy:
@@ -110,7 +111,6 @@ jobs:
         LINUX: ["ubuntu20.04"]
     steps:
       - name: Publish npm packages
-        if: ${{ inputs.make-release == true && inputs.npm-publish == true }}
         shell: bash
         env:
           NPM_TOKEN: "${{ secrets.RAPIDSAI_OWNER_NPM_AUTOMATION_TOKEN }}"
@@ -129,5 +129,4 @@ jobs:
             sh -c "find /opt/rapids/ -type f -name 'rapidsai-[^demo]*.tgz' -exec cp {} /out/ \;"
 
           echo "//registry.npmjs.org/:_authToken=\${NPM_TOKEN}" > "$HOME/.npmrc"
-          npm whoami
           find build -type f -name 'rapidsai-*.tgz' -exec npm publish --access public ./{} \;

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.2-runtime-node16.15.1-cuda11-ubuntu20.04"
+VERSIONS="22.6.3-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.2-runtime-node16.15.1-cuda11-ubuntu20.04"
+VERSIONS="22.6.3-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.2-runtime-node16.15.1-cuda11-ubuntu20.04"
+VERSIONS="22.6.3-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.2-runtime-node16.15.1-cuda11-ubuntu20.04"
+VERSIONS="22.6.3-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.2-devel-node16.15.1-cuda11-ubuntu20.04"
+VERSIONS="22.6.3-devel-node16.15.1-cuda11-ubuntu20.04"
 
 # Pull the latest image of the packaged .tgz artifacts
 docker pull $REPO:$VERSIONS-packages

docker-compose.devel.yml

@@ -31,10 +31,9 @@ x-main-service-settings: &main_service_settings
     DISPLAY: "${DISPLAY:-}"
     XAUTHORITY: "${XAUTHORITY:-}"
     XDG_SESSION_TYPE: "${XDG_SESSION_TYPE:-}"
-    VERSION: "${npm_package_version:-22.6.2}"
-    RAPIDS_VERSION: "${RAPIDS_VERSION:-22.06.00}"
     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}"
     DBUS_SESSION_BUS_ADDRESS: "${DBUS_SESSION_BUS_ADDRESS:-unix:path=/run/user/$UID/bus}"
   cap_add:
     - SYS_ADMIN
@@ -46,7 +45,7 @@ services:
 
   main:
     <<: *main_service_settings
-    image: ${REPOSITORY:-ghcr.io/rapidsai/node}:${npm_package_version:-22.6.2}-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.6.3}-devel-node${NODE_VERSION:-16.15.1}-cuda${CUDA_VERSION_MAJOR:-11}-${LINUX_VERSION:-ubuntu20.04}-main
     secrets:
       - sccache_credentials
     build:
@@ -57,7 +56,7 @@ services:
         NODE_VERSION: ${NODE_VERSION:-16.15.1}
         LINUX_VERSION: ${LINUX_VERSION:-ubuntu20.04}
         AMD64_BASE: nvidia/cuda:${CUDA_VERSION:-11.6.2}-devel-${LINUX_VERSION:-ubuntu20.04}
-        ARM64_BASE: nvcr.io/nvidia/l4t-cuda:${CUDA_VERSION:-11.4.14}-runtime
+        ARM64_BASE: nvidia/cuda:${CUDA_VERSION:-11.6.2}-devel-${LINUX_VERSION:-ubuntu20.04}
     environment:
       <<: *main_environment_settings
       SSH_AUTH_SOCK: "/ssh-agent"
@@ -76,12 +75,12 @@ services:
 
   notebook:
     <<: *main_service_settings
-    image: ${REPOSITORY:-ghcr.io/rapidsai/node}:${npm_package_version:-22.6.2}-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.6.3}-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.2}-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.6.3}-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
@@ -98,7 +97,7 @@ services:
 
   packages:
     <<: *base_service_settings
-    image: ${REPOSITORY:-ghcr.io/rapidsai/node}:${npm_package_version:-22.6.2}-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.6.3}-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
@@ -110,11 +109,11 @@ services:
         CUDAARCHS: "${CUDAARCHS:-ALL}"
         PARALLEL_LEVEL: "${PARALLEL_LEVEL:-4}"
         NVCC_APPEND_FLAGS: "${NVCC_APPEND_FLAGS:-}"
-        RAPIDS_VERSION: "${RAPIDS_VERSION:-22.06.00}"
         SCCACHE_REGION: "${SCCACHE_REGION:-us-west-2}"
         SCCACHE_BUCKET: "${SCCACHE_BUCKET:-node-rapids-sccache}"
         SCCACHE_IDLE_TIMEOUT: "${SCCACHE_IDLE_TIMEOUT:-32768}"
-        FROM_IMAGE: ${REPOSITORY:-ghcr.io/rapidsai/node}:${npm_package_version:-22.6.2}-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.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
 
 secrets:
   sccache_credentials: