Skip to content

Commit

Permalink
Updating tests to force .pyi files to be committed into the repo
Browse files Browse the repository at this point in the history
  • Loading branch information
mdemoret-nv committed Jul 28, 2023
1 parent 7719873 commit 35887fc
Show file tree
Hide file tree
Showing 3 changed files with 52 additions and 30 deletions.
34 changes: 16 additions & 18 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -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

Expand Down Expand Up @@ -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/
Expand Down
46 changes: 35 additions & 11 deletions ci/scripts/github/test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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"))

Expand Down
2 changes: 1 addition & 1 deletion external/utilities

0 comments on commit 35887fc

Please sign in to comment.