Tidy more includes. (#103)

Signed-off-by: Samuel K. Gutierrez <[email protected]>
hpc · Mar 21, 2024 · cdbd0eb · cdbd0eb
1 parent 449cdba
commit cdbd0eb
Show file tree

Hide file tree

Showing 38 changed files with 15 additions and 52 deletions.
diff --git a/src/quo-vadis-mpi.cc b/src/quo-vadis-mpi.cc
@@ -14,10 +14,7 @@
  * @file quo-vadis-mpi.cc
  */
 
-#include "qvi-common.h" // IWYU pragma: keep
-
 #include "quo-vadis-mpi.h"
-
 #include "qvi-context.h"
 #include "qvi-group-mpi.h"
 #include "qvi-zgroup-mpi.h"

diff --git a/src/quo-vadis-process.cc b/src/quo-vadis-process.cc
@@ -11,10 +11,7 @@
  * @file quo-vadis-process.cc
  */
 
-#include "qvi-common.h" // IWYU pragma: keep
-
 #include "quo-vadis-process.h"
-
 #include "qvi-context.h"
 #include "qvi-zgroup-process.h"
 

diff --git a/src/quo-vadis.cc b/src/quo-vadis.cc
@@ -14,8 +14,6 @@
  * @file quo-vadis.cc
  */
 
-#include "qvi-common.h" // IWYU pragma: keep
-
 #include "qvi-context.h" // IWYU pragma: keep
 #include "qvi-scope.h"
 

diff --git a/src/quo-vadisd.cc b/src/quo-vadisd.cc
@@ -1,6 +1,6 @@
 /* -*- Mode: C++; c-basic-offset:4; indent-tabs-mode:nil -*- */
 /*
- * Copyright (c) 2020-2022 Triad National Security, LLC
+ * Copyright (c) 2020-2024 Triad National Security, LLC
  *                         All rights reserved.
  *
  * Copyright (c) 2020-2021 Lawrence Livermore National Security, LLC
@@ -19,7 +19,6 @@
 // TODO(skg)
 // * Add something like QV_SHUTDOWN_ON_DISCONNECT or QV_DAEMON_KEEP_ALIVE
 
-#include "qvi-common.h"
 #include "qvi-utils.h"
 #include "qvi-hwloc.h"
 #include "qvi-line.h"

diff --git a/src/qvi-bbuff.cc b/src/qvi-bbuff.cc
@@ -14,7 +14,6 @@
  * @file qvi-bbuff.cc
  */
 
-#include "qvi-common.h"
 #include "qvi-bbuff.h"
 #include "qvi-utils.h"
 

diff --git a/src/qvi-bind.cc b/src/qvi-bind.cc
@@ -14,7 +14,6 @@
  * @file qvi-bind.cc
  */
 
-#include "qvi-common.h" // IWYU pragma: keep
 #include "qvi-bind.h"
 #include "qvi-utils.h"
 

diff --git a/src/qvi-bind.h b/src/qvi-bind.h
@@ -21,7 +21,6 @@
 
 #include "qvi-common.h" // IWYU pragma: keep
 #include "qvi-task.h"
-#include "qvi-hwloc.h" // IWYU pragma: keep
 #include "qvi-rmi.h"
 
 #ifdef __cplusplus

diff --git a/src/qvi-common.h b/src/qvi-common.h
@@ -22,6 +22,8 @@
 #include "qvi-macros.h"
 #include "quo-vadis.h"
 
+#include "hwloc.h"
+
 #include <assert.h>
 #include <errno.h>
 #include <fcntl.h>

diff --git a/src/qvi-context.cc b/src/qvi-context.cc
@@ -14,7 +14,6 @@
  * @file qvi-context.cc
  */
 
-#include "qvi-common.h" // IWYU pragma: keep
 #include "qvi-context.h"
 #include "qvi-utils.h"
 

diff --git a/src/qvi-context.h b/src/qvi-context.h
@@ -23,7 +23,6 @@
 #define QVI_CONTEXT_H
 
 #include "qvi-common.h" // IWYU pragma: keep
-
 #include "qvi-rmi.h"
 #include "qvi-zgroup.h"
 #include "qvi-bind.h"

diff --git a/src/qvi-group-mpi.cc b/src/qvi-group-mpi.cc
@@ -14,7 +14,6 @@
  * @file qvi-group-mpi.cc
  */
 
-#include "qvi-common.h" // IWYU pragma: keep
 #include "qvi-group-mpi.h"
 
 qvi_group_mpi_s::~qvi_group_mpi_s(void)

diff --git a/src/qvi-group-mpi.h b/src/qvi-group-mpi.h
@@ -1,6 +1,6 @@
 /* -*- Mode: C++; c-basic-offset:4; indent-tabs-mode:nil -*- */
 /*
- * Copyright (c) 2020-2022 Triad National Security, LLC
+ * Copyright (c) 2020-2024 Triad National Security, LLC
  *                         All rights reserved.
  *
  * Copyright (c) 2020-2021 Lawrence Livermore National Security, LLC
@@ -18,6 +18,7 @@
 #ifndef QVI_GROUP_MPI_H
 #define QVI_GROUP_MPI_H
 
+#include "qvi-common.h" // IWYU pragma: keep
 #include "qvi-group.h"
 #include "qvi-mpi.h"
 

diff --git a/src/qvi-group-process.cc b/src/qvi-group-process.cc
@@ -11,7 +11,6 @@
  * @file qvi-group-process.cc
  */
 
-#include "qvi-common.h" // IWYU pragma: keep
 #include "qvi-group-process.h"
 
 qvi_group_process_s::~qvi_group_process_s(void)

diff --git a/src/qvi-group-process.h b/src/qvi-group-process.h
@@ -1,6 +1,6 @@
 /* -*- Mode: C++; c-basic-offset:4; indent-tabs-mode:nil -*- */
 /*
- * Copyright (c) 2020-2022 Triad National Security, LLC
+ * Copyright (c) 2020-2024 Triad National Security, LLC
  *                         All rights reserved.
  *
  * This file is part of the quo-vadis project. See the LICENSE file at the
@@ -15,6 +15,7 @@
 #ifndef QVI_GROUP_PROCESS_H
 #define QVI_GROUP_PROCESS_H
 
+#include "qvi-common.h" // IWYU pragma: keep
 #include "qvi-group.h"
 #include "qvi-process.h"
 

diff --git a/src/qvi-group.cc b/src/qvi-group.cc
@@ -11,7 +11,6 @@
  * @file qvi-group.cc
  */
 
-#include "qvi-common.h" // IWYU pragma: keep
 #include "qvi-group.h"
 #include "qvi-utils.h"
 #include "qvi-log.h"

diff --git a/src/qvi-group.h b/src/qvi-group.h
@@ -1,6 +1,6 @@
 /* -*- Mode: C++; c-basic-offset:4; indent-tabs-mode:nil -*- */
 /*
- * Copyright (c) 2021-2022 Triad National Security, LLC
+ * Copyright (c) 2021-2024 Triad National Security, LLC
  *                         All rights reserved.
  *
  * Copyright (c)      2021 Lawrence Livermore National Security, LLC
@@ -17,6 +17,7 @@
 #ifndef QVI_GROUP_H
 #define QVI_GROUP_H
 
+#include "qvi-common.h" // IWYU pragma: keep
 #include "qvi-bbuff.h"
 #include "qvi-task.h"
 

diff --git a/src/qvi-hwloc.cc b/src/qvi-hwloc.cc
@@ -14,7 +14,6 @@
  * @file qvi-hwloc.cc
  */
 
-#include "qvi-common.h"
 #include "qvi-hwloc.h"
 #include "qvi-utils.h"
 

diff --git a/src/qvi-hwloc.h b/src/qvi-hwloc.h
@@ -20,8 +20,6 @@
 #include "qvi-common.h"
 #include "qvi-task.h"
 
-#include "hwloc.h" // IWYU pragma: keep
-
 #ifdef __cplusplus
 extern "C" {
 #endif

diff --git a/src/qvi-line.cc b/src/qvi-line.cc
@@ -14,11 +14,8 @@
  * More generally, they are types that can be easily serialized.
  */
 
-#include "qvi-common.h" // IWYU pragma: keep
-
 #include "qvi-line.h"
 #include "qvi-bbuff-rmi.h"
-#include "qvi-utils.h" // IWYU pragma: keep
 
 int
 qvi_line_config_new(

diff --git a/src/qvi-line.h b/src/qvi-line.h
@@ -18,7 +18,6 @@
 #define QVI_LINE_H
 
 #include "qvi-common.h" // IWYU pragma: keep
-
 #include "qvi-bbuff.h"
 #include "qvi-hwloc.h"
 

diff --git a/src/qvi-map.h b/src/qvi-map.h
@@ -15,7 +15,6 @@
 #define QVI_MAP_H
 
 #include "qvi-common.h"
-#include "qvi-hwloc.h" // IWYU pragma: keep
 
 /**
  * Modes used to influence how affinity preserving mapping is done.

diff --git a/src/qvi-mpi.cc b/src/qvi-mpi.cc
@@ -14,13 +14,9 @@
  * @file qvi-mpi.cc
  */
 
-#include "qvi-common.h"
-
 #include "qvi-mpi.h"
 #include "qvi-utils.h" // IWYU pragma: keep
 
-#include "mpi.h"
-
 using qvi_mpi_group_tab_t = std::unordered_map<
     qvi_mpi_group_id_t, qvi_mpi_group_t
 >;

diff --git a/src/qvi-mpi.h b/src/qvi-mpi.h
@@ -18,7 +18,6 @@
 #define QVI_MPI_H
 
 #include "qvi-common.h" // IWYU pragma: keep
-
 #include "qvi-task.h"
 #include "qvi-group.h"
 #include "qvi-bbuff.h"

diff --git a/src/qvi-nvml.cc b/src/qvi-nvml.cc
@@ -11,7 +11,6 @@
  * @file qvi-nvml.cc
  */
 
-#include "qvi-common.h" // IWYU pragma: keep
 #include "qvi-nvml.h"
 #include "qvi-hwloc.h"
 

diff --git a/src/qvi-process.cc b/src/qvi-process.cc
@@ -11,7 +11,6 @@
  * @file qvi-process.cc
  */
 
-#include "qvi-common.h"
 #include "qvi-process.h"
 #include "qvi-utils.h"
 #include "qvi-group.h"

diff --git a/src/qvi-process.h b/src/qvi-process.h
@@ -15,7 +15,6 @@
 #define QVI_PROCESS_H
 
 #include "qvi-common.h" // IWYU pragma: keep
-
 #include "qvi-task.h"
 #include "qvi-bbuff.h"
 

diff --git a/src/qvi-rmi.cc b/src/qvi-rmi.cc
@@ -25,7 +25,6 @@
 //
 // TODO(skg) We need to implement timeouts.
 
-#include "qvi-common.h"
 #include "qvi-rmi.h"
 #include "qvi-bbuff-rmi.h"
 #include "qvi-hwpool.h"

diff --git a/src/qvi-rmi.h b/src/qvi-rmi.h
@@ -20,7 +20,6 @@
 #define QVI_RMI_H
 
 #include "qvi-common.h" // IWYU pragma: keep
-
 #include "qvi-line.h"
 #include "qvi-hwloc.h"
 #include "qvi-hwpool.h"

diff --git a/src/qvi-rsmi.cc b/src/qvi-rsmi.cc
@@ -11,7 +11,6 @@
  * @file qvi-rsmi.cc
  */
 
-#include "qvi-common.h" // IWYU pragma: keep
 #include "qvi-rsmi.h"
 #include "qvi-hwloc.h"
 

diff --git a/src/qvi-scope.cc b/src/qvi-scope.cc
@@ -16,8 +16,6 @@
 
 // TODO(skg) Use distance API for device affinity.
 
-#include "qvi-common.h"
-
 #include "qvi-scope.h"
 #include "qvi-rmi.h"
 #include "qvi-hwpool.h"

diff --git a/src/qvi-scope.h b/src/qvi-scope.h
@@ -18,7 +18,6 @@
 #define QVI_SCOPE_H
 
 #include "qvi-common.h" // IWYU pragma: keep
-
 #include "qvi-zgroup.h"
 #include "qvi-rmi.h"
 

diff --git a/src/qvi-task.cc b/src/qvi-task.cc
@@ -14,7 +14,6 @@
  * @file qvi-task.cc
  */
 
-#include "qvi-common.h" // IWYU pragma: keep
 #include "qvi-task.h"
 #include "qvi-utils.h"
 

diff --git a/src/qvi-utils.cc b/src/qvi-utils.cc
@@ -14,7 +14,6 @@
  * @file qvi-utils.cc
  */
 
-#include "qvi-common.h"
 #include "qvi-utils.h"
 
 /** Description of the return codes. */

diff --git a/src/qvi-zgroup-mpi.cc b/src/qvi-zgroup-mpi.cc
@@ -14,8 +14,6 @@
  * @file qvi-zgroup-mpi.cc
  */
 
-#include "qvi-common.h" // IWYU pragma: keep
-
 #include "qvi-zgroup-mpi.h"
 #include "qvi-group-mpi.h"
 

diff --git a/src/qvi-zgroup-mpi.h b/src/qvi-zgroup-mpi.h
@@ -1,6 +1,6 @@
 /* -*- Mode: C++; c-basic-offset:4; indent-tabs-mode:nil -*- */
 /*
- * Copyright (c) 2020-2022 Triad National Security, LLC
+ * Copyright (c) 2020-2024 Triad National Security, LLC
  *                         All rights reserved.
  *
  * Copyright (c) 2020-2021 Lawrence Livermore National Security, LLC
@@ -19,6 +19,7 @@
 #ifndef QVI_ZGROUP_MPI_H
 #define QVI_ZGROUP_MPI_H
 
+#include "qvi-common.h" // IWYU pragma: keep
 #include "qvi-zgroup.h"
 #include "qvi-mpi.h"
 

diff --git a/src/qvi-zgroup-process.cc b/src/qvi-zgroup-process.cc
@@ -11,8 +11,6 @@
  * @file qvi-zgroup-process.cc
  */
 
-#include "qvi-common.h" // IWYU pragma: keep
-
 #include "qvi-zgroup-process.h"
 #include "qvi-group-process.h"
 

diff --git a/src/qvi-zgroup-process.h b/src/qvi-zgroup-process.h
@@ -1,6 +1,6 @@
 /* -*- Mode: C++; c-basic-offset:4; indent-tabs-mode:nil -*- */
 /*
- * Copyright (c) 2020-2022 Triad National Security, LLC
+ * Copyright (c) 2020-2024 Triad National Security, LLC
  *                         All rights reserved.
  *
  * This file is part of the quo-vadis project. See the LICENSE file at the
@@ -17,6 +17,7 @@
 #ifndef QVI_ZGROUP_PROCESS_H
 #define QVI_ZGROUP_PROCESS_H
 
+#include "qvi-common.h" // IWYU pragma: keep
 #include "qvi-zgroup.h"
 #include "qvi-process.h"
 

diff --git a/src/qvi-zgroup.h b/src/qvi-zgroup.h
@@ -1,6 +1,6 @@
 /* -*- Mode: C++; c-basic-offset:4; indent-tabs-mode:nil -*- */
 /*
- * Copyright (c) 2020-2022 Triad National Security, LLC
+ * Copyright (c) 2020-2024 Triad National Security, LLC
  *                         All rights reserved.
  *
  * Copyright (c) 2020-2021 Lawrence Livermore National Security, LLC
@@ -20,6 +20,7 @@
 #ifndef QVI_ZGROUP_H
 #define QVI_ZGROUP_H
 
+#include "qvi-common.h" // IWYU pragma: keep
 #include "qvi-task.h"
 #include "qvi-group.h"