Style fixes

nv-morpheus · May 19, 2023 · 1b4fbc1 · 1b4fbc1
1 parent ac4eeb4
commit 1b4fbc1
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 16 deletions.
diff --git a/ci/scripts/cpp_checks.sh b/ci/scripts/cpp_checks.sh
@@ -80,9 +80,14 @@ if [[ -n "${MORPHEUS_MODIFIED_FILES}" ]]; then
 
    # Include What You Use
    if [[ "${SKIP_IWYU}" == "" ]]; then
-      IWYU_DIRS="morpheus"
+      IWYU_MODIFIED_FILES=( "${MORPHEUS_MODIFIED_FILES[@]}" )
+
+      # Remove .h, .hpp, and .cu files from the modified list
+      shopt -s extglob
+      IWYU_MODIFIED_FILES=( "${IWYU_MODIFIED_FILES[@]/*.@(h|hpp|cu)/}" )
+
       NUM_PROC=$(get_num_proc)
-      IWYU_OUTPUT=`${IWYU_TOOL} -p ${BUILD_DIR} -j ${NUM_PROC} ${IWYU_DIRS} 2>&1`
+      IWYU_OUTPUT=`${IWYU_TOOL} -p ${BUILD_DIR} -j ${NUM_PROC} ${IWYU_MODIFIED_FILES[@]} 2>&1`
       IWYU_RETVAL=$?
    fi
 else

diff --git a/cmake/package_config/bsd/Configure_bsd.cmake b/cmake/package_config/bsd/Configure_bsd.cmake
@@ -81,7 +81,8 @@ function(morpheus_configure_libbsd)
       LOG_BUILD           TRUE
       LOG_INSTALL         TRUE
       # Add a target for configuring to allow for style checks on source code
-      STEP_TARGETS      install
+      STEP_TARGETS        install
+      DEPENDS             md::md
     )
 
     # Install only the headers
@@ -90,8 +91,6 @@ function(morpheus_configure_libbsd)
       TYPE INCLUDE
     )
 
-    add_dependencies(bsd md::md)
-
     add_library(bsd::bsd STATIC IMPORTED GLOBAL)
     set_target_properties(bsd::bsd
       PROPERTIES

diff --git a/cmake/package_config/md/Configure_md.cmake b/cmake/package_config/md/Configure_md.cmake
@@ -74,7 +74,7 @@ function(morpheus_configure_libmd)
       LOG_BUILD           TRUE
       LOG_INSTALL         TRUE
       # Add a target for configuring to allow for style checks on source code
-      STEP_TARGETS      install
+      STEP_TARGETS        install
     )
 
     # Install only the headers

diff --git a/morpheus/_lib/doca/module.cpp b/morpheus/_lib/doca/module.cpp
@@ -17,7 +17,7 @@
 
 #include "doca_source.hpp"
 
-#include <mrc/segment/builder.hpp>  // IWYU Pragma: keep
+#include <mrc/segment/builder.hpp>  // IWYU pragma: keep
 #include <mrc/segment/object.hpp>
 #include <pybind11/attr.h>
 #include <pybind11/pybind11.h>  // for str_attr_accessor

diff --git a/morpheus/_lib/doca/src/doca_context.cpp b/morpheus/_lib/doca/src/doca_context.cpp
@@ -133,14 +133,14 @@ doca_flow_port* init_doca_flow(uint16_t port_id, uint8_t rxq_num)
     doca_flow_port_cfg port_cfg = {0};
     doca_flow_port* df_port;
     doca_flow_cfg rxq_flow_cfg = {0};
-    rte_eth_dev_info dev_info  = {0};
+    rte_eth_dev_info dev_info  = {nullptr};
     rte_eth_conf eth_conf      = {
              .rxmode =
-            {
+                 {
                      .mtu = 2048, /* Not really used, just to initialize DPDK */
             },
              .txmode =
-            {
+                 {
                      .offloads = RTE_ETH_TX_OFFLOAD_IPV4_CKSUM | RTE_ETH_TX_OFFLOAD_UDP_CKSUM | RTE_ETH_TX_OFFLOAD_TCP_CKSUM,
             },
     };

diff --git a/morpheus/_lib/doca/src/rte_context.cpp b/morpheus/_lib/doca/src/rte_context.cpp
@@ -38,12 +38,6 @@ RTEContext::RTEContext()
     argv.push_back(a_flag.begin());
     argv.push_back(fake_pci_address.begin());
 
-    // argv.push_back("-l");
-    // argv.push_back("0,1,2,3,4");
-
-    // argv.push_back("--log-level");
-    // argv.push_back("eal,8");
-
     RTE_TRY(rte_eal_init(argv.size(), argv.data()));
 }