allow ibverbs to run in standalone mode.
authorGengbin Zheng <gzheng@illinois.edu>
Thu, 1 Apr 2010 20:47:24 +0000 (15:47 -0500)
committerGengbin Zheng <gzheng@illinois.edu>
Thu, 1 Apr 2010 20:47:24 +0000 (15:47 -0500)
src/arch/net/machine-dgram.c
src/arch/net/machine.c

index bf676406fcdd12ab2ca302477392d4d89effde87..01e24054c3dc886f90a603fc4764fe2fd796fc97 100644 (file)
@@ -508,8 +508,11 @@ static void node_addresses_store(ChMessage *msg)
   _Cmi_numnodes=ChMessageInt(n32[0]);
 
 #if CMK_USE_IBVERBS
-       ChInfiAddr *remoteInfiAddr = (ChInfiAddr *) (&msg->data[sizeof(ChMessageInt_t)+sizeof(ChNodeinfo)*_Cmi_numnodes]);
-  if ((sizeof(ChMessageInt_t)+sizeof(ChNodeinfo)*_Cmi_numnodes +sizeof(ChInfiAddr)*_Cmi_numnodes )
+  ChInfiAddr *remoteInfiAddr = (ChInfiAddr *) (&msg->data[sizeof(ChMessageInt_t)+sizeof(ChNodeinfo)*_Cmi_numnodes]);
+  if (Cmi_charmrun_fd == -1) {
+    d = &((ChSingleNodeinfo*)n32)->info;
+  }
+  else if ((sizeof(ChMessageInt_t)+sizeof(ChNodeinfo)*_Cmi_numnodes +sizeof(ChInfiAddr)*_Cmi_numnodes )
          !=(unsigned int)msg->len)
     {printf("Node table has inconsistent length!");machine_exit(1);}
 
index 51352cd1dfcb2db257f5e4fd3bde129f88d2ad3b..a464de4d9ed3d6721f82b806159e0ffe4ff46d72 100644 (file)
@@ -2811,10 +2811,6 @@ void ConverseInit(int argc, char **argv, CmiStartFn fn, int usc, int everReturn)
   node_addresses_obtain(argv);
   MACHSTATE(5,"node_addresses_obtain done");
 
-#if CMK_USE_IBVERBS
-  if (Cmi_charmrun_fd==-1) CmiAbort("Fatal error: standalone mode is not supported in ibverbs. \n");
-#endif
-
   CmiCommunicationInit(argv);
 
 #if CMK_USE_SYSVSHM