Always include config.h first

To make autoconf config.h useful, it needs to be the first include in any .c file. Fix a couple of occurances that were missed. With those fixups, there's no need for the bandaid includes in some of the header files, so remove those as well. Signed-off-by: Brian Barrett <[email protected]>
aws · Mar 30, 2024 · d91e9bf · d91e9bf
1 parent a04d366
commit d91e9bf
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 5 deletions.
diff --git a/include/nccl_ofi_rdma.h b/include/nccl_ofi_rdma.h
@@ -9,8 +9,6 @@
 extern "C" {
 #endif
 
-#include "config.h"
-
 #include <rdma/fabric.h>
 
 #include "nccl_ofi.h"

diff --git a/include/nccl_ofi_sendrecv.h b/include/nccl_ofi_sendrecv.h
@@ -9,8 +9,6 @@
 extern "C" {
 #endif
 
-#include "config.h"
-
 #include <rdma/fabric.h>
 #include "nccl_ofi.h"
 #include "nccl_ofi_freelist.h"

diff --git a/include/tracepoint.h b/include/tracepoint.h
@@ -30,7 +30,6 @@
  *
  */
 
-#include "config.h"
 #if HAVE_LIBLTTNG_UST == 1
 
 /*

diff --git a/src/nccl_ofi_idpool.c b/src/nccl_ofi_idpool.c
@@ -2,6 +2,8 @@
  * Copyright (c) 2024 Amazon.com, Inc. or its affiliates. All rights reserved.
  */
 
+#include "config.h"
+
 #include "nccl_ofi.h"
 #include "nccl_ofi_idpool.h"
 #include "nccl_ofi_math.h"

diff --git a/src/tuner/nccl_ofi_model.c b/src/tuner/nccl_ofi_model.c
@@ -1,5 +1,8 @@
+#include "config.h"
+
 #include <stdlib.h>
 #include <math.h>
+
 #include "nccl-headers/nvidia/tuner.h"
 #include "nccl_ofi_tuner.h"
 #include "nccl_ofi_log.h"

diff --git a/src/tuner/nccl_ofi_tuner.c b/src/tuner/nccl_ofi_tuner.c
@@ -1,5 +1,8 @@
+#include "config.h"
+
 #include <stdlib.h>
 #include <pthread.h>
+
 #include "nccl-headers/nvidia/tuner.h"
 #include "nccl_ofi_tuner.h"
 #include "nccl_ofi_log.h"
-Original file line number
+Diff line change
@@ Expand Up / @@ -30,7 +30,6 @@ @@
      *
      */
-    #include "config.h"
     #if HAVE_LIBLTTNG_UST == 1
     /*
@@ Expand Down @@