Merge branch 'branch-22.11' into dvn-modules

AyodeAwe · Oct 17, 2022 · c8ee29f · c8ee29f
2 parents 656bb46 + 6b4b6c7
commit c8ee29f
Show file tree

Hide file tree

Showing 29 changed files with 276 additions and 418 deletions.
diff --git a/.github/workflows/add_to_project.yml b/.github/workflows/add_to_project.yml
@@ -17,4 +17,4 @@ jobs:
       - uses: actions/add-to-project@v0.3.0
         with:
           project-url: https://github.com/orgs/nv-morpheus/projects/2
-          github-token: ${{ secrets.ACTIONS_ACCESS_TOKEN }}
+          github-token: ${{ github.token}}
diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml
@@ -0,0 +1,190 @@
+# SPDX-FileCopyrightText: Copyright (c) 2022, 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.
+
+name: Build pull request
+
+on:
+  push:
+    branches:
+      - 'pull-request/**'
+      - "branch-*"
+
+# This allows a subsequently queued workflow run to interrupt previous runs
+concurrency:
+  group: '${{ github.workflow }} @ ${{ github.event.pull_request.head.label || github.head_ref || github.ref }}'
+  cancel-in-progress: true
+
+env:
+  AWS_DEFAULT_REGION: us-west-2
+  AWS_ACCESS_KEY_ID: "${{ secrets.GHA_AWS_ACCESS_KEY_ID }}"
+  AWS_SECRET_ACCESS_KEY: "${{ secrets.GHA_AWS_SECRET_ACCESS_KEY }}"
+  BUILD_CC: "gcc"
+  CHANGE_TARGET: "${{ github.base_ref }}"
+  GH_TOKEN: "${{ github.token }}"
+  GIT_COMMIT: "${{ github.sha }}"
+  SRF_ROOT: "${{ github.workspace }}/srf"
+  WORKSPACE: "${{ github.workspace }}/srf"
+  WORKSPACE_TMP: "${{ github.workspace }}/tmp"
+
+
+jobs:
+  check:
+    if: ${{ startsWith(github.ref_name, 'pull-request/') }}
+    name: Check
+    runs-on: [self-hosted, linux, amd64, cpu4]
+    timeout-minutes: 60
+    container:
+      image: gpuci/rapidsai-driver:21.10-cuda11.4-devel-ubuntu20.04-py3.8
+    strategy:
+      fail-fast: true
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+        with:
+          lfs: false
+          path: 'srf'
+          fetch-depth: 0
+
+      - name: Check
+        shell: bash
+        run: ./srf/ci/scripts/github/checks.sh
+
+  build:
+    name: Build
+    runs-on: [self-hosted, linux, amd64, cpu16]
+    timeout-minutes: 60
+    container:
+      image: gpuci/rapidsai-driver:21.10-cuda11.4-devel-ubuntu20.04-py3.8
+    strategy:
+      fail-fast: true
+      matrix:
+        build_cc: ["gcc", "gcc-coverage", "clang"]
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+        with:
+          lfs: false
+          path: 'srf'
+
+      - name: Build:linux:x86_64
+        shell: bash
+        env:
+          BUILD_CC: ${{ matrix.build_cc }}
+        run: ./srf/ci/scripts/github/build.sh
+
+  test:
+    name: Test
+    needs: [build]
+    runs-on: [self-hosted, linux, amd64, gpu-v100-495-1]
+    timeout-minutes: 60
+    container:
+      image: gpuci/rapidsai:21.10-cuda11.4-devel-ubuntu20.04-py3.8
+      options: --cap-add=sys_nice
+      env:
+        NVIDIA_VISIBLE_DEVICES: ${{ env.NVIDIA_VISIBLE_DEVICES }}
+        PARALLEL_LEVEL: '10'
+    strategy:
+      fail-fast: true
+      matrix:
+        build_type: ["Debug", "Release"]
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+        with:
+          lfs: false
+          path: 'srf'
+
+      - name: Test:linux:x86_64:gcc
+        shell: bash
+        env:
+          BUILD_TYPE: ${{ matrix.build_type }}
+        run: ./srf/ci/scripts/github/test.sh
+
+  documentation:
+    name: Documentation
+    needs: [build]
+    runs-on: [self-hosted, linux, amd64, cpu4]
+    timeout-minutes: 60
+    container:
+      image: gpuci/rapidsai-driver:21.10-cuda11.4-devel-ubuntu20.04-py3.8
+    strategy:
+      fail-fast: true
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+        with:
+          lfs: false
+          path: 'srf'
+
+      - name: build_docs
+        shell: bash
+        run: ./srf/ci/scripts/github/docs.sh
+
+  benchmark:
+    name: Benchmark
+    needs: [build]
+    runs-on: [self-hosted, linux, amd64, cpu4]
+    timeout-minutes: 60
+    container:
+      image: gpuci/rapidsai-driver:21.10-cuda11.4-devel-ubuntu20.04-py3.8
+    strategy:
+      fail-fast: true
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+        with:
+          lfs: false
+          path: 'srf'
+
+      - name: pre_benchmark
+        shell: bash
+        run: ./srf/ci/scripts/github/pre_benchmark.sh
+      - name: benchmark
+        shell: bash
+        run: ./srf/ci/scripts/github/benchmark.sh
+      - name: post_benchmark
+        shell: bash
+        run: ./srf/ci/scripts/github/benchmark.sh
+
+
+  package:
+    name: Package
+    if: ${{ startsWith(github.ref_name, 'branch-') }}
+    needs: [benchmark, documentation, test]
+    runs-on: [self-hosted, linux, amd64, cpu16]
+    timeout-minutes: 60
+    container:
+      image: gpuci/rapidsai-driver:21.10-cuda11.4-devel-ubuntu20.04-py3.8
+    strategy:
+      fail-fast: true
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+        with:
+          lfs: false
+          path: 'srf'
+          fetch-depth: 0
+
+      - name: conda
+        shell: bash
+        env:
+          CONDA_TOKEN: "${{ secrets.CONDA_TOKEN }}"
+        run: ./srf/ci/scripts/github/conda.sh
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -58,7 +58,7 @@ endif()
 rapids_cuda_init_architectures(srf)
 
 project(srf
-  VERSION 22.09.00
+  VERSION 22.11.00
   LANGUAGES C CXX
 )
 

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -27,7 +27,7 @@ More information can be found at: [Contributor Code of Conduct](CODE_OF_CONDUCT.
 
 1. Find an issue to work on. The best way is to look for issues with the [good first issue](https://github.com/NVIDIA/SRF/issues) label.
 2. Comment on the issue stating that you are going to work on it.
-3. Code! Make sure to update unit tests and confirm that test coverage has not decreased (see below)! Ensure the 
+3. Code! Make sure to update unit tests and confirm that test coverage has not decreased (see below)! Ensure the
 [license headers are set properly](#Licensing).
 4. When done, [create your pull request](https://github.com/NVIDIA/SRF/compare).
 5. Wait for other developers to review your code and update code as needed.
@@ -37,7 +37,7 @@ Remember, if you are unsure about anything, don't hesitate to comment on issues
 
 ## Unit testing and Code Coverage
 Prior to submitting a pull request, you should ensure that all your contributed code is covered by unit tests, and that
-unit test coverage percentages have not decreased (even better if they've increased). To test, from the SRF root 
+unit test coverage percentages have not decreased (even better if they've increased). To test, from the SRF root
 directory:
 
 1. Generate a code coverage report and ensure your additions are covered.
@@ -114,6 +114,13 @@ pip install -e $SRF_HOME/build/python
 pytest $SRF_HOME/python
 ```
 
+### Building API Documentation
+From the root of the SRF repo, configure CMake with `SRF_BUILD_DOCS=ON` then build the `srf_docs` target. Once built the documentation will be located in the `build/docs/html` directory.
+```bash
+cmake -B build -DSRF_BUILD_DOCS=ON .
+cmake --build build --target srf_docs
+```
+
 ## Licensing
 SRF is licensed under the Apache v2.0 license. All new source files including CMake and other build scripts should contain the Apache v2.0 license header. Any edits to existing source code should update the date range of the copyright to the current year. The format for the license header is:
 

diff --git a/Dockerfile b/Dockerfile
@@ -40,7 +40,7 @@ RUN apt-key adv --fetch-keys https://developer.download.nvidia.com/compute/cuda/
 RUN conda config --set ssl_verify false &&\
     conda config --add pkgs_dirs /opt/conda/pkgs &&\
     conda config --env --add channels conda-forge &&\
-    /opt/conda/bin/conda install -y -n base -c conda-forge "mamba >=0.22" "boa >=0.10" python=${PYTHON_VER}
+    /opt/conda/bin/conda install -y -n base -c conda-forge "mamba >=0.22" "boa >=0.12" python=${PYTHON_VER}
     # conda clean -afy
 
 # All code will be under /work