Avoid compiler warnings (#518)

* Set `-lto=auto` to avoid a warning about [falling back to serialized compilation (`cpp/mrc/CMakeLists.txt`) * Ensure we never pass a capacity value larger than `PTRDIFF_MAX` to `boost::fibers::buffered_channel` avoids a -Walloc-size-larger-than compiler warning (`cpp/mrc/include/mrc/channel/buffered_channel.hpp`). * Ensure tags are fetched for local CI builds (fixes version number for local conda builds). Everything else is an IWYU fix Part of nv-morpheus/Morpheus#1988 Authors: - David Gardner (https://github.com/dagardner-nv) Approvers: - Michael Demoret (https://github.com/mdemoret-nv) URL: #518
nv-morpheus · Nov 20, 2024 · 10439b3 · 10439b3
1 parent 0b9cede
commit 10439b3
Show file tree

Hide file tree

Showing 29 changed files with 56 additions and 31 deletions.
diff --git a/ci/scripts/bootstrap_local_ci.sh b/ci/scripts/bootstrap_local_ci.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-# SPDX-FileCopyrightText: Copyright (c) 2022-2023, NVIDIA CORPORATION & AFFILIATES. All rights reserved.
+# SPDX-FileCopyrightText: Copyright (c) 2022-2024, NVIDIA CORPORATION & AFFILIATES. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -21,6 +21,7 @@ cd mrc/
 git checkout ${GIT_BRANCH}
 git pull
 git checkout ${GIT_COMMIT}
+git fetch --tags
 
 export MRC_ROOT=$(pwd)
 export WORKSPACE=${MRC_ROOT}

diff --git a/ci/scripts/github/conda.sh b/ci/scripts/github/conda.sh
@@ -1,5 +1,5 @@
 #!/usr/bin/bash
-# SPDX-FileCopyrightText: Copyright (c) 2022-2023, NVIDIA CORPORATION & AFFILIATES. All rights reserved.
+# SPDX-FileCopyrightText: Copyright (c) 2022-2024, NVIDIA CORPORATION & AFFILIATES. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -19,6 +19,8 @@ set -e
 CI_SCRIPT_ARGS="$@"
 source ${WORKSPACE}/ci/scripts/github/common.sh
 
+fetch_base_branch
+
 # Its important that we are in the base environment for the build
 rapids-logger "Activating Base Conda Environment"
 

diff --git a/ci/scripts/run_ci_local.sh b/ci/scripts/run_ci_local.sh
@@ -59,7 +59,7 @@ GIT_COMMIT=$(git log -n 1 --pretty=format:%H)
 
 BASE_LOCAL_CI_TMP=${BASE_LOCAL_CI_TMP:-${MRC_ROOT}/.tmp/local_ci_tmp}
 CONTAINER_VER=${CONTAINER_VER:-241002}
-CUDA_VER=${CUDA_VER:-12.1}
+CUDA_VER=${CUDA_VER:-12.5}
 DOCKER_EXTRA_ARGS=${DOCKER_EXTRA_ARGS:-""}
 
 BUILD_CONTAINER="nvcr.io/ea-nvidia-morpheus/morpheus:mrc-ci-build-${CONTAINER_VER}"

diff --git a/cpp/mrc/CMakeLists.txt b/cpp/mrc/CMakeLists.txt
@@ -208,6 +208,11 @@ endif()
 
 target_compile_features(libmrc PUBLIC cxx_std_20)
 
+# Avoid GCC warning from the lto-wrapper about serial compilation
+if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
+  target_link_options(libmrc PUBLIC "-flto=auto")
+endif()
+
 set_target_properties(libmrc PROPERTIES OUTPUT_NAME ${PROJECT_NAME})
 
 # Generates an include file for specifying external linkage since everything is hidden by default

diff --git a/cpp/mrc/benchmarks/bench_baselines.cpp b/cpp/mrc/benchmarks/bench_baselines.cpp
@@ -21,6 +21,7 @@
 #include <benchmark/benchmark.h>
 #include <rxcpp/rx.hpp>
 
+#include <algorithm>
 #include <chrono>
 #include <cstddef>
 #include <iostream>

diff --git a/cpp/mrc/benchmarks/bench_segment.cpp b/cpp/mrc/benchmarks/bench_segment.cpp
@@ -27,6 +27,7 @@
 #include <nlohmann/json.hpp>
 #include <rxcpp/rx.hpp>
 
+#include <algorithm>
 #include <chrono>
 #include <cstddef>
 #include <iostream>

diff --git a/cpp/mrc/include/mrc/benchmarking/tracer.hpp b/cpp/mrc/include/mrc/benchmarking/tracer.hpp
@@ -1,5 +1,5 @@
 /*
- * SPDX-FileCopyrightText: Copyright (c) 2021-2023, NVIDIA CORPORATION & AFFILIATES. All rights reserved.
+ * SPDX-FileCopyrightText: Copyright (c) 2021-2024, NVIDIA CORPORATION & AFFILIATES. All rights reserved.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -22,7 +22,6 @@
 #include <glog/logging.h>
 #include <nlohmann/json.hpp>
 
-#include <array>
 #include <chrono>
 #include <cstddef>
 #include <map>
@@ -31,6 +30,7 @@
 #include <string>
 #include <tuple>
 #include <type_traits>
+#include <utility>
 #include <vector>
 
 // IWYU pragma: no_include <compare> (Issues with this header)

diff --git a/cpp/mrc/include/mrc/channel/buffered_channel.hpp b/cpp/mrc/include/mrc/channel/buffered_channel.hpp
@@ -1,5 +1,5 @@
 /*
- * SPDX-FileCopyrightText: Copyright (c) 2021-2023, NVIDIA CORPORATION & AFFILIATES. All rights reserved.
+ * SPDX-FileCopyrightText: Copyright (c) 2021-2024, NVIDIA CORPORATION & AFFILIATES. All rights reserved.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -22,6 +22,10 @@
 #include <boost/fiber/buffered_channel.hpp>
 #include <boost/fiber/channel_op_status.hpp>
 
+#include <algorithm>  // for std::min
+#include <cstddef>    // for std::ptrdiff_t, std::size_t
+#include <limits>     // for std::numeric_limits
+
 namespace mrc::channel {
 
 template <typename T>
@@ -30,7 +34,11 @@ class BufferedChannel final : public Channel<T>
     using status_t = boost::fibers::channel_op_status;
 
   public:
-    BufferedChannel(std::size_t buffer_size = default_channel_size()) : m_channel(buffer_size) {}
+    BufferedChannel(std::size_t buffer_size = default_channel_size()) :
+      // This avoids a Walloc-size-larger-than warning about potentially allocating a size larger than PTRDIFF_MAX
+      m_channel(std::min(static_cast<std::size_t>(std::numeric_limits<ptrdiff_t>::max()), buffer_size))
+    {}
+
     ~BufferedChannel() final = default;
 
   private:

diff --git a/cpp/mrc/include/mrc/modules/module_registry.hpp b/cpp/mrc/include/mrc/modules/module_registry.hpp
@@ -1,5 +1,5 @@
 /*
- * SPDX-FileCopyrightText: Copyright (c) 2021-2023, NVIDIA CORPORATION & AFFILIATES. All rights reserved.
+ * SPDX-FileCopyrightText: Copyright (c) 2021-2024, NVIDIA CORPORATION & AFFILIATES. All rights reserved.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -19,6 +19,7 @@
 
 #include <nlohmann/json.hpp>
 
+#include <algorithm>
 #include <functional>
 #include <map>
 #include <memory>

diff --git a/cpp/mrc/include/mrc/utils/type_utils.hpp b/cpp/mrc/include/mrc/utils/type_utils.hpp
@@ -19,12 +19,13 @@
 
 #include <boost/type_index.hpp>
 
-#include <array>
 #include <climits>
 #include <cstddef>
 #include <cstdint>
 #include <string>
+#include <type_traits>
 #include <typeindex>
+#include <utility>
 #include <variant>
 
 namespace mrc {

diff --git a/cpp/mrc/src/internal/codable/codable_storage.cpp b/cpp/mrc/src/internal/codable/codable_storage.cpp
@@ -1,5 +1,5 @@
 /*
- * SPDX-FileCopyrightText: Copyright (c) 2021-2023, NVIDIA CORPORATION & AFFILIATES. All rights reserved.
+ * SPDX-FileCopyrightText: Copyright (c) 2021-2024, NVIDIA CORPORATION & AFFILIATES. All rights reserved.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -36,6 +36,7 @@
 #include <glog/logging.h>
 #include <google/protobuf/any.pb.h>
 
+#include <algorithm>
 #include <cstdint>
 #include <optional>
 #include <ostream>

diff --git a/cpp/mrc/src/internal/control_plane/server/connection_manager.cpp b/cpp/mrc/src/internal/control_plane/server/connection_manager.cpp
@@ -1,5 +1,5 @@
 /*
- * SPDX-FileCopyrightText: Copyright (c) 2021-2023, NVIDIA CORPORATION & AFFILIATES. All rights reserved.
+ * SPDX-FileCopyrightText: Copyright (c) 2021-2024, NVIDIA CORPORATION & AFFILIATES. All rights reserved.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -27,6 +27,7 @@
 #include <glog/logging.h>
 #include <google/protobuf/any.pb.h>
 
+#include <algorithm>
 #include <sstream>
 #include <utility>
 

diff --git a/cpp/mrc/src/internal/memory/device_resources.cpp b/cpp/mrc/src/internal/memory/device_resources.cpp
@@ -1,5 +1,5 @@
 /*
- * SPDX-FileCopyrightText: Copyright (c) 2021-2023, NVIDIA CORPORATION & AFFILIATES. All rights reserved.
+ * SPDX-FileCopyrightText: Copyright (c) 2021-2024, NVIDIA CORPORATION & AFFILIATES. All rights reserved.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -39,7 +39,6 @@
 
 #include <sstream>
 #include <string>
-#include <thread>
 #include <utility>
 
 namespace mrc::memory {

diff --git a/cpp/mrc/src/internal/memory/host_resources.cpp b/cpp/mrc/src/internal/memory/host_resources.cpp
@@ -1,5 +1,5 @@
 /*
- * SPDX-FileCopyrightText: Copyright (c) 2021-2023, NVIDIA CORPORATION & AFFILIATES. All rights reserved.
+ * SPDX-FileCopyrightText: Copyright (c) 2021-2024, NVIDIA CORPORATION & AFFILIATES. All rights reserved.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -40,7 +40,6 @@
 #include <memory>
 #include <ostream>
 #include <string>
-#include <thread>
 #include <utility>
 #include <vector>
 

diff --git a/cpp/mrc/src/public/benchmarking/tracer.cpp b/cpp/mrc/src/public/benchmarking/tracer.cpp
@@ -1,5 +1,5 @@
 /*
- * SPDX-FileCopyrightText: Copyright (c) 2021-2023, NVIDIA CORPORATION & AFFILIATES. All rights reserved.
+ * SPDX-FileCopyrightText: Copyright (c) 2021-2024, NVIDIA CORPORATION & AFFILIATES. All rights reserved.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -21,6 +21,7 @@
 
 #include <nlohmann/json.hpp>
 
+#include <algorithm>
 #include <mutex>
 
 namespace mrc::benchmarking {

diff --git a/cpp/mrc/src/public/core/logging.cpp b/cpp/mrc/src/public/core/logging.cpp
@@ -1,5 +1,5 @@
 /*
- * SPDX-FileCopyrightText: Copyright (c) 2022-2023, NVIDIA CORPORATION & AFFILIATES. All rights reserved.
+ * SPDX-FileCopyrightText: Copyright (c) 2022-2024, NVIDIA CORPORATION & AFFILIATES. All rights reserved.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -17,6 +17,8 @@
 
 #include "mrc/core/logging.hpp"
 
+#include <glog/flags.h>
+
 #include <atomic>
 
 namespace {

diff --git a/cpp/mrc/src/tests/test_control_plane_components.cpp b/cpp/mrc/src/tests/test_control_plane_components.cpp
@@ -1,5 +1,5 @@
 /*
- * SPDX-FileCopyrightText: Copyright (c) 2021-2023, NVIDIA CORPORATION & AFFILIATES. All rights reserved.
+ * SPDX-FileCopyrightText: Copyright (c) 2021-2024, NVIDIA CORPORATION & AFFILIATES. All rights reserved.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -23,6 +23,7 @@
 
 #include <gtest/gtest.h>
 
+#include <algorithm>
 #include <atomic>
 #include <cstddef>
 #include <cstdint>

diff --git a/cpp/mrc/src/tests/test_memory.cpp b/cpp/mrc/src/tests/test_memory.cpp
@@ -1,5 +1,5 @@
 /*
- * SPDX-FileCopyrightText: Copyright (c) 2021-2023, NVIDIA CORPORATION & AFFILIATES. All rights reserved.
+ * SPDX-FileCopyrightText: Copyright (c) 2021-2024, NVIDIA CORPORATION & AFFILIATES. All rights reserved.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -42,7 +42,6 @@
 #include <optional>
 #include <ostream>
 #include <string>
-#include <thread>
 #include <utility>
 #include <vector>
 

diff --git a/cpp/mrc/src/tests/test_next.cpp b/cpp/mrc/src/tests/test_next.cpp
@@ -1,5 +1,5 @@
 /*
- * SPDX-FileCopyrightText: Copyright (c) 2021-2023, NVIDIA CORPORATION & AFFILIATES. All rights reserved.
+ * SPDX-FileCopyrightText: Copyright (c) 2021-2024, NVIDIA CORPORATION & AFFILIATES. All rights reserved.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -25,11 +25,11 @@
 #include "mrc/channel/ingress.hpp"
 #include "mrc/data/reusable_pool.hpp"
 #include "mrc/edge/edge_builder.hpp"
-#include "mrc/edge/edge_writable.hpp"
 #include "mrc/node/generic_node.hpp"
 #include "mrc/node/generic_sink.hpp"
 #include "mrc/node/generic_source.hpp"
 #include "mrc/node/operators/conditional.hpp"
+#include "mrc/node/operators/router.hpp"
 #include "mrc/node/readable_endpoint.hpp"
 #include "mrc/node/rx_execute.hpp"
 #include "mrc/node/rx_node.hpp"

diff --git a/cpp/mrc/src/tests/test_ranges.cpp b/cpp/mrc/src/tests/test_ranges.cpp
@@ -1,5 +1,5 @@
 /*
- * SPDX-FileCopyrightText: Copyright (c) 2021-2023, NVIDIA CORPORATION & AFFILIATES. All rights reserved.
+ * SPDX-FileCopyrightText: Copyright (c) 2021-2024, NVIDIA CORPORATION & AFFILIATES. All rights reserved.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -19,6 +19,7 @@
 
 #include <gtest/gtest.h>
 
+#include <algorithm>
 #include <utility>
 #include <vector>
 

diff --git a/cpp/mrc/tests/logging/test_logging.cpp b/cpp/mrc/tests/logging/test_logging.cpp
@@ -1,5 +1,5 @@
 /*
- * SPDX-FileCopyrightText: Copyright (c) 2021-2023, NVIDIA CORPORATION & AFFILIATES. All rights reserved.
+ * SPDX-FileCopyrightText: Copyright (c) 2021-2024, NVIDIA CORPORATION & AFFILIATES. All rights reserved.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -19,6 +19,7 @@
 
 #include "mrc/core/logging.hpp"
 
+#include <glog/flags.h>
 #include <glog/logging.h>
 
 namespace mrc {

diff --git a/python/mrc/_pymrc/include/pymrc/types.hpp b/python/mrc/_pymrc/include/pymrc/types.hpp
@@ -22,6 +22,7 @@
 #include "mrc/segment/object.hpp"
 
 #include <nlohmann/json_fwd.hpp>
+#include <pybind11/pytypes.h>
 #include <rxcpp/rx.hpp>
 
 #include <functional>  // for function

diff --git a/python/mrc/_pymrc/include/pymrc/utilities/object_cache.hpp b/python/mrc/_pymrc/include/pymrc/utilities/object_cache.hpp
@@ -23,7 +23,6 @@
 
 #include <cstddef>
 #include <functional>
-#include <map>
 #include <memory>
 #include <mutex>
 #include <string>

diff --git a/python/mrc/_pymrc/include/pymrc/utilities/object_wrappers.hpp b/python/mrc/_pymrc/include/pymrc/utilities/object_wrappers.hpp
@@ -1,5 +1,5 @@
 /*
- * SPDX-FileCopyrightText: Copyright (c) 2021-2023, NVIDIA CORPORATION & AFFILIATES. All rights reserved.
+ * SPDX-FileCopyrightText: Copyright (c) 2021-2024, NVIDIA CORPORATION & AFFILIATES. All rights reserved.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -18,7 +18,6 @@
 #pragma once
 
 #include <pybind11/cast.h>
-#include <pybind11/detail/descr.h>
 #include <pybind11/pybind11.h>
 #include <pybind11/pytypes.h>
 

diff --git a/python/mrc/_pymrc/src/utilities/object_cache.cpp b/python/mrc/_pymrc/src/utilities/object_cache.cpp
@@ -24,6 +24,7 @@
 #include <pybind11/pytypes.h>
 #include <pylifecycle.h>
 
+#include <map>
 #include <mutex>
 #include <ostream>
 #include <stdexcept>

diff --git a/python/mrc/_pymrc/src/utils.cpp b/python/mrc/_pymrc/src/utils.cpp
@@ -22,7 +22,6 @@
 #include <glog/logging.h>
 #include <nlohmann/json.hpp>
 #include <pybind11/cast.h>
-#include <pybind11/detail/internals.h>
 #include <pybind11/pybind11.h>
 #include <pybind11/pytypes.h>
 #include <pyerrors.h>

diff --git a/python/mrc/_pymrc/tests/test_object_cache.cpp b/python/mrc/_pymrc/tests/test_object_cache.cpp
@@ -18,6 +18,7 @@
 #include "test_pymrc.hpp"
 
 #include "pymrc/utilities/object_cache.hpp"
+#include "pymrc/utilities/object_wrappers.hpp"
 
 #include <gtest/gtest.h>
 #include <pybind11/cast.h>

diff --git a/python/mrc/benchmarking/trace_statistics.cpp b/python/mrc/benchmarking/trace_statistics.cpp
@@ -1,5 +1,5 @@
 /*
- * SPDX-FileCopyrightText: Copyright (c) 2021-2023, NVIDIA CORPORATION & AFFILIATES. All rights reserved.
+ * SPDX-FileCopyrightText: Copyright (c) 2021-2024, NVIDIA CORPORATION & AFFILIATES. All rights reserved.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -19,7 +19,6 @@
 
 #include "pymrc/utils.hpp"
 
-#include <nlohmann/json.hpp>
 #include <pybind11/cast.h>
 #include <pybind11/pybind11.h>
 #include <pybind11/pytypes.h>