Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Adding an update-version.sh script and CI check to keep versions up to date #314

Merged
merged 4 commits into from
Apr 13, 2023
Merged

Adding an update-version.sh script and CI check to keep versions up to date #314

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9332beb
Adding an `update-version.sh` script and CI check to run on every com…
mdemoret-nv Apr 12, 2023
64d072a
Fixing check found by CI
mdemoret-nv Apr 12, 2023
2c39833
Updating to use merged utilities PR.
mdemoret-nv Apr 13, 2023
9789611
Merge branch 'branch-23.07' into mdd_update-versions
mdemoret-nv Apr 13, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Merge branch 'branch-23.07' into mdd_update-versions
  • Loading branch information
@mdemoret-nv
mdemoret-nv committed Apr 13, 2023
commit 9789611fbab28a93c3ad06ea6d3166d054622092
4 changes: 2 additions & 2 deletions .github/workflows/ci_pipe.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ jobs:
test:
name: Test
needs: [build]
runs-on: [self-hosted, linux, amd64, gpu-v100-525-1]
runs-on: [self-hosted, linux, amd64, gpu-v100-latest-1]
timeout-minutes: 60
container:
credentials:
Expand Down Expand Up @@ -171,7 +171,7 @@ jobs:

codecov:
name: Code Coverage
runs-on: [self-hosted, linux, amd64, gpu-v100-525-1]
runs-on: [self-hosted, linux, amd64, gpu-v100-latest-1]
timeout-minutes: 60
container:
credentials:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/pull_request.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,8 @@ jobs:
with:
run_check: ${{ startsWith(github.ref_name, 'pull-request/') }}
run_package_conda: ${{ !startsWith(github.ref_name, 'pull-request/') }}
container: nvcr.io/ea-nvidia-morpheus/morpheus:mrc-ci-driver-230410
test_container: nvcr.io/ea-nvidia-morpheus/morpheus:mrc-ci-test-230410
container: nvcr.io/ea-nvidia-morpheus/morpheus:mrc-ci-build-230412
test_container: nvcr.io/ea-nvidia-morpheus/morpheus:mrc-ci-test-230412
secrets:
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
CONDA_TOKEN: ${{ secrets.CONDA_TOKEN }}
Expand Down
13 changes: 4 additions & 9 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,16 +55,11 @@ ENV CMAKE_CUDA_COMPILER_LAUNCHER=
ENV CMAKE_CXX_COMPILER_LAUNCHER=
ENV CMAKE_C_COMPILER_LAUNCHER=

# ============ driver ==================
FROM base as driver
# ============ build ==================
FROM base as build

RUN --mount=type=cache,target=/var/cache/apt \
apt update && \
DEBIAN_FRONTEND=noninteractive TZ=Etc/UTC \
apt install --no-install-recommends -y \
libnvidia-compute-525 \
&& \
rm -rf /var/lib/apt/lists/*
# Add any build only dependencies here. For now there is none but we need the
# target to get the CI runner build scripts to work

# ============ test ==================
FROM base as test
Expand Down
8 changes: 1 addition & 7 deletions cpp/mrc/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,6 @@ target_link_libraries(libmrc
mrc_protos
mrc_architect_protos
rmm::rmm
CUDA::nvml
CUDA::cudart
rxcpp::rxcpp
glog::glog
Expand All @@ -180,8 +179,8 @@ target_link_libraries(libmrc
PRIVATE
hwloc::hwloc
prometheus-cpp::core # private in MR !199
ucx::ucs
ucx::ucp
ucx::ucs
)

target_include_directories(libmrc
Expand All @@ -206,10 +205,6 @@ target_compile_features(libmrc PUBLIC cxx_std_20)

set_target_properties(libmrc PROPERTIES OUTPUT_NAME ${PROJECT_NAME})

# Finally, set the install RPATH to include the stubs folder for CUDA::nvml. If thats made private, this can be removed
set_target_properties(libmrc PROPERTIES INSTALL_RPATH
"${CMAKE_INSTALL_PREFIX}/lib:\$ORIGIN:${CMAKE_INSTALL_PREFIX}/lib/stubs")

# ##################################################################################################
# - install targets --------------------------------------------------------------------------------

Expand Down Expand Up @@ -277,4 +272,3 @@ rapids_export(BUILD ${PROJECT_NAME}
DOCUMENTATION doc_string
FINAL_CODE_BLOCK code_string
)

Loading
You are viewing a condensed version of this merge commit. You can view the full changes here.