[mpich2-commits] r6625 - in mpich2/trunk: maint src/mpid/ch3/channels/nemesis src/mpid/ch3/channels/nemesis/nemesis/netmod

[buntinas at mcs.anl.gov]

Author: buntinas
Date: 2010-05-07 11:36:39 -0500 (Fri, 07 May 2010)
New Revision: 6625

Removed:
   mpich2/trunk/src/mpid/ch3/channels/nemesis/nemesis/netmod/ib/
Modified:
   mpich2/trunk/maint/release.pl
   mpich2/trunk/src/mpid/ch3/channels/nemesis/configure.in
   mpich2/trunk/src/mpid/ch3/channels/nemesis/nemesis/netmod/Makefile.sm
Log:
Removed obsolete ib netmod

Modified: mpich2/trunk/maint/release.pl
===================================================================
--- mpich2/trunk/maint/release.pl	2010-05-07 14:51:54 UTC (rev 6624)
+++ mpich2/trunk/maint/release.pl	2010-05-07 16:36:39 UTC (rev 6625)
@@ -168,7 +168,7 @@
 run_cmd("rm -rf src/mpid/globus doc/notes src/pm/mpd/Zeroconf.py");
 
 chdir("${root}/${pack}-${version}/src/mpid/ch3/channels/nemesis/nemesis/netmod");
-my @nem_modules = qw(elan ib psm);
+my @nem_modules = qw(elan psm);
 run_cmd("rm -rf ".join(' ', map({$_ . "/*"} @nem_modules)));
 for my $module (@nem_modules) {
     # system to avoid problems with shell redirect in run_cmd

Modified: mpich2/trunk/src/mpid/ch3/channels/nemesis/configure.in
===================================================================
--- mpich2/trunk/src/mpid/ch3/channels/nemesis/configure.in	2010-05-07 14:51:54 UTC (rev 6624)
+++ mpich2/trunk/src/mpid/ch3/channels/nemesis/configure.in	2010-05-07 16:36:39 UTC (rev 6625)
@@ -79,9 +79,8 @@
     AC_DEFINE(ENABLE_NO_YIELD,1,[Define to remove yield()s in polling loops])
 fi
 
-# Check for gm, ib, mx, elan, psm options
+# Check for gm, mx, elan, psm options
 PAC_SET_HEADER_LIB_PATH(gm)
-PAC_SET_HEADER_LIB_PATH(ib)
 PAC_SET_HEADER_LIB_PATH(mx)
 PAC_SET_HEADER_LIB_PATH(elan)
 PAC_SET_HEADER_LIB_PATH(psm)
@@ -149,8 +148,6 @@
 
     if test "${net}" = "gm" ; then
        PAC_CHECK_HEADER_LIB_FATAL(gm, gm.h, gm, gm_init)
-    elif test "${net}" = "ib" ; then 
-       PAC_CHECK_HEADER_LIB_FATAL(ib, verbs.h, ibverbs, ibv_open_device)
     elif test "${net}" = "elan" ; then 
        echo "=== You're about to use the experimental Nemesis/Elan network module." 
        echo "=== This module has not been thoroughly tested and some performance issues remain."
@@ -207,8 +204,6 @@
           AC_DEFINE(MPID_NEM_NET_MODULE, MPID_NEM_NEWMAD, [Choose netmod]) ;;
      tcp )
           AC_DEFINE(MPID_NEM_NET_MODULE, MPID_NEM_TCP, [Choose netmod]) ;;
-     ib )
-          AC_DEFINE(MPID_NEM_NET_MODULE, MPID_NEM_IB, [Choose netmod]) ;;
      psm )
           AC_DEFINE(MPID_NEM_NET_MODULE, MPID_NEM_PSM, [Choose netmod]) ;;
      * )
@@ -503,4 +498,4 @@
 
 AC_SUBST(ETAGS)
 
-AC_OUTPUT(Makefile src/Makefile nemesis/Makefile nemesis/src/Makefile nemesis/utils/Makefile nemesis/utils/replacements/Makefile nemesis/utils/monitor/Makefile nemesis/netmod/Makefile nemesis/netmod/elan/Makefile  nemesis/netmod/gm/Makefile nemesis/netmod/mx/Makefile nemesis/netmod/tcp/Makefile nemesis/netmod/ib/Makefile nemesis/netmod/psm/Makefile nemesis/netmod/newmad/Makefile nemesis/netmod/none/Makefile localdefs nemesis/include/mpid_nem_net_module_defs.h nemesis/src/mpid_nem_net_array.c)
+AC_OUTPUT(Makefile src/Makefile nemesis/Makefile nemesis/src/Makefile nemesis/utils/Makefile nemesis/utils/replacements/Makefile nemesis/utils/monitor/Makefile nemesis/netmod/Makefile nemesis/netmod/elan/Makefile  nemesis/netmod/gm/Makefile nemesis/netmod/mx/Makefile nemesis/netmod/tcp/Makefile nemesis/netmod/psm/Makefile nemesis/netmod/newmad/Makefile nemesis/netmod/none/Makefile localdefs nemesis/include/mpid_nem_net_module_defs.h nemesis/src/mpid_nem_net_array.c)

Modified: mpich2/trunk/src/mpid/ch3/channels/nemesis/nemesis/netmod/Makefile.sm
===================================================================
--- mpich2/trunk/src/mpid/ch3/channels/nemesis/nemesis/netmod/Makefile.sm	2010-05-07 14:51:54 UTC (rev 6624)
+++ mpich2/trunk/src/mpid/ch3/channels/nemesis/nemesis/netmod/Makefile.sm	2010-05-07 16:36:39 UTC (rev 6625)
@@ -1,3 +1,3 @@
-SUBDIRS_nemesis_nets_dirs = elan gm mx tcp ib none psm newmad
+SUBDIRS_nemesis_nets_dirs = elan gm mx tcp none psm newmad
 SUBDIRS = @nemesis_nets_dirs@