Merge pull request #356 from nv-morpheus/branch-23.07

[RELEASE] MRC v23.07
nv-morpheus · Jul 20, 2023 · ed9ff73 · ed9ff73
2 parents 7ff0227 + f7fbde9
commit ed9ff73
Show file tree

Hide file tree

Showing 704 changed files with 6,135 additions and 4,996 deletions.
diff --git a/.devcontainer/conda/Dockerfile b/.devcontainer/conda/Dockerfile
@@ -0,0 +1,18 @@
+# SPDX-FileCopyrightText: Copyright (c) 2022-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.
+
+FROM rapidsai/devcontainers:23.04-cuda11.8-mambaforge-ubuntu22.04 AS base
+
+ENV PATH="${PATH}:/workspaces/mrc/.devcontainer/bin"
diff --git a/.devcontainer/conda/devcontainer.json b/.devcontainer/conda/devcontainer.json
@@ -0,0 +1,92 @@
+//  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": "mrc-dev",
+    "build": {
+        "dockerfile": "Dockerfile"
+    },
+    "hostRequirements": {
+        "gpu": true
+    },
+    "capAdd":[
+        "SYS_NICE",
+        "SYS_PTRACE"
+    ],
+    "securityOpt": [
+        "seccomp=unconfined"
+    ],
+    "runArgs": [
+        "--network=host"
+    ],
+    "containerEnv": {
+        "HOST_MRC_ROOT": "${localWorkspaceFolder}",
+        "MRC_ROOT": "${containerWorkspaceFolder}",
+        "DEFAULT_CONDA_ENV": "mrc",
+        "MAMBA_NO_BANNER": "1",
+        "VAULT_HOST": "https://vault.ops.k8s.rapids.ai"
+    },
+    "initializeCommand": [ "${localWorkspaceFolder}/.devcontainer/conda/initialize-command.sh" ],
+    "remoteUser": "coder",
+    "mounts": [
+        {
+            "type": "bind",
+            "source": "${localWorkspaceFolder}/.cache/conda/envs",
+            "target": "/home/coder/.conda/envs"
+        },
+        {
+            "type": "bind",
+            "source": "${localWorkspaceFolder}/../.conda/pkgs",
+            "target": "/home/coder/.conda/pkgs"
+        },
+        {
+            "type": "bind",
+            "source": "${localWorkspaceFolder}/../.config", // parent folder because sister repos are sibling dirs
+            "target": "/home/coder/.config"
+        },
+        {
+            "type": "bind",
+            "source": "${localWorkspaceFolder}/.devcontainer/opt/mrc",
+            "target": "/opt/mrc"
+        },
+    ],
+    "features": {
+        "ghcr.io/devcontainers/features/dotnet:1": {}
+    },
+    "customizations": {
+        "vscode": {
+            "extensions": [
+                "eamodio.gitlens",
+                "formulahendry.terminal",
+                "hbenl.vscode-test-explorer",
+                "josetr.cmake-language-support-vscode",
+                "llvm-vs-code-extensions.vscode-clangd",
+                "matepek.vscode-catch2-test-adapter",
+                "ms-dotnettools.vscode-dotnet-runtime",
+                "ms-vscode.cmake-tools",
+                "ms-vscode.cpptools-extension-pack",
+                "ms-vscode.cpptools-themes",
+                "ms-vscode.cpptools",
+                "ms-vscode.test-adapter-converter",
+                "xaver.clang-format"
+            ],
+            "settings": {
+                "cmake.cmakePath": "/tmp/.current-conda-env/bin/cmake",
+                "cmake.languageSupport.dotnetPath": "/usr/bin/dotnet",
+                "C_Cpp.intelliSenseEngine": "disabled",
+                "python.terminal.activateEnvironment": false
+            }
+        }
+    },
+}
diff --git a/.devcontainer/conda/initialize-command.sh b/.devcontainer/conda/initialize-command.sh
@@ -0,0 +1,21 @@
+#!/bin/bash
+# SPDX-FileCopyrightText: Copyright (c) 2022-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.
+
+# create the parent conda folder so it's found when mounting
+mkdir -p ../.conda
+
+# create a config directory if it does not exist so it's found when mounting
+mkdir -p ../.config
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
@@ -1,3 +1,17 @@
+//  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.
 {
     "build": {
         "args": {
@@ -36,13 +50,15 @@
     "hostRequirements": {
         "gpu": true
     },
+    "initializeCommand": [ "${localWorkspaceFolder}/.devcontainer/initialize-command.sh" ],
     "mounts": [
+        "source=${localEnv:HOME}/.config,target=/home/${localEnv:USER}/.config,type=bind",
         // Mount the necessary files for GDB pretty-printing to work
-        "source=${localWorkspaceFolder}/.devcontainer/home/.gdbinit,target=/home/${localEnv:USER}/.gdbinit,type=bind",
-        "source=${localWorkspaceFolder}/.devcontainer/home/.config/gdb,target=/home/${localEnv:USER}/.config/gdb,type=bind",
-        // Mount the Github CLI config directory to allow using the Github CLI
-        "source=${localEnv:HOME}/.config/gh,target=/home/${localEnv:USER}/.config/gh,type=bind",
+        "source=${localWorkspaceFolder}/.devcontainer/opt/mrc/etc/.gdbinit,target=/home/${localEnv:USER}/.gdbinit,type=bind",
     ],
+    "features": {
+        "ghcr.io/devcontainers/features/git-lfs": {}
+    },
     "name": "mrc-dev",
     "overrideCommand": true, // infinite loop of sleeps,
     "remoteUser": "${localEnv:USER}",

diff --git a/.devcontainer/home/.gdbinit b/.devcontainer/home/.gdbinit
diff --git a/.devcontainer/init.sh b/.devcontainer/init.sh
@@ -0,0 +1,18 @@
+#!/bin/bash
+# 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.
+
+# create the github config directory if it does not exist so it's found when mounting
+mkdir -p ~/.config/gh
diff --git a/.devcontainer/initialize-command.sh b/.devcontainer/initialize-command.sh
@@ -0,0 +1,21 @@
+#!/bin/bash
+# SPDX-FileCopyrightText: Copyright (c) 2022-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.
+
+# create the parent conda folder so it's found when mounting
+mkdir -p ../.conda
+
+# create a config directory if it does not exist so it's found when mounting
+mkdir -p ../.config
diff --git a/.devcontainer/opt/mrc/bin/post-attach-command.sh b/.devcontainer/opt/mrc/bin/post-attach-command.sh
@@ -0,0 +1,33 @@
+#!/bin/bash
+# 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.
+
+# Ensure our ~/.config directory has the correct permissions. If ~/.config did
+# not exist, and you mount ~/.config/gh from the host, then ~/.config will be
+# created with root permissions which can break things
+
+conda_env_find(){
+    conda env list | grep "${@}" >/dev/null 2>/dev/null
+}
+
+ENV_NAME=${ENV_NAME:-mrc}
+
+sed -ri "s/conda activate base/conda activate $ENV_NAME/g" ~/.bashrc;
+
+if conda_env_find "${ENV_NAME}" ; \
+
+then mamba env update --name ${ENV_NAME} -f ${MRC_ROOT}/ci/conda/environments/dev_env.yml --prune; \
+else mamba env create --name ${ENV_NAME} -f ${MRC_ROOT}/ci/conda/environments/dev_env.yml; \
+fi
diff --git a/.github/ISSUE_TEMPLATE/submit_question.yml → ...ner/opt/mrc/bin/update-content-command.sh b/.github/ISSUE_TEMPLATE/submit_question.yml → ...ner/opt/mrc/bin/update-content-command.sh
@@ -1,4 +1,5 @@
-# SPDX-FileCopyrightText: Copyright (c) 2022, NVIDIA CORPORATION & AFFILIATES. All rights reserved.
+#!/bin/bash
+# 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");
@@ -13,22 +14,10 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-name: Submit Question
-description: Ask a general question about MRC
-title: "[QST]: "
-labels: ["question"]
+# Ensure our ~/.config directory has the correct permissions. If ~/.config did
+# not exist, and you mount ~/.config/gh from the host, then ~/.config will be
+# created with root permissions which can break things
 
-body:
-  - type: markdown
-    attributes:
-      value: |
-        Thanks for taking the time to ask us a question!
-
-  - type: textarea
-    id: question
-    attributes:
-      label: What is your question?
-      description: Please be specific and we will answer your question as soon as possible.
-      placeholder: Does MRC integrate with XYZ software?
-    validations:
-      required: true
+if [[ ! -f ~/.config/.gdbinit ]]; then
+    cp /opt/mrc/etc/.gdbinit ~/.config/.gdbinit
+fi
diff --git a/.devcontainer/opt/mrc/conda/Dockerfile b/.devcontainer/opt/mrc/conda/Dockerfile
@@ -0,0 +1,18 @@
+# SPDX-FileCopyrightText: Copyright (c) 2022-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.
+
+FROM rapidsai/devcontainers:23.04-cuda11.8-mambaforge-ubuntu22.04 AS base
+
+ENV PATH="${PATH}:/workspaces/mrc/.devcontainer/bin"
diff --git a/.devcontainer/opt/mrc/conda/devcontainer.json b/.devcontainer/opt/mrc/conda/devcontainer.json
@@ -0,0 +1,92 @@
+//  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": "mrc-dev",
+    "build": {
+        "dockerfile": "Dockerfile"
+    },
+    "hostRequirements": {
+        "gpu": true
+    },
+    "capAdd":[
+        "SYS_NICE",
+        "SYS_PTRACE"
+    ],
+    "securityOpt": [
+        "seccomp=unconfined"
+    ],
+    "runArgs": [
+        "--network=host"
+    ],
+    "containerEnv": {
+        "HOST_MRC_ROOT": "${localWorkspaceFolder}",
+        "MRC_ROOT": "${containerWorkspaceFolder}",
+        "DEFAULT_CONDA_ENV": "mrc",
+        "MAMBA_NO_BANNER": "1",
+        "VAULT_HOST": "https://vault.ops.k8s.rapids.ai"
+    },
+    "initializeCommand": [ "${localWorkspaceFolder}/.devcontainer/initialize-command.sh" ],
+    "remoteUser": "coder",
+    "mounts": [
+        {
+            "type": "bind",
+            "source": "${localWorkspaceFolder}/.cache/conda/envs",
+            "target": "/home/coder/.conda/envs"
+        },
+        {
+            "type": "bind",
+            "source": "${localWorkspaceFolder}/../.conda/pkgs",
+            "target": "/home/coder/.conda/pkgs"
+        },
+        {
+            "type": "bind",
+            "source": "${localWorkspaceFolder}/../.config", // parent folder because sister repos are sibling dirs
+            "target": "/home/coder/.config"
+        },
+        {
+            "type": "bind",
+            "source": "${localWorkspaceFolder}/.devcontainer/opt/mrc",
+            "target": "/opt/mrc"
+        },
+    ],
+    "features": {
+        "ghcr.io/devcontainers/features/dotnet:1": {}
+    },
+    "customizations": {
+        "vscode": {
+            "extensions": [
+                "eamodio.gitlens",
+                "formulahendry.terminal",
+                "hbenl.vscode-test-explorer",
+                "josetr.cmake-language-support-vscode",
+                "llvm-vs-code-extensions.vscode-clangd",
+                "matepek.vscode-catch2-test-adapter",
+                "ms-dotnettools.vscode-dotnet-runtime",
+                "ms-vscode.cmake-tools",
+                "ms-vscode.cpptools-extension-pack",
+                "ms-vscode.cpptools-themes",
+                "ms-vscode.cpptools",
+                "ms-vscode.test-adapter-converter",
+                "xaver.clang-format"
+            ],
+            "settings": {
+                "cmake.cmakePath": "/tmp/.current-conda-env/bin/cmake",
+                "cmake.languageSupport.dotnetPath": "/usr/bin/dotnet",
+                "C_Cpp.intelliSenseEngine": "disabled",
+                "python.terminal.activateEnvironment": false
+            }
+        }
+    },
+}