Sync with cccl repo

NVIDIA · Aug 16, 2023 · 2dee7ce · 2dee7ce
1 parent c1082ad
commit 2dee7ce
Show file tree

Hide file tree

Showing 15 changed files with 328 additions and 138 deletions.
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
@@ -1,25 +1,37 @@
 {
-  "shutdownAction": "stopContainer",
-  "image": "rapidsai/devcontainers:23.06-cpp-gcc12-cuda12.1-ubuntu22.04",
-  "hostRequirements": {
-      "gpu": true
-  },
-  "initializeCommand": [
-      "/bin/bash",
-      "-c",
-      "mkdir -m 0755 -p ${localWorkspaceFolder}/.{aws,cache,config}"
-  ],
-  "containerEnv": {
-      "SCCACHE_REGION": "us-east-2",
-      "SCCACHE_BUCKET": "rapids-sccache-devs",
-      "VAULT_HOST": "https://vault.ops.k8s.rapids.ai",
-      "HISTFILE": "${containerWorkspaceFolder}/.cache/._bash_history"
-  },
-  "workspaceFolder": "/home/coder/${localWorkspaceFolderBasename}",
-  "workspaceMount": "source=${localWorkspaceFolder},target=/home/coder/${localWorkspaceFolderBasename},type=bind,consistency=consistent",
-  "mounts": [
-      "source=${localWorkspaceFolder}/.aws,target=/home/coder/.aws,type=bind,consistency=consistent",
-      "source=${localWorkspaceFolder}/.cache,target=/home/coder/.cache,type=bind,consistency=consistent",
-      "source=${localWorkspaceFolder}/.config,target=/home/coder/.config,type=bind,consistency=consistent"
-  ]
+    "shutdownAction": "stopContainer",
+    "image": "rapidsai/devcontainers:23.08-cpp-gcc12-cuda12.2-ubuntu22.04",
+    "hostRequirements": {
+        "gpu": true
+    },
+    "initializeCommand": [
+        "/bin/bash",
+        "-c",
+        "mkdir -m 0755 -p ${localWorkspaceFolder}/.{aws,cache,config}"
+    ],
+    "containerEnv": {
+        "SCCACHE_REGION": "us-east-2",
+        "SCCACHE_BUCKET": "rapids-sccache-devs",
+        "VAULT_HOST": "https://vault.ops.k8s.rapids.ai",
+        "HISTFILE": "${containerWorkspaceFolder}/.cache/._bash_history"
+    },
+    "workspaceFolder": "/home/coder/${localWorkspaceFolderBasename}",
+    "workspaceMount": "source=${localWorkspaceFolder},target=/home/coder/${localWorkspaceFolderBasename},type=bind,consistency=consistent",
+    "mounts": [
+        "source=${localWorkspaceFolder}/.aws,target=/home/coder/.aws,type=bind,consistency=consistent",
+        "source=${localWorkspaceFolder}/.cache,target=/home/coder/.cache,type=bind,consistency=consistent",
+        "source=${localWorkspaceFolder}/.config,target=/home/coder/.config,type=bind,consistency=consistent"
+    ],
+    "customizations": {
+        "vscode": {
+            "extensions": [
+                "llvm-vs-code-extensions.vscode-clangd"
+            ],
+            "settings": {
+                "clangd.arguments": [
+                    "--compile-commands-dir=${workspaceFolder}/build/latest"
+                ]
+            }
+        }
+    }
 }
