bgltorus.h removed from CVS and also its usage from various files
authorAbhinav Bhatele <bhatele@illinois.edu>
Fri, 18 Jan 2008 06:49:23 +0000 (06:49 +0000)
committerAbhinav Bhatele <bhatele@illinois.edu>
Fri, 18 Jan 2008 06:49:23 +0000 (06:49 +0000)
src/arch/bluegenel/bglmachine.C
src/arch/bluegenep/machine.c
src/arch/mpi/machine.c
src/arch/portals-crayxt3/machine.c

index 5dc9c1249c00a80820799276ee96e731c605056b..4cf0a781952a190c09683fac17aa2a35e61f4342 100644 (file)
@@ -1,3 +1,9 @@
+/*****************************************************************************
+ * $Source$
+ * $Author$
+ * $Date$
+ * $Revision$
+ *****************************************************************************/
 
 #include <stdio.h>
 #include <errno.h>
@@ -425,8 +431,8 @@ void sendBroadcastMessages() {
 
 unsigned int *ranklist;
 
-#include "bgltorus.h"
-CpvDeclare(BGLTorusManager*, tmanager);
+// #include "BGLTorus.h"
+// CpvDeclare(BGLTorusManager*, tmanager);
 
 BGTsC_t        barrier;
 
@@ -592,8 +598,8 @@ void ConverseInit(int argc, char **argv, CmiStartFn fn, int usched, int initret)
   Cmi_argvcopy = CmiCopyArgs(argv);
   Cmi_argv = argv; Cmi_startfn = fn; Cmi_usrsched = usched;
 
-  CpvInitialize(BGLTorusManager*, tmanager);
-  CpvAccess(tmanager) = new BGLTorusManager();
+  // CpvInitialize(BGLTorusManager*, tmanager);
+  // CpvAccess(tmanager) = new BGLTorusManager();
 
 
   /* find dim = log2(numpes), to pretend we are a hypercube */
index 3e2dd23c58f2a5d59fa673c6e85cae7df8b4f528..4977c89d741a62055cdd9e3d92485536ad647bf2 100644 (file)
@@ -360,9 +360,6 @@ int  networkProgressPeriod;
 #if 0
 unsigned int *ranklist;
 
-//#include "bgltorus.h"
-//CpvDeclare(BGLTorusManager*, tmanager);
-
 BGTsC_t        barrier;
 
 // -----------------------------------------
index 03a5ec37aa38b339788d0f677acb2258f4e0d211..30a2b8a7385175616834c4fbba1234470f7b8b3c 100644 (file)
@@ -1627,11 +1627,6 @@ static void ConverseRunPE(int everReturn)
   }
 }
 
-#if CMK_VERSION_BLUEGENE
-struct BGLTorusManager;
-CpvDeclare(struct BGLTorusManager *, tmanager);
-#endif
-
 void ConverseInit(int argc, char **argv, CmiStartFn fn, int usched, int initret)
 {
   int n,i;
@@ -1761,12 +1756,6 @@ void ConverseInit(int argc, char **argv, CmiStartFn fn, int usched, int initret)
   networkProgressPeriod = NETWORK_PROGRESS_PERIOD_DEFAULT;
   CmiGetArgInt(argv, "+networkProgressPeriod", &networkProgressPeriod);
 
-#if CMK_VERSION_BLUEGENE
-    /* CpvInitialize should not be called before all worker threads start */
-  CpvInitialize(struct BGLTorusManager*, tmanager);
-  CpvAccess(tmanager) = NULL;
-#endif
-
   CmiStartThreads(argv);
   ConverseRunPE(initret);
 }
index 6ca2fbcf9e38ff67f7386a2fdcf2208df9510a77..86a3bf5b170c0bd7102a1d4b99067093827769ee 100644 (file)
@@ -1297,11 +1297,6 @@ static void ConverseRunPE(int everReturn)
   }
 }
 
-#if CMK_VERSION_BLUEGENE
-struct BGLTorusManager;
-CpvDeclare(struct BGLTorusManager *, tmanager);
-#endif
-
 void ConverseInit(int argc, char **argv, CmiStartFn fn, int usched, int initret)
 {
   ptl_process_id_t   my_id;
@@ -1426,11 +1421,6 @@ void ConverseInit(int argc, char **argv, CmiStartFn fn, int usched, int initret)
   networkProgressPeriod = NETWORK_PROGRESS_PERIOD_DEFAULT;
   CmiGetArgInt(argv, "+networkProgressPeriod", &networkProgressPeriod);
 
-#if CMK_VERSION_BLUEGENE
-  CpvInitialize(struct BGLTorusManager*, tmanager);
-  CpvAccess(tmanager) = NULL;
-#endif
-  
   CmiStartThreads(argv);
   ConverseRunPE(initret);
 }