From 35887fc952875388fabac6643e5955a532d9cce1 Mon Sep 17 00:00:00 2001
From: Michael Demoret <mdemoret@nvidia.com>
Date: Fri, 28 Jul 2023 15:22:21 -0600
Subject: [PATCH] Updating tests to force .pyi files to be committed into the
 repo

---
 .gitignore                | 34 ++++++++++++++---------------
 ci/scripts/github/test.sh | 46 +++++++++++++++++++++++++++++----------
 external/utilities        |  2 +-
 3 files changed, 52 insertions(+), 30 deletions(-)

diff --git a/.gitignore b/.gitignore
index a122a27a76..064d3cf759 100755
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,4 @@
-./build
-*.engine
-.Dockerfile
-
+# Put new items at the bottom of this list!!!
 
 # Created by https://www.gitignore.io/api/vim,c++,cmake,python,synology
 
@@ -181,26 +178,27 @@ tags
 
 
 # End of https://www.gitignore.io/api/vim,c++,cmake,python,synology
+
+./build
+.conda-bld
+.Dockerfile
 .tmp
-examples/data/dfp
-examples/digital_fingerprinting/**/dfp_detections_*.csv
-viz_frames*
-notebooks/output
-dask-worker-space
 *.dirlock
+*.engine
 *.lock
-triton_models/**/*.onnx
-triton_models/**/*.engine
+/build*/
+/conda-build/
+dask-worker-space
+data/*
 docs/source/_lib
 docs/source/_modules
-data/*
+examples/data/dfp
+examples/digital_fingerprinting/**/dfp_detections_*.csv
 mlruns/*
-/build*/
-/conda-build/
-.conda-bld
-
-# Ignore generated pyi files for pybind and cython modules
-morpheus/_lib/**/*.pyi
+notebooks/output
+triton_models/**/*.engine
+triton_models/**/*.onnx
+viz_frames*
 
 # Explicitly ignore .vscode/. Shared settings should go in morpheus.code-workspace
 # and user settings will go in .vscode/
diff --git a/ci/scripts/github/test.sh b/ci/scripts/github/test.sh
index 1fad54e560..2bdb2f223a 100755
--- a/ci/scripts/github/test.sh
+++ b/ci/scripts/github/test.sh
@@ -21,17 +21,41 @@ source ${WORKSPACE}/ci/scripts/github/common.sh
 
 update_conda_env
 
-download_artifact "wheel.tar.bz"
-download_artifact "cpp_tests.tar.bz"
-download_artifact "morhpeus_libs.tar.bz"
-
-tar xf "${WORKSPACE_TMP}/wheel.tar.bz"
-tar xf "${WORKSPACE_TMP}/morhpeus_libs.tar.bz"
-tar xf "${WORKSPACE_TMP}/cpp_tests.tar.bz"
-
-# Install the built Morpheus python package
-cd ${MORPHEUS_ROOT}
-pip install ${MORPHEUS_ROOT}/build/dist/*.whl
+rapids-logger "Check versions"
+python3 --version
+x86_64-conda-linux-gnu-cc --version
+x86_64-conda-linux-gnu-c++ --version
+cmake --version
+ninja --version
+sccache --version
+
+git submodule update --init --recursive
+
+CMAKE_FLAGS="${CMAKE_BUILD_ALL_FEATURES}"
+CMAKE_FLAGS="${CMAKE_FLAGS} -DMORPHEUS_PYTHON_BUILD_WHEEL=OFF"
+CMAKE_FLAGS="${CMAKE_FLAGS} -DMORPHEUS_PYTHON_BUILD_STUBS=ON"
+CMAKE_FLAGS="${CMAKE_FLAGS} -DCMAKE_BUILD_RPATH_USE_ORIGIN=ON"
+if [[ "${LOCAL_CI}" == "" ]]; then
+    CMAKE_FLAGS="${CMAKE_FLAGS} -DCCACHE_PROGRAM_PATH=$(which sccache)"
+fi
+
+rapids-logger "Configuring cmake for Morpheus with ${CMAKE_FLAGS}"
+cmake -B build -G Ninja ${CMAKE_FLAGS} .
+
+rapids-logger "Building Morpheus"
+cmake --build build --parallel ${PARALLEL_LEVEL}
+
+if [[ "${LOCAL_CI}" == "" ]]; then
+    rapids-logger "sccache usage for morpheus build:"
+    sccache --show-stats
+fi
+
+# Check for git diffs which would mean the build is out of sync with the repo
+if [[ $(git diff --shortstat 2> /dev/null | tail -n1) != "" ]]; then
+    rapids-logger "ERROR: git diff found, build is out of sync with repo"
+    git status
+    exit 1
+fi
 
 CPP_TESTS=($(find ${MORPHEUS_ROOT}/build -name "*.x"))
 
diff --git a/external/utilities b/external/utilities
index b3af2a3501..08c2eb0c60 160000
--- a/external/utilities
+++ b/external/utilities
@@ -1 +1 @@
-Subproject commit b3af2a3501b2357c3467b7abb295ae75151db186
+Subproject commit 08c2eb0c608a8062ff1810907851aca20a09826a