Author: buntinas Date: 2012-12-11 17:03:18 -0600 (Tue, 11 Dec 2012) New Revision: 10763 Removed: mpich2/trunk/src/mpid/ch3/channels/nemesis/netmod/elan/ mpich2/trunk/src/mpid/ch3/channels/nemesis/netmod/gm/ Modified: mpich2/trunk/src/mpi/errhan/errnames.txt mpich2/trunk/src/mpid/ch3/channels/nemesis/netmod/Makefile.mk mpich2/trunk/src/mpid/ch3/channels/nemesis/subconfigure.m4 Log: removed gm and elan netmods since they used an obsolete netmod API Modified: mpich2/trunk/src/mpi/errhan/errnames.txt =================================================================== --- mpich2/trunk/src/mpi/errhan/errnames.txt 2012-12-11 17:23:40 UTC (rev 10762) +++ mpich2/trunk/src/mpi/errhan/errnames.txt 2012-12-11 23:03:18 UTC (rev 10763) @@ -698,14 +698,6 @@ **remove_shar_mem %s %s:unable to remove shared memory - %s %s **detach_shar_mem:unable to detach shared memory **detach_shar_mem %s %s:unable to detach shared memory - %s %s -**gm_init:gm_init failed -**gm_init %d:gm_init failed gm_status=%d -**gm_regmem:gm_register_memory failed -**gm_regmem %d:gm_register_memory failed gm_status=%d -**gm_get_unique_board_id:gm_get_unique_board_id failed -**gm_get_unique_board_id %d:gm_get_unique_board_id failed status=%d -**gm_incompatible_lib:GM library and driver are different versions -**gm_no_port:unable to find a free GM port **read %d %s:read from socket failed - nread=%d %s **winput_oob:target pointer for win_put is out of bounds **winget_oob:source pointer for win_get is out of bounds Modified: mpich2/trunk/src/mpid/ch3/channels/nemesis/netmod/Makefile.mk =================================================================== --- mpich2/trunk/src/mpid/ch3/channels/nemesis/netmod/Makefile.mk 2012-12-11 17:23:40 UTC (rev 10762) +++ mpich2/trunk/src/mpid/ch3/channels/nemesis/netmod/Makefile.mk 2012-12-11 23:03:18 UTC (rev 10763) @@ -5,8 +5,6 @@ ## See COPYRIGHT in top-level directory. ## -include $(top_srcdir)/src/mpid/ch3/channels/nemesis/netmod/elan/Makefile.mk -include $(top_srcdir)/src/mpid/ch3/channels/nemesis/netmod/gm/Makefile.mk include $(top_srcdir)/src/mpid/ch3/channels/nemesis/netmod/mx/Makefile.mk include $(top_srcdir)/src/mpid/ch3/channels/nemesis/netmod/tcp/Makefile.mk include $(top_srcdir)/src/mpid/ch3/channels/nemesis/netmod/none/Makefile.mk Modified: mpich2/trunk/src/mpid/ch3/channels/nemesis/subconfigure.m4 =================================================================== --- mpich2/trunk/src/mpid/ch3/channels/nemesis/subconfigure.m4 2012-12-11 17:23:40 UTC (rev 10762) +++ mpich2/trunk/src/mpid/ch3/channels/nemesis/subconfigure.m4 2012-12-11 23:03:18 UTC (rev 10763) @@ -92,9 +92,7 @@ AC_CHECK_FUNCS(signal) # Check for netmod relevant headers and libraries -PAC_SET_HEADER_LIB_PATH(gm) PAC_SET_HEADER_LIB_PATH(mx) -PAC_SET_HEADER_LIB_PATH(elan) PAC_SET_HEADER_LIB_PATH(scif) nemesis_nets_dirs=""