moving numa to include

microsoft · Aug 4, 2023 · 9e417e8 · 9e417e8
1 parent e87752a
commit 9e417e8
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 8 deletions.
diff --git a/src/include/numa.hpp → include/mscclpp/numa.hpp b/src/include/numa.hpp → include/mscclpp/numa.hpp
diff --git a/src/numa.cc b/src/numa.cc
@@ -6,6 +6,8 @@
 #include <fstream>
 #include <mscclpp/cuda_utils.hpp>
 
+#include "api.h"
+
 // Convert a logical cudaDev index to the NVML device minor number
 static const std::string getBusId(int cudaDev) {
   // On most systems, the PCI bus ID comes back as in the 0000:00:00.0
@@ -22,7 +24,7 @@ static const std::string getBusId(int cudaDev) {
 
 namespace mscclpp {
 
-int getDeviceNumaNode(int cudaDev) {
+MSCCLPP_API_CPP int getDeviceNumaNode(int cudaDev) {
   std::string busId = getBusId(cudaDev);
   std::string file_str = "/sys/bus/pci/devices/" + busId + "/numa_node";
   std::ifstream file(file_str);
@@ -37,7 +39,7 @@ int getDeviceNumaNode(int cudaDev) {
   return numaNode;
 }
 
-void numaBind(int node) {
+MSCCLPP_API_CPP void numaBind(int node) {
   int totalNumNumaNodes = numa_num_configured_nodes();
   if (node < 0 || node >= totalNumNumaNodes) {
     throw Error(

diff --git a/src/proxy_channel.cc b/src/proxy_channel.cc
@@ -1,11 +1,11 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT license.
 
+#include <mscclpp/numa.hpp>
 #include <mscclpp/proxy_channel.hpp>
 
 #include "api.h"
 #include "debug.h"
-#include "numa.hpp"
 
 namespace mscclpp {
 

diff --git a/test/allgather_test_host_offloading.cu b/test/allgather_test_host_offloading.cu
@@ -4,9 +4,9 @@
 #include <mscclpp/core.hpp>
 #include <mscclpp/cuda_utils.hpp>
 #include <mscclpp/fifo.hpp>
+#include <mscclpp/numa.hpp>
 #include <mscclpp/proxy.hpp>
 #include <mscclpp/semaphore.hpp>
-#include <numa.hpp>
 
 #ifdef MSCCLPP_USE_MPI_FOR_TESTS
 #include "mpi.h"

diff --git a/test/unit/fifo_tests.cu b/test/unit/fifo_tests.cu
@@ -5,10 +5,9 @@
 
 #include <mscclpp/cuda_utils.hpp>
 #include <mscclpp/fifo.hpp>
+#include <mscclpp/numa.hpp>
 #include <mscclpp/utils.hpp>
 
-#include "numa.hpp"
-
 #define FLUSH_PERIOD (MSCCLPP_PROXY_FIFO_SIZE)  // should not exceed MSCCLPP_PROXY_FIFO_SIZE
 #define ITER 10000                              // should be larger than MSCCLPP_PROXY_FIFO_SIZE for proper testing
 

diff --git a/test/unit/numa_tests.cc b/test/unit/numa_tests.cc
@@ -4,8 +4,7 @@
 #include <gtest/gtest.h>
 
 #include <mscclpp/cuda_utils.hpp>
-
-#include "numa.hpp"
+#include <mscclpp/numa.hpp>
 
 TEST(NumaTest, Basic) {
   int num;