Disabling commlib entirely for AMPI. In the future it will be reenabled once it has...
authorIsaac Dooley <idooley2@illinois.edu>
Tue, 2 Jun 2009 21:20:40 +0000 (21:20 +0000)
committerIsaac Dooley <idooley2@illinois.edu>
Tue, 2 Jun 2009 21:20:40 +0000 (21:20 +0000)
src/libs/ck-libs/ampi/ampi.C

index 7bee1c436a1f4660570bfc14ff2d6c1ea742d421..d9ba9e9adfc7c3403877679f07b00e9267a610bc 100644 (file)
@@ -651,22 +651,20 @@ static ampi *ampiInit(char **argv)
          //Make a new ampi array
          CkArrayID empty;
 
+       ampiCommStruct worldComm(new_world,empty,_nchunks);
+       CProxy_ampi arr;
+
+
+#if AMPI_COMLIB
 
-         CkVec<int> _indices;
-         for(int i=0;i<_nchunks;i++) _indices.push_back(i);
-         ampiCommStruct worldComm(new_world,empty,_nchunks,_indices);
-       
-       CkAssert(CkMyPe()==0);
-       
        ComlibInstanceHandle ciStreaming = 1;
        ComlibInstanceHandle ciBcast = 2;
        ComlibInstanceHandle ciAllgather = 3;
        ComlibInstanceHandle ciAlltoall = 4;
 
-       CProxy_ampi arr=CProxy_ampi::ckNew(parent, worldComm, ciStreaming, ciBcast, ciAllgather, ciAlltoall, opts);
+       arr=CProxy_ampi::ckNew(parent, worldComm, ciStreaming, ciBcast, ciAllgather, ciAlltoall, opts);
        
 
-#if AMPI_COMLIB
        CkPrintf("Using untested comlib code in ampi.C\n");
 
        Strategy *sStreaming = new StreamingStrategy(1,10);
@@ -685,6 +683,9 @@ static ampi *ampiInit(char **argv)
 
        // FIXME: Propogate the comlib table here
        CkpvAccess(conv_com_object).doneCreating();
+#else
+       arr=CProxy_ampi::ckNew(parent,worldComm,opts);
+
 #endif
 
        //Broadcast info. to the mpi_worlds array