From fdb256c55891c52931ec4dfa317a974fcf96067d Mon Sep 17 00:00:00 2001 From: David Gardner Date: Fri, 17 Jan 2025 11:47:22 -0800 Subject: [PATCH 1/4] Track cccl 2.7 ref: https://github.com/rapidsai/build-planning/issues/115 --- .../package_config/cccl/Configure_cccl.cmake | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/cmake/morpheus_utils/package_config/cccl/Configure_cccl.cmake b/cmake/morpheus_utils/package_config/cccl/Configure_cccl.cmake index 50f2538..8c5a5ac 100644 --- a/cmake/morpheus_utils/package_config/cccl/Configure_cccl.cmake +++ b/cmake/morpheus_utils/package_config/cccl/Configure_cccl.cmake @@ -1,4 +1,4 @@ -#============================================================================= +# ============================================================================= # SPDX-FileCopyrightText: Copyright (c) 2020-2022, NVIDIA CORPORATION & AFFILIATES. All rights reserved. # SPDX-License-Identifier: Apache-2.0 # @@ -6,14 +6,14 @@ # 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 +# 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. -#============================================================================= +# ============================================================================= include_guard(GLOBAL) @@ -21,7 +21,7 @@ function(morpheus_utils_configure_cccl) list(APPEND CMAKE_MESSAGE_CONTEXT "cccl") morpheus_utils_assert_cpm_initialized() - set(cccl_VERSION "2.5.0" CACHE STRING "Version of cccl to use") + set(cccl_VERSION "2.7.0" CACHE STRING "Version of cccl to use") include("${rapids-cmake-dir}/cpm/cccl.cmake") @@ -35,6 +35,8 @@ function(morpheus_utils_configure_cccl) ${PROJECT_NAME}-exports INSTALL_EXPORT_SET ${PROJECT_NAME}-exports + GIT_TAG "83028fcdcfa8de51ab359e61ce07198a6003a65e" + GIT_SHALLOW FALSE ) list(POP_BACK CMAKE_MESSAGE_CONTEXT) From 4b25ee425e91bfd0b6a4a326e903a05fa6d76e3f Mon Sep 17 00:00:00 2001 From: David Gardner Date: Fri, 17 Jan 2025 12:30:00 -0800 Subject: [PATCH 2/4] DO NOT MERGE: Use my mrc fork/branch --- .../package_config/mrc/Configure_mrc.cmake | 37 +++++++++---------- 1 file changed, 18 insertions(+), 19 deletions(-) diff --git a/cmake/morpheus_utils/package_config/mrc/Configure_mrc.cmake b/cmake/morpheus_utils/package_config/mrc/Configure_mrc.cmake index 8d6c9dd..111f2ba 100644 --- a/cmake/morpheus_utils/package_config/mrc/Configure_mrc.cmake +++ b/cmake/morpheus_utils/package_config/mrc/Configure_mrc.cmake @@ -1,19 +1,18 @@ -#============================================================================= +# ============================================================================= # Copyright (c) 2020-2022, NVIDIA CORPORATION. # # 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 +# 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. -#============================================================================= - +# ============================================================================= include_guard(GLOBAL) @@ -36,21 +35,21 @@ function(morpheus_utils_configure_mrc) INSTALL_EXPORT_SET ${PROJECT_NAME}-exports CPM_ARGS - GIT_REPOSITORY https://github.com/nv-morpheus/MRC.git - GIT_TAG branch-${MRC_VERSION} - GIT_SHALLOW FALSE - OPTIONS "MRC_BUILD_EXAMPLES OFF" - "MRC_BUILD_TESTS OFF" - "MRC_BUILD_BENCHMARKS OFF" - "MRC_BUILD_PYTHON ON" - "MRC_ENABLE_XTENSOR ON" - "MRC_ENABLE_MATX ON" - "MRC_USE_CONDA ${MORPHEUS_USE_CONDA}" - "MRC_USE_CCACHE ${MORPHEUS_USE_CCACHE}" - "MRC_USE_CLANG_TIDY ${MORPHEUS_USE_CLANG_TIDY}" - "MRC_PYTHON_INPLACE_BUILD OFF" - "MRC_PYTHON_PERFORM_INSTALL ON" - "MRC_PYTHON_BUILD_STUBS ${${PROJECT_NAME_UPPER}_PYTHON_BUILD_STUBS}" + GIT_REPOSITORY git@github.com:dagardner-nv/MRC.git # temp using my fork do not merge + GIT_TAG david-25.02-x-25.02 + GIT_SHALLOW FALSE + OPTIONS "MRC_BUILD_EXAMPLES OFF" + "MRC_BUILD_TESTS OFF" + "MRC_BUILD_BENCHMARKS OFF" + "MRC_BUILD_PYTHON ON" + "MRC_ENABLE_XTENSOR ON" + "MRC_ENABLE_MATX ON" + "MRC_USE_CONDA ${MORPHEUS_USE_CONDA}" + "MRC_USE_CCACHE ${MORPHEUS_USE_CCACHE}" + "MRC_USE_CLANG_TIDY ${MORPHEUS_USE_CLANG_TIDY}" + "MRC_PYTHON_INPLACE_BUILD OFF" + "MRC_PYTHON_PERFORM_INSTALL ON" + "MRC_PYTHON_BUILD_STUBS ${${PROJECT_NAME_UPPER}_PYTHON_BUILD_STUBS}" ) list(POP_BACK CMAKE_MESSAGE_CONTEXT) From b5bde28ea3ea59cb772c456e82edb9dad64ee292 Mon Sep 17 00:00:00 2001 From: David Gardner Date: Fri, 17 Jan 2025 15:26:53 -0800 Subject: [PATCH 3/4] Cleanup formatting --- .../package_config/cccl/Configure_cccl.cmake | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/cmake/morpheus_utils/package_config/cccl/Configure_cccl.cmake b/cmake/morpheus_utils/package_config/cccl/Configure_cccl.cmake index 8c5a5ac..cc90ffc 100644 --- a/cmake/morpheus_utils/package_config/cccl/Configure_cccl.cmake +++ b/cmake/morpheus_utils/package_config/cccl/Configure_cccl.cmake @@ -1,4 +1,4 @@ -# ============================================================================= +#============================================================================= # SPDX-FileCopyrightText: Copyright (c) 2020-2022, NVIDIA CORPORATION & AFFILIATES. All rights reserved. # SPDX-License-Identifier: Apache-2.0 # @@ -6,14 +6,14 @@ # 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 +# 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. -# ============================================================================= +#============================================================================= include_guard(GLOBAL) @@ -35,6 +35,7 @@ function(morpheus_utils_configure_cccl) ${PROJECT_NAME}-exports INSTALL_EXPORT_SET ${PROJECT_NAME}-exports + # Set to match changes in https://github.com/rapidsai/rapids-cmake/pull/710/files GIT_TAG "83028fcdcfa8de51ab359e61ce07198a6003a65e" GIT_SHALLOW FALSE ) From d5638dc6200949aa6d5851a3626484c5eaa550e4 Mon Sep 17 00:00:00 2001 From: David Gardner Date: Fri, 17 Jan 2025 15:27:38 -0800 Subject: [PATCH 4/4] Revert temporary changes --- .../package_config/mrc/Configure_mrc.cmake | 37 ++++++++++--------- 1 file changed, 19 insertions(+), 18 deletions(-) diff --git a/cmake/morpheus_utils/package_config/mrc/Configure_mrc.cmake b/cmake/morpheus_utils/package_config/mrc/Configure_mrc.cmake index 111f2ba..8d6c9dd 100644 --- a/cmake/morpheus_utils/package_config/mrc/Configure_mrc.cmake +++ b/cmake/morpheus_utils/package_config/mrc/Configure_mrc.cmake @@ -1,18 +1,19 @@ -# ============================================================================= +#============================================================================= # Copyright (c) 2020-2022, NVIDIA CORPORATION. # # 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 +# 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. -# ============================================================================= +#============================================================================= + include_guard(GLOBAL) @@ -35,21 +36,21 @@ function(morpheus_utils_configure_mrc) INSTALL_EXPORT_SET ${PROJECT_NAME}-exports CPM_ARGS - GIT_REPOSITORY git@github.com:dagardner-nv/MRC.git # temp using my fork do not merge - GIT_TAG david-25.02-x-25.02 - GIT_SHALLOW FALSE - OPTIONS "MRC_BUILD_EXAMPLES OFF" - "MRC_BUILD_TESTS OFF" - "MRC_BUILD_BENCHMARKS OFF" - "MRC_BUILD_PYTHON ON" - "MRC_ENABLE_XTENSOR ON" - "MRC_ENABLE_MATX ON" - "MRC_USE_CONDA ${MORPHEUS_USE_CONDA}" - "MRC_USE_CCACHE ${MORPHEUS_USE_CCACHE}" - "MRC_USE_CLANG_TIDY ${MORPHEUS_USE_CLANG_TIDY}" - "MRC_PYTHON_INPLACE_BUILD OFF" - "MRC_PYTHON_PERFORM_INSTALL ON" - "MRC_PYTHON_BUILD_STUBS ${${PROJECT_NAME_UPPER}_PYTHON_BUILD_STUBS}" + GIT_REPOSITORY https://github.com/nv-morpheus/MRC.git + GIT_TAG branch-${MRC_VERSION} + GIT_SHALLOW FALSE + OPTIONS "MRC_BUILD_EXAMPLES OFF" + "MRC_BUILD_TESTS OFF" + "MRC_BUILD_BENCHMARKS OFF" + "MRC_BUILD_PYTHON ON" + "MRC_ENABLE_XTENSOR ON" + "MRC_ENABLE_MATX ON" + "MRC_USE_CONDA ${MORPHEUS_USE_CONDA}" + "MRC_USE_CCACHE ${MORPHEUS_USE_CCACHE}" + "MRC_USE_CLANG_TIDY ${MORPHEUS_USE_CLANG_TIDY}" + "MRC_PYTHON_INPLACE_BUILD OFF" + "MRC_PYTHON_PERFORM_INSTALL ON" + "MRC_PYTHON_BUILD_STUBS ${${PROJECT_NAME_UPPER}_PYTHON_BUILD_STUBS}" ) list(POP_BACK CMAKE_MESSAGE_CONTEXT)