2.18.5 fix (#1077)

* Revert "Revert "2.18.5-1""

This reverts commit 767fde8210.

* Fix initial net device value

src/transport/net_ib.cc

@@ -68,7 +68,7 @@ struct userIbDev {
   uint16_t port_en;
 };
 
-#define MAX_IB_DEVS 16
+#define MAX_IB_DEVS 32
 struct ncclIbDev ncclIbDevs[MAX_IB_DEVS];
 struct userIbDev userIbDevs[MAX_IB_DEVS];
 pthread_mutex_t ncclIbLock = PTHREAD_MUTEX_INITIALIZER;