[mpich2-commits] r7436 - in mpich2/branches/release/mpich2-1.3.x: . confdb maint src/include src/mpid/ch3/channels/nemesis/nemesis/netmod/newmad src/mpid/ch3/channels/nemesis/nemesis/netmod/wintcp src/mpl/src src/pm/hydra src/pm/hydra/examples src/pm/hydra/include src/pm/hydra/pm src/pm/hydra/tools src/pm/hydra/tools/bind/hwloc/hwloc/config src/pm/hydra/tools/bootstrap/external src/pm/hydra/tools/bootstrap/src src/pm/hydra/tools/bootstrap/utils src/pm/hydra/ui src/pm/hydra/utils src/pm/hydra/utils/string
balaji at mcs.anl.gov
balaji at mcs.anl.gov
Thu Nov 11 01:55:02 CST 2010
Author: balaji
Date: 2010-11-11 01:55:02 -0600 (Thu, 11 Nov 2010)
New Revision: 7436
Modified:
mpich2/branches/release/mpich2-1.3.x/
mpich2/branches/release/mpich2-1.3.x/confdb/
mpich2/branches/release/mpich2-1.3.x/configure.in
mpich2/branches/release/mpich2-1.3.x/maint/Version
mpich2/branches/release/mpich2-1.3.x/src/include/mpiu_ex.h
mpich2/branches/release/mpich2-1.3.x/src/mpid/ch3/channels/nemesis/nemesis/netmod/newmad/newmad_impl.h
mpich2/branches/release/mpich2-1.3.x/src/mpid/ch3/channels/nemesis/nemesis/netmod/newmad/newmad_init.c
mpich2/branches/release/mpich2-1.3.x/src/mpid/ch3/channels/nemesis/nemesis/netmod/wintcp/socksm.c
mpich2/branches/release/mpich2-1.3.x/src/mpl/src/mplstr.c
mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/
mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/Makefile.am
mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/README
mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/autogen.sh
mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/configure.in
mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/examples/
mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/hydra-doxygen.cfg.in
mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/include/
mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/include/hydra_utils.h
mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/mpich2prereq
mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/pm/
mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/tools/
mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/tools/bind/hwloc/hwloc/config/hwloc.m4
mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/tools/bind/hwloc/hwloc/config/hwloc_internal.m4
mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/tools/bootstrap/external/slurm_launch.c
mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/tools/bootstrap/external/slurm_query_node_list.c
mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/tools/bootstrap/external/slurm_query_proxy_id.c
mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/tools/bootstrap/src/bsci_query_proxy_id.c
mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/tools/bootstrap/utils/bscu_query_proxy_id.c
mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/ui/
mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/utils/
mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/utils/string/string.c
mpich2/branches/release/mpich2-1.3.x/winconfigure.wsf
Log:
Merging r7422, r7423, r7424, r7429, r7430, r7431, r7432 and r7435 from
trunk.
Property changes on: mpich2/branches/release/mpich2-1.3.x
___________________________________________________________________
Modified: svn:mergeinfo
- /mpich2/branches/dev/ckpt:5050
/mpich2/branches/dev/ckpt2:5057-6537
/mpich2/branches/dev/ftb:5661-5730
/mpich2/branches/dev/lapi:5817
/mpich2/branches/dev/wintcp_async_progress:5008-5009,5123,5555-5559,5561-5564,5566-5567,5570,5577-5581,5613-5616,5619
/mpich2/branches/release/mpich2-1.1.1:5022,5032,5110,5113,5140-5141
/mpich2/branches/release/mpich2-1.2:5406
/mpich2/trunk:7355-7359,7366-7367,7371-7402,7406-7409,7411-7416,7419-7420,7433
+ /mpich2/branches/dev/ckpt:5050
/mpich2/branches/dev/ckpt2:5057-6537
/mpich2/branches/dev/ftb:5661-5730
/mpich2/branches/dev/lapi:5817
/mpich2/branches/dev/wintcp_async_progress:5008-5009,5123,5555-5559,5561-5564,5566-5567,5570,5577-5581,5613-5616,5619
/mpich2/branches/release/mpich2-1.1.1:5022,5032,5110,5113,5140-5141
/mpich2/branches/release/mpich2-1.2:5406
/mpich2/trunk:7355-7359,7366-7367,7371-7402,7406-7409,7411-7416,7419-7420,7422-7424,7429-7433,7435
Property changes on: mpich2/branches/release/mpich2-1.3.x/confdb
___________________________________________________________________
Modified: svn:mergeinfo
- /mpich2/branches/dev/ckpt2/confdb:5180,5182,5196,5198
/mpich2/branches/dev/ftb/confdb:5661-5730
/mpich2/branches/dev/lapi/confdb:5817
/mpich2/branches/dev/wintcp_async_progress/confdb:5008-5009,5123,5555-5559,5561-5564,5566-5567,5570,5577-5581,5613-5616,5619
/mpich2/branches/release/mpich2-1.1.1/confdb:5022,5032,5110,5113,5140-5141
/mpich2/branches/release/mpich2-1.2/confdb:5406
/mpich2/trunk/confdb:7355-7359,7366-7367,7371-7402,7406-7409,7411-7416,7419-7420,7433
+ /mpich2/branches/dev/ckpt2/confdb:5180,5182,5196,5198
/mpich2/branches/dev/ftb/confdb:5661-5730
/mpich2/branches/dev/lapi/confdb:5817
/mpich2/branches/dev/wintcp_async_progress/confdb:5008-5009,5123,5555-5559,5561-5564,5566-5567,5570,5577-5581,5613-5616,5619
/mpich2/branches/release/mpich2-1.1.1/confdb:5022,5032,5110,5113,5140-5141
/mpich2/branches/release/mpich2-1.2/confdb:5406
/mpich2/trunk/confdb:7355-7359,7366-7367,7371-7402,7406-7409,7411-7416,7419-7420,7422-7424,7429-7433,7435
Modified: mpich2/branches/release/mpich2-1.3.x/configure.in
===================================================================
--- mpich2/branches/release/mpich2-1.3.x/configure.in 2010-11-11 01:37:08 UTC (rev 7435)
+++ mpich2/branches/release/mpich2-1.3.x/configure.in 2010-11-11 07:55:02 UTC (rev 7436)
@@ -2446,7 +2446,7 @@
case "$ENABLE_SHLIB" in
gcc-osx|osx-gcc)
# Assume that the compiler is g++ if gcc style shared libraries chosen
- CXX_SHL="$CXX -fPIC"
+ CXX_SHL="$CXX -fPIC -dynamiclib -undefined suppress -single_module -flat_namespace"
CXX_LINKPATH_SHL=""
;;
gcc)
Property changes on: mpich2/branches/release/mpich2-1.3.x/maint/Version
___________________________________________________________________
Modified: svn:mergeinfo
- /mpich2/branches/dev/ckpt/maint/Version:5050
/mpich2/branches/dev/ckpt2/maint/Version:5057-6537
/mpich2/branches/dev/ftb/maint/Version:5661-5730
/mpich2/branches/dev/lapi/maint/Version:5817
/mpich2/branches/dev/wintcp_async_progress/maint/Version:5008-5009,5123,5555-5559,5561-5564,5566-5567,5570,5577-5581,5613-5616,5619
/mpich2/branches/release/mpich2-1.1.1/maint/Version:5022,5032,5110,5113,5140-5141
/mpich2/branches/release/mpich2-1.2/maint/Version:5406
/mpich2/trunk/maint/Version:7433
/mpich2/trunk/src/pm/hydra/VERSION:7355-7359,7366-7367,7371-7402,7406-7409,7411-7416
+ /mpich2/branches/dev/ckpt/maint/Version:5050
/mpich2/branches/dev/ckpt2/maint/Version:5057-6537
/mpich2/branches/dev/ftb/maint/Version:5661-5730
/mpich2/branches/dev/lapi/maint/Version:5817
/mpich2/branches/dev/wintcp_async_progress/maint/Version:5008-5009,5123,5555-5559,5561-5564,5566-5567,5570,5577-5581,5613-5616,5619
/mpich2/branches/release/mpich2-1.1.1/maint/Version:5022,5032,5110,5113,5140-5141
/mpich2/branches/release/mpich2-1.2/maint/Version:5406
/mpich2/trunk/maint/Version:7422-7424,7429-7433,7435
/mpich2/trunk/src/pm/hydra/VERSION:7355-7359,7366-7367,7371-7402,7406-7409,7411-7416
Modified: mpich2/branches/release/mpich2-1.3.x/src/include/mpiu_ex.h
===================================================================
--- mpich2/branches/release/mpich2-1.3.x/src/include/mpiu_ex.h 2010-11-11 01:37:08 UTC (rev 7435)
+++ mpich2/branches/release/mpich2-1.3.x/src/include/mpiu_ex.h 2010-11-11 07:55:02 UTC (rev 7436)
@@ -307,13 +307,11 @@
}
/*
- MPIU_ExReInitOverlapped
+ MPIU_ExReInitOverlapped ==> ONLY REQD for manual events
Re-Initialize the success & failure callback function fields
- The hEvent field of the OVERLAPPED is reset since it will
- be reused
- Returns TRUE if Re-init succeeds, FALSE otherwise
+ Re-init the event
*/
static
@@ -325,10 +323,18 @@
MPIU_ExCompletionRoutine pfnFailure
)
{
- pOverlapped->pfnSuccess = pfnSuccess;
- pOverlapped->pfnFailure = pfnFailure;
+ /* Re-init succ/fail handlers only if they are ~null */
+ if(pfnSuccess){
+ pOverlapped->pfnSuccess = pfnSuccess;
+ }
+ if(pfnFailure){
+ pOverlapped->pfnFailure = pfnFailure;
+ }
- return(ResetEvent(pOverlapped->ov.hEvent));
+ if(pOverlapped->ov.hEvent)
+ return(ResetEvent(pOverlapped->ov.hEvent));
+ else
+ return TRUE;
}
/*
Modified: mpich2/branches/release/mpich2-1.3.x/src/mpid/ch3/channels/nemesis/nemesis/netmod/newmad/newmad_impl.h
===================================================================
--- mpich2/branches/release/mpich2-1.3.x/src/mpid/ch3/channels/nemesis/nemesis/netmod/newmad/newmad_impl.h 2010-11-11 01:37:08 UTC (rev 7435)
+++ mpich2/branches/release/mpich2-1.3.x/src/mpid/ch3/channels/nemesis/nemesis/netmod/newmad/newmad_impl.h 2010-11-11 07:55:02 UTC (rev 7436)
@@ -65,23 +65,17 @@
/* Connection management*/
int MPID_nem_newmad_send_conn_info (MPIDI_VC_t *vc);
-#define MPID_NEM_NMAD_MAX_SIZE (MPID_NEM_MAX_NETMOD_STRING_LEN)
+#define MPID_NEM_NMAD_MAX_SIZE 64
typedef nm_gate_t mpid_nem_newmad_p_gate_t;
-typedef struct MPID_nem_newmad_vc_area_internal
-{
- char hostname[MPID_NEM_NMAD_MAX_SIZE];
- char url[MPID_NEM_NMAD_MAX_SIZE];
- mpid_nem_newmad_p_gate_t p_gate;
-} MPID_nem_newmad_vc_area_internal_t;
-
/* The current max size for the whole structure is 128 bytes */
typedef struct
{
- MPID_nem_newmad_vc_area_internal_t *area;
+ char url[MPID_NEM_NMAD_MAX_SIZE];
+ mpid_nem_newmad_p_gate_t p_gate;
} MPID_nem_newmad_vc_area;
/* accessor macro to private fields in VC */
-#define VC_FIELD(vcp, field) (((MPID_nem_newmad_vc_area *)((MPIDI_CH3I_VC *)((vcp)->channel_private))->netmod_area.padding)->area->field)
+#define VC_FIELD(vcp, field) (((MPID_nem_newmad_vc_area *)((MPIDI_CH3I_VC *)((vcp)->channel_private))->netmod_area.padding)->field)
/* The req provides a generic buffer in which network modules can store
private fields This removes all dependencies from the req structure
Modified: mpich2/branches/release/mpich2-1.3.x/src/mpid/ch3/channels/nemesis/nemesis/netmod/newmad/newmad_init.c
===================================================================
--- mpich2/branches/release/mpich2-1.3.x/src/mpid/ch3/channels/nemesis/nemesis/netmod/newmad/newmad_init.c 2010-11-11 01:37:08 UTC (rev 7435)
+++ mpich2/branches/release/mpich2-1.3.x/src/mpid/ch3/channels/nemesis/nemesis/netmod/newmad/newmad_init.c 2010-11-11 07:55:02 UTC (rev 7436)
@@ -6,9 +6,6 @@
#include "newmad_impl.h"
-#define MPIDI_CH3I_HOSTNAME_KEY "hostname_id"
-#define MPIDI_CH3I_URL_KEY "url_id"
-
MPID_nem_netmod_funcs_t MPIDI_nem_newmad_funcs = {
MPID_nem_newmad_init,
MPID_nem_newmad_finalize,
@@ -44,6 +41,7 @@
MPID_nem_newmad_iprobe /* iprobe */
};
+#define MPIDI_CH3I_URL_KEY "url_id"
static int mpid_nem_newmad_myrank;
static const char *label="mpich2";
@@ -112,7 +110,7 @@
{
int mpi_errno = MPI_SUCCESS ;
int index;
-
+
/*
fprintf(stdout,"Size of MPID_nem_mad_module_vc_area_internal_t : %i | size of nm_sr_request_t :%i | Size of req_area : %i\n",
sizeof(MPID_nem_newmad_vc_area_internal_t),sizeof(nm_sr_request_t), sizeof(MPID_nem_newmad_req_area));
@@ -123,17 +121,16 @@
MPIU_Assert( sizeof(MPID_nem_newmad_req_area) <= MPID_NEM_REQ_NETMOD_AREA_LEN);
*/
- /*
- if (sizeof(MPID_nem_newmad_vc_area_internal_t) > MPID_NEM_VC_NETMOD_AREA_LEN)
+
+ if (sizeof(MPID_nem_newmad_vc_area) > MPID_NEM_VC_NETMOD_AREA_LEN)
{
fprintf(stdout,"===========================================================\n");
fprintf(stdout,"=== Error : Newmad data structure size is too long ===\n");
fprintf(stdout,"=== VC netmod area is %4i | Nmad struct size is %4i ===\n",
- MPID_NEM_VC_NETMOD_AREA_LEN, sizeof(MPID_nem_newmad_vc_area_internal_t));
+ MPID_NEM_VC_NETMOD_AREA_LEN, sizeof(MPID_nem_newmad_vc_area));
fprintf(stdout,"===========================================================\n");
- MPIU_Abort();
+ exit(0);
}
- */
if (sizeof(MPID_nem_newmad_req_area) > MPID_NEM_REQ_NETMOD_AREA_LEN)
{
@@ -142,7 +139,7 @@
fprintf(stdout,"=== Req netmod area is %4i | Nmad struct size is %4i ===\n",
MPID_NEM_REQ_NETMOD_AREA_LEN, sizeof(MPID_nem_newmad_req_area));
fprintf(stdout,"===========================================================\n");
- /* MPIU_Abort(); */
+ exit(0);
}
mpid_nem_newmad_myrank = pg_rank;
@@ -172,16 +169,7 @@
{
int mpi_errno = MPI_SUCCESS;
int str_errno = MPIU_STR_SUCCESS;
- char name[MPID_NEM_NMAD_MAX_SIZE];
- gethostname(name,MPID_NEM_NMAD_MAX_SIZE);
-
- str_errno = MPIU_Str_add_binary_arg (bc_val_p, val_max_sz_p, MPIDI_CH3I_HOSTNAME_KEY, name, strlen(name));
- if (str_errno) {
- MPIU_ERR_CHKANDJUMP(str_errno == MPIU_STR_NOMEM, mpi_errno, MPI_ERR_OTHER, "**buscard_len");
- MPIU_ERR_SETANDJUMP(mpi_errno, MPI_ERR_OTHER, "**buscard");
- }
-
str_errno = MPIU_Str_add_binary_arg (bc_val_p, val_max_sz_p, MPIDI_CH3I_URL_KEY, local_session_url, strlen(local_session_url));
if (str_errno) {
MPIU_ERR_CHKANDJUMP(str_errno == MPIU_STR_NOMEM, mpi_errno, MPI_ERR_OTHER, "**buscard_len");
@@ -199,20 +187,12 @@
#undef FCNAME
#define FCNAME MPIDI_QUOTE(FUNCNAME)
int
-MPID_nem_newmad_get_from_bc (const char *business_card, char *hostname, char *url)
+MPID_nem_newmad_get_from_bc (const char *business_card, char *url)
{
int mpi_errno = MPI_SUCCESS;
int str_errno = MPIU_STR_SUCCESS;
int len;
- str_errno = MPIU_Str_get_binary_arg (business_card, MPIDI_CH3I_HOSTNAME_KEY, hostname,
- MPID_NEM_NMAD_MAX_SIZE, &len);
- if (str_errno != MPIU_STR_SUCCESS)
- {
- /* FIXME: create a real error string for this */
- MPIU_ERR_CHKANDJUMP(str_errno, mpi_errno, MPI_ERR_OTHER, "**argstr_hostd");
- }
-
str_errno = MPIU_Str_get_binary_arg (business_card, MPIDI_CH3I_URL_KEY, url,
MPID_NEM_NMAD_MAX_SIZE, &len);
if (str_errno != MPIU_STR_SUCCESS)
@@ -263,15 +243,10 @@
mpi_errno = vc->pg->getConnInfo(vc->pg_rank, business_card,val_max_sz,vc->pg);
if (mpi_errno) MPIU_ERR_POP(mpi_errno);
- (((MPID_nem_newmad_vc_area *)((MPIDI_CH3I_VC *)(vc)->channel_private)->netmod_area.padding)->area) =
- (MPID_nem_newmad_vc_area_internal_t *)MPIU_Malloc(sizeof(MPID_nem_newmad_vc_area_internal_t));
- MPIU_Assert( (((MPID_nem_newmad_vc_area *)((MPIDI_CH3I_VC *)(vc)->channel_private)->netmod_area.padding)->area) != NULL);
-
/* Very important */
- memset(VC_FIELD(vc, hostname),0,MPID_NEM_NMAD_MAX_SIZE);
memset(VC_FIELD(vc, url),0,MPID_NEM_NMAD_MAX_SIZE);
- mpi_errno = MPID_nem_newmad_get_from_bc (business_card, VC_FIELD(vc, hostname), VC_FIELD(vc, url));
+ mpi_errno = MPID_nem_newmad_get_from_bc (business_card, VC_FIELD(vc, url));
if (mpi_errno) MPIU_ERR_POP (mpi_errno);
MPIU_Free(business_card);
@@ -280,7 +255,6 @@
if (ret != NM_ESUCCESS) fprintf(stdout,"nm_session_connect returned ret = %d\n", ret);
nm_gate_ref_set(VC_FIELD(vc, p_gate),(void*)vc);
-
MPIDI_CHANGE_VC_STATE(vc, ACTIVE);
vc->eager_max_msg_sz = 32768;
@@ -305,8 +279,6 @@
{
int mpi_errno = MPI_SUCCESS;
- MPIU_Free((((MPID_nem_newmad_vc_area *)((MPIDI_CH3I_VC *)(vc)->channel_private)->netmod_area.padding)->area));
-
fn_exit:
return mpi_errno;
fn_fail: ATTRIBUTE((unused))
Property changes on: mpich2/branches/release/mpich2-1.3.x/src/mpid/ch3/channels/nemesis/nemesis/netmod/wintcp/socksm.c
___________________________________________________________________
Modified: svn:mergeinfo
- /mpich2/branches/dev/ckpt/src/mpid/ch3/channels/nemesis/nemesis/netmod/wintcp/socksm.c:5050
/mpich2/branches/dev/ckpt2/src/mpid/ch3/channels/nemesis/nemesis/netmod/wintcp/socksm.c:5057-6537
/mpich2/branches/dev/ftb/src/mpid/ch3/channels/nemesis/nemesis/netmod/wintcp/socksm.c:5661-5730
/mpich2/branches/dev/lapi/src/mpid/ch3/channels/nemesis/nemesis/netmod/wintcp/socksm.c:5817
/mpich2/branches/dev/win_rrvm/src/mpid/ch3/channels/nemesis/nemesis/netmod/wintcp/socksm.c:6416,6428
/mpich2/branches/dev/wintcp_async_progress/src/mpid/ch3/channels/nemesis/nemesis/netmod/wintcp/socksm.c:5008-5009,5123,5555-5559,5561-5564,5566-5567,5570,5577-5581,5613-5616,5619
/mpich2/branches/release/mpich2-1.1.1/src/mpid/ch3/channels/nemesis/nemesis/netmod/wintcp/socksm.c:5022,5032,5110,5113,5140-5141
/mpich2/branches/release/mpich2-1.2/src/mpid/ch3/channels/nemesis/nemesis/netmod/wintcp/socksm.c:5406
/mpich2/trunk/src/mpid/ch3/channels/nemesis/nemesis/netmod/wintcp/socksm.c:7355-7359,7366-7367,7371-7402,7406-7409,7411-7416,7419-7420,7425,7433
+ /mpich2/branches/dev/ckpt/src/mpid/ch3/channels/nemesis/nemesis/netmod/wintcp/socksm.c:5050
/mpich2/branches/dev/ckpt2/src/mpid/ch3/channels/nemesis/nemesis/netmod/wintcp/socksm.c:5057-6537
/mpich2/branches/dev/ftb/src/mpid/ch3/channels/nemesis/nemesis/netmod/wintcp/socksm.c:5661-5730
/mpich2/branches/dev/lapi/src/mpid/ch3/channels/nemesis/nemesis/netmod/wintcp/socksm.c:5817
/mpich2/branches/dev/win_rrvm/src/mpid/ch3/channels/nemesis/nemesis/netmod/wintcp/socksm.c:6416,6428
/mpich2/branches/dev/wintcp_async_progress/src/mpid/ch3/channels/nemesis/nemesis/netmod/wintcp/socksm.c:5008-5009,5123,5555-5559,5561-5564,5566-5567,5570,5577-5581,5613-5616,5619
/mpich2/branches/release/mpich2-1.1.1/src/mpid/ch3/channels/nemesis/nemesis/netmod/wintcp/socksm.c:5022,5032,5110,5113,5140-5141
/mpich2/branches/release/mpich2-1.2/src/mpid/ch3/channels/nemesis/nemesis/netmod/wintcp/socksm.c:5406
/mpich2/trunk/src/mpid/ch3/channels/nemesis/nemesis/netmod/wintcp/socksm.c:7355-7359,7366-7367,7371-7402,7406-7409,7411-7416,7419-7420,7422-7425,7429-7433,7435
Property changes on: mpich2/branches/release/mpich2-1.3.x/src/mpl/src/mplstr.c
___________________________________________________________________
Modified: svn:mergeinfo
- /mpich2/branches/dev/ckpt2/src/mpl/src/string/mplstr.c:5182,5196,5198
/mpich2/branches/dev/ftb/src/mpl/src/mplstr.c:5661-5730
/mpich2/branches/dev/lapi/src/mpl/src/mplstr.c:5817
/mpich2/branches/release/mpich2-1.1.1/src/mpl/src/string/mplstr.c:5022,5032,5110,5113,5140-5141
/mpich2/branches/release/mpich2-1.2/src/mpl/src/string/mplstr.c:5406
/mpich2/trunk/src/mpl/src/mplstr.c:7355-7359,7366-7367,7371-7402,7406-7409,7411-7416,7419-7420,7433
+ /mpich2/branches/dev/ckpt2/src/mpl/src/string/mplstr.c:5182,5196,5198
/mpich2/branches/dev/ftb/src/mpl/src/mplstr.c:5661-5730
/mpich2/branches/dev/lapi/src/mpl/src/mplstr.c:5817
/mpich2/branches/release/mpich2-1.1.1/src/mpl/src/string/mplstr.c:5022,5032,5110,5113,5140-5141
/mpich2/branches/release/mpich2-1.2/src/mpl/src/string/mplstr.c:5406
/mpich2/trunk/src/mpl/src/mplstr.c:7355-7359,7366-7367,7371-7402,7406-7409,7411-7416,7419-7420,7422-7424,7429-7433,7435
Property changes on: mpich2/branches/release/mpich2-1.3.x/src/pm/hydra
___________________________________________________________________
Modified: svn:mergeinfo
- /mpich2/branches/dev/ckpt/src/pm/hydra:5050
/mpich2/branches/dev/ckpt2/src/pm/hydra:5057-6537
/mpich2/branches/dev/ftb/src/pm/hydra:5661-5730
/mpich2/branches/dev/lapi/src/pm/hydra:5817
/mpich2/branches/dev/wintcp_async_progress/src/pm/hydra:5008-5009,5123,5555-5559,5561-5564,5566-5567,5570,5577-5581,5613-5616,5619
/mpich2/branches/release/mpich2-1.1.1/src/pm/hydra:5022,5032,5110,5113,5140-5141
/mpich2/branches/release/mpich2-1.2/src/pm/hydra:5406
/mpich2/trunk/src/pm/hydra:7355-7359*,7366-7367*,7371-7402*,7406-7409*,7411-7416*,7419-7420*,7433*
+ /mpich2/branches/dev/ckpt/src/pm/hydra:5050
/mpich2/branches/dev/ckpt2/src/pm/hydra:5057-6537
/mpich2/branches/dev/ftb/src/pm/hydra:5661-5730
/mpich2/branches/dev/lapi/src/pm/hydra:5817
/mpich2/branches/dev/wintcp_async_progress/src/pm/hydra:5008-5009,5123,5555-5559,5561-5564,5566-5567,5570,5577-5581,5613-5616,5619
/mpich2/branches/release/mpich2-1.1.1/src/pm/hydra:5022,5032,5110,5113,5140-5141
/mpich2/branches/release/mpich2-1.2/src/pm/hydra:5406
/mpich2/trunk/src/pm/hydra:7355-7359*,7366-7367*,7371-7402*,7406-7409*,7411-7416*,7419-7420*,7422-7424*,7429-7433*,7435*
Property changes on: mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/Makefile.am
___________________________________________________________________
Modified: svn:mergeinfo
- /mpich2/branches/dev/ckpt/src/pm/hydra/Makefile.am:5050
/mpich2/branches/dev/ckpt2/src/pm/hydra/Makefile.am:5057-6537
/mpich2/branches/dev/ftb/src/pm/hydra/Makefile.am:5661-5730
/mpich2/branches/dev/lapi/src/pm/hydra/Makefile.am:5817
/mpich2/branches/dev/wintcp_async_progress/src/pm/hydra/Makefile.am:5008-5009,5123,5555-5559,5561-5564,5566-5567,5570,5577-5581,5613-5616,5619
/mpich2/branches/release/mpich2-1.1.1/src/pm/hydra/Makefile.am:5022,5032,5110,5113,5140-5141
/mpich2/branches/release/mpich2-1.2/src/pm/hydra/Makefile.am:5406
/mpich2/trunk/src/pm/hydra/Makefile.am:7355-7359,7366-7367,7371-7402,7406-7409,7411-7416,7419-7420,7433
+ /mpich2/branches/dev/ckpt/src/pm/hydra/Makefile.am:5050
/mpich2/branches/dev/ckpt2/src/pm/hydra/Makefile.am:5057-6537
/mpich2/branches/dev/ftb/src/pm/hydra/Makefile.am:5661-5730
/mpich2/branches/dev/lapi/src/pm/hydra/Makefile.am:5817
/mpich2/branches/dev/wintcp_async_progress/src/pm/hydra/Makefile.am:5008-5009,5123,5555-5559,5561-5564,5566-5567,5570,5577-5581,5613-5616,5619
/mpich2/branches/release/mpich2-1.1.1/src/pm/hydra/Makefile.am:5022,5032,5110,5113,5140-5141
/mpich2/branches/release/mpich2-1.2/src/pm/hydra/Makefile.am:5406
/mpich2/trunk/src/pm/hydra/Makefile.am:7355-7359,7366-7367,7371-7402,7406-7409,7411-7416,7419-7420,7422-7424,7429-7433,7435
Property changes on: mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/README
___________________________________________________________________
Modified: svn:mergeinfo
- /mpich2/branches/dev/ckpt/src/pm/hydra/README:5050
/mpich2/branches/dev/ckpt2/src/pm/hydra/README:5057-6537
/mpich2/branches/dev/ftb/src/pm/hydra/README:5661-5730
/mpich2/branches/dev/lapi/src/pm/hydra/README:5817
/mpich2/branches/dev/wintcp_async_progress/src/pm/hydra/README:5008-5009,5123,5555-5559,5561-5564,5566-5567,5570,5577-5581,5613-5616,5619
/mpich2/branches/release/mpich2-1.1.1/src/pm/hydra/README:5022,5032,5110,5113,5140-5141
/mpich2/branches/release/mpich2-1.2/src/pm/hydra/README:5406
/mpich2/trunk/src/pm/hydra/README:7355-7359,7366-7367,7371-7402,7406-7409,7411-7416,7419-7420,7433
+ /mpich2/branches/dev/ckpt/src/pm/hydra/README:5050
/mpich2/branches/dev/ckpt2/src/pm/hydra/README:5057-6537
/mpich2/branches/dev/ftb/src/pm/hydra/README:5661-5730
/mpich2/branches/dev/lapi/src/pm/hydra/README:5817
/mpich2/branches/dev/wintcp_async_progress/src/pm/hydra/README:5008-5009,5123,5555-5559,5561-5564,5566-5567,5570,5577-5581,5613-5616,5619
/mpich2/branches/release/mpich2-1.1.1/src/pm/hydra/README:5022,5032,5110,5113,5140-5141
/mpich2/branches/release/mpich2-1.2/src/pm/hydra/README:5406
/mpich2/trunk/src/pm/hydra/README:7355-7359,7366-7367,7371-7402,7406-7409,7411-7416,7419-7420,7422-7424,7429-7433,7435
Property changes on: mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/autogen.sh
___________________________________________________________________
Modified: svn:mergeinfo
- /mpich2/branches/dev/ckpt/src/pm/hydra/autogen.sh:5050
/mpich2/branches/dev/ckpt2/src/pm/hydra/autogen.sh:5057-6537
/mpich2/branches/dev/ftb/src/pm/hydra/autogen.sh:5661-5730
/mpich2/branches/dev/lapi/src/pm/hydra/autogen.sh:5817
/mpich2/branches/dev/wintcp_async_progress/src/pm/hydra/autogen.sh:5008-5009,5123,5555-5559,5561-5564,5566-5567,5570,5577-5581,5613-5616,5619
/mpich2/branches/release/mpich2-1.1.1/src/pm/hydra/autogen.sh:5022,5032,5110,5113,5140-5141
/mpich2/branches/release/mpich2-1.2/src/pm/hydra/autogen.sh:5406
/mpich2/trunk/src/pm/hydra/autogen.sh:7355-7359,7366-7367,7371-7402,7406-7409,7411-7416,7419-7420,7433
+ /mpich2/branches/dev/ckpt/src/pm/hydra/autogen.sh:5050
/mpich2/branches/dev/ckpt2/src/pm/hydra/autogen.sh:5057-6537
/mpich2/branches/dev/ftb/src/pm/hydra/autogen.sh:5661-5730
/mpich2/branches/dev/lapi/src/pm/hydra/autogen.sh:5817
/mpich2/branches/dev/wintcp_async_progress/src/pm/hydra/autogen.sh:5008-5009,5123,5555-5559,5561-5564,5566-5567,5570,5577-5581,5613-5616,5619
/mpich2/branches/release/mpich2-1.1.1/src/pm/hydra/autogen.sh:5022,5032,5110,5113,5140-5141
/mpich2/branches/release/mpich2-1.2/src/pm/hydra/autogen.sh:5406
/mpich2/trunk/src/pm/hydra/autogen.sh:7355-7359,7366-7367,7371-7402,7406-7409,7411-7416,7419-7420,7422-7424,7429-7433,7435
Property changes on: mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/configure.in
___________________________________________________________________
Modified: svn:mergeinfo
- /mpich2/branches/dev/ckpt/src/pm/hydra/configure.in:5050
/mpich2/branches/dev/ckpt2/src/pm/hydra/configure.in:5057-6537
/mpich2/branches/dev/ftb/src/pm/hydra/configure.in:5661-5730
/mpich2/branches/dev/lapi/src/pm/hydra/configure.in:5817
/mpich2/branches/dev/wintcp_async_progress/src/pm/hydra/configure.in:5008-5009,5123,5555-5559,5561-5564,5566-5567,5570,5577-5581,5613-5616,5619
/mpich2/branches/release/mpich2-1.1.1/src/pm/hydra/configure.in:5022,5032,5110,5113,5140-5141
/mpich2/branches/release/mpich2-1.2/src/pm/hydra/configure.in:5406
/mpich2/trunk/src/pm/hydra/configure.in:7355-7359,7366-7367,7371-7402,7406-7409,7411-7416,7419-7420,7433
+ /mpich2/branches/dev/ckpt/src/pm/hydra/configure.in:5050
/mpich2/branches/dev/ckpt2/src/pm/hydra/configure.in:5057-6537
/mpich2/branches/dev/ftb/src/pm/hydra/configure.in:5661-5730
/mpich2/branches/dev/lapi/src/pm/hydra/configure.in:5817
/mpich2/branches/dev/wintcp_async_progress/src/pm/hydra/configure.in:5008-5009,5123,5555-5559,5561-5564,5566-5567,5570,5577-5581,5613-5616,5619
/mpich2/branches/release/mpich2-1.1.1/src/pm/hydra/configure.in:5022,5032,5110,5113,5140-5141
/mpich2/branches/release/mpich2-1.2/src/pm/hydra/configure.in:5406
/mpich2/trunk/src/pm/hydra/configure.in:7355-7359,7366-7367,7371-7402,7406-7409,7411-7416,7419-7420,7422-7424,7429-7433,7435
Property changes on: mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/examples
___________________________________________________________________
Modified: svn:mergeinfo
- /mpich2/branches/dev/ckpt/src/pm/hydra/examples:5050
/mpich2/branches/dev/ckpt2/src/pm/hydra/examples:5057-6537
/mpich2/branches/dev/ftb/src/pm/hydra/examples:5661-5730
/mpich2/branches/dev/lapi/src/pm/hydra/examples:5817
/mpich2/branches/dev/wintcp_async_progress/src/pm/hydra/examples:5008-5009,5123,5555-5559,5561-5564,5566-5567,5570,5577-5581,5613-5616,5619
/mpich2/branches/release/mpich2-1.1.1/src/pm/hydra/examples:5022,5032,5110,5113,5140-5141
/mpich2/branches/release/mpich2-1.2/src/pm/hydra/examples:5406
/mpich2/trunk/src/pm/hydra/examples:7355-7359,7366-7367,7371-7402,7406-7409,7411-7416,7419-7420,7433
+ /mpich2/branches/dev/ckpt/src/pm/hydra/examples:5050
/mpich2/branches/dev/ckpt2/src/pm/hydra/examples:5057-6537
/mpich2/branches/dev/ftb/src/pm/hydra/examples:5661-5730
/mpich2/branches/dev/lapi/src/pm/hydra/examples:5817
/mpich2/branches/dev/wintcp_async_progress/src/pm/hydra/examples:5008-5009,5123,5555-5559,5561-5564,5566-5567,5570,5577-5581,5613-5616,5619
/mpich2/branches/release/mpich2-1.1.1/src/pm/hydra/examples:5022,5032,5110,5113,5140-5141
/mpich2/branches/release/mpich2-1.2/src/pm/hydra/examples:5406
/mpich2/trunk/src/pm/hydra/examples:7355-7359,7366-7367,7371-7402,7406-7409,7411-7416,7419-7420,7422-7424,7429-7433,7435
Property changes on: mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/hydra-doxygen.cfg.in
___________________________________________________________________
Modified: svn:mergeinfo
- /mpich2/branches/dev/ckpt/src/pm/hydra/hydra-doxygen.cfg.in:5050
/mpich2/branches/dev/ckpt2/src/pm/hydra/hydra-doxygen.cfg.in:5057-6537
/mpich2/branches/dev/ftb/src/pm/hydra/hydra-doxygen.cfg.in:5661-5730
/mpich2/branches/dev/lapi/src/pm/hydra/hydra-doxygen.cfg.in:5817
/mpich2/branches/dev/wintcp_async_progress/src/pm/hydra/hydra-doxygen.cfg.in:5008-5009,5123,5555-5559,5561-5564,5566-5567,5570,5577-5581,5613-5616,5619
/mpich2/branches/release/mpich2-1.1.1/src/pm/hydra/hydra-doxygen.cfg.in:5022,5032,5110,5113,5140-5141
/mpich2/branches/release/mpich2-1.2/src/pm/hydra/hydra-doxygen.cfg.in:5406
/mpich2/trunk/src/pm/hydra/hydra-doxygen.cfg.in:7355-7359,7366-7367,7371-7402,7406-7409,7411-7416,7419-7420,7433
+ /mpich2/branches/dev/ckpt/src/pm/hydra/hydra-doxygen.cfg.in:5050
/mpich2/branches/dev/ckpt2/src/pm/hydra/hydra-doxygen.cfg.in:5057-6537
/mpich2/branches/dev/ftb/src/pm/hydra/hydra-doxygen.cfg.in:5661-5730
/mpich2/branches/dev/lapi/src/pm/hydra/hydra-doxygen.cfg.in:5817
/mpich2/branches/dev/wintcp_async_progress/src/pm/hydra/hydra-doxygen.cfg.in:5008-5009,5123,5555-5559,5561-5564,5566-5567,5570,5577-5581,5613-5616,5619
/mpich2/branches/release/mpich2-1.1.1/src/pm/hydra/hydra-doxygen.cfg.in:5022,5032,5110,5113,5140-5141
/mpich2/branches/release/mpich2-1.2/src/pm/hydra/hydra-doxygen.cfg.in:5406
/mpich2/trunk/src/pm/hydra/hydra-doxygen.cfg.in:7355-7359,7366-7367,7371-7402,7406-7409,7411-7416,7419-7420,7422-7424,7429-7433,7435
Property changes on: mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/include
___________________________________________________________________
Modified: svn:mergeinfo
- /mpich2/branches/dev/ckpt/src/pm/hydra/include:5050
/mpich2/branches/dev/ckpt2/src/pm/hydra/include:5057-6537
/mpich2/branches/dev/ftb/src/pm/hydra/include:5661-5730
/mpich2/branches/dev/lapi/src/pm/hydra/include:5817
/mpich2/branches/dev/wintcp_async_progress/src/pm/hydra/include:5008-5009,5123,5555-5559,5561-5564,5566-5567,5570,5577-5581,5613-5616,5619
/mpich2/branches/release/mpich2-1.1.1/src/pm/hydra/include:5022,5032,5110,5113,5140-5141
/mpich2/branches/release/mpich2-1.2/src/pm/hydra/include:5406
/mpich2/trunk/src/pm/hydra/include:7355-7359,7366-7367,7371-7402,7406-7409,7411-7416,7419-7420,7433
+ /mpich2/branches/dev/ckpt/src/pm/hydra/include:5050
/mpich2/branches/dev/ckpt2/src/pm/hydra/include:5057-6537
/mpich2/branches/dev/ftb/src/pm/hydra/include:5661-5730
/mpich2/branches/dev/lapi/src/pm/hydra/include:5817
/mpich2/branches/dev/wintcp_async_progress/src/pm/hydra/include:5008-5009,5123,5555-5559,5561-5564,5566-5567,5570,5577-5581,5613-5616,5619
/mpich2/branches/release/mpich2-1.1.1/src/pm/hydra/include:5022,5032,5110,5113,5140-5141
/mpich2/branches/release/mpich2-1.2/src/pm/hydra/include:5406
/mpich2/trunk/src/pm/hydra/include:7355-7359,7366-7367,7371-7402,7406-7409,7411-7416,7419-7420,7422-7424,7429-7433,7435
Modified: mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/include/hydra_utils.h
===================================================================
--- mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/include/hydra_utils.h 2010-11-11 01:37:08 UTC (rev 7435)
+++ mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/include/hydra_utils.h 2010-11-11 07:55:02 UTC (rev 7436)
@@ -282,6 +282,7 @@
HYD_status HYDU_strsplit(char *str, char **str1, char **str2, char sep);
HYD_status HYDU_strdup_list(char *src[], char **dest[]);
char *HYDU_int_to_str(int x);
+char *HYDU_int_to_str_pad(int x, int maxlen);
char *HYDU_strerror(int error);
int HYDU_strlist_lastidx(char **strlist);
char **HYDU_str_to_strlist(char *str);
Property changes on: mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/mpich2prereq
___________________________________________________________________
Modified: svn:mergeinfo
- /mpich2/branches/dev/ckpt/src/pm/hydra/mpich2prereq:5050
/mpich2/branches/dev/ckpt2/src/pm/hydra/mpich2prereq:5057-6537
/mpich2/branches/dev/ftb/src/pm/hydra/mpich2prereq:5661-5730
/mpich2/branches/dev/lapi/src/pm/hydra/mpich2prereq:5817
/mpich2/branches/dev/wintcp_async_progress/src/pm/hydra/mpich2prereq:5008-5009,5123,5555-5559,5561-5564,5566-5567,5570,5577-5581,5613-5616,5619
/mpich2/branches/release/mpich2-1.1.1/src/pm/hydra/mpich2prereq:5022,5032,5110,5113,5140-5141
/mpich2/branches/release/mpich2-1.2/src/pm/hydra/mpich2prereq:5406
/mpich2/trunk/src/pm/hydra/mpich2prereq:7355-7359,7366-7367,7371-7402,7406-7409,7411-7416,7419-7420,7433
+ /mpich2/branches/dev/ckpt/src/pm/hydra/mpich2prereq:5050
/mpich2/branches/dev/ckpt2/src/pm/hydra/mpich2prereq:5057-6537
/mpich2/branches/dev/ftb/src/pm/hydra/mpich2prereq:5661-5730
/mpich2/branches/dev/lapi/src/pm/hydra/mpich2prereq:5817
/mpich2/branches/dev/wintcp_async_progress/src/pm/hydra/mpich2prereq:5008-5009,5123,5555-5559,5561-5564,5566-5567,5570,5577-5581,5613-5616,5619
/mpich2/branches/release/mpich2-1.1.1/src/pm/hydra/mpich2prereq:5022,5032,5110,5113,5140-5141
/mpich2/branches/release/mpich2-1.2/src/pm/hydra/mpich2prereq:5406
/mpich2/trunk/src/pm/hydra/mpich2prereq:7355-7359,7366-7367,7371-7402,7406-7409,7411-7416,7419-7420,7422-7424,7429-7433,7435
Property changes on: mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/pm
___________________________________________________________________
Modified: svn:mergeinfo
- /mpich2/branches/dev/ckpt/src/pm/hydra/pm:5050
/mpich2/branches/dev/ckpt2/src/pm/hydra/pm:5057-6537
/mpich2/branches/dev/ftb/src/pm/hydra/pm:5661-5730
/mpich2/branches/dev/lapi/src/pm/hydra/pm:5817
/mpich2/branches/dev/wintcp_async_progress/src/pm/hydra/pm:5008-5009,5123,5555-5559,5561-5564,5566-5567,5570,5577-5581,5613-5616,5619
/mpich2/branches/release/mpich2-1.1.1/src/pm/hydra/pm:5022,5032,5110,5113,5140-5141
/mpich2/branches/release/mpich2-1.2/src/pm/hydra/pm:5406
/mpich2/trunk/src/pm/hydra/pm:7355-7359,7366-7367,7371-7402,7406-7409,7411-7416,7419-7420,7433
+ /mpich2/branches/dev/ckpt/src/pm/hydra/pm:5050
/mpich2/branches/dev/ckpt2/src/pm/hydra/pm:5057-6537
/mpich2/branches/dev/ftb/src/pm/hydra/pm:5661-5730
/mpich2/branches/dev/lapi/src/pm/hydra/pm:5817
/mpich2/branches/dev/wintcp_async_progress/src/pm/hydra/pm:5008-5009,5123,5555-5559,5561-5564,5566-5567,5570,5577-5581,5613-5616,5619
/mpich2/branches/release/mpich2-1.1.1/src/pm/hydra/pm:5022,5032,5110,5113,5140-5141
/mpich2/branches/release/mpich2-1.2/src/pm/hydra/pm:5406
/mpich2/trunk/src/pm/hydra/pm:7355-7359,7366-7367,7371-7402,7406-7409,7411-7416,7419-7420,7422-7424,7429-7433,7435
Property changes on: mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/tools
___________________________________________________________________
Modified: svn:mergeinfo
- /mpich2/branches/dev/ckpt/src/pm/hydra/tools:5050
/mpich2/branches/dev/ckpt2/src/pm/hydra/tools:5057-6537
/mpich2/branches/dev/ftb/src/pm/hydra/tools:5661-5730
/mpich2/branches/dev/lapi/src/pm/hydra/tools:5817
/mpich2/branches/dev/wintcp_async_progress/src/pm/hydra/tools:5008-5009,5123,5555-5559,5561-5564,5566-5567,5570,5577-5581,5613-5616,5619
/mpich2/branches/release/mpich2-1.1.1/src/pm/hydra/tools:5022,5032,5110,5113,5140-5141
/mpich2/branches/release/mpich2-1.2/src/pm/hydra/tools:5406
/mpich2/trunk/src/pm/hydra/tools:7355-7359,7366-7367,7371-7402,7406-7409,7411-7416,7419-7420,7433
+ /mpich2/branches/dev/ckpt/src/pm/hydra/tools:5050
/mpich2/branches/dev/ckpt2/src/pm/hydra/tools:5057-6537
/mpich2/branches/dev/ftb/src/pm/hydra/tools:5661-5730
/mpich2/branches/dev/lapi/src/pm/hydra/tools:5817
/mpich2/branches/dev/wintcp_async_progress/src/pm/hydra/tools:5008-5009,5123,5555-5559,5561-5564,5566-5567,5570,5577-5581,5613-5616,5619
/mpich2/branches/release/mpich2-1.1.1/src/pm/hydra/tools:5022,5032,5110,5113,5140-5141
/mpich2/branches/release/mpich2-1.2/src/pm/hydra/tools:5406
/mpich2/trunk/src/pm/hydra/tools:7355-7359,7366-7367,7371-7402,7406-7409,7411-7416,7419-7420,7422-7424,7429-7433,7435
Modified: mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/tools/bind/hwloc/hwloc/config/hwloc.m4
===================================================================
--- mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/tools/bind/hwloc/hwloc/config/hwloc.m4 2010-11-11 01:37:08 UTC (rev 7435)
+++ mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/tools/bind/hwloc/hwloc/config/hwloc.m4 2010-11-11 07:55:02 UTC (rev 7436)
@@ -93,12 +93,6 @@
AS_IF([test "$hwloc_debug" = "" -a "$enable_debug" = "yes"],
[hwloc_debug=1
hwloc_debug_msg="enabled"])
- AS_IF([test "$hwloc_debug" = "" -a "$enable_debug" = "" -a -d .svn],
- [hwloc_debug=1
- hwloc_debug_msg="enabled (SVN checkout default)"])
- AS_IF([test "$hwloc_debug" = "" -a "$enable_debug" = "" -a -d .hg],
- [hwloc_debug=1
- hwloc_debug_msg="enabled (HG clone default)"])
AS_IF([test "$hwloc_debug" = ""],
[hwloc_debug=0
hwloc_debug_msg="disabled"])
Modified: mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/tools/bind/hwloc/hwloc/config/hwloc_internal.m4
===================================================================
--- mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/tools/bind/hwloc/hwloc/config/hwloc_internal.m4 2010-11-11 01:37:08 UTC (rev 7435)
+++ mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/tools/bind/hwloc/hwloc/config/hwloc_internal.m4 2010-11-11 07:55:02 UTC (rev 7436)
@@ -135,9 +135,6 @@
# specifically disabled by the user.
AC_MSG_CHECKING([whether to enable "picky" compiler mode])
hwloc_want_picky=0
- AS_IF([test "$GCC" = "yes"],
- [AS_IF([test -d "$srcdir/.svn" -o -d "$srcdir/.hg"],
- [hwloc_want_picky=1])])
if test "$enable_picky" = "yes"; then
if test "$GCC" = "yes"; then
AC_MSG_RESULT([yes])
Modified: mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/tools/bootstrap/external/slurm_launch.c
===================================================================
--- mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/tools/bootstrap/external/slurm_launch.c 2010-11-11 01:37:08 UTC (rev 7435)
+++ mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/tools/bootstrap/external/slurm_launch.c 2010-11-11 07:55:02 UTC (rev 7436)
@@ -137,6 +137,11 @@
targs[idx++] = HYDU_int_to_str(-1);
targs[idx++] = NULL;
+ if (HYDT_bsci_info.debug) {
+ HYDU_dump(stdout, "Launch arguments: ");
+ HYDU_print_strlist(targs);
+ }
+
HYDT_bind_cpuset_zero(&cpuset);
status = HYDU_create_process(targs, NULL,
enable_stdin ? &fd_stdin : NULL, &fd_stdout,
Modified: mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/tools/bootstrap/external/slurm_query_node_list.c
===================================================================
--- mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/tools/bootstrap/external/slurm_query_node_list.c 2010-11-11 01:37:08 UTC (rev 7435)
+++ mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/tools/bootstrap/external/slurm_query_node_list.c 2010-11-11 07:55:02 UTC (rev 7436)
@@ -73,14 +73,15 @@
arg = 0;
for (i = 0; set[i]; i++) {
start_str = strtok(set[i], "-");
- end_str = strtok(NULL, "-");
+ if ((end_str = strtok(NULL, "-")) == NULL)
+ end_str = start_str;
start = atoi(start_str);
- end = end_str ? atoi(end_str) : start;
+ end = atoi(end_str);
for (j = start; j <= end; j++) {
node_str[0] = HYDU_strdup(pre);
- node_str[1] = HYDU_int_to_str(j);
+ node_str[1] = HYDU_int_to_str_pad(j, strlen(start_str));
node_str[2] = NULL;
status = HYDU_str_alloc_and_join(node_str, &list[arg++]);
Property changes on: mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/tools/bootstrap/external/slurm_query_proxy_id.c
___________________________________________________________________
Modified: svn:mergeinfo
- /mpich2/branches/dev/ftb/src/pm/hydra/tools/bootstrap/slurm/slurm_query_proxy_id.c:5661-5730
/mpich2/branches/dev/lapi/src/pm/hydra/tools/bootstrap/slurm/slurm_query_proxy_id.c:5817
/mpich2/trunk/src/pm/hydra/tools/bootstrap/external/slurm_query_proxy_id.c:7355-7359,7366-7367,7371-7402,7406-7409,7411-7416,7419-7420,7433
+ /mpich2/branches/dev/ftb/src/pm/hydra/tools/bootstrap/slurm/slurm_query_proxy_id.c:5661-5730
/mpich2/branches/dev/lapi/src/pm/hydra/tools/bootstrap/slurm/slurm_query_proxy_id.c:5817
/mpich2/trunk/src/pm/hydra/tools/bootstrap/external/slurm_query_proxy_id.c:7355-7359,7366-7367,7371-7402,7406-7409,7411-7416,7419-7420,7422-7424,7429-7433,7435
Property changes on: mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/tools/bootstrap/src/bsci_query_proxy_id.c
___________________________________________________________________
Modified: svn:mergeinfo
- /mpich2/branches/dev/ftb/src/pm/hydra/tools/bootstrap/src/bsci_query_proxy_id.c:5661-5730
/mpich2/branches/dev/lapi/src/pm/hydra/tools/bootstrap/src/bsci_query_proxy_id.c:5817
/mpich2/trunk/src/pm/hydra/tools/bootstrap/src/bsci_query_proxy_id.c:7355-7359,7366-7367,7371-7402,7406-7409,7411-7416,7419-7420,7433
+ /mpich2/branches/dev/ftb/src/pm/hydra/tools/bootstrap/src/bsci_query_proxy_id.c:5661-5730
/mpich2/branches/dev/lapi/src/pm/hydra/tools/bootstrap/src/bsci_query_proxy_id.c:5817
/mpich2/trunk/src/pm/hydra/tools/bootstrap/src/bsci_query_proxy_id.c:7355-7359,7366-7367,7371-7402,7406-7409,7411-7416,7419-7420,7422-7424,7429-7433,7435
Property changes on: mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/tools/bootstrap/utils/bscu_query_proxy_id.c
___________________________________________________________________
Modified: svn:mergeinfo
- /mpich2/branches/dev/ftb/src/pm/hydra/tools/bootstrap/utils/bscu_query_proxy_id.c:5661-5730
/mpich2/branches/dev/lapi/src/pm/hydra/tools/bootstrap/utils/bscu_query_proxy_id.c:5817
/mpich2/trunk/src/pm/hydra/tools/bootstrap/utils/bscu_query_proxy_id.c:7355-7359,7366-7367,7371-7402,7406-7409,7411-7416,7419-7420,7433
+ /mpich2/branches/dev/ftb/src/pm/hydra/tools/bootstrap/utils/bscu_query_proxy_id.c:5661-5730
/mpich2/branches/dev/lapi/src/pm/hydra/tools/bootstrap/utils/bscu_query_proxy_id.c:5817
/mpich2/trunk/src/pm/hydra/tools/bootstrap/utils/bscu_query_proxy_id.c:7355-7359,7366-7367,7371-7402,7406-7409,7411-7416,7419-7420,7422-7424,7429-7433,7435
Property changes on: mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/ui
___________________________________________________________________
Modified: svn:mergeinfo
- /mpich2/branches/dev/ckpt/src/pm/hydra/ui:5050
/mpich2/branches/dev/ckpt2/src/pm/hydra/ui:5057-6537
/mpich2/branches/dev/ftb/src/pm/hydra/ui:5661-5730
/mpich2/branches/dev/lapi/src/pm/hydra/ui:5817
/mpich2/branches/dev/wintcp_async_progress/src/pm/hydra/ui:5008-5009,5123,5555-5559,5561-5564,5566-5567,5570,5577-5581,5613-5616,5619
/mpich2/branches/release/mpich2-1.1.1/src/pm/hydra/ui:5022,5032,5110,5113,5140-5141
/mpich2/branches/release/mpich2-1.2/src/pm/hydra/ui:5406
/mpich2/trunk/src/pm/hydra/ui:7355-7359,7366-7367,7371-7402,7406-7409,7411-7416,7419-7420,7433
+ /mpich2/branches/dev/ckpt/src/pm/hydra/ui:5050
/mpich2/branches/dev/ckpt2/src/pm/hydra/ui:5057-6537
/mpich2/branches/dev/ftb/src/pm/hydra/ui:5661-5730
/mpich2/branches/dev/lapi/src/pm/hydra/ui:5817
/mpich2/branches/dev/wintcp_async_progress/src/pm/hydra/ui:5008-5009,5123,5555-5559,5561-5564,5566-5567,5570,5577-5581,5613-5616,5619
/mpich2/branches/release/mpich2-1.1.1/src/pm/hydra/ui:5022,5032,5110,5113,5140-5141
/mpich2/branches/release/mpich2-1.2/src/pm/hydra/ui:5406
/mpich2/trunk/src/pm/hydra/ui:7355-7359,7366-7367,7371-7402,7406-7409,7411-7416,7419-7420,7422-7424,7429-7433,7435
Property changes on: mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/utils
___________________________________________________________________
Modified: svn:mergeinfo
- /mpich2/branches/dev/ckpt/src/pm/hydra/utils:5050
/mpich2/branches/dev/ckpt2/src/pm/hydra/utils:5057-6537
/mpich2/branches/dev/ftb/src/pm/hydra/utils:5661-5730
/mpich2/branches/dev/lapi/src/pm/hydra/utils:5817
/mpich2/branches/dev/wintcp_async_progress/src/pm/hydra/utils:5008-5009,5123,5555-5559,5561-5564,5566-5567,5570,5577-5581,5613-5616,5619
/mpich2/branches/release/mpich2-1.1.1/src/pm/hydra/utils:5022,5032,5110,5113,5140-5141
/mpich2/branches/release/mpich2-1.2/src/pm/hydra/utils:5406
/mpich2/trunk/src/pm/hydra/utils:7355-7359,7366-7367,7371-7402,7406-7409,7411-7416,7419-7420,7433
+ /mpich2/branches/dev/ckpt/src/pm/hydra/utils:5050
/mpich2/branches/dev/ckpt2/src/pm/hydra/utils:5057-6537
/mpich2/branches/dev/ftb/src/pm/hydra/utils:5661-5730
/mpich2/branches/dev/lapi/src/pm/hydra/utils:5817
/mpich2/branches/dev/wintcp_async_progress/src/pm/hydra/utils:5008-5009,5123,5555-5559,5561-5564,5566-5567,5570,5577-5581,5613-5616,5619
/mpich2/branches/release/mpich2-1.1.1/src/pm/hydra/utils:5022,5032,5110,5113,5140-5141
/mpich2/branches/release/mpich2-1.2/src/pm/hydra/utils:5406
/mpich2/trunk/src/pm/hydra/utils:7355-7359,7366-7367,7371-7402,7406-7409,7411-7416,7419-7420,7422-7424,7429-7433,7435
Modified: mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/utils/string/string.c
===================================================================
--- mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/utils/string/string.c 2010-11-11 01:37:08 UTC (rev 7435)
+++ mpich2/branches/release/mpich2-1.3.x/src/pm/hydra/utils/string/string.c 2010-11-11 07:55:02 UTC (rev 7436)
@@ -135,7 +135,14 @@
char *HYDU_int_to_str(int x)
{
+ return HYDU_int_to_str_pad(x, 0);
+}
+
+
+char *HYDU_int_to_str_pad(int x, int maxlen)
+{
int len = 1, max = 10, y;
+ int actual_len, i;
char *str;
HYD_status status = HYD_SUCCESS;
@@ -153,11 +160,19 @@
max *= 10;
}
- HYDU_MALLOC(str, char *, len + 1, status);
+ if (len > maxlen)
+ actual_len = len + 1;
+ else
+ actual_len = maxlen + 1;
+
+ HYDU_MALLOC(str, char *, actual_len, status);
HYDU_ERR_POP(status, "unable to allocate memory\n");
- HYDU_snprintf(str, len + 1, "%d", x);
+ for (i = 0; i < actual_len; i++)
+ str[i] = '0';
+ HYDU_snprintf(str + actual_len - len - 1, len + 1, "%d", x);
+
fn_exit:
HYDU_FUNC_EXIT();
return str;
Modified: mpich2/branches/release/mpich2-1.3.x/winconfigure.wsf
===================================================================
--- mpich2/branches/release/mpich2-1.3.x/winconfigure.wsf 2010-11-11 01:37:08 UTC (rev 7435)
+++ mpich2/branches/release/mpich2-1.3.x/winconfigure.wsf 2010-11-11 07:55:02 UTC (rev 7436)
@@ -1133,91 +1133,124 @@
ToInteger = i
End Function
+' eg: IsSignedInteger(0x8000, 4) = True
+Function IsSignedInteger(hex_str, nb)
+ Dim max_nibbles
+
+ IsSignedInteger = False
+ max_nibbles = nb/4
+
+ If (len(hex_str) > 2) AND (len(hex_str) - 2 <= max_nibbles) Then
+ If len(hex_str) - 2 < max_nibbles Then
+ ' IsSignedInteger = False
+ Else
+ If ToInteger(Mid(hex_str, 3, 1)) >= 8 Then
+ IsSignedInteger = True
+ End If
+ End If
+ Else
+ printMsg "ERROR", "Invalid HEX string provided , str=" & hex_str
+ End If
+End Function
+
'first = true
-Function HexToInt(str)
- Dim i, multiplier, index
- i = 0
- multiplier = 1
- for index = len(str) to 3 step -1
- i = i + (ToInteger(Mid(str, index, 1)) * multiplier)
- multiplier = multiplier * 16
- 'if first then
- ' MsgBox "char " & Mid(str, index, 1) & ", i = " & i
- 'end if
- next
- 'first = false
- HexToInt = i
+' eg: HexToInt(0x1, 32) = 1, HexToInt(0x1f, 32)=31
+Function HexToInt(str, nb)
+ Dim i, multiplier, index, max_nibbles
+ i = 0
+ multiplier = 1
+ max_nibbles = nb/4
+ if len(str) - 2 > max_nibbles then
+ printMsg "ERROR", "Cannot convert hex to integer, hex=" & str
+ HexToInt = 0
+ else
+ for index = len(str) to 3 step -1
+ i = i + (ToInteger(Mid(str, index, 1)) * multiplier)
+ multiplier = multiplier * 16
+ next
+ If IsSignedInteger(str, nb) Then
+ HexToInt = i - 2^nb
+ Else
+ HexToInt = i
+ End If
+ end if
End Function
-F77_MPI_DOUBLE_COMPLEX = HexToInt(dtypes.Item("MPI_DOUBLE_COMPLEX"))
-F77_MPI_COMPLEX = HexToInt(dtypes.Item("MPI_COMPLEX"))
-F77_MPI_LOGICAL_W32 = HexToInt(dtypes.Item("MPI_LOGICAL"))
-F77_MPI_LOGICAL_W64 = HexToInt(dtypes64.Item("MPI_LOGICAL"))
-F77_MPI_REAL_W32 = HexToInt(dtypes.Item("MPI_REAL"))
-F77_MPI_REAL_W64 = HexToInt(dtypes64.Item("MPI_REAL"))
-F77_MPI_DOUBLE_PRECISION = HexToInt(dtypes.Item("MPI_DOUBLE_PRECISION"))
-F77_MPI_INTEGER_W32 = HexToInt(dtypes.Item("MPI_INTEGER"))
-F77_MPI_INTEGER_W64 = HexToInt(dtypes64.Item("MPI_INTEGER"))
-F77_MPI_2INTEGER = HexToInt(dtypes.Item("MPI_2INTEGER"))
-F77_MPI_2COMPLEX = HexToInt(dtypes.Item("MPI_2COMPLEX"))
-F77_MPI_2DOUBLE_COMPLEX = HexToInt(dtypes.Item("MPI_2DOUBLE_COMPLEX"))
-F77_MPI_2REAL = HexToInt(dtypes.Item("MPI_2REAL"))
-F77_MPI_2DOUBLE_PRECISION = HexToInt(dtypes.Item("MPI_2DOUBLE_PRECISION"))
-F77_MPI_CHARACTER = HexToInt(dtypes.Item("MPI_CHARACTER"))
-F77_MPI_BYTE = HexToInt(dtypes.Item("MPI_BYTE"))
-F77_MPI_LB = HexToInt(dtypes.Item("MPI_LB"))
-F77_MPI_PACKED = HexToInt(dtypes.Item("MPI_PACKED"))
-F77_MPI_UB = HexToInt(dtypes.Item("MPI_UB"))
-F77_COMPLEX8 = HexToInt(dtypes.Item("MPI_COMPLEX8"))
-F77_COMPLEX16 = HexToInt(dtypes.Item("MPI_COMPLEX16"))
-F77_COMPLEX32 = HexToInt(dtypes.Item("MPI_COMPLEX32"))
-F77_INTEGER1 = HexToInt(dtypes.Item("MPI_INTEGER1"))
-F77_INTEGER2 = HexToInt(dtypes.Item("MPI_INTEGER2"))
-F77_INTEGER4 = HexToInt(dtypes.Item("MPI_INTEGER4"))
-F77_INTEGER8 = HexToInt(dtypes.Item("MPI_INTEGER8"))
-F77_INTEGER16 = HexToInt(dtypes.Item("MPI_INTEGER16"))
-F77_REAL4 = HexToInt(dtypes.Item("MPI_REAL4"))
-F77_REAL8 = HexToInt(dtypes.Item("MPI_REAL8"))
-F77_REAL16 = HexToInt(dtypes.Item("MPI_REAL16"))
-F77_CHAR = HexToInt(dtypes.Item("MPI_CHAR"))
-F77_SIGNED_CHAR = HexToInt(dtypes.Item("MPI_SIGNED_CHAR"))
-F77_UNSIGNED_CHAR = HexToInt(dtypes.Item("MPI_UNSIGNED_CHAR"))
-F77_WCHAR = HexToInt(dtypes.Item("MPI_WCHAR"))
-F77_SHORT = HexToInt(dtypes.Item("MPI_SHORT"))
-F77_UNSIGNED_SHORT = HexToInt(dtypes.Item("MPI_UNSIGNED_SHORT"))
-F77_INT = HexToInt(dtypes.Item("MPI_INT"))
-F77_UNSIGNED = HexToInt(dtypes.Item("MPI_UNSIGNED"))
-F77_LONG = HexToInt(dtypes.Item("MPI_LONG"))
-F77_UNSIGNED_LONG = HexToInt(dtypes.Item("MPI_UNSIGNED_LONG"))
-F77_FLOAT = HexToInt(dtypes.Item("MPI_FLOAT"))
-F77_DOUBLE = HexToInt(dtypes.Item("MPI_DOUBLE"))
-F77_LONG_DOUBLE = HexToInt(dtypes.Item("MPI_LONG_DOUBLE"))
-F77_LONG_LONG_INT = HexToInt(dtypes.Item("MPI_LONG_LONG_INT"))
-F77_UNSIGNED_LONG_LONG = HexToInt(dtypes.Item("MPI_UNSIGNED_LONG_LONG"))
-F77_LONG_LONG = HexToInt(dtypes.Item("MPI_LONG_LONG"))
-F77_FLOAT_INT = HexToInt(dtypes.Item("MPI_FLOAT_INT"))
-F77_DOUBLE_INT = HexToInt(dtypes.Item("MPI_DOUBLE_INT"))
-F77_LONG_INT = HexToInt(dtypes.Item("MPI_LONG_INT"))
-F77_SHORT_INT = HexToInt(dtypes.Item("MPI_SHORT_INT"))
-F77_2INT = HexToInt(dtypes.Item("MPI_2INT"))
-F77_LONG_DOUBLE_INT = HexToInt(dtypes.Item("MPI_LONG_DOUBLE_INT"))
-F77_INT8_T = HexToInt(dtypes.Item("MPI_INT8_T"))
-F77_INT16_T = HexToInt(dtypes.Item("MPI_INT16_T"))
-F77_INT32_T = HexToInt(dtypes.Item("MPI_INT32_T"))
-F77_INT64_T = HexToInt(dtypes.Item("MPI_INT64_T"))
-F77_UINT8_T = HexToInt(dtypes.Item("MPI_UINT8_T"))
-F77_UINT16_T = HexToInt(dtypes.Item("MPI_UINT16_T"))
-F77_UINT32_T = HexToInt(dtypes.Item("MPI_UINT32_T"))
-F77_UINT64_T = HexToInt(dtypes.Item("MPI_UINT64_T"))
-F77_C_BOOL = HexToInt(dtypes.Item("MPI_C_BOOL"))
-F77_C_FLOAT_COMPLEX = HexToInt(dtypes.Item("MPI_C_FLOAT_COMPLEX"))
-F77_C_COMPLEX = HexToInt(dtypes.Item("MPI_C_COMPLEX"))
-F77_C_DOUBLE_COMPLEX = HexToInt(dtypes.Item("MPI_C_DOUBLE_COMPLEX"))
-F77_C_LONG_DOUBLE_COMPLEX = HexToInt(dtypes.Item("MPI_C_LONG_DOUBLE_COMPLEX"))
-F77_AINT_W32 = HexToInt(dtypes.Item("MPI_AINT_W32"))
-F77_AINT_W64 = HexToInt(dtypes64.Item("MPI_AINT_W64"))
-F77_OFFSET_W64 = HexToInt(dtypes.Item("MPI_OFFSET_W64"))
+'Convert hex to a fortran integer
+Function HexToFint(str)
+ ' sizeof(fint) = 4 bytes
+ HexToFint = HexToInt(str, 32)
+End Function
+F77_MPI_DOUBLE_COMPLEX = HexToFint(dtypes.Item("MPI_DOUBLE_COMPLEX"))
+F77_MPI_COMPLEX = HexToFint(dtypes.Item("MPI_COMPLEX"))
+F77_MPI_LOGICAL_W32 = HexToFint(dtypes.Item("MPI_LOGICAL"))
+F77_MPI_LOGICAL_W64 = HexToFint(dtypes64.Item("MPI_LOGICAL"))
+F77_MPI_REAL_W32 = HexToFint(dtypes.Item("MPI_REAL"))
+F77_MPI_REAL_W64 = HexToFint(dtypes64.Item("MPI_REAL"))
+F77_MPI_DOUBLE_PRECISION = HexToFint(dtypes.Item("MPI_DOUBLE_PRECISION"))
+F77_MPI_INTEGER_W32 = HexToFint(dtypes.Item("MPI_INTEGER"))
+F77_MPI_INTEGER_W64 = HexToFint(dtypes64.Item("MPI_INTEGER"))
+F77_MPI_2INTEGER = HexToFint(dtypes.Item("MPI_2INTEGER"))
+F77_MPI_2COMPLEX = HexToFint(dtypes.Item("MPI_2COMPLEX"))
+F77_MPI_2DOUBLE_COMPLEX = HexToFint(dtypes.Item("MPI_2DOUBLE_COMPLEX"))
+F77_MPI_2REAL = HexToFint(dtypes.Item("MPI_2REAL"))
+F77_MPI_2DOUBLE_PRECISION = HexToFint(dtypes.Item("MPI_2DOUBLE_PRECISION"))
+F77_MPI_CHARACTER = HexToFint(dtypes.Item("MPI_CHARACTER"))
+F77_MPI_BYTE = HexToFint(dtypes.Item("MPI_BYTE"))
+F77_MPI_LB = HexToFint(dtypes.Item("MPI_LB"))
+F77_MPI_PACKED = HexToFint(dtypes.Item("MPI_PACKED"))
+F77_MPI_UB = HexToFint(dtypes.Item("MPI_UB"))
+F77_COMPLEX8 = HexToFint(dtypes.Item("MPI_COMPLEX8"))
+F77_COMPLEX16 = HexToFint(dtypes.Item("MPI_COMPLEX16"))
+F77_COMPLEX32 = HexToFint(dtypes.Item("MPI_COMPLEX32"))
+F77_INTEGER1 = HexToFint(dtypes.Item("MPI_INTEGER1"))
+F77_INTEGER2 = HexToFint(dtypes.Item("MPI_INTEGER2"))
+F77_INTEGER4 = HexToFint(dtypes.Item("MPI_INTEGER4"))
+F77_INTEGER8 = HexToFint(dtypes.Item("MPI_INTEGER8"))
+F77_INTEGER16 = HexToFint(dtypes.Item("MPI_INTEGER16"))
+F77_REAL4 = HexToFint(dtypes.Item("MPI_REAL4"))
+F77_REAL8 = HexToFint(dtypes.Item("MPI_REAL8"))
+F77_REAL16 = HexToFint(dtypes.Item("MPI_REAL16"))
+F77_CHAR = HexToFint(dtypes.Item("MPI_CHAR"))
+F77_SIGNED_CHAR = HexToFint(dtypes.Item("MPI_SIGNED_CHAR"))
+F77_UNSIGNED_CHAR = HexToFint(dtypes.Item("MPI_UNSIGNED_CHAR"))
+F77_WCHAR = HexToFint(dtypes.Item("MPI_WCHAR"))
+F77_SHORT = HexToFint(dtypes.Item("MPI_SHORT"))
+F77_UNSIGNED_SHORT = HexToFint(dtypes.Item("MPI_UNSIGNED_SHORT"))
+F77_INT = HexToFint(dtypes.Item("MPI_INT"))
+F77_UNSIGNED = HexToFint(dtypes.Item("MPI_UNSIGNED"))
+F77_LONG = HexToFint(dtypes.Item("MPI_LONG"))
+F77_UNSIGNED_LONG = HexToFint(dtypes.Item("MPI_UNSIGNED_LONG"))
+F77_FLOAT = HexToFint(dtypes.Item("MPI_FLOAT"))
+F77_DOUBLE = HexToFint(dtypes.Item("MPI_DOUBLE"))
+F77_LONG_DOUBLE = HexToFint(dtypes.Item("MPI_LONG_DOUBLE"))
+F77_LONG_LONG_INT = HexToFint(dtypes.Item("MPI_LONG_LONG_INT"))
+F77_UNSIGNED_LONG_LONG = HexToFint(dtypes.Item("MPI_UNSIGNED_LONG_LONG"))
+F77_LONG_LONG = HexToFint(dtypes.Item("MPI_LONG_LONG"))
+F77_FLOAT_INT = HexToFint(dtypes.Item("MPI_FLOAT_INT"))
+F77_DOUBLE_INT = HexToFint(dtypes.Item("MPI_DOUBLE_INT"))
+F77_LONG_INT = HexToFint(dtypes.Item("MPI_LONG_INT"))
+F77_SHORT_INT = HexToFint(dtypes.Item("MPI_SHORT_INT"))
+F77_2INT = HexToFint(dtypes.Item("MPI_2INT"))
+F77_LONG_DOUBLE_INT = HexToFint(dtypes.Item("MPI_LONG_DOUBLE_INT"))
+F77_INT8_T = HexToFint(dtypes.Item("MPI_INT8_T"))
+F77_INT16_T = HexToFint(dtypes.Item("MPI_INT16_T"))
+F77_INT32_T = HexToFint(dtypes.Item("MPI_INT32_T"))
+F77_INT64_T = HexToFint(dtypes.Item("MPI_INT64_T"))
+F77_UINT8_T = HexToFint(dtypes.Item("MPI_UINT8_T"))
+F77_UINT16_T = HexToFint(dtypes.Item("MPI_UINT16_T"))
+F77_UINT32_T = HexToFint(dtypes.Item("MPI_UINT32_T"))
+F77_UINT64_T = HexToFint(dtypes.Item("MPI_UINT64_T"))
+F77_C_BOOL = HexToFint(dtypes.Item("MPI_C_BOOL"))
+F77_C_FLOAT_COMPLEX = HexToFint(dtypes.Item("MPI_C_FLOAT_COMPLEX"))
+F77_C_COMPLEX = HexToFint(dtypes.Item("MPI_C_COMPLEX"))
+F77_C_DOUBLE_COMPLEX = HexToFint(dtypes.Item("MPI_C_DOUBLE_COMPLEX"))
+F77_C_LONG_DOUBLE_COMPLEX = HexToFint(dtypes.Item("MPI_C_LONG_DOUBLE_COMPLEX"))
+F77_AINT_W32 = HexToFint(dtypes.Item("MPI_AINT_W32"))
+F77_AINT_W64 = HexToFint(dtypes64.Item("MPI_AINT_W64"))
+F77_OFFSET_W64 = HexToFint(dtypes.Item("MPI_OFFSET_W64"))
+
if false then
foo = ""
foo = "F77_MPI_COMPLEX = " & F77_MPI_COMPLEX & vbCrLf
@@ -3802,6 +3835,8 @@
' LT_OBJDIR
Case "LT_OBJDIR"
fout.WriteLine("/* #undef LT_OBJDIR */")
+ Case "USE_MPIU_INSTR"
+ fout.WriteLine("/* #undef USE_MPIU_INSTR */")
Case Else
Dim useCustomDefDict
useCustomDefDict = False
Property changes on: mpich2/branches/release/mpich2-1.3.x/winconfigure.wsf
___________________________________________________________________
Modified: svn:mergeinfo
- /mpich2/branches/dev/ckpt/winconfigure.wsf:5050
/mpich2/branches/dev/ckpt2/winconfigure.wsf:5057-6537
/mpich2/branches/dev/ftb/winconfigure.wsf:5661-5730
/mpich2/branches/dev/lapi/winconfigure.wsf:5817
/mpich2/branches/dev/win_rrvm/winconfigure.wsf:6404,6407-6408,6420,6422-6423
/mpich2/branches/dev/wintcp_async_progress/winconfigure.wsf:5008-5009,5123,5555-5559,5561-5564,5566-5567,5570,5577-5581,5613-5616,5619
/mpich2/branches/release/mpich2-1.1.1/winconfigure.wsf:5022,5032,5110,5113,5140-5141
/mpich2/branches/release/mpich2-1.2/winconfigure.wsf:5406
/mpich2/trunk/winconfigure.wsf:7355-7359,7366-7367,7371-7402,7406-7409,7411-7416,7419-7420,7433
+ /mpich2/branches/dev/ckpt/winconfigure.wsf:5050
/mpich2/branches/dev/ckpt2/winconfigure.wsf:5057-6537
/mpich2/branches/dev/ftb/winconfigure.wsf:5661-5730
/mpich2/branches/dev/lapi/winconfigure.wsf:5817
/mpich2/branches/dev/win_rrvm/winconfigure.wsf:6404,6407-6408,6420,6422-6423
/mpich2/branches/dev/wintcp_async_progress/winconfigure.wsf:5008-5009,5123,5555-5559,5561-5564,5566-5567,5570,5577-5581,5613-5616,5619
/mpich2/branches/release/mpich2-1.1.1/winconfigure.wsf:5022,5032,5110,5113,5140-5141
/mpich2/branches/release/mpich2-1.2/winconfigure.wsf:5406
/mpich2/trunk/winconfigure.wsf:7355-7359,7366-7367,7371-7402,7406-7409,7411-7416,7419-7420,7422-7424,7429-7433,7435
More information about the mpich2-commits
mailing list