From 3557d95456eb0cc82e0bf5d47dfcdfbff4872c94 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Samuel=20K=2E=20Guti=C3=A9rrez?= Date: Wed, 14 Feb 2024 10:58:45 -0700 Subject: [PATCH] Tidy includes. (#74) Signed-off-by: Samuel K. Gutierrez --- src/quo-vadis-mpi.cc | 5 ++-- src/quo-vadis-process.cc | 5 ++-- src/quo-vadis-thread.cc | 6 ++--- src/quo-vadis.cc | 7 +++--- src/qvi-bbuff.h | 4 ++-- src/qvi-bind.cc | 4 ++-- src/qvi-bind.h | 6 ++--- src/qvi-common.h | 48 +++++++++++++++++++-------------------- src/qvi-context.cc | 4 ++-- src/qvi-context.h | 4 ++-- src/qvi-group-mpi.cc | 4 ++-- src/qvi-group-process.cc | 4 ++-- src/qvi-group-thread.cc | 4 ++-- src/qvi-group.cc | 4 ++-- src/qvi-hwloc.h | 4 ++-- src/qvi-line.cc | 6 ++--- src/qvi-line.h | 4 ++-- src/qvi-log.cc | 4 ++-- src/qvi-map.cc | 3 +-- src/qvi-map.h | 4 ++-- src/qvi-mpi.cc | 4 ++-- src/qvi-mpi.h | 6 ++--- src/qvi-nvml.cc | 5 ++-- src/qvi-nvml.h | 4 ++-- src/qvi-pmi.cc | 4 ++-- src/qvi-pmi.h | 4 ++-- src/qvi-process.cc | 3 +-- src/qvi-process.h | 4 ++-- src/qvi-rmi.h | 4 ++-- src/qvi-rsmi.cc | 4 ++-- src/qvi-rsmi.h | 4 ++-- src/qvi-scope.h | 6 ++--- src/qvi-task.cc | 4 ++-- src/qvi-task.h | 4 ++-- src/qvi-thread.cc | 4 ++-- src/qvi-thread.h | 4 ++-- src/qvi-zgroup-mpi.cc | 4 ++-- src/qvi-zgroup-process.cc | 4 ++-- src/qvi-zgroup-thread.cc | 4 ++-- 39 files changed, 103 insertions(+), 111 deletions(-) diff --git a/src/quo-vadis-mpi.cc b/src/quo-vadis-mpi.cc index 93332257..48339b82 100644 --- a/src/quo-vadis-mpi.cc +++ b/src/quo-vadis-mpi.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 @@ -14,7 +14,7 @@ * @file quo-vadis-mpi.cc */ -#include "qvi-common.h" +#include "qvi-common.h" // IWYU pragma: keep #include "quo-vadis-mpi.h" @@ -22,7 +22,6 @@ #include "qvi-group-mpi.h" #include "qvi-zgroup-mpi.h" #include "qvi-scope.h" -#include "qvi-utils.h" /** * Simply a wrapper for our Fortran interface to C interface. No need to expose diff --git a/src/quo-vadis-process.cc b/src/quo-vadis-process.cc index a114eac7..a7faa1b8 100644 --- a/src/quo-vadis-process.cc +++ b/src/quo-vadis-process.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. * * This file is part of the quo-vadis project. See the LICENSE file at the @@ -11,13 +11,12 @@ * @file quo-vadis-process.cc */ -#include "qvi-common.h" +#include "qvi-common.h" // IWYU pragma: keep #include "quo-vadis-process.h" #include "qvi-context.h" #include "qvi-zgroup-process.h" -#include "qvi-group-process.h" int qv_process_context_free( diff --git a/src/quo-vadis-thread.cc b/src/quo-vadis-thread.cc index aa732e57..0c39bd1b 100644 --- a/src/quo-vadis-thread.cc +++ b/src/quo-vadis-thread.cc @@ -1,6 +1,6 @@ /* -*- Mode: C++; c-basic-offset:4; indent-tabs-mode:nil -*- */ /* - * Copyright (c) 2020-2023 Triad National Security, LLC + * Copyright (c) 2020-2024 Triad National Security, LLC * All rights reserved. * * Copyright (c) Inria 2022-2023. All rights reserved. @@ -14,13 +14,13 @@ * @file quo-vadis-thread.cc */ -#include "qvi-common.h" +#include "qvi-common.h" // IWYU pragma: keep #include "quo-vadis-thread.h" #include "qvi-context.h" #include "qvi-zgroup-thread.h" -#include "qvi-group-thread.h" +#include "qvi-group-thread.h" // IWYU pragma: keep #include "qvi-scope.h" #ifdef OPENMP_FOUND diff --git a/src/quo-vadis.cc b/src/quo-vadis.cc index a8102b92..cc6775ae 100644 --- a/src/quo-vadis.cc +++ b/src/quo-vadis.cc @@ -1,6 +1,6 @@ /* -*- Mode: C++; c-basic-offset:4; indent-tabs-mode:nil -*- */ /* - * Copyright (c) 2020-2023 Triad National Security, LLC + * Copyright (c) 2020-2024 Triad National Security, LLC * All rights reserved. * * Copyright (c) 2020-2021 Lawrence Livermore National Security, LLC @@ -14,11 +14,10 @@ * @file quo-vadis.cc */ -#include "qvi-common.h" +#include "qvi-common.h" // IWYU pragma: keep -#include "qvi-context.h" +#include "qvi-context.h" // IWYU pragma: keep #include "qvi-scope.h" -#include "qvi-utils.h" int qv_version( diff --git a/src/qvi-bbuff.h b/src/qvi-bbuff.h index 9ab407fb..0955baff 100644 --- a/src/qvi-bbuff.h +++ b/src/qvi-bbuff.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,7 +19,7 @@ #ifndef QVI_BBUFF_H #define QVI_BBUFF_H -#include "qvi-common.h" +#include "qvi-common.h" // IWYU pragma: keep #ifdef __cplusplus extern "C" { diff --git a/src/qvi-bind.cc b/src/qvi-bind.cc index 2dfaeb9f..c47c6544 100644 --- a/src/qvi-bind.cc +++ b/src/qvi-bind.cc @@ -1,6 +1,6 @@ /* -*- Mode: C++; c-basic-offset:4; indent-tabs-mode:nil -*- */ /* - * Copyright (c) 2021-2023 Triad National Security, LLC + * Copyright (c) 2021-2024 Triad National Security, LLC * All rights reserved. * * Copyright (c) 2021 Lawrence Livermore National Security, LLC @@ -14,7 +14,7 @@ * @file qvi-bind.cc */ -#include "qvi-common.h" +#include "qvi-common.h" // IWYU pragma: keep #include "qvi-bind.h" using qvi_bind_bitmap_stack_t = std::stack; diff --git a/src/qvi-bind.h b/src/qvi-bind.h index 677120e3..8bb11ebd 100644 --- a/src/qvi-bind.h +++ b/src/qvi-bind.h @@ -1,6 +1,6 @@ /* -*- Mode: C++; c-basic-offset:4; indent-tabs-mode:nil -*- */ /* - * Copyright (c) 2021 Triad National Security, LLC + * Copyright (c) 2021-2024 Triad National Security, LLC * All rights reserved. * * Copyright (c) 2021 Lawrence Livermore National Security, LLC @@ -19,9 +19,9 @@ #ifndef QVI_BIND_H #define QVI_BIND_H -#include "qvi-common.h" +#include "qvi-common.h" // IWYU pragma: keep #include "qvi-task.h" -#include "qvi-hwloc.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 index f6a5a41b..eb33f538 100644 --- a/src/qvi-common.h +++ b/src/qvi-common.h @@ -1,6 +1,6 @@ /* -*- Mode: C++; c-basic-offset:4; indent-tabs-mode:nil -*- */ /* - * Copyright (c) 2020-2023 Triad National Security, LLC + * Copyright (c) 2020-2024 Triad National Security, LLC * All rights reserved. * * Copyright (c) 2020-2021 Lawrence Livermore National Security, LLC @@ -17,22 +17,22 @@ #ifndef QVI_COMMON_H #define QVI_COMMON_H -#include "quo-vadis/config.h" -#include "qvi-macros.h" -#include "quo-vadis.h" +#include "quo-vadis/config.h" // IWYU pragma: keep +#include "qvi-macros.h" // IWYU pragma: keep +#include "quo-vadis.h" // IWYU pragma: keep -#include -#include +#include // IWYU pragma: keep +#include // IWYU pragma: keep #include -#include -#include +#include // IWYU pragma: keep +#include // IWYU pragma: keep #include -#include +#include // IWYU pragma: keep #include #include -#include -#include -#include +#include // IWYU pragma: keep +#include // IWYU pragma: keep +#include // IWYU pragma: keep #include #include #include @@ -41,18 +41,18 @@ #include #ifdef __cplusplus -#include "qvi-log.h" - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "qvi-log.h" // IWYU pragma: keep + // IWYU pragma: keep +#include // IWYU pragma: keep +#include // IWYU pragma: keep +#include // IWYU pragma: keep +#include // IWYU pragma: keep +#include // IWYU pragma: keep +#include // IWYU pragma: keep +#include // IWYU pragma: keep +#include // IWYU pragma: keep +#include // IWYU pragma: keep +#include // IWYU pragma: keep #endif typedef uint8_t byte_t; diff --git a/src/qvi-context.cc b/src/qvi-context.cc index 9ed9eba1..1a02f21f 100644 --- a/src/qvi-context.cc +++ b/src/qvi-context.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 @@ -14,7 +14,7 @@ * @file qvi-context.cc */ -#include "qvi-common.h" +#include "qvi-common.h" // IWYU pragma: keep #include "qvi-context.h" diff --git a/src/qvi-context.h b/src/qvi-context.h index 1df5acc7..0cdfcacf 100644 --- a/src/qvi-context.h +++ b/src/qvi-context.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 @@ -22,7 +22,7 @@ #ifndef QVI_CONTEXT_H #define QVI_CONTEXT_H -#include "qvi-common.h" +#include "qvi-common.h" // IWYU pragma: keep #include "qvi-rmi.h" #include "qvi-zgroup.h" diff --git a/src/qvi-group-mpi.cc b/src/qvi-group-mpi.cc index e810065b..8ad23b8d 100644 --- a/src/qvi-group-mpi.cc +++ b/src/qvi-group-mpi.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 @@ -14,7 +14,7 @@ * @file qvi-group-mpi.cc */ -#include "qvi-common.h" +#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-process.cc b/src/qvi-group-process.cc index 4fcc25ee..6338bb47 100644 --- a/src/qvi-group-process.cc +++ b/src/qvi-group-process.cc @@ -1,6 +1,6 @@ /* -*- Mode: C++; c-basic-offset:4; indent-tabs-mode:nil -*- */ /* - * Copyright (c) 2022 Triad National Security, LLC + * Copyright (c) 2022-2024 Triad National Security, LLC * All rights reserved. * * This file is part of the quo-vadis project. See the LICENSE file at the @@ -11,7 +11,7 @@ * @file qvi-group-process.cc */ -#include "qvi-common.h" +#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-thread.cc b/src/qvi-group-thread.cc index 5bfde1dc..d12212f9 100644 --- a/src/qvi-group-thread.cc +++ b/src/qvi-group-thread.cc @@ -1,6 +1,6 @@ /* -*- Mode: C++; c-basic-offset:4; indent-tabs-mode:nil -*- */ /* - * Copyright (c) 2022 Triad National Security, LLC + * Copyright (c) 2022-2024 Triad National Security, LLC * All rights reserved. * * Copyright (c) 2022 Inria. @@ -17,7 +17,7 @@ * @file qvi-group-thread.cc */ -#include "qvi-common.h" +#include "qvi-common.h" // IWYU pragma: keep #include "qvi-group-thread.h" qvi_group_thread_s::~qvi_group_thread_s(void) diff --git a/src/qvi-group.cc b/src/qvi-group.cc index 3d0113d7..dbe0c256 100644 --- a/src/qvi-group.cc +++ b/src/qvi-group.cc @@ -1,6 +1,6 @@ /* -*- Mode: C++; c-basic-offset:4; indent-tabs-mode:nil -*- */ /* - * Copyright (c) 2022 Triad National Security, LLC + * Copyright (c) 2022-2024 Triad National Security, LLC * All rights reserved. * * This file is part of the quo-vadis project. See the LICENSE file at the @@ -11,7 +11,7 @@ * @file qvi-group.cc */ -#include "qvi-common.h" +#include "qvi-common.h" // IWYU pragma: keep #include "qvi-group.h" #include "qvi-log.h" diff --git a/src/qvi-hwloc.h b/src/qvi-hwloc.h index 3a8a7b9e..2f89661e 100644 --- a/src/qvi-hwloc.h +++ b/src/qvi-hwloc.h @@ -1,6 +1,6 @@ /* -*- Mode: C++; c-basic-offset:4; indent-tabs-mode:nil -*- */ /* - * Copyright (c) 2020-2023 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,7 +20,7 @@ #include "qvi-common.h" #include "qvi-task.h" -#include "hwloc.h" +#include "hwloc.h" // IWYU pragma: keep #ifdef __cplusplus extern "C" { diff --git a/src/qvi-line.cc b/src/qvi-line.cc index 2609e0a7..55f13c8b 100644 --- a/src/qvi-line.cc +++ b/src/qvi-line.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. * * This file is part of the quo-vadis project. See the LICENSE file at the @@ -14,11 +14,11 @@ * More generally, they are types that can be easily serialized. */ -#include "qvi-common.h" +#include "qvi-common.h" // IWYU pragma: keep #include "qvi-line.h" #include "qvi-bbuff-rmi.h" -#include "qvi-utils.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 index a6072198..a077900e 100644 --- a/src/qvi-line.h +++ b/src/qvi-line.h @@ -1,6 +1,6 @@ /* -*- Mode: C++; c-basic-offset:4; indent-tabs-mode:nil -*- */ /* - * Copyright (c) 2022-2023 Triad National Security, LLC + * Copyright (c) 2022-2024 Triad National Security, LLC * All rights reserved. * * This file is part of the quo-vadis project. See the LICENSE file at the @@ -17,7 +17,7 @@ #ifndef QVI_LINE_H #define QVI_LINE_H -#include "qvi-common.h" +#include "qvi-common.h" // IWYU pragma: keep #include "qvi-bbuff.h" #include "qvi-hwloc.h" diff --git a/src/qvi-log.cc b/src/qvi-log.cc index c3c7c593..9b535a08 100644 --- a/src/qvi-log.cc +++ b/src/qvi-log.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 @@ -14,7 +14,7 @@ * @file qvi-log.cc */ -#include "qvi-common.h" +#include "qvi-common.h" // IWYU pragma: keep #include "qvi-log.h" #include "spdlog/sinks/stdout_sinks.h" diff --git a/src/qvi-map.cc b/src/qvi-map.cc index 9408395c..c68e83d8 100644 --- a/src/qvi-map.cc +++ b/src/qvi-map.cc @@ -1,6 +1,6 @@ /* -*- Mode: C++; c-basic-offset:4; indent-tabs-mode:nil -*- */ /* - * Copyright (c) 2022-2023 Triad National Security, LLC + * Copyright (c) 2022-2024 Triad National Security, LLC * All rights reserved. * * This file is part of the quo-vadis project. See the LICENSE file at the @@ -12,7 +12,6 @@ */ #include "qvi-map.h" -#include "qvi-devinfo.h" /** * Performs a k-set intersection of the sets included in the provided set map. diff --git a/src/qvi-map.h b/src/qvi-map.h index f4a3154f..9951cfa5 100644 --- a/src/qvi-map.h +++ b/src/qvi-map.h @@ -1,6 +1,6 @@ /* -*- Mode: C++; c-basic-offset:4; indent-tabs-mode:nil -*- */ /* - * Copyright (c) 2022-2023 Triad National Security, LLC + * Copyright (c) 2022-2024 Triad National Security, LLC * All rights reserved. * * This file is part of the quo-vadis project. See the LICENSE file at the @@ -15,7 +15,7 @@ #define QVI_MAP_H #include "qvi-common.h" -#include "qvi-hwloc.h" +#include "qvi-hwloc.h" // IWYU pragma: keep #ifdef __cplusplus extern "C" { diff --git a/src/qvi-mpi.cc b/src/qvi-mpi.cc index 73ec8282..cf0986be 100644 --- a/src/qvi-mpi.cc +++ b/src/qvi-mpi.cc @@ -1,6 +1,6 @@ /* -*- Mode: C++; c-basic-offset:4; indent-tabs-mode:nil -*- */ /* - * Copyright (c) 2020-2023 Triad National Security, LLC + * Copyright (c) 2020-2024 Triad National Security, LLC * All rights reserved. * * Copyright (c) 2020-2021 Lawrence Livermore National Security, LLC @@ -17,7 +17,7 @@ #include "qvi-common.h" #include "qvi-mpi.h" -#include "qvi-utils.h" +#include "qvi-utils.h" // IWYU pragma: keep #include "mpi.h" diff --git a/src/qvi-mpi.h b/src/qvi-mpi.h index d5971a96..3dc9f289 100644 --- a/src/qvi-mpi.h +++ b/src/qvi-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 @@ -17,12 +17,12 @@ #ifndef QVI_MPI_H #define QVI_MPI_H -#include "qvi-common.h" +#include "qvi-common.h" // IWYU pragma: keep #include "qvi-task.h" #include "qvi-group.h" #include "qvi-bbuff.h" -#include "quo-vadis-mpi.h" +#include "quo-vadis-mpi.h" // IWYU pragma: keep #ifdef __cplusplus extern "C" { diff --git a/src/qvi-nvml.cc b/src/qvi-nvml.cc index 1192fcea..0d83e736 100644 --- a/src/qvi-nvml.cc +++ b/src/qvi-nvml.cc @@ -1,6 +1,6 @@ /* -*- Mode: C++; c-basic-offset:4; indent-tabs-mode:nil -*- */ /* - * Copyright (c) 2021 Triad National Security, LLC + * Copyright (c) 2021-2024 Triad National Security, LLC * All rights reserved. * * This file is part of the quo-vadis project. See the LICENSE file at the @@ -11,10 +11,9 @@ * @file qvi-nvml.cc */ -#include "qvi-common.h" +#include "qvi-common.h" // IWYU pragma: keep #include "qvi-nvml.h" #include "qvi-hwloc.h" -#include "qvi-utils.h" #ifdef CUDAToolkit_FOUND #include "hwloc/nvml.h" diff --git a/src/qvi-nvml.h b/src/qvi-nvml.h index 854a2ec8..b2454e25 100644 --- a/src/qvi-nvml.h +++ b/src/qvi-nvml.h @@ -1,6 +1,6 @@ /* -*- Mode: C++; c-basic-offset:4; indent-tabs-mode:nil -*- */ /* - * Copyright (c) 2021 Triad National Security, LLC + * Copyright (c) 2021-2024 Triad National Security, LLC * All rights reserved. * * This file is part of the quo-vadis project. See the LICENSE file at the @@ -14,7 +14,7 @@ #ifndef QVI_NVML_H #define QVI_NVML_H -#include "qvi-common.h" +#include "qvi-common.h" // IWYU pragma: keep #include "qvi-hwloc.h" #ifdef __cplusplus diff --git a/src/qvi-pmi.cc b/src/qvi-pmi.cc index 24105703..187822f3 100644 --- a/src/qvi-pmi.cc +++ b/src/qvi-pmi.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 @@ -14,7 +14,7 @@ * @file qvi-pmi.cc */ -#include "qvi-common.h" +#include "qvi-common.h" // IWYU pragma: keep #include "qvi-pmi.h" #include "qvi-log.h" diff --git a/src/qvi-pmi.h b/src/qvi-pmi.h index 2e0e3040..06aedbb2 100644 --- a/src/qvi-pmi.h +++ b/src/qvi-pmi.h @@ -1,6 +1,6 @@ /* -*- Mode: C++; c-basic-offset:4; indent-tabs-mode:nil -*- */ /* - * Copyright (c) 2020 Triad National Security, LLC + * Copyright (c) 2020-2024 Triad National Security, LLC * All rights reserved. * * Copyright (c) 2020 Lawrence Livermore National Security, LLC @@ -17,7 +17,7 @@ #ifndef QVI_PMI_H #define QVI_PMI_H -#include "qvi-common.h" +#include "qvi-common.h" // IWYU pragma: keep #ifdef __cplusplus extern "C" { diff --git a/src/qvi-process.cc b/src/qvi-process.cc index 8ba2ed29..331548fe 100644 --- a/src/qvi-process.cc +++ b/src/qvi-process.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. * * This file is part of the quo-vadis project. See the LICENSE file at the @@ -15,7 +15,6 @@ #include "qvi-process.h" #include "qvi-group.h" -#include "qvi-utils.h" // Type definitions. typedef qvi_group_id_t qvi_process_group_id_t; diff --git a/src/qvi-process.h b/src/qvi-process.h index 97f8872e..872a4a05 100644 --- a/src/qvi-process.h +++ b/src/qvi-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 @@ -14,7 +14,7 @@ #ifndef QVI_PROCESS_H #define QVI_PROCESS_H -#include "qvi-common.h" +#include "qvi-common.h" // IWYU pragma: keep #include "qvi-task.h" #include "qvi-bbuff.h" diff --git a/src/qvi-rmi.h b/src/qvi-rmi.h index aad2753e..bfae7aa4 100644 --- a/src/qvi-rmi.h +++ b/src/qvi-rmi.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,7 +19,7 @@ #ifndef QVI_RMI_H #define QVI_RMI_H -#include "qvi-common.h" +#include "qvi-common.h" // IWYU pragma: keep #include "qvi-line.h" #include "qvi-hwloc.h" diff --git a/src/qvi-rsmi.cc b/src/qvi-rsmi.cc index 2cb33a79..68ddf6fb 100644 --- a/src/qvi-rsmi.cc +++ b/src/qvi-rsmi.cc @@ -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. * * This file is part of the quo-vadis project. See the LICENSE file at the @@ -11,7 +11,7 @@ * @file qvi-rsmi.cc */ -#include "qvi-common.h" +#include "qvi-common.h" // IWYU pragma: keep #include "qvi-rsmi.h" #include "qvi-hwloc.h" diff --git a/src/qvi-rsmi.h b/src/qvi-rsmi.h index c72ec04d..a7f72d8a 100644 --- a/src/qvi-rsmi.h +++ b/src/qvi-rsmi.h @@ -1,6 +1,6 @@ /* -*- Mode: C++; c-basic-offset:4; indent-tabs-mode:nil -*- */ /* - * Copyright (c) 2022 Triad National Security, LLC + * Copyright (c) 2022-2024 Triad National Security, LLC * All rights reserved. * * Copyright (c) 2021 Lawrence Livermore National Security, LLC @@ -17,7 +17,7 @@ #ifndef QVI_RSMI_H #define QVI_RSMI_H -#include "qvi-common.h" +#include "qvi-common.h" // IWYU pragma: keep #include "qvi-hwloc.h" int diff --git a/src/qvi-scope.h b/src/qvi-scope.h index 5e7f0e98..43b6cec2 100644 --- a/src/qvi-scope.h +++ b/src/qvi-scope.h @@ -1,6 +1,6 @@ /* -*- Mode: C++; c-basic-offset:4; indent-tabs-mode:nil -*- */ /* - * Copyright (c) 2021-2023 Triad National Security, LLC + * Copyright (c) 2021-2024 Triad National Security, LLC * All rights reserved. * * Copyright (c) 2021 Lawrence Livermore National Security, LLC @@ -17,13 +17,11 @@ #ifndef QVI_SCOPE_H #define QVI_SCOPE_H -#include "qvi-common.h" +#include "qvi-common.h" // IWYU pragma: keep #include "qvi-zgroup.h" #include "qvi-rmi.h" -#include "hwloc.h" - /** * */ diff --git a/src/qvi-task.cc b/src/qvi-task.cc index 245274d9..9ecab736 100644 --- a/src/qvi-task.cc +++ b/src/qvi-task.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 @@ -14,7 +14,7 @@ * @file qvi-task.cc */ -#include "qvi-common.h" +#include "qvi-common.h" // IWYU pragma: keep #include "qvi-task.h" static const int qvi_task_id_invalid = -1; diff --git a/src/qvi-task.h b/src/qvi-task.h index 536b2924..0f57befe 100644 --- a/src/qvi-task.h +++ b/src/qvi-task.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 @@ -17,7 +17,7 @@ #ifndef QVI_TASK_H #define QVI_TASK_H -#include "qvi-common.h" +#include "qvi-common.h" // IWYU pragma: keep #ifdef __cplusplus extern "C" { diff --git a/src/qvi-thread.cc b/src/qvi-thread.cc index 90ecd8c7..6925f3a6 100644 --- a/src/qvi-thread.cc +++ b/src/qvi-thread.cc @@ -1,6 +1,6 @@ /* -*- Mode: C++; c-basic-offset:4; indent-tabs-mode:nil -*- */ /* - * Copyright (c) 2020-2023 Triad National Security, LLC + * Copyright (c) 2020-2024 Triad National Security, LLC * All rights reserved. * * Copyright (c) 2022 Inria. @@ -17,7 +17,7 @@ * @file qvi-thread.cc */ -#include "qvi-common.h" +#include "qvi-common.h" // IWYU pragma: keep #include "qvi-thread.h" #include "qvi-group.h" diff --git a/src/qvi-thread.h b/src/qvi-thread.h index 61b81667..345a3fbc 100644 --- a/src/qvi-thread.h +++ b/src/qvi-thread.h @@ -1,6 +1,6 @@ /* -*- Mode: C++; c-basic-offset:4; indent-tabs-mode:nil -*- */ /* - * Copyright (c) 2020-2023 Triad National Security, LLC + * Copyright (c) 2020-2024 Triad National Security, LLC * All rights reserved. * Copyright (c) 2022 Inria. All rights reserved. * Copyright (c) 2022 Bordeaux INP. All rights reserved. @@ -16,7 +16,7 @@ #ifndef QVI_THREAD_H #define QVI_THREAD_H -#include "qvi-common.h" +#include "qvi-common.h" // IWYU pragma: keep #include "qvi-task.h" #include "qvi-bbuff.h" diff --git a/src/qvi-zgroup-mpi.cc b/src/qvi-zgroup-mpi.cc index 91e75f1c..de778177 100644 --- a/src/qvi-zgroup-mpi.cc +++ b/src/qvi-zgroup-mpi.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 @@ -14,7 +14,7 @@ * @file qvi-zgroup-mpi.cc */ -#include "qvi-common.h" +#include "qvi-common.h" // IWYU pragma: keep #include "qvi-zgroup-mpi.h" #include "qvi-group-mpi.h" diff --git a/src/qvi-zgroup-process.cc b/src/qvi-zgroup-process.cc index a2ca21ec..681aba12 100644 --- a/src/qvi-zgroup-process.cc +++ b/src/qvi-zgroup-process.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. * * This file is part of the quo-vadis project. See the LICENSE file at the @@ -11,7 +11,7 @@ * @file qvi-zgroup-process.cc */ -#include "qvi-common.h" +#include "qvi-common.h" // IWYU pragma: keep #include "qvi-zgroup-process.h" #include "qvi-group-process.h" diff --git a/src/qvi-zgroup-thread.cc b/src/qvi-zgroup-thread.cc index 8033691b..9b37db65 100644 --- a/src/qvi-zgroup-thread.cc +++ b/src/qvi-zgroup-thread.cc @@ -1,6 +1,6 @@ /* -*- Mode: C++; c-basic-offset:4; indent-tabs-mode:nil -*- */ /* - * Copyright (c) 2020-2023 Triad National Security, LLC + * Copyright (c) 2020-2024 Triad National Security, LLC * All rights reserved. * * Copyright (c) 2022 Inria. @@ -17,7 +17,7 @@ * @file qvi-zgroup-thread.cc */ -#include "qvi-common.h" +#include "qvi-common.h" // IWYU pragma: keep #include "qvi-zgroup-thread.h" #include "qvi-group-thread.h"