netlrts: remove AMMASSO related
authorYanhuaSun <sun51@illinois.edu>
Mon, 4 Mar 2013 23:22:44 +0000 (17:22 -0600)
committerNikhil Jain <nikhil@illinois.edu>
Fri, 24 May 2013 20:27:39 +0000 (15:27 -0500)
src/arch/net-linux-x86_64/conv-mach-ammasso.h [deleted file]
src/arch/net-linux-x86_64/conv-mach-ammasso.sh [deleted file]
src/arch/net/machine-dgram.c

diff --git a/src/arch/net-linux-x86_64/conv-mach-ammasso.h b/src/arch/net-linux-x86_64/conv-mach-ammasso.h
deleted file mode 100644 (file)
index f4d2609..0000000
+++ /dev/null
@@ -1,15 +0,0 @@
-/**
- ** Ammasso Specific File
- **
- ** Created: 03/12/05
- **
- **/
-
-#undef  CMK_USE_AMMASSO
-#define CMK_USE_AMMASSO                      1
-
-#undef  CMK_BROADCAST_SPANNING_TREE
-#define CMK_BROADCAST_SPANNING_TREE          0
-
-#undef  CMK_BROADCAST_HYPERCUBE
-#define CMK_BROADCAST_HYPERCUBE              1
diff --git a/src/arch/net-linux-x86_64/conv-mach-ammasso.sh b/src/arch/net-linux-x86_64/conv-mach-ammasso.sh
deleted file mode 100644 (file)
index 4d6448e..0000000
+++ /dev/null
@@ -1,35 +0,0 @@
-#
-# Ammasso Specific File
-#
-# Created: 03/12/05
-#
-
-# Default ammasso directory
-# Guess where it is ???
-
-CMK_INCDIR="-I/scratch/ammasso/AMSO1100/software/host/common/include -I/scratch/ammasso/AMSO1100/software/common/include -I/scratch/ammasso/AMSO1100/software/host/linux/include"
-CMK_LIBDIR="-L/usr/opt/ammasso/lib64"
-
-CMK_LIBS="$CMK_LIBS -lccil"
-
-# Example: Originally from conv-mach-gm.sh
-#
-#default gm dir
-#guess where the gm.h is installed
-#if test -z "$CMK_INCDIR"
-#then
-#  # gm ver 1.0
-#  if test -f /usr/gm/include/gm.h
-#  then
-#    CMK_INCDIR="-I /usr/gm/include"
-#    CMK_LIBDIR="-L /usr/gm/lib"
-#  # gm ver 2.0
-#  elif test -f /opt/gm/include/gm.h
-#  then
-#    CMK_INCDIR="-I /opt/gm/include"
-#    CMK_LIBDIR="-L /opt/gm/lib"
-#  fi
-#fi
-#
-#
-#CMK_LIBS="$CMK_LIBS -lgm"
index 8885198ed51d21670c193f3117c72a69a86a0083..e9d713fff184ab6f1a486fa5c8a919e83e41fa17 100644 (file)
@@ -236,24 +236,6 @@ struct infiOtherNodeData *initInfiOtherNodeData(int node,int addr[3]);
 void   infiPostInitialRecvs();
 #endif
 
-#if CMK_USE_AMMASSO
-
-/*
- * State Machine for Queue Pair Connection State (machine layer state for QP)
- *  PRE_CONNECT  --->  CONNECTED  ---> CONNECTION_LOST
- *                        |    /|\              |
- *                       \|/    \---------------/
- *           CONNECTION_CLOSED
- */
-
-typedef enum __qp_connection_state {
-  QP_CONN_STATE_PRE_CONNECT = 1,     /* Connection is being attempted and no successful connection has been made yet           */
-  QP_CONN_STATE_CONNECTED,           /* Connection has be established                                                          */
-  QP_CONN_STATE_CONNECTION_LOST,     /* Connection is being attempted and there has been an established connection in the past */
-  QP_CONN_STATE_CONNECTION_CLOSED    /* Connection closed                                                                      */
-} qp_connection_state_t;
-#endif
-  
 typedef struct FutureMessageStruct {
   char *msg;
   int len;
@@ -485,10 +467,6 @@ static void node_addresses_store(ChMessage *msg)
 #endif
     nodestart+=nodes[i].nodesize;
 
-#if CMK_USE_AMMASSO
-    CmiAmmassoNodeAddressesStoreHandler(nodes[i].nodestart, &(nodes[i].addr), nodes[i].dataport);
-#endif
-
   }
   _Cmi_numpes=nodestart;
   n = _Cmi_numpes;