diff --git a/.devcontainer/launch.sh b/.devcontainer/launch.sh
@@ -1,3 +1,4 @@
+
 #! /usr/bin/env bash
 
 launch_devcontainer() {

diff --git a/.devcontainer/make_devcontainers.sh b/.devcontainer/make_devcontainers.sh
@@ -13,14 +13,17 @@ cd "$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )";
 # by replacing the `image:` field with the appropriate image name
 base_devcontainer_file="./devcontainer.json"
 
-# Define image root
-IMAGE_ROOT="rapidsai/devcontainers:23.06-cpp-"
 
 # Read matrix.yaml and convert it to json
-matrix_json=$(yq -o json ../ci/matrix.yaml)
+matrix_json=$(yq -o json ../ci/matrix.yml)
+
+
+# Get the devcontainer image version and define image tag root
+DEVCONTAINER_VERSION=$(echo "$matrix_json" | jq -r '.devcontainer_version')
+IMAGE_ROOT="rapidsai/devcontainers:${DEVCONTAINER_VERSION}-cpp-"
 
 # Get unique combinations of cuda version, compiler name/version, and Ubuntu version
-combinations=$(echo "$matrix_json" | jq -c '[."pull-request"[] | {cuda: .cuda, compiler_name: .compiler.name, compiler_version: .compiler.version, os: .os}] | unique | .[]')
+combinations=$(echo "$matrix_json" | jq -c '[.pull_request.nvcc[] | {cuda: .cuda, compiler_name: .compiler.name, compiler_version: .compiler.version, os: .os}] | unique | .[]')
 
 # For each unique combination
 for combination in $combinations; do
@@ -36,7 +39,8 @@ for combination in $combinations; do
 
     # Use the base_devcontainer.json as a template, plug in the CUDA, compiler names, versions, and Ubuntu version,
     # and write the output to the new devcontainer.json file
-    jq --arg image "$image"  --arg name "$name" '. + {image: $image, name: $name}' $base_devcontainer_file > "$devcontainer_file"
+    #jq --arg image "$image"  --arg name "$name" '. + {image: $image, name: $name}' $base_devcontainer_file > "$devcontainer_file"
+    jq --arg image "$image" --arg name "$name" '.image = $image | .name = $name | .containerEnv.DEVCONTAINER_NAME = $name' $base_devcontainer_file > "$devcontainer_file"
 
     echo "Created $devcontainer_file"
 done
diff --git a/.github/actions/compute-matrix/action.yml b/.github/actions/compute-matrix/action.yml
@@ -0,0 +1,24 @@
+name: Compute Matrix
+description: "Compute the matrix for a given matrix type from the specified matrix file"
+
+inputs:
+  matrix_query:
+    description: "The jq query used to specify the desired matrix. e.g., .pull_request.nvcc"
+    required: true
+  matrix_file:
+    description: 'The file containing the matrix'
+    required: true
+outputs:
+  matrix:
+    description: 'The requested matrix'
+    value: ${{ steps.compute-matrix.outputs.MATRIX }}
+
+runs:
+  using: "composite"
+  steps:
+    - name: Compute matrix
+      id: compute-matrix
+      run: |
+        MATRIX=$(./.github/actions/compute-matrix/compute-matrix.sh ${{inputs.matrix_file}}  ${{inputs.matrix_query}} )
+        echo "matrix=$MATRIX" | tee -a $GITHUB_OUTPUT
+      shell: bash -euxo pipefail {0}
diff --git a/.github/actions/compute-matrix/compute-matrix.sh b/.github/actions/compute-matrix/compute-matrix.sh
@@ -0,0 +1,23 @@
+#!/bin/bash
+
+set -euo pipefail
+
+# Check for the correct number of arguments
+if [ $# -ne 2 ]; then
+    echo "Usage: $0 MATRIX_FILE MATRIX_QUERY"
+    echo "MATRIX_FILE: The path to the matrix file."
+    echo "MATRIX_QUERY: The jq query used to specify the desired matrix. e.g., '.pull-request.nvcc'"
+    exit 1
+fi
+
+# Get realpath before changing directory
+MATRIX_FILE=$(realpath "$1")
+MATRIX_QUERY="$2"
+
+# Ensure the script is being executed in its containing directory
+cd "$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )";
+
+echo "Input matrix file:" >&2
+cat "$MATRIX_FILE" >&2
+echo "Query: $MATRIX_QUERY" >&2
+echo $(yq -o=json "$MATRIX_FILE" | jq -c -r "$MATRIX_QUERY | map(. as \$o | {std: .std[]} + del(\$o.std))")
diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
@@ -16,7 +16,8 @@ on:
       cpu: {type: string, required: true}
       os: {type: string, required: true}
       build_script: {type: string, required: false}
-      test_script: {type: string, required: false }
+      test_script: {type: string, required: false}
+      run_tests: {type: boolean, required: false, default: true}
       build_image: {type: string, required: false}
       test_image: {type: string, required: false}
 

diff --git a/.github/workflows/compute-matrix.yml b/.github/workflows/compute-matrix.yml
diff --git a/.github/workflows/dispatch-build-and-test.yml b/.github/workflows/dispatch-build-and-test.yml
@@ -6,6 +6,7 @@ on:
       per_cuda_compiler_matrix: {type: string, required: true}
       build_script: {type: string, required: false}
       test_script: {type: string, required: false}
+      devcontainer_version: {type: string, required: true}
 
 jobs:
   # Using a matrix to dispatch to the build-and-test reusable workflow for each build configuration
@@ -28,6 +29,7 @@ jobs:
       cpu: ${{ matrix.cpu }}
       os: ${{ matrix.os }}
       build_script: ${{ inputs.build_script }}
-      build_image: rapidsai/devcontainers:23.06-cpp-${{matrix.compiler.name}}${{matrix.compiler.version}}-cuda${{matrix.cuda}}-${{matrix.os}}
+      build_image: rapidsai/devcontainers:${{inputs.devcontainer_version}}-cpp-${{matrix.compiler.name}}${{matrix.compiler.version}}-cuda${{matrix.cuda}}-${{matrix.os}}
       test_script: ${{ inputs.test_script }}
-      test_image: rapidsai/devcontainers:23.06-cpp-${{matrix.compiler.name}}${{matrix.compiler.version}}-cuda${{matrix.cuda}}-${{matrix.os}}
+      run_tests: ${{ contains(matrix.jobs, 'test') && !contains(github.event.head_commit.message, 'skip-tests') }}
+      test_image: rapidsai/devcontainers:${{inputs.devcontainer_version}}-cpp-${{matrix.compiler.name}}${{matrix.compiler.version}}-cuda${{matrix.cuda}}-${{matrix.os}}
diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
@@ -1,10 +1,24 @@
+# SPDX-FileCopyrightText: Copyright (c) 2023 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
+# SPDX-License-Identifier: Apache-2.0
+#
+# 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.
 
 # This is the main workflow that runs on every PR and push to main
 name: pr
 
 defaults:
   run:
-    shell: bash
+    shell: bash -euo pipefail {0}
 
 on:
   push:
@@ -18,25 +32,64 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
-  compute-matrix:
-    uses: ./.github/workflows/compute-matrix.yml
-    with:
-      matrix_file: "./ci/matrix.yml"
-      matrix_type: "pull-request"
+
+  get-devcontainer-version:
+    name: Get devcontainer version
+    runs-on: ubuntu-latest
+    outputs:
+      DEVCONTAINER_VERSION: ${{ steps.set-outputs.outputs.DEVCONTAINER_VERSION }}
+    steps:
+      - name: Checkout repo
+        uses: actions/checkout@v3
+      - name: Get devcontainer version
+        id: set-outputs
+        run: |
+          DEVCONTAINER_VERSION=$(yq -o json ci/matrix.yml | jq -r '.devcontainer_version')
+          echo "DEVCONTAINER_VERSION=$DEVCONTAINER_VERSION" | tee -a "$GITHUB_OUTPUT"
+
+  compute-nvcc-matrix:
+    name: Compute NVCC matrix
+    runs-on: ubuntu-latest
+    outputs:
+      FULL_MATRIX: ${{ steps.set-outputs.outputs.FULL_MATRIX }}
+      CUDA_VERSIONS: ${{ steps.set-outputs.outputs.CUDA_VERSIONS }}
+      HOST_COMPILERS: ${{ steps.set-outputs.outputs.HOST_COMPILERS }}
+      PER_CUDA_COMPILER_MATRIX: ${{ steps.set-outputs.outputs.PER_CUDA_COMPILER_MATRIX }}
+    steps:
+      - name: Checkout repo
+        uses: actions/checkout@v3
+      - name: Get full nvcc matrix
+        id: compute-nvcc-matrix
+        uses: ./.github/actions/compute-matrix
+        with:
+          matrix_file: './ci/matrix.yml'
+          matrix_query: '.pull_request.nvcc'
+      - name: Set outputs
+        id: set-outputs
+        run: |
+          FULL_MATRIX='${{steps.compute-nvcc-matrix.outputs.matrix}}'
+          echo "FULL_MATRIX=$FULL_MATRIX" | tee -a "$GITHUB_OUTPUT"
+          CUDA_VERSIONS=$(echo $FULL_MATRIX | jq -c '[.[] | .cuda] | unique')
+          echo "CUDA_VERSIONS=$CUDA_VERSIONS" | tee -a "$GITHUB_OUTPUT"
+          HOST_COMPILERS=$(echo $FULL_MATRIX | jq -c '[.[] | .compiler.name] | unique')
+          echo "HOST_COMPILERS=$HOST_COMPILERS" | tee -a "$GITHUB_OUTPUT"
+          PER_CUDA_COMPILER_MATRIX=$(echo $FULL_MATRIX | jq -c ' group_by(.cuda + .compiler.name) | map({(.[0].cuda + "-" + .[0].compiler.name): .}) | add')
+          echo "PER_CUDA_COMPILER_MATRIX=$PER_CUDA_COMPILER_MATRIX" | tee -a "$GITHUB_OUTPUT"
 
   ci:
     name: CUDA${{ matrix.cuda_version }} ${{ matrix.compiler }}
-    needs: compute-matrix
+    needs: [compute-nvcc-matrix, get-devcontainer-version]
     uses: ./.github/workflows/dispatch-build-and-test.yml
     strategy:
       fail-fast: false
       matrix:
-        cuda_version: ${{ fromJSON(needs.compute-matrix.outputs.CUDA_VERSIONS) }}
-        compiler: ${{ fromJSON(needs.compute-matrix.outputs.COMPILERS) }}
+        cuda_version: ${{ fromJSON(needs.compute-nvcc-matrix.outputs.CUDA_VERSIONS) }}
+        compiler: ${{ fromJSON(needs.compute-nvcc-matrix.outputs.HOST_COMPILERS) }}
     with:
-      per_cuda_compiler_matrix: ${{ toJSON(fromJSON(needs.compute-matrix.outputs.PER_CUDA_COMPILER_MATRIX)[ format('{0}-{1}', matrix.cuda_version, matrix.compiler) ]) }}
+      per_cuda_compiler_matrix: ${{ toJSON(fromJSON(needs.compute-nvcc-matrix.outputs.PER_CUDA_COMPILER_MATRIX)[ format('{0}-{1}', matrix.cuda_version, matrix.compiler) ]) }}
       build_script: "./ci/build.sh"
       test_script: "./ci/test.sh"
+      devcontainer_version: ${{ needs.get-devcontainer-version.outputs.DEVCONTAINER_VERSION }}
 
   # This job is the final job that runs after all other jobs and is used for branch protection status checks.
   # See: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/collaborating-on-repositories-with-code-quality-features/about-status-checks

diff --git a/.github/workflows/run-as-coder.yml b/.github/workflows/run-as-coder.yml
@@ -40,11 +40,12 @@ jobs:
       - name: Run command
         shell: su coder {0}
         run: |
+            set -exo pipefail
             cd ~/cuCollections
             eval "${{inputs.command}}" || exit_code=$?
             if [ ! -z "$exit_code" ]; then
                 echo "::error::Error! To checkout the corresponding code and reproduce locally, run the following commands:"
-                echo "git clone --branch $GITHUB_REF_NAME --single-branch https://github.com/$GITHUB_REPOSITORY.git && cd $(echo $GITHUB_REPOSITORY | cut -d'/' -f2) && git checkout $GITHUB_SHA"
+                echo "git clone --branch $GITHUB_REF_NAME --single-branch --recurse-submodules https://github.com/$GITHUB_REPOSITORY.git && cd $(echo $GITHUB_REPOSITORY | cut -d'/' -f2) && git checkout $GITHUB_SHA"
                 echo "docker run --rm -it --gpus all --pull=always --volume \$PWD:/repo --workdir /repo ${{ inputs.image }} ${{inputs.command}}"
                 exit $exit_code
             fi