ibverbs_van: rename

Author: changlan

Makefile

@@ -21,9 +21,9 @@ INCPATH = -I./src -I./include -I$(DEPS_PATH)/include
 CFLAGS = -std=c++11 -msse2 -fPIC -O3 -ggdb -Wall -finline-functions $(INCPATH) $(ADD_CFLAGS)
 LIBS = -pthread
 
-ifdef USE_RDMA
+ifdef USE_IBVERBS
 LIBS += -lrdmacm -libverbs
-CFLAGS += -DDMLC_USE_RDMA
+CFLAGS += -DDMLC_USE_IBVERBS
 endif
 
 ifdef ASAN

src/rdma_van.h src/ibverbs_van.h

@@ -4,10 +4,10 @@
  *          jiangyimin@bytedance.com (Yimin Jiang)
  *          chenjingrong@bytedance.com (Jingrong Chen)
  */
-#ifndef PS_RDMA_VAN_H_
-#define PS_RDMA_VAN_H_
+#ifndef PS_IBVERBS_VAN_H_
+#define PS_IBVERBS_VAN_H_
 
-#ifdef DMLC_USE_RDMA
+#ifdef DMLC_USE_IBVERBS
 
 #include <errno.h>
 #include <fcntl.h>
@@ -478,10 +478,10 @@ struct Endpoint {
   }
 };
 
-class RDMAVan : public Van {
+class IBVerbsVan : public Van {
  public:
-  RDMAVan() {}
-  ~RDMAVan() {}
+  IBVerbsVan() {}
+  ~IBVerbsVan() {}
 
  protected:
   void Start(int customer_id) override {
@@ -493,7 +493,7 @@ class RDMAVan : public Van {
       CHECK(event_channel_) << "Create RDMA event channel failed";
 
       cm_event_polling_thread_.reset(
-          new std::thread(&RDMAVan::PollEvents, this));
+          new std::thread(&IBVerbsVan::PollEvents, this));
     }
 
     start_mu_.unlock();
@@ -1114,7 +1114,7 @@ class RDMAVan : public Van {
     CHECK(endpoint) << "Endpoint not found.";
 
     if (cq_polling_thread_ == nullptr) {
-      cq_polling_thread_.reset(new std::thread(&RDMAVan::PollCQ, this));
+      cq_polling_thread_.reset(new std::thread(&IBVerbsVan::PollCQ, this));
     }
 
     CHECK_EQ(endpoint->cm_id, id);
@@ -1165,5 +1165,5 @@ class RDMAVan : public Van {
 };  // namespace ps
 };  // namespace ps
 
-#endif  // DMLC_USE_RDMA
-#endif  // PS_RDMA_VAN_H_
+#endif  // DMLC_USE_IBVERBS
+#endif  // PS_IBVERBS_VAN_H_

src/postoffice.cc

@@ -15,10 +15,10 @@ Postoffice::Postoffice() {
 
 void Postoffice::InitEnvironment() {
   const char* val = NULL;
-  int enable_rdma = GetEnv("DMLC_ENABLE_RDMA", 0);
-  if (enable_rdma) {
-    LOG(INFO) << "enable RDMA for networking";
-    van_ = Van::Create("rdma");
+  int enable_ibverbs = GetEnv("DMLC_ENABLE_IBVERBS", 0);
+  if (enable_ibverbs) {
+    LOG(INFO) << "ibverbs enabled.";
+    van_ = Van::Create("ibverbs");
   } else {
     van_ = Van::Create("zmq");
   }

src/van.cc

@@ -13,7 +13,7 @@
 
 #include "./meta.pb.h"
 #include "./network_utils.h"
-#include "./rdma_van.h"
+#include "./ibverbs_van.h"
 #include "./resender.h"
 #include "./zmq_van.h"
 
@@ -28,9 +28,9 @@ static const int kDefaultHeartbeatInterval = 0;
 Van* Van::Create(const std::string& type) {
   if (type == "zmq") {
     return new ZMQVan();
-#ifdef DMLC_USE_RDMA
-  } else if (type == "rdma") {
-    return new RDMAVan();
+#ifdef DMLC_USE_IBVERBS
+} else if (type == "ibverbs") {
+    return new IBVerbsVan();
 #endif
   } else {
     LOG(FATAL) << "unsupported van type: " << type;