June 2013 - commits - mailman3.cels.anl.gov

[mpich] MPICH primary repository branch, master, updated. v3.0.4-321-g5d2dd1c
by noreply＠mpich.org 30 Jun '13

30 Jun '13

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "MPICH primary repository". The branch, master has been updated via 5d2dd1c58465a86249bcb699ad802f091a212524 (commit) from 89958058a63760b81afde2bc62ec7d60dacfe13e (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- http://git.mpich.org/mpich.git/commitdiff/5d2dd1c58465a86249bcb699ad802f091… commit 5d2dd1c58465a86249bcb699ad802f091a212524 Author: William Gropp <wgropp(a)illinois.edu> Date: Sun Jun 30 12:48:59 2013 -0500 Add explicit casts to unsigned long for printing types of size_t diff --git a/src/mpl/src/mpltrmem.c b/src/mpl/src/mpltrmem.c index cac9f12..b33887f 100644 --- a/src/mpl/src/mpltrmem.c +++ b/src/mpl/src/mpltrmem.c @@ -351,7 +351,7 @@ void MPL_trfree(void *a_ptr, int line, const char file[]) if (TRidSet) { MPL_error_printf ("[%d] Block [id=%d(%lu)] at address %s was already freed\n", world_rank, - head->id, head->size, hexstring); + head->id, (unsigned long)head->size, hexstring); } else { MPL_error_printf("[%d] Block at address %s was already freed\n", @@ -371,7 +371,7 @@ void MPL_trfree(void *a_ptr, int line, const char file[]) if (TRidSet) { MPL_error_printf ("[%d] Block [id=%d(%lu)] at address %s is corrupted (probably write past end)\n", - world_rank, head->id, head->size, hexstring); + world_rank, head->id, (unsigned long)head->size, hexstring); } else { MPL_error_printf @@ -412,7 +412,8 @@ void MPL_trfree(void *a_ptr, int line, const char file[]) if (TRlevel & TR_FREE) { addrToHex(a_ptr, hexstring); MPL_error_printf("[%d] Freeing %lu bytes at %s in %s[%d]\n", - world_rank, head->size, hexstring, file, line); + world_rank, (unsigned long)head->size, hexstring, + file, line); } /* @@ -530,7 +531,7 @@ int MPL_trvalid2(const char str[], int line, const char file[] ) if (TRidSet) { MPL_error_printf ("[%d] Block [id=%d(%lu)] at address %s is corrupted (probably write past end)\n", - world_rank, head->id, head->size, hexstring); + world_rank, head->id, (unsigned long)head->size, hexstring); } else { MPL_error_printf @@ -594,7 +595,8 @@ void MPL_trdump(FILE * fp, int minid) MPL_VG_MAKE_MEM_DEFINED(head, sizeof(*head)); if (head->id >= minid) { addrToHex((char *) head + sizeof(TrSPACE), hexstring); - fprintf(fp, "[%d] %lu at [%s], ", world_rank, head->size, hexstring); + fprintf(fp, "[%d] %lu at [%s], ", world_rank, + (unsigned long)head->size, hexstring); head->fname[TR_FNAME_LEN - 1] = 0; /* Be extra careful */ if (TRidSet) { /* For head->id >= 0, we can add code to map the id to ----------------------------------------------------------------------- Summary of changes: src/mpl/src/mpltrmem.c | 12 +++++++----- 1 files changed, 7 insertions(+), 5 deletions(-) hooks/post-receive -- MPICH primary repository

1 0

[mpich] MPICH primary repository branch, master, updated. v3.0.4-320-g8995805
by noreply＠mpich.org 28 Jun '13

28 Jun '13

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "MPICH primary repository". The branch, master has been updated via 89958058a63760b81afde2bc62ec7d60dacfe13e (commit) from 59cbc846d56eb259f6014b23114eed67b90abe95 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- http://git.mpich.org/mpich.git/commitdiff/89958058a63760b81afde2bc62ec7d60d… commit 89958058a63760b81afde2bc62ec7d60dacfe13e Author: Rob Latham <robl(a)mcs.anl.gov> Date: Fri Jun 28 13:50:10 2013 -0500 subdir-objects and top_srcdir/top_builddir conflict After adding the subdir-objects automake option, the autotools will try to create a directory called literally '$(top_srcdir)'/path/to/source to store .Plo files. with subdir-objects option, the top_srcdir and top_builddir variables are no longer needed (except in AM_CPPFLAGS and linker commands). *finally* gets hydra building again after yesterday's attempt to make automake-1.14 happy diff --git a/src/pm/hydra/pm/pmiserv/Makefile.mk b/src/pm/hydra/pm/pmiserv/Makefile.mk index 8561280..157b4e9 100644 --- a/src/pm/hydra/pm/pmiserv/Makefile.mk +++ b/src/pm/hydra/pm/pmiserv/Makefile.mk @@ -17,23 +17,23 @@ noinst_HEADERS += \ bin_PROGRAMS += hydra_pmi_proxy -hydra_pmi_proxy_SOURCES = $(top_srcdir)/pm/pmiserv/pmip.c \ - $(top_srcdir)/pm/pmiserv/pmip_cb.c \ - $(top_srcdir)/pm/pmiserv/pmip_utils.c \ - $(top_srcdir)/pm/pmiserv/pmip_pmi_v1.c \ - $(top_srcdir)/pm/pmiserv/pmip_pmi_v2.c \ - $(top_srcdir)/pm/pmiserv/common.c \ - $(top_srcdir)/pm/pmiserv/pmi_v2_common.c +hydra_pmi_proxy_SOURCES = pm/pmiserv/pmip.c \ + pm/pmiserv/pmip_cb.c \ + pm/pmiserv/pmip_utils.c \ + pm/pmiserv/pmip_pmi_v1.c \ + pm/pmiserv/pmip_pmi_v2.c \ + pm/pmiserv/common.c \ + pm/pmiserv/pmi_v2_common.c hydra_pmi_proxy_CFLAGS = $(AM_CFLAGS) hydra_pmi_proxy_LDFLAGS = $(external_ldflags) -L$(top_builddir) hydra_pmi_proxy_LDADD = -lhydra $(external_libs) hydra_pmi_proxy_DEPENDENCIES = libhydra.la -libpm_la_SOURCES += $(top_srcdir)/pm/pmiserv/pmiserv_pmi.c \ - $(top_srcdir)/pm/pmiserv/pmiserv_pmi_v1.c \ - $(top_srcdir)/pm/pmiserv/pmiserv_pmi_v2.c \ - $(top_srcdir)/pm/pmiserv/pmiserv_pmci.c \ - $(top_srcdir)/pm/pmiserv/pmiserv_cb.c \ - $(top_srcdir)/pm/pmiserv/pmiserv_utils.c \ - $(top_srcdir)/pm/pmiserv/common.c \ - $(top_srcdir)/pm/pmiserv/pmi_v2_common.c +libpm_la_SOURCES += pm/pmiserv/pmiserv_pmi.c \ + pm/pmiserv/pmiserv_pmi_v1.c \ + pm/pmiserv/pmiserv_pmi_v2.c \ + pm/pmiserv/pmiserv_pmci.c \ + pm/pmiserv/pmiserv_cb.c \ + pm/pmiserv/pmiserv_utils.c \ + pm/pmiserv/common.c \ + pm/pmiserv/pmi_v2_common.c diff --git a/src/pm/hydra/tools/bootstrap/external/Makefile.mk b/src/pm/hydra/tools/bootstrap/external/Makefile.mk index 91d5ee1..8cf57a5 100644 --- a/src/pm/hydra/tools/bootstrap/external/Makefile.mk +++ b/src/pm/hydra/tools/bootstrap/external/Makefile.mk @@ -15,48 +15,48 @@ noinst_HEADERS += \ tools/bootstrap/external/cobalt.h \ tools/bootstrap/external/ssh.h -libhydra_la_SOURCES += $(top_srcdir)/tools/bootstrap/external/external_common.c \ - $(top_srcdir)/tools/bootstrap/external/external_common_launch.c \ - $(top_srcdir)/tools/bootstrap/external/fork_init.c \ - $(top_srcdir)/tools/bootstrap/external/user_init.c \ - $(top_srcdir)/tools/bootstrap/external/manual_init.c \ - $(top_srcdir)/tools/bootstrap/external/rsh_init.c \ - $(top_srcdir)/tools/bootstrap/external/rsh_env.c \ - $(top_srcdir)/tools/bootstrap/external/ssh_init.c \ - $(top_srcdir)/tools/bootstrap/external/ssh.c \ - $(top_srcdir)/tools/bootstrap/external/ssh_env.c \ - $(top_srcdir)/tools/bootstrap/external/ssh_finalize.c \ - $(top_srcdir)/tools/bootstrap/external/slurm_init.c \ - $(top_srcdir)/tools/bootstrap/external/slurm_launch.c \ - $(top_srcdir)/tools/bootstrap/external/slurm_env.c \ - $(top_srcdir)/tools/bootstrap/external/slurm_query_native_int.c \ - $(top_srcdir)/tools/bootstrap/external/slurm_query_node_list.c \ - $(top_srcdir)/tools/bootstrap/external/slurm_query_proxy_id.c \ - $(top_srcdir)/tools/bootstrap/external/ll_init.c \ - $(top_srcdir)/tools/bootstrap/external/ll_launch.c \ - $(top_srcdir)/tools/bootstrap/external/ll_query_native_int.c \ - $(top_srcdir)/tools/bootstrap/external/ll_query_node_list.c \ - $(top_srcdir)/tools/bootstrap/external/ll_query_proxy_id.c \ - $(top_srcdir)/tools/bootstrap/external/ll_env.c \ - $(top_srcdir)/tools/bootstrap/external/lsf_init.c \ - $(top_srcdir)/tools/bootstrap/external/lsf_query_native_int.c \ - $(top_srcdir)/tools/bootstrap/external/lsf_query_node_list.c \ - $(top_srcdir)/tools/bootstrap/external/lsf_env.c \ - $(top_srcdir)/tools/bootstrap/external/sge_init.c \ - $(top_srcdir)/tools/bootstrap/external/sge_query_native_int.c \ - $(top_srcdir)/tools/bootstrap/external/sge_query_node_list.c \ - $(top_srcdir)/tools/bootstrap/external/sge_env.c \ - $(top_srcdir)/tools/bootstrap/external/pbs_init.c \ - $(top_srcdir)/tools/bootstrap/external/pbs_query_native_int.c \ - $(top_srcdir)/tools/bootstrap/external/pbs_query_node_list.c \ - $(top_srcdir)/tools/bootstrap/external/cobalt_init.c \ - $(top_srcdir)/tools/bootstrap/external/cobalt_query_native_int.c \ - $(top_srcdir)/tools/bootstrap/external/cobalt_query_node_list.c +libhydra_la_SOURCES += tools/bootstrap/external/external_common.c \ + tools/bootstrap/external/external_common_launch.c \ + tools/bootstrap/external/fork_init.c \ + tools/bootstrap/external/user_init.c \ + tools/bootstrap/external/manual_init.c \ + tools/bootstrap/external/rsh_init.c \ + tools/bootstrap/external/rsh_env.c \ + tools/bootstrap/external/ssh_init.c \ + tools/bootstrap/external/ssh.c \ + tools/bootstrap/external/ssh_env.c \ + tools/bootstrap/external/ssh_finalize.c \ + tools/bootstrap/external/slurm_init.c \ + tools/bootstrap/external/slurm_launch.c \ + tools/bootstrap/external/slurm_env.c \ + tools/bootstrap/external/slurm_query_native_int.c \ + tools/bootstrap/external/slurm_query_node_list.c \ + tools/bootstrap/external/slurm_query_proxy_id.c \ + tools/bootstrap/external/ll_init.c \ + tools/bootstrap/external/ll_launch.c \ + tools/bootstrap/external/ll_query_native_int.c \ + tools/bootstrap/external/ll_query_node_list.c \ + tools/bootstrap/external/ll_query_proxy_id.c \ + tools/bootstrap/external/ll_env.c \ + tools/bootstrap/external/lsf_init.c \ + tools/bootstrap/external/lsf_query_native_int.c \ + tools/bootstrap/external/lsf_query_node_list.c \ + tools/bootstrap/external/lsf_env.c \ + tools/bootstrap/external/sge_init.c \ + tools/bootstrap/external/sge_query_native_int.c \ + tools/bootstrap/external/sge_query_node_list.c \ + tools/bootstrap/external/sge_env.c \ + tools/bootstrap/external/pbs_init.c \ + tools/bootstrap/external/pbs_query_native_int.c \ + tools/bootstrap/external/pbs_query_node_list.c \ + tools/bootstrap/external/cobalt_init.c \ + tools/bootstrap/external/cobalt_query_native_int.c \ + tools/bootstrap/external/cobalt_query_node_list.c if hydra_pbs_launcher libhydra_la_SOURCES += \ - $(top_srcdir)/tools/bootstrap/external/pbs_finalize.c \ - $(top_srcdir)/tools/bootstrap/external/pbs_launch.c \ - $(top_srcdir)/tools/bootstrap/external/pbs_wait.c \ - $(top_srcdir)/tools/bootstrap/external/pbs_env.c + tools/bootstrap/external/pbs_finalize.c \ + tools/bootstrap/external/pbs_launch.c \ + tools/bootstrap/external/pbs_wait.c \ + tools/bootstrap/external/pbs_env.c endif diff --git a/src/pm/hydra/tools/bootstrap/persist/Makefile.mk b/src/pm/hydra/tools/bootstrap/persist/Makefile.mk index 28d6870..564c36f 100644 --- a/src/pm/hydra/tools/bootstrap/persist/Makefile.mk +++ b/src/pm/hydra/tools/bootstrap/persist/Makefile.mk @@ -6,7 +6,7 @@ bin_PROGRAMS += hydra_persist -hydra_persist_SOURCES = $(top_srcdir)/tools/bootstrap/persist/persist_server.c +hydra_persist_SOURCES = tools/bootstrap/persist/persist_server.c hydra_persist_CFLAGS = $(AM_CFLAGS) hydra_persist_LDFLAGS = $(external_ldflags) -L$(top_builddir) hydra_persist_LDADD = -lhydra $(external_libs) @@ -17,6 +17,6 @@ noinst_HEADERS += \ tools/bootstrap/persist/persist_client.h \ tools/bootstrap/persist/persist_server.h -libhydra_la_SOURCES += $(top_srcdir)/tools/bootstrap/persist/persist_init.c \ - $(top_srcdir)/tools/bootstrap/persist/persist_launch.c \ - $(top_srcdir)/tools/bootstrap/persist/persist_wait.c +libhydra_la_SOURCES += tools/bootstrap/persist/persist_init.c \ + tools/bootstrap/persist/persist_launch.c \ + tools/bootstrap/persist/persist_wait.c diff --git a/src/pm/hydra/tools/bootstrap/src/Makefile.mk b/src/pm/hydra/tools/bootstrap/src/Makefile.mk index 228faf6..785b0e8 100644 --- a/src/pm/hydra/tools/bootstrap/src/Makefile.mk +++ b/src/pm/hydra/tools/bootstrap/src/Makefile.mk @@ -4,11 +4,11 @@ ## See COPYRIGHT in top-level directory. ## -libhydra_la_SOURCES += $(top_builddir)/tools/bootstrap/src/bsci_init.c \ - $(top_srcdir)/tools/bootstrap/src/bsci_finalize.c \ - $(top_srcdir)/tools/bootstrap/src/bsci_launch.c \ - $(top_srcdir)/tools/bootstrap/src/bsci_query_node_list.c \ - $(top_srcdir)/tools/bootstrap/src/bsci_query_proxy_id.c \ - $(top_srcdir)/tools/bootstrap/src/bsci_query_native_int.c \ - $(top_srcdir)/tools/bootstrap/src/bsci_wait.c \ - $(top_srcdir)/tools/bootstrap/src/bsci_env.c +libhydra_la_SOURCES += tools/bootstrap/src/bsci_init.c \ + tools/bootstrap/src/bsci_finalize.c \ + tools/bootstrap/src/bsci_launch.c \ + tools/bootstrap/src/bsci_query_node_list.c \ + tools/bootstrap/src/bsci_query_proxy_id.c \ + tools/bootstrap/src/bsci_query_native_int.c \ + tools/bootstrap/src/bsci_wait.c \ + tools/bootstrap/src/bsci_env.c diff --git a/src/pm/hydra/tools/bootstrap/utils/Makefile.mk b/src/pm/hydra/tools/bootstrap/utils/Makefile.mk index 25c6daa..f3d3f25 100644 --- a/src/pm/hydra/tools/bootstrap/utils/Makefile.mk +++ b/src/pm/hydra/tools/bootstrap/utils/Makefile.mk @@ -9,5 +9,5 @@ AM_CPPFLAGS += -I$(top_srcdir)/tools/bootstrap/utils noinst_HEADERS += tools/bootstrap/utils/bscu.h libhydra_la_SOURCES += \ - $(top_srcdir)/tools/bootstrap/utils/bscu_wait.c \ - $(top_srcdir)/tools/bootstrap/utils/bscu_cb.c + tools/bootstrap/utils/bscu_wait.c \ + tools/bootstrap/utils/bscu_cb.c diff --git a/src/pm/hydra/tools/ckpoint/Makefile.mk b/src/pm/hydra/tools/ckpoint/Makefile.mk index 2fa7303..a47bab2 100644 --- a/src/pm/hydra/tools/ckpoint/Makefile.mk +++ b/src/pm/hydra/tools/ckpoint/Makefile.mk @@ -8,7 +8,7 @@ AM_CPPFLAGS += -I$(top_srcdir)/tools/ckpoint noinst_HEADERS += tools/ckpoint/ckpoint.h -libhydra_la_SOURCES += $(top_srcdir)/tools/ckpoint/ckpoint.c +libhydra_la_SOURCES += tools/ckpoint/ckpoint.c if hydra_have_blcr include tools/ckpoint/blcr/Makefile.mk diff --git a/src/pm/hydra/tools/ckpoint/blcr/Makefile.mk b/src/pm/hydra/tools/ckpoint/blcr/Makefile.mk index 80163fe..ea66342 100644 --- a/src/pm/hydra/tools/ckpoint/blcr/Makefile.mk +++ b/src/pm/hydra/tools/ckpoint/blcr/Makefile.mk @@ -4,7 +4,7 @@ ## See COPYRIGHT in top-level directory. ## -libhydra_la_SOURCES += $(top_srcdir)/tools/ckpoint/blcr/ckpoint_blcr.c +libhydra_la_SOURCES += tools/ckpoint/blcr/ckpoint_blcr.c noinst_HEADERS += tools/ckpoint/blcr/ckpoint_blcr.h diff --git a/src/pm/hydra/tools/debugger/Makefile.mk b/src/pm/hydra/tools/debugger/Makefile.mk index 860b88c..0cb2078 100644 --- a/src/pm/hydra/tools/debugger/Makefile.mk +++ b/src/pm/hydra/tools/debugger/Makefile.mk @@ -8,4 +8,4 @@ AM_CPPFLAGS += -I$(top_srcdir)/tools/debugger noinst_HEADERS += tools/debugger/debugger.h -libhydra_la_SOURCES += $(top_srcdir)/tools/debugger/debugger.c +libhydra_la_SOURCES += tools/debugger/debugger.c diff --git a/src/pm/hydra/tools/demux/Makefile.mk b/src/pm/hydra/tools/demux/Makefile.mk index 3097781..127537e 100644 --- a/src/pm/hydra/tools/demux/Makefile.mk +++ b/src/pm/hydra/tools/demux/Makefile.mk @@ -8,12 +8,12 @@ AM_CPPFLAGS += -I$(top_srcdir)/tools/demux noinst_HEADERS += tools/demux/demux.h tools/demux/demux_internal.h -libhydra_la_SOURCES += $(top_srcdir)/tools/demux/demux.c +libhydra_la_SOURCES += tools/demux/demux.c if hydra_have_poll -libhydra_la_SOURCES += $(top_srcdir)/tools/demux/demux_poll.c +libhydra_la_SOURCES += tools/demux/demux_poll.c endif if hydra_have_select -libhydra_la_SOURCES += $(top_srcdir)/tools/demux/demux_select.c +libhydra_la_SOURCES += tools/demux/demux_select.c endif diff --git a/src/pm/hydra/tools/ftb/Makefile.mk b/src/pm/hydra/tools/ftb/Makefile.mk index db605af..f48d74e 100644 --- a/src/pm/hydra/tools/ftb/Makefile.mk +++ b/src/pm/hydra/tools/ftb/Makefile.mk @@ -9,7 +9,7 @@ AM_CPPFLAGS += -I$(top_srcdir)/tools/ftb noinst_HEADERS += tools/ftb/hydt_ftb.h if hydra_have_ftb -libhydra_la_SOURCES += $(top_srcdir)/tools/ftb/hydt_ftb.c +libhydra_la_SOURCES += tools/ftb/hydt_ftb.c else -libhydra_la_SOURCES += $(top_srcdir)/tools/ftb/hydt_ftb_dummy.c +libhydra_la_SOURCES += tools/ftb/hydt_ftb_dummy.c endif diff --git a/src/pm/hydra/tools/nameserver/Makefile.mk b/src/pm/hydra/tools/nameserver/Makefile.mk index bb362e1..e8a19fb 100644 --- a/src/pm/hydra/tools/nameserver/Makefile.mk +++ b/src/pm/hydra/tools/nameserver/Makefile.mk @@ -6,8 +6,8 @@ bin_PROGRAMS += hydra_nameserver -hydra_nameserver_SOURCES = $(top_srcdir)/tools/nameserver/hydra_nameserver.c +hydra_nameserver_SOURCES = tools/nameserver/hydra_nameserver.c hydra_nameserver_CFLAGS = $(AM_CFLAGS) -hydra_nameserver_LDFLAGS = $(external_ldflags) -L$(top_builddir) +hydra_nameserver_LDFLAGS = $(external_ldflags) hydra_nameserver_LDADD = -lhydra $(external_libs) hydra_nameserver_DEPENDENCIES = libhydra.la diff --git a/src/pm/hydra/tools/topo/Makefile.mk b/src/pm/hydra/tools/topo/Makefile.mk index 0e43c95..55751df 100644 --- a/src/pm/hydra/tools/topo/Makefile.mk +++ b/src/pm/hydra/tools/topo/Makefile.mk @@ -8,7 +8,7 @@ AM_CPPFLAGS += -I$(top_srcdir)/tools/topo noinst_HEADERS += tools/topo/topo.h -libhydra_la_SOURCES += $(top_srcdir)/tools/topo/topo.c +libhydra_la_SOURCES += tools/topo/topo.c if hydra_have_hwloc include tools/topo/hwloc/Makefile.mk diff --git a/src/pm/hydra/tools/topo/hwloc/Makefile.mk b/src/pm/hydra/tools/topo/hwloc/Makefile.mk index 01b8ce7..7dc6482 100644 --- a/src/pm/hydra/tools/topo/hwloc/Makefile.mk +++ b/src/pm/hydra/tools/topo/hwloc/Makefile.mk @@ -4,7 +4,7 @@ ## See COPYRIGHT in top-level directory. ## -libhydra_la_SOURCES += $(top_srcdir)/tools/topo/hwloc/topo_hwloc.c +libhydra_la_SOURCES += tools/topo/hwloc/topo_hwloc.c noinst_HEADERS += tools/topo/hwloc/topo_hwloc.h diff --git a/src/pm/hydra/ui/mpich/Makefile.mk b/src/pm/hydra/ui/mpich/Makefile.mk index 029116f..aad94a8 100644 --- a/src/pm/hydra/ui/mpich/Makefile.mk +++ b/src/pm/hydra/ui/mpich/Makefile.mk @@ -10,7 +10,7 @@ noinst_HEADERS += ui/mpich/mpiexec.h bin_PROGRAMS += mpiexec.hydra -mpiexec_hydra_SOURCES = $(top_srcdir)/ui/mpich/mpiexec.c $(top_srcdir)/ui/mpich/utils.c +mpiexec_hydra_SOURCES = ui/mpich/mpiexec.c ui/mpich/utils.c mpiexec_hydra_LDFLAGS = $(external_ldflags) -L$(top_builddir) mpiexec_hydra_LDADD = -lpm -lhydra $(external_libs) mpiexec_hydra_DEPENDENCIES = libpm.la libhydra.la diff --git a/src/pm/hydra/ui/utils/Makefile.mk b/src/pm/hydra/ui/utils/Makefile.mk index 105a90a..5b51ad5 100644 --- a/src/pm/hydra/ui/utils/Makefile.mk +++ b/src/pm/hydra/ui/utils/Makefile.mk @@ -4,7 +4,7 @@ ## See COPYRIGHT in top-level directory. ## -libhydra_la_SOURCES += $(top_srcdir)/ui/utils/uiu.c +libhydra_la_SOURCES += ui/utils/uiu.c noinst_HEADERS += ui/utils/uiu.h diff --git a/src/pm/hydra/utils/alloc/Makefile.mk b/src/pm/hydra/utils/alloc/Makefile.mk index 52b6ca1..0dbdcd6 100644 --- a/src/pm/hydra/utils/alloc/Makefile.mk +++ b/src/pm/hydra/utils/alloc/Makefile.mk @@ -4,4 +4,4 @@ ## See COPYRIGHT in top-level directory. ## -libhydra_la_SOURCES += $(top_srcdir)/utils/alloc/alloc.c +libhydra_la_SOURCES += utils/alloc/alloc.c diff --git a/src/pm/hydra/utils/args/Makefile.mk b/src/pm/hydra/utils/args/Makefile.mk index 77959a8..5d3673c 100644 --- a/src/pm/hydra/utils/args/Makefile.mk +++ b/src/pm/hydra/utils/args/Makefile.mk @@ -4,4 +4,4 @@ ## See COPYRIGHT in top-level directory. ## -libhydra_la_SOURCES += $(top_srcdir)/utils/args/args.c +libhydra_la_SOURCES += utils/args/args.c diff --git a/src/pm/hydra/utils/dbg/Makefile.mk b/src/pm/hydra/utils/dbg/Makefile.mk index bcf2abb..c89023b 100644 --- a/src/pm/hydra/utils/dbg/Makefile.mk +++ b/src/pm/hydra/utils/dbg/Makefile.mk @@ -4,4 +4,4 @@ ## See COPYRIGHT in top-level directory. ## -libhydra_la_SOURCES += $(top_srcdir)/utils/dbg/dbg.c +libhydra_la_SOURCES += utils/dbg/dbg.c diff --git a/src/pm/hydra/utils/env/Makefile.mk b/src/pm/hydra/utils/env/Makefile.mk index 0cb53c4..01a7f6a 100644 --- a/src/pm/hydra/utils/env/Makefile.mk +++ b/src/pm/hydra/utils/env/Makefile.mk @@ -4,4 +4,4 @@ ## See COPYRIGHT in top-level directory. ## -libhydra_la_SOURCES += $(top_srcdir)/utils/env/env.c +libhydra_la_SOURCES += utils/env/env.c diff --git a/src/pm/hydra/utils/launch/Makefile.mk b/src/pm/hydra/utils/launch/Makefile.mk index 23b6a47..92cb377 100644 --- a/src/pm/hydra/utils/launch/Makefile.mk +++ b/src/pm/hydra/utils/launch/Makefile.mk @@ -4,4 +4,4 @@ ## See COPYRIGHT in top-level directory. ## -libhydra_la_SOURCES += $(top_srcdir)/utils/launch/launch.c +libhydra_la_SOURCES += utils/launch/launch.c diff --git a/src/pm/hydra/utils/others/Makefile.mk b/src/pm/hydra/utils/others/Makefile.mk index a0d3c92..bab6dec 100644 --- a/src/pm/hydra/utils/others/Makefile.mk +++ b/src/pm/hydra/utils/others/Makefile.mk @@ -4,4 +4,4 @@ ## See COPYRIGHT in top-level directory. ## -libhydra_la_SOURCES += $(top_srcdir)/utils/others/others.c +libhydra_la_SOURCES += utils/others/others.c diff --git a/src/pm/hydra/utils/signals/Makefile.mk b/src/pm/hydra/utils/signals/Makefile.mk index 3a9d416..84ed3c2 100644 --- a/src/pm/hydra/utils/signals/Makefile.mk +++ b/src/pm/hydra/utils/signals/Makefile.mk @@ -4,4 +4,4 @@ ## See COPYRIGHT in top-level directory. ## -libhydra_la_SOURCES += $(top_srcdir)/utils/signals/signals.c +libhydra_la_SOURCES += utils/signals/signals.c diff --git a/src/pm/hydra/utils/sock/Makefile.mk b/src/pm/hydra/utils/sock/Makefile.mk index fc2790c..5af92c4 100644 --- a/src/pm/hydra/utils/sock/Makefile.mk +++ b/src/pm/hydra/utils/sock/Makefile.mk @@ -4,4 +4,4 @@ ## See COPYRIGHT in top-level directory. ## -libhydra_la_SOURCES += $(top_srcdir)/utils/sock/sock.c +libhydra_la_SOURCES += utils/sock/sock.c diff --git a/src/pm/hydra/utils/string/Makefile.mk b/src/pm/hydra/utils/string/Makefile.mk index f5f3fcf..eeebe7b 100644 --- a/src/pm/hydra/utils/string/Makefile.mk +++ b/src/pm/hydra/utils/string/Makefile.mk @@ -4,4 +4,4 @@ ## See COPYRIGHT in top-level directory. ## -libhydra_la_SOURCES += $(top_srcdir)/utils/string/string.c +libhydra_la_SOURCES += utils/string/string.c ----------------------------------------------------------------------- Summary of changes: src/pm/hydra/pm/pmiserv/Makefile.mk | 30 ++++---- src/pm/hydra/tools/bootstrap/external/Makefile.mk | 82 ++++++++++---------- src/pm/hydra/tools/bootstrap/persist/Makefile.mk | 8 +- src/pm/hydra/tools/bootstrap/src/Makefile.mk | 16 ++-- src/pm/hydra/tools/bootstrap/utils/Makefile.mk | 4 +- src/pm/hydra/tools/ckpoint/Makefile.mk | 2 +- src/pm/hydra/tools/ckpoint/blcr/Makefile.mk | 2 +- src/pm/hydra/tools/debugger/Makefile.mk | 2 +- src/pm/hydra/tools/demux/Makefile.mk | 6 +- src/pm/hydra/tools/ftb/Makefile.mk | 4 +- src/pm/hydra/tools/nameserver/Makefile.mk | 4 +- src/pm/hydra/tools/topo/Makefile.mk | 2 +- src/pm/hydra/tools/topo/hwloc/Makefile.mk | 2 +- src/pm/hydra/ui/mpich/Makefile.mk | 2 +- src/pm/hydra/ui/utils/Makefile.mk | 2 +- src/pm/hydra/utils/alloc/Makefile.mk | 2 +- src/pm/hydra/utils/args/Makefile.mk | 2 +- src/pm/hydra/utils/dbg/Makefile.mk | 2 +- src/pm/hydra/utils/env/Makefile.mk | 2 +- src/pm/hydra/utils/launch/Makefile.mk | 2 +- src/pm/hydra/utils/others/Makefile.mk | 2 +- src/pm/hydra/utils/signals/Makefile.mk | 2 +- src/pm/hydra/utils/sock/Makefile.mk | 2 +- src/pm/hydra/utils/string/Makefile.mk | 2 +- 24 files changed, 93 insertions(+), 93 deletions(-) hooks/post-receive -- MPICH primary repository

1 0

[mpich] MPICH primary repository branch, master, updated. v3.0.4-319-g59cbc84
by noreply＠mpich.org 27 Jun '13

27 Jun '13

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "MPICH primary repository". The branch, master has been updated via 59cbc846d56eb259f6014b23114eed67b90abe95 (commit) from bf9f8ea8a298131bb7405eee07a54fd211323d57 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- http://git.mpich.org/mpich.git/commitdiff/59cbc846d56eb259f6014b23114eed67b… commit 59cbc846d56eb259f6014b23114eed67b90abe95 Author: Rob Latham <robl(a)mcs.anl.gov> Date: Thu Jun 27 19:07:36 2013 +0000 automake subdir-object mode needs check for -c -o Older automake versions (at least 1.13.1) will complain if we asked for subdir mode and we did not verify that both -c and -o flags work (AM_PROG_CC_C_O) diff --git a/src/armci/configure.ac b/src/armci/configure.ac index 3baec51..c146c45 100644 --- a/src/armci/configure.ac +++ b/src/armci/configure.ac @@ -18,6 +18,7 @@ if test ! -z "$MPICC" ; then fi PAC_PUSH_FLAG(CFLAGS) AC_PROG_CC(mpicc) +AM_PROG_CC_C_O AM_PROG_AR diff --git a/src/mpi/romio/configure.ac b/src/mpi/romio/configure.ac index 0670739..a1d0a5e 100644 --- a/src/mpi/romio/configure.ac +++ b/src/mpi/romio/configure.ac @@ -27,6 +27,7 @@ AM_MAINTAINER_MODE([enable]) dnl must come before LT_INIT, which AC_REQUIREs AC_PROG_CC PAC_PROG_CC +AM_PROG_CC_C_O AM_PROG_AR diff --git a/src/mpl/configure.ac b/src/mpl/configure.ac index 9630371..c151de7 100644 --- a/src/mpl/configure.ac +++ b/src/mpl/configure.ac @@ -15,6 +15,7 @@ AM_INIT_AUTOMAKE([subdir-objects] [-Wall -Werror foreign 1.12.3]) dnl must come before LT_INIT, which AC_REQUIREs AC_PROG_CC PAC_PROG_CC +AM_PROG_CC_C_O AM_PROG_AR diff --git a/src/openpa/configure.ac b/src/openpa/configure.ac index cb21607..3f67b0d 100644 --- a/src/openpa/configure.ac +++ b/src/openpa/configure.ac @@ -72,6 +72,7 @@ else fi AC_PROG_CC +AM_PROG_CC_C_O AC_HEADER_ASSERT # do we need intrin.h in here since it's a windows file? diff --git a/src/pm/hydra/configure.ac b/src/pm/hydra/configure.ac index 85a3f1e..a9d3776 100644 --- a/src/pm/hydra/configure.ac +++ b/src/pm/hydra/configure.ac @@ -18,6 +18,7 @@ AC_ARG_PROGRAM dnl must come before LT_INIT, which AC_REQUIREs AC_PROG_CC dnl must also come before AC_USE_SYSTEM_EXTENSIONS PAC_PROG_CC +AM_PROG_CC_C_O # also needed by hwloc in embedded mode, must also come early for expansion # ordering reasons @@ -44,7 +45,6 @@ m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) # Reset link flags PAC_RESET_LINK_FLAGS() -AM_PROG_CC_C_O PAC_ARG_STRICT diff --git a/src/pm/hydra/tools/topo/hwloc/hwloc/tests/embedded/configure.ac b/src/pm/hydra/tools/topo/hwloc/hwloc/tests/embedded/configure.ac index d697e58..c0d6ba1 100644 --- a/src/pm/hydra/tools/topo/hwloc/hwloc/tests/embedded/configure.ac +++ b/src/pm/hydra/tools/topo/hwloc/hwloc/tests/embedded/configure.ac @@ -9,9 +9,11 @@ AC_CANONICAL_TARGET AM_INIT_AUTOMAKE([1.10 dist-bzip2 foreign subdir-objects tar-ustar -Wall -Werror]) m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) + AC_LANG([C]) AC_PROG_CC +AM_PROG_CC_C_O cat <<EOF diff --git a/src/pm/mpd/configure.ac b/src/pm/mpd/configure.ac index d56d1f2..9e11768 100644 --- a/src/pm/mpd/configure.ac +++ b/src/pm/mpd/configure.ac @@ -46,6 +46,7 @@ AC_EXEEXT AC_OBJEXT # Checking for programs. PAC_PROG_CC +AM_PROG_CC_C_O AC_PROG_MAKE_SET AC_PROG_LN_S # A quick check to ensure that install-sh has the execute bit set diff --git a/test/mpi/configure.ac b/test/mpi/configure.ac index bac91ac..3816e1a 100644 --- a/test/mpi/configure.ac +++ b/test/mpi/configure.ac @@ -448,6 +448,7 @@ fi # Running C compiler tests PAC_PROG_CC +AM_PROG_CC_C_O # Note that some versions of autoconf will insist that the compiler # produce executables at this point, which is why we must do something ----------------------------------------------------------------------- Summary of changes: src/armci/configure.ac | 1 + src/mpi/romio/configure.ac | 1 + src/mpl/configure.ac | 1 + src/openpa/configure.ac | 1 + src/pm/hydra/configure.ac | 2 +- .../topo/hwloc/hwloc/tests/embedded/configure.ac | 2 ++ src/pm/mpd/configure.ac | 1 + test/mpi/configure.ac | 1 + 8 files changed, 9 insertions(+), 1 deletions(-) hooks/post-receive -- MPICH primary repository

1 0

[mpich] MPICH primary repository branch, master, updated. v3.0.4-318-gbf9f8ea
by noreply＠mpich.org 27 Jun '13

27 Jun '13

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "MPICH primary repository". The branch, master has been updated via bf9f8ea8a298131bb7405eee07a54fd211323d57 (commit) from 80e65b62447095372b18459d170f09316a71431a (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- http://git.mpich.org/mpich.git/commitdiff/bf9f8ea8a298131bb7405eee07a54fd21… commit bf9f8ea8a298131bb7405eee07a54fd211323d57 Author: Rob Latham <robl(a)mcs.anl.gov> Date: Thu Jun 27 16:41:58 2013 +0000 some AM_INIT_AUTOMAKE invocations were missing subdir-objects automake-1.14 will carp if the subdir-objects option is missing and it thinks you should have specified this option, and since we treat warnings as errors we need to specify this option. MPICH requires a pretty new version of automake, so it's doubtful we'll ever encounter the 1999-era automake that does not understand 'subdir-objects' diff --git a/src/armci/configure.ac b/src/armci/configure.ac index 99c71a4..3baec51 100644 --- a/src/armci/configure.ac +++ b/src/armci/configure.ac @@ -7,7 +7,7 @@ AC_PREREQ(2.62) AC_INIT([armci],[0]) AC_CONFIG_AUX_DIR(m4) AC_CONFIG_MACRO_DIR(m4) -AM_INIT_AUTOMAKE([-Wall -Werror -Wno-portability-recursive foreign 1.12.3 color-tests parallel-tests]) +AM_INIT_AUTOMAKE([-Wall -Werror -Wno-portability-recursive foreign 1.12.3 color-tests parallel-tests subdir-objects]) LT_PREREQ([2.2.6]) diff --git a/src/mpl/configure.ac b/src/mpl/configure.ac index fa7380c..9630371 100644 --- a/src/mpl/configure.ac +++ b/src/mpl/configure.ac @@ -11,7 +11,7 @@ AC_CONFIG_SRCDIR([src/mplstr.c]) AC_CONFIG_AUX_DIR(confdb) AC_CONFIG_MACRO_DIR(confdb) -AM_INIT_AUTOMAKE([-Wall -Werror foreign 1.12.3]) +AM_INIT_AUTOMAKE([subdir-objects] [-Wall -Werror foreign 1.12.3]) dnl must come before LT_INIT, which AC_REQUIREs AC_PROG_CC PAC_PROG_CC diff --git a/src/openpa/configure.ac b/src/openpa/configure.ac index 7390333..cb21607 100644 --- a/src/openpa/configure.ac +++ b/src/openpa/configure.ac @@ -12,7 +12,7 @@ dnl config.guess. It also contains autoconf macro files. AC_CONFIG_AUX_DIR(confdb) AC_CONFIG_MACRO_DIR([confdb]) -AM_INIT_AUTOMAKE([-Wall -Werror foreign color-tests 1.12.3]) +AM_INIT_AUTOMAKE([-Wall -Werror foreign color-tests 1.12.3 subdir-objects]) # automake 1.12 seems to require this, but automake 1.11 doesn't recognize it # must come before LT_INIT diff --git a/src/pm/hydra/configure.ac b/src/pm/hydra/configure.ac index 46a980e..85a3f1e 100644 --- a/src/pm/hydra/configure.ac +++ b/src/pm/hydra/configure.ac @@ -32,7 +32,7 @@ AS_CASE([$host], ) -AM_INIT_AUTOMAKE([-Wall -Werror foreign 1.12.3]) +AM_INIT_AUTOMAKE([-Wall -Werror foreign 1.12.3 subdir-objects]) AM_PROG_AR ----------------------------------------------------------------------- Summary of changes: src/armci/configure.ac | 2 +- src/mpl/configure.ac | 2 +- src/openpa/configure.ac | 2 +- src/pm/hydra/configure.ac | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) hooks/post-receive -- MPICH primary repository

1 0

[mpich] MPICH primary repository branch, master, updated. v3.0.4-317-g80e65b6
by noreply＠mpich.org 24 Jun '13

24 Jun '13

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "MPICH primary repository". The branch, master has been updated via 80e65b62447095372b18459d170f09316a71431a (commit) from 1deb8ae7c393928272bc29ad27ad27ecdafd4116 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- http://git.mpich.org/mpich.git/commitdiff/80e65b62447095372b18459d170f09316… commit 80e65b62447095372b18459d170f09316a71431a Author: Ken Raffenetti <raffenet(a)mcs.anl.gov> Date: Mon Jun 24 09:28:17 2013 -0500 Add support for MPICH_AUTOTOOLS_DIR in hwloc. Fixes 1881. diff --git a/src/pm/hydra/tools/topo/hwloc/hwloc/autogen.sh b/src/pm/hydra/tools/topo/hwloc/hwloc/autogen.sh index df42802..c73edc2 100755 --- a/src/pm/hydra/tools/topo/hwloc/hwloc/autogen.sh +++ b/src/pm/hydra/tools/topo/hwloc/hwloc/autogen.sh @@ -1,2 +1,9 @@ -: -autoreconf ${autoreconf_args:-"-ivf"} +#!/bin/sh + +if [ -n "$MPICH_AUTOTOOLS_DIR" ] ; then + autoreconf=${MPICH_AUTOTOOLS_DIR}/autoreconf +else + autoreconf=${AUTORECONF:-autoreconf} +fi + +$autoreconf ${autoreconf_args:-"-ivf"} ----------------------------------------------------------------------- Summary of changes: src/pm/hydra/tools/topo/hwloc/hwloc/autogen.sh | 11 +++++++++-- 1 files changed, 9 insertions(+), 2 deletions(-) hooks/post-receive -- MPICH primary repository

1 0

[mpich] MPICH primary repository branch, master, updated. v3.0.4-316-g1deb8ae
by noreply＠mpich.org 22 Jun '13

22 Jun '13

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "MPICH primary repository". The branch, master has been updated via 1deb8ae7c393928272bc29ad27ad27ecdafd4116 (commit) via c5b009001f1ccda595ada8db42e831208c4dbdb4 (commit) from 6f05c767e32172545cf8a50538762943d7ff5618 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- http://git.mpich.org/mpich.git/commitdiff/1deb8ae7c393928272bc29ad27ad27ecd… commit 1deb8ae7c393928272bc29ad27ad27ecdafd4116 Author: Pavan Balaji <balaji(a)mcs.anl.gov> Date: Sat Jun 22 09:50:19 2013 -0500 General cleanup of RELEASE_NOTES. Removed parts that are no longer relevant due to deprecated features in MPICH or in the MPI standard. diff --git a/RELEASE_NOTES b/RELEASE_NOTES index ab5a914..20c3b0f 100644 --- a/RELEASE_NOTES +++ b/RELEASE_NOTES @@ -10,19 +10,15 @@ http://trac.mpich.org/projects/mpich/ticket/1719 + ### Large counts * The new MPI-3 "large count" routines (e.g., MPI_Type_size_x) do not work correctly due to 64-bit to 32-bit truncations occurring inside the MPICH library. We expect to fix this in upcoming releases. -### Known runtime failures - - * MPI_Alltoall might fail in some cases because of the newly added - fault-tolerance features. If you are seeing this error, try setting - the environment variable MPICH_ENABLE_COLL_FT_RET=0. -### Threads +### Fine-grained thread safety * ch3:sock does not (and will not) support fine-grained threading. @@ -74,14 +70,6 @@ https://trac.mpich.org/projects/mpich/ticket/1782 - * The MPD process manager can only handle relatively small amounts of - data on stdin and may also have problems if there is data on stdin - that is not consumed by the program. - - * The SMPD process manager does not work reliably with threaded MPI - processes. MPI_Comm_spawn() does not currently work for >= 256 - arguments with smpd. - ### Performance issues @@ -96,12 +84,3 @@ operations may erroneously fail. By explicitly completed, we mean that the request associated with the operation is completed by one of the MPI_Test or MPI_Wait routines. - - -### C++ Binding: - - * The MPI datatypes corresponding to Fortran datatypes are not - available (e.g., no MPI::DOUBLE_PRECISION). - - * MPI::ERRORS_RETURN may still throw exceptions in the event of an - error rather than silently returning. http://git.mpich.org/mpich.git/commitdiff/c5b009001f1ccda595ada8db42e831208… commit c5b009001f1ccda595ada8db42e831208c4dbdb4 Author: Pavan Balaji <balaji(a)mcs.anl.gov> Date: Sat Jun 22 09:42:36 2013 -0500 Added a note on the ABI issues. diff --git a/RELEASE_NOTES b/RELEASE_NOTES index 49f2e7e..ab5a914 100644 --- a/RELEASE_NOTES +++ b/RELEASE_NOTES @@ -2,6 +2,14 @@ KNOWN ISSUES ---------------------------------------------------------------------- +### ABI issues + + * The format of MPI_INFO_ENV was changed between v3.0 and v3.0.1 in + an ABI incompatible way. The change was not caught, unfortunately, + and the ABI string not updated appropriately. + + http://trac.mpich.org/projects/mpich/ticket/1719 + ### Large counts * The new MPI-3 "large count" routines (e.g., MPI_Type_size_x) do not ----------------------------------------------------------------------- Summary of changes: RELEASE_NOTES | 33 ++++++++++----------------------- 1 files changed, 10 insertions(+), 23 deletions(-) hooks/post-receive -- MPICH primary repository

1 0

[mpich] MPICH primary repository branch, master, updated. v3.0.4-314-g6f05c76
by noreply＠mpich.org 21 Jun '13

21 Jun '13

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "MPICH primary repository". The branch, master has been updated via 6f05c767e32172545cf8a50538762943d7ff5618 (commit) via 8c8820de103189ff40f577fe0dde73ddb1c1e307 (commit) from f8bedf1e74383cf166a278dd93fdad078cefc78e (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- http://git.mpich.org/mpich.git/commitdiff/6f05c767e32172545cf8a50538762943d… commit 6f05c767e32172545cf8a50538762943d7ff5618 Author: Rob Latham <robl(a)mcs.anl.gov> Date: Fri Jun 21 16:14:05 2013 -0500 check existance of headers before including diff --git a/src/mpi/romio/adio/common/shfp_fname.c b/src/mpi/romio/adio/common/shfp_fname.c index ebd7d73..308b946 100644 --- a/src/mpi/romio/adio/common/shfp_fname.c +++ b/src/mpi/romio/adio/common/shfp_fname.c @@ -7,8 +7,12 @@ #include "adio.h" +#ifdef HAVE_UNISTD_H #include <unistd.h> +#endif +#ifdef HAVE_SYS_TYPES_H #include <sys/types.h> +#endif /* The following function selects the name of the file to be used to store the shared file pointer. The shared-file-pointer file is a http://git.mpich.org/mpich.git/commitdiff/8c8820de103189ff40f577fe0dde73ddb… commit 8c8820de103189ff40f577fe0dde73ddb1c1e307 Author: Qi QC Zhang <keirazhang(a)cn.ibm.com> Date: Mon Dec 17 02:04:48 2012 -0500 MPI_File_close shared file fail occasionally w/ case rw_share4 (ibm) D187762 (ibm) 0404df3637157f9aac3644ca62d9ed7f61e5d73d Signed-off-by: Michael Blocksome <blocksom(a)us.ibm.com> diff --git a/src/mpi/romio/adio/common/shfp_fname.c b/src/mpi/romio/adio/common/shfp_fname.c index 024ced5..ebd7d73 100644 --- a/src/mpi/romio/adio/common/shfp_fname.c +++ b/src/mpi/romio/adio/common/shfp_fname.c @@ -7,6 +7,9 @@ #include "adio.h" +#include <unistd.h> +#include <sys/types.h> + /* The following function selects the name of the file to be used to store the shared file pointer. The shared-file-pointer file is a hidden file in the same directory as the real file being accessed. @@ -21,6 +24,7 @@ void ADIOI_Shfp_fname(ADIO_File fd, int rank) double tm; int i, len; char *slash, *ptr, tmp[128]; + int pid = 0; fd->shared_fp_fname = (char *) ADIOI_Malloc(256); @@ -31,6 +35,7 @@ void ADIOI_Shfp_fname(ADIO_File fd, int rank) tm = tm - (double) i; tm *= 1000000.0; i = (int) tm; + pid = (int)getpid(); ADIOI_Strncpy(fd->shared_fp_fname, fd->filename, 256); @@ -55,7 +60,7 @@ void ADIOI_Shfp_fname(ADIO_File fd, int rank) ADIOI_Strncpy(slash + 2, ptr + 1, len); } - ADIOI_Snprintf(tmp, 128, ".shfp.%d", i); + ADIOI_Snprintf(tmp, 128, ".shfp.%d.%d", pid, i); ADIOI_Strnapp(fd->shared_fp_fname, tmp, 256); len = (int)strlen(fd->shared_fp_fname); ----------------------------------------------------------------------- Summary of changes: src/mpi/romio/adio/common/shfp_fname.c | 11 ++++++++++- 1 files changed, 10 insertions(+), 1 deletions(-) hooks/post-receive -- MPICH primary repository

1 0

[mpich] MPICH primary repository branch, master, updated. v3.0.4-312-gf8bedf1
by noreply＠mpich.org 21 Jun '13

21 Jun '13

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "MPICH primary repository". The branch, master has been updated via f8bedf1e74383cf166a278dd93fdad078cefc78e (commit) via a502e2d7355700d3e2343954ebc994e56a63b916 (commit) from ef0c452628efb4e63b1b69aff05335c1ced77434 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- http://git.mpich.org/mpich.git/commitdiff/f8bedf1e74383cf166a278dd93fdad078… commit f8bedf1e74383cf166a278dd93fdad078cefc78e Author: Joe Ratterman <jratt(a)us.ibm.com> Date: Wed Sep 28 16:05:45 2011 -0500 Trap unsupported read- and write-conversions. This change was originally part of an extensive 'PE Code Merge' commit that was a sqaushed commit of approximately 50 defect and feature code changes. (ibm) 17b9e8973047abdb461f0303bc6c15509aef160b diff --git a/src/mpi/romio/mpi-io/register_datarep.c b/src/mpi/romio/mpi-io/register_datarep.c index c4f6a46..84767e8 100644 --- a/src/mpi/romio/mpi-io/register_datarep.c +++ b/src/mpi/romio/mpi-io/register_datarep.c @@ -96,6 +96,19 @@ int MPI_Register_datarep(const char *datarep, } } + /* Check Non-NULL Read and Write conversion function pointer */ + /* Read and Write conversions are currently not supported. */ + if ( (read_conversion_fn != NULL) || (write_conversion_fn != NULL) ) + { + error_code = MPIO_Err_create_code(MPI_SUCCESS, MPIR_ERR_RECOVERABLE, + myname, __LINE__, + MPI_ERR_CONVERSION, + "**drconvnotsupported", 0); + + error_code = MPIO_Err_return_file(MPI_FILE_NULL, error_code); + goto fn_exit; + } + /* check extent function pointer */ if (dtype_file_extent_fn == NULL) { http://git.mpich.org/mpich.git/commitdiff/a502e2d7355700d3e2343954ebc994e56… commit a502e2d7355700d3e2343954ebc994e56a63b916 Author: Rob Latham <robl(a)mcs.anl.gov> Date: Tue Jun 11 12:00:21 2013 -0500 automake doesn't like CFLAGS and CPPFLAGS automake yelled at me for overriding potentially user-supplied variables diff --git a/examples/Makefile.am b/examples/Makefile.am index 77b21f0..b38a6a7 100644 --- a/examples/Makefile.am +++ b/examples/Makefile.am @@ -9,15 +9,15 @@ # all of these? MPICHDIR=.. #CC = $(MPICHDIR)/bin/mpicc -CFLAGS = $(WRAPPER_CFLAGS) +AM_CFLAGS = $(WRAPPER_CFLAGS) CXXFLAGS = $(WRAPPER_CXXFLAGS) FFLAGS = $(WRAPPER_FFLAGS) FCFLAGS = $(WRAPPER_FCFLAGS) -LDFLAGS = -CPPFLAGS = $(WRAPPER_CPPFLAGS) +AM_LDFLAGS = +AM_CPPFLAGS = $(WRAPPER_CPPFLAGS) #DEFS = -AM_CPPFLAGS = -I$(top_builddir)/src/include -I${top_srcdir}/src/include +AM_CPPFLAGS += -I$(top_builddir)/src/include -I${top_srcdir}/src/include if BUILD_ROMIO AM_CPPFLAGS += -I$(top_builddir)/src/mpi/romio/include -I${top_srcdir}/mpi/romio/include/include endif BUILD_ROMIO @@ -34,14 +34,14 @@ cpi_DEPENDENCIES = # is a better system? # the make-time instances of libpmpich.la and libmpich.la live here -LDFLAGS += -L../lib +AM_LDFLAGS += -L../lib # the make-time instances of libmpl.la and libopa.la live here -LDFLAGS += -L@mpllibdir@ -L@opalibdir@ +AM_LDFLAGS += -L@mpllibdir@ -L@opalibdir@ # Wrapper LDFLAGS need to be added at the end to make sure we link # with the libraries we just built, and not any previously installed # libraries. -LDFLAGS += $(WRAPPER_LDFLAGS) +AM_LDFLAGS += $(WRAPPER_LDFLAGS) external_libs = -l@MPLLIBNAME@ -l@OPALIBNAME@ $(WRAPPER_LIBS) if BUILD_PROFILING_LIB @@ -78,7 +78,7 @@ parent_SOURCES = parent.c # --disable-static" is passed to configure. cpi_SOURCES = cpi.c cpi_LDADD = -lm -cpi_LDFLAGS = $(LDFLAGS) $(mpich_libtool_static_flag) +cpi_LDFLAGS = $(AM_LDFLAGS) $(mpich_libtool_static_flag) icpi_SOURCES = icpi.c icpi_LDADD = -lm ----------------------------------------------------------------------- Summary of changes: examples/Makefile.am | 16 ++++++++-------- src/mpi/romio/mpi-io/register_datarep.c | 13 +++++++++++++ 2 files changed, 21 insertions(+), 8 deletions(-) hooks/post-receive -- MPICH primary repository

1 0

[mpich] MPICH primary repository branch, master, updated. v3.0.4-310-gef0c452
by noreply＠mpich.org 21 Jun '13

21 Jun '13

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "MPICH primary repository". The branch, master has been updated via ef0c452628efb4e63b1b69aff05335c1ced77434 (commit) from 08c22ebe9f47923b56a19770200fccf48187ee92 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- http://git.mpich.org/mpich.git/commitdiff/ef0c452628efb4e63b1b69aff05335c1c… commit ef0c452628efb4e63b1b69aff05335c1ced77434 Author: Ken Raffenetti <raffenet(a)mcs.anl.gov> Date: Fri Jun 21 14:13:30 2013 -0500 Revert "Debugger changes from IBM." This change causes the build to break with --enable-debuginfo This reverts commit 08c22ebe9f47923b56a19770200fccf48187ee92. diff --git a/src/mpi/debugger/dbginit.c b/src/mpi/debugger/dbginit.c index fccc557..57227e5 100644 --- a/src/mpi/debugger/dbginit.c +++ b/src/mpi/debugger/dbginit.c @@ -309,7 +309,6 @@ typedef struct MPIR_Sendq { MPID_Request *sreq; int tag, rank, context_id; struct MPIR_Sendq *next; - struct MPIR_Sendq *prev; } MPIR_Sendq; MPIR_Sendq *MPIR_Sendq_head = 0; @@ -334,7 +333,6 @@ void MPIR_Sendq_remember( MPID_Request *req, p = (MPIR_Sendq *)MPIU_Malloc( sizeof(MPIR_Sendq) ); if (!p) { /* Just ignore it */ - req->mpid.next = NULL; goto fn_exit; } } @@ -343,10 +341,7 @@ void MPIR_Sendq_remember( MPID_Request *req, p->rank = rank; p->context_id = context_id; p->next = MPIR_Sendq_head; - p->prev = NULL; MPIR_Sendq_head = p; - if (p->next) p->next->prev = p; - req->mpid.next = (MPID_Request *)p; /* overload 'next' for debugger SEND queue */ fn_exit: MPIU_THREAD_CS_EXIT(HANDLE,req); } @@ -356,19 +351,22 @@ void MPIR_Sendq_forget( MPID_Request *req ) MPIR_Sendq *p, *prev; MPIU_THREAD_CS_ENTER(HANDLE,req); - p = (MPIR_Sendq *)req->mpid.next; - if (!p) { - /* Just ignore it */ - MPIU_THREAD_CS_EXIT(HANDLE,req); - return; + p = MPIR_Sendq_head; + prev = 0; + + while (p) { + if (p->sreq == req) { + if (prev) prev->next = p->next; + else MPIR_Sendq_head = p->next; + /* Return this element to the pool */ + p->next = pool; + pool = p; + break; + } + prev = p; + p = p->next; } - prev = p->prev; - if (prev != NULL) prev->next = p->next; - else MPIR_Sendq_head = p->next; - if (p->next != NULL) p->next->prev = prev; - /* Return this element to the pool */ - p->next = pool; - pool = p; + /* If we don't find the request, just ignore it */ MPIU_THREAD_CS_EXIT(HANDLE,req); } diff --git a/src/mpi/debugger/dll_mpich.c b/src/mpi/debugger/dll_mpich.c index cf957eb..5578a31 100644 --- a/src/mpi/debugger/dll_mpich.c +++ b/src/mpi/debugger/dll_mpich.c @@ -308,54 +308,57 @@ int mqs_image_has_queues (mqs_image *image, char **message) request definition */ { mqs_type *req_type = dbgr_find_type( image, (char *)"MPID_Request", mqs_lang_c ); - if (req_type) { - int mpid_offs; + if (req_type) { + int dev_offs; have_req = 1; - mpid_offs = dbgr_field_offset( req_type, (char *)"mpid" ); + dev_offs = dbgr_field_offset( req_type, (char *)"dev" ); i_info->req_status_offs = dbgr_field_offset( req_type, (char *)"status" ); i_info->req_cc_offs = dbgr_field_offset( req_type, (char *)"cc" ); - - if (mpid_offs >= 0) { + if (dev_offs >= 0) { mqs_type *dreq_type = dbgr_find_type( image, (char *)"MPIDI_Request", mqs_lang_c ); - i_info->req_mpid_offs = mpid_offs; + i_info->req_dev_offs = dev_offs; if (dreq_type) { - int loff, envelope_offs; + int loff, match_offs; have_dreq = 1; loff = dbgr_field_offset( dreq_type, (char *)"next" ); - i_info->req_next_offs = mpid_offs + loff; - loff = dbgr_field_offset( dreq_type, (char *)"userbuf" ); - i_info->req_userbuf_offs = mpid_offs + loff; - loff = dbgr_field_offset( dreq_type, (char *)"userbufcount" ); - i_info->req_userbufcount_offs = mpid_offs + loff; + i_info->req_next_offs = dev_offs + loff; + loff = dbgr_field_offset( dreq_type, (char *)"user_buf" ); + i_info->req_user_buf_offs = dev_offs + loff; + loff = dbgr_field_offset( dreq_type, (char *)"user_count" ); + i_info->req_user_count_offs = dev_offs + loff; loff = dbgr_field_offset( dreq_type, (char *)"datatype" ); - i_info->req_datatype_offs = mpid_offs + loff; - loff = dbgr_field_offset( dreq_type, (char *)"uebuflen" ); - i_info->req_uebuflen_offs = mpid_offs + loff; - loff = dbgr_field_offset( dreq_type, (char *)"uebuf" ); - i_info->req_uebuf_offs = mpid_offs + loff; - envelope_offs = dbgr_field_offset( dreq_type, (char *)"envelope" ); - envelope_offs += mpid_offs ; - - if (envelope_offs >= 0) { - mqs_type *envelope_type = dbgr_find_type( image, (char *)"MPIDI_MsgEnvelope", mqs_lang_c ); - if (envelope_type) { - int msginfo_offs= dbgr_field_offset( envelope_type, (char *)"msginfo" ); - msginfo_offs = envelope_offs + msginfo_offs; - - if (msginfo_offs >= 0) { - mqs_type *msginfo_type= dbgr_find_type( image, (char *)"MPIDI_MsgInfo", mqs_lang_c ); - if (msginfo_type) { + i_info->req_datatype_offs = dev_offs + loff; + match_offs = dbgr_field_offset( dreq_type, (char *)"match" ); + /* + Current definition from the mpidpre.h file for ch3. + + typedef struct MPIDI_Message_match_parts { + int32_t tag; + MPIR_Rank_t rank; + MPIR_Context_id_t context_id; + } MPIDI_Message_match_parts_t; + typedef union { + MPIDI_Message_match_parts_t parts; + MPIR_Upint whole; + } MPIDI_Message_match; + */ + if (match_offs >= 0) { + mqs_type *match_type = dbgr_find_type( image, (char *)"MPIDI_Message_match", mqs_lang_c ); + if (match_type) { + int parts_offs = dbgr_field_offset( match_type, (char *)"parts" ); + if (parts_offs >= 0) { + mqs_type *parts_type = dbgr_find_type( image, (char *)"MPIDI_Message_match_parts_t", mqs_lang_c ); + if (parts_type) { int moff; - moff = dbgr_field_offset( msginfo_type, (char *)"MPItag" ); - i_info->req_tag_offs = msginfo_offs + moff; - moff = dbgr_field_offset( msginfo_type, (char *)"MPIrank" ); - i_info->req_rank_offs = msginfo_offs + moff; - moff = dbgr_field_offset( msginfo_type, (char *)"MPIctxt" ); - i_info->req_context_id_offs = msginfo_offs + moff; + moff = dbgr_field_offset( parts_type, (char *)"tag" ); + i_info->req_tag_offs = dev_offs + match_offs + moff; + moff = dbgr_field_offset( parts_type, (char *)"rank" ); + i_info->req_rank_offs = dev_offs + match_offs + moff; + moff = dbgr_field_offset( parts_type, (char *)"context_id" ); + i_info->req_context_id_offs = dev_offs + match_offs + moff; } } - } } } @@ -642,7 +645,7 @@ static int fetch_receive (mqs_process *proc, mpich_process_info *p_info, #endif while (base != 0) { /* Check this entry to see if the context matches */ - int actual_context = fetch_int16( proc, base + i_info->req_context_id_offs, p_info ); + int16_t actual_context = fetch_int16( proc, base + i_info->req_context_id_offs, p_info ); #ifdef DEBUG_LIST_ITER initLogFile(); @@ -651,39 +654,27 @@ static int fetch_receive (mqs_process *proc, mpich_process_info *p_info, if (actual_context == wanted_context) { /* Found a request for this communicator */ int tag = fetch_int( proc, base + i_info->req_tag_offs, p_info ); - int rank = fetch_int( proc, base + i_info->req_rank_offs, p_info ); + int rank = fetch_int16( proc, base + i_info->req_rank_offs, p_info ); int is_complete = fetch_int ( proc, base + i_info->req_cc_offs, p_info); - mqs_taddr_t buffer = 0; - unsigned buf_count = -1; - int datatype; - datatype = fetch_int(proc, base + i_info->req_datatype_offs, p_info); - - if(look_for_user_buffer) - { - buffer = fetch_pointer(proc, base + i_info->req_userbuf_offs, p_info); - buf_count = fetch_int(proc, base + i_info->req_userbufcount_offs, p_info); - }else{ - /* unexpected buffer*/ - buffer = fetch_pointer(proc, base + i_info->req_uebuf_offs, p_info); - buf_count = fetch_int(proc, base + i_info->req_uebuflen_offs, p_info); - } - - /* Return -1 for ANY_TAG or ANY_SOURCE */ + mqs_tword_t user_buffer = fetch_pointer( proc,base+i_info->req_user_buf_offs, p_info); + int user_count = fetch_int( proc,base + i_info->req_user_count_offs, p_info ); + + /* Return -1 for ANY_TAG or ANY_SOURCE */ res->desired_tag = (tag >= 0) ? tag : -1; res->desired_local_rank = (rank >= 0) ? rank : -1; res->desired_global_rank = -1; /* Convert to rank in comm world, if valid (in mpi-2, may not be available) */ - res->desired_length = buf_count; /* Count, not bytes */ + res->desired_length = user_count; /* Count, not bytes */ res->tag_wild = (tag < 0); - res->buffer = buffer; + res->buffer = user_buffer; /* We don't know the rest of these */ res->system_buffer = 0; res->actual_local_rank = rank; res->actual_global_rank = -1; res->actual_tag = tag; - res->actual_length = buf_count; + res->actual_length = -1; res->extra_text[0][0] = 0; res->status = (is_complete != 0) ? mqs_st_pending : mqs_st_complete; @@ -804,7 +795,7 @@ static int fetch_send (mqs_process *proc, mpich_process_info *p_info, #ifdef DEBUG_LIST_ITER if (base) { initLogFile(); - fprintf( debugfp, "comm ptr = %p, comm context = %d\n", + fprintf( debugf, "comm ptr = %p, comm context = %d\n", comm, comm->context_id ); } #endif @@ -827,13 +818,13 @@ static int fetch_send (mqs_process *proc, mpich_process_info *p_info, mqs_taddr_t data = 0; mqs_taddr_t sreq = fetch_pointer(proc, base+i_info->sendq_req_offs, p_info ); mqs_tword_t is_complete = fetch_int( proc, sreq+i_info->req_cc_offs, p_info ); - data = fetch_pointer( proc, sreq+i_info->req_userbuf_offs, p_info ); - length = fetch_int( proc, sreq+i_info->req_userbufcount_offs, p_info ); + data = fetch_pointer( proc, sreq+i_info->req_user_buf_offs, p_info ); + length = fetch_int( proc, sreq+i_info->req_user_count_offs, p_info ); /* mqs_tword_t complete=0; */ #ifdef DEBUG_LIST_ITER initLogFile(); - fprintf( debugfp, "sendq entry = %p, rank off = %d, tag off = %d, context = %d\n", + fprintf( debugpf, "sendq entry = %p, rank off = %d, tag off = %d, context = %d\n", base, i_info->sendq_rank_offs, i_info->sendq_tag_offs, actual_context ); #endif @@ -1110,14 +1101,14 @@ static mqs_tword_t fetch_int (mqs_process * proc, mqs_taddr_t addr, dbgr_target_to_host (proc, buffer, ((char *)&res) + (host_is_big_endian ? sizeof(mqs_tword_t)-isize : 0), isize); - + return res; } static mqs_tword_t fetch_int16 (mqs_process * proc, mqs_taddr_t addr, mpich_process_info *p_info) { char buffer[8]; /* ASSUME an integer fits in 8 bytes */ - mqs_tword_t res = 0; + int16_t res = 0; if (mqs_ok == dbgr_fetch_data (proc, addr, 2, buffer)) dbgr_target_to_host (proc, buffer, diff --git a/src/mpi/debugger/mpich_dll_defs.h b/src/mpi/debugger/mpich_dll_defs.h index 561dfba..c66c39a 100644 --- a/src/mpi/debugger/mpich_dll_defs.h +++ b/src/mpi/debugger/mpich_dll_defs.h @@ -32,16 +32,14 @@ typedef struct /* Fields in MPID_Request (including structures within the request) */ int req_status_offs; int req_cc_offs; - int req_mpid_offs; + int req_dev_offs; int req_next_offs; int req_tag_offs; int req_rank_offs; int req_context_id_offs; - int req_userbuf_offs; - int req_userbufcount_offs; + int req_user_buf_offs; + int req_user_count_offs; int req_datatype_offs; - int req_uebuf_offs; - int req_uebuflen_offs; /* Fields in MPIR_Sendq */ int sendq_next_offs; ----------------------------------------------------------------------- Summary of changes: src/mpi/debugger/dbginit.c | 32 +++++----- src/mpi/debugger/dll_mpich.c | 117 +++++++++++++++++-------------------- src/mpi/debugger/mpich_dll_defs.h | 8 +-- 3 files changed, 72 insertions(+), 85 deletions(-) hooks/post-receive -- MPICH primary repository

1 0

[mpich] MPICH primary repository branch, master, updated. v3.0.4-309-g08c22eb
by noreply＠mpich.org 19 Jun '13

19 Jun '13

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "MPICH primary repository". The branch, master has been updated via 08c22ebe9f47923b56a19770200fccf48187ee92 (commit) from 6dbb07aa774daabd4c87787d87f0ec30347c256b (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- http://git.mpich.org/mpich.git/commitdiff/08c22ebe9f47923b56a19770200fccf48… commit 08c22ebe9f47923b56a19770200fccf48187ee92 Author: Michael Blocksome <blocksom(a)us.ibm.com> Date: Wed Apr 3 12:58:43 2013 -0500 Debugger changes from IBM. These are misc debugger changes that were not picked up during the merge for some reason. diff --git a/src/mpi/debugger/dbginit.c b/src/mpi/debugger/dbginit.c index 57227e5..fccc557 100644 --- a/src/mpi/debugger/dbginit.c +++ b/src/mpi/debugger/dbginit.c @@ -309,6 +309,7 @@ typedef struct MPIR_Sendq { MPID_Request *sreq; int tag, rank, context_id; struct MPIR_Sendq *next; + struct MPIR_Sendq *prev; } MPIR_Sendq; MPIR_Sendq *MPIR_Sendq_head = 0; @@ -333,6 +334,7 @@ void MPIR_Sendq_remember( MPID_Request *req, p = (MPIR_Sendq *)MPIU_Malloc( sizeof(MPIR_Sendq) ); if (!p) { /* Just ignore it */ + req->mpid.next = NULL; goto fn_exit; } } @@ -341,7 +343,10 @@ void MPIR_Sendq_remember( MPID_Request *req, p->rank = rank; p->context_id = context_id; p->next = MPIR_Sendq_head; + p->prev = NULL; MPIR_Sendq_head = p; + if (p->next) p->next->prev = p; + req->mpid.next = (MPID_Request *)p; /* overload 'next' for debugger SEND queue */ fn_exit: MPIU_THREAD_CS_EXIT(HANDLE,req); } @@ -351,22 +356,19 @@ void MPIR_Sendq_forget( MPID_Request *req ) MPIR_Sendq *p, *prev; MPIU_THREAD_CS_ENTER(HANDLE,req); - p = MPIR_Sendq_head; - prev = 0; - - while (p) { - if (p->sreq == req) { - if (prev) prev->next = p->next; - else MPIR_Sendq_head = p->next; - /* Return this element to the pool */ - p->next = pool; - pool = p; - break; - } - prev = p; - p = p->next; + p = (MPIR_Sendq *)req->mpid.next; + if (!p) { + /* Just ignore it */ + MPIU_THREAD_CS_EXIT(HANDLE,req); + return; } - /* If we don't find the request, just ignore it */ + prev = p->prev; + if (prev != NULL) prev->next = p->next; + else MPIR_Sendq_head = p->next; + if (p->next != NULL) p->next->prev = prev; + /* Return this element to the pool */ + p->next = pool; + pool = p; MPIU_THREAD_CS_EXIT(HANDLE,req); } diff --git a/src/mpi/debugger/dll_mpich.c b/src/mpi/debugger/dll_mpich.c index 5578a31..cf957eb 100644 --- a/src/mpi/debugger/dll_mpich.c +++ b/src/mpi/debugger/dll_mpich.c @@ -308,57 +308,54 @@ int mqs_image_has_queues (mqs_image *image, char **message) request definition */ { mqs_type *req_type = dbgr_find_type( image, (char *)"MPID_Request", mqs_lang_c ); - if (req_type) { - int dev_offs; + if (req_type) { + int mpid_offs; have_req = 1; - dev_offs = dbgr_field_offset( req_type, (char *)"dev" ); + mpid_offs = dbgr_field_offset( req_type, (char *)"mpid" ); i_info->req_status_offs = dbgr_field_offset( req_type, (char *)"status" ); i_info->req_cc_offs = dbgr_field_offset( req_type, (char *)"cc" ); - if (dev_offs >= 0) { + + if (mpid_offs >= 0) { mqs_type *dreq_type = dbgr_find_type( image, (char *)"MPIDI_Request", mqs_lang_c ); - i_info->req_dev_offs = dev_offs; + i_info->req_mpid_offs = mpid_offs; if (dreq_type) { - int loff, match_offs; + int loff, envelope_offs; have_dreq = 1; loff = dbgr_field_offset( dreq_type, (char *)"next" ); - i_info->req_next_offs = dev_offs + loff; - loff = dbgr_field_offset( dreq_type, (char *)"user_buf" ); - i_info->req_user_buf_offs = dev_offs + loff; - loff = dbgr_field_offset( dreq_type, (char *)"user_count" ); - i_info->req_user_count_offs = dev_offs + loff; + i_info->req_next_offs = mpid_offs + loff; + loff = dbgr_field_offset( dreq_type, (char *)"userbuf" ); + i_info->req_userbuf_offs = mpid_offs + loff; + loff = dbgr_field_offset( dreq_type, (char *)"userbufcount" ); + i_info->req_userbufcount_offs = mpid_offs + loff; loff = dbgr_field_offset( dreq_type, (char *)"datatype" ); - i_info->req_datatype_offs = dev_offs + loff; - match_offs = dbgr_field_offset( dreq_type, (char *)"match" ); - /* - Current definition from the mpidpre.h file for ch3. - - typedef struct MPIDI_Message_match_parts { - int32_t tag; - MPIR_Rank_t rank; - MPIR_Context_id_t context_id; - } MPIDI_Message_match_parts_t; - typedef union { - MPIDI_Message_match_parts_t parts; - MPIR_Upint whole; - } MPIDI_Message_match; - */ - if (match_offs >= 0) { - mqs_type *match_type = dbgr_find_type( image, (char *)"MPIDI_Message_match", mqs_lang_c ); - if (match_type) { - int parts_offs = dbgr_field_offset( match_type, (char *)"parts" ); - if (parts_offs >= 0) { - mqs_type *parts_type = dbgr_find_type( image, (char *)"MPIDI_Message_match_parts_t", mqs_lang_c ); - if (parts_type) { + i_info->req_datatype_offs = mpid_offs + loff; + loff = dbgr_field_offset( dreq_type, (char *)"uebuflen" ); + i_info->req_uebuflen_offs = mpid_offs + loff; + loff = dbgr_field_offset( dreq_type, (char *)"uebuf" ); + i_info->req_uebuf_offs = mpid_offs + loff; + envelope_offs = dbgr_field_offset( dreq_type, (char *)"envelope" ); + envelope_offs += mpid_offs ; + + if (envelope_offs >= 0) { + mqs_type *envelope_type = dbgr_find_type( image, (char *)"MPIDI_MsgEnvelope", mqs_lang_c ); + if (envelope_type) { + int msginfo_offs= dbgr_field_offset( envelope_type, (char *)"msginfo" ); + msginfo_offs = envelope_offs + msginfo_offs; + + if (msginfo_offs >= 0) { + mqs_type *msginfo_type= dbgr_find_type( image, (char *)"MPIDI_MsgInfo", mqs_lang_c ); + if (msginfo_type) { int moff; - moff = dbgr_field_offset( parts_type, (char *)"tag" ); - i_info->req_tag_offs = dev_offs + match_offs + moff; - moff = dbgr_field_offset( parts_type, (char *)"rank" ); - i_info->req_rank_offs = dev_offs + match_offs + moff; - moff = dbgr_field_offset( parts_type, (char *)"context_id" ); - i_info->req_context_id_offs = dev_offs + match_offs + moff; + moff = dbgr_field_offset( msginfo_type, (char *)"MPItag" ); + i_info->req_tag_offs = msginfo_offs + moff; + moff = dbgr_field_offset( msginfo_type, (char *)"MPIrank" ); + i_info->req_rank_offs = msginfo_offs + moff; + moff = dbgr_field_offset( msginfo_type, (char *)"MPIctxt" ); + i_info->req_context_id_offs = msginfo_offs + moff; } } + } } } @@ -645,7 +642,7 @@ static int fetch_receive (mqs_process *proc, mpich_process_info *p_info, #endif while (base != 0) { /* Check this entry to see if the context matches */ - int16_t actual_context = fetch_int16( proc, base + i_info->req_context_id_offs, p_info ); + int actual_context = fetch_int16( proc, base + i_info->req_context_id_offs, p_info ); #ifdef DEBUG_LIST_ITER initLogFile(); @@ -654,27 +651,39 @@ static int fetch_receive (mqs_process *proc, mpich_process_info *p_info, if (actual_context == wanted_context) { /* Found a request for this communicator */ int tag = fetch_int( proc, base + i_info->req_tag_offs, p_info ); - int rank = fetch_int16( proc, base + i_info->req_rank_offs, p_info ); + int rank = fetch_int( proc, base + i_info->req_rank_offs, p_info ); int is_complete = fetch_int ( proc, base + i_info->req_cc_offs, p_info); - mqs_tword_t user_buffer = fetch_pointer( proc,base+i_info->req_user_buf_offs, p_info); - int user_count = fetch_int( proc,base + i_info->req_user_count_offs, p_info ); - - /* Return -1 for ANY_TAG or ANY_SOURCE */ + mqs_taddr_t buffer = 0; + unsigned buf_count = -1; + int datatype; + datatype = fetch_int(proc, base + i_info->req_datatype_offs, p_info); + + if(look_for_user_buffer) + { + buffer = fetch_pointer(proc, base + i_info->req_userbuf_offs, p_info); + buf_count = fetch_int(proc, base + i_info->req_userbufcount_offs, p_info); + }else{ + /* unexpected buffer*/ + buffer = fetch_pointer(proc, base + i_info->req_uebuf_offs, p_info); + buf_count = fetch_int(proc, base + i_info->req_uebuflen_offs, p_info); + } + + /* Return -1 for ANY_TAG or ANY_SOURCE */ res->desired_tag = (tag >= 0) ? tag : -1; res->desired_local_rank = (rank >= 0) ? rank : -1; res->desired_global_rank = -1; /* Convert to rank in comm world, if valid (in mpi-2, may not be available) */ - res->desired_length = user_count; /* Count, not bytes */ + res->desired_length = buf_count; /* Count, not bytes */ res->tag_wild = (tag < 0); - res->buffer = user_buffer; + res->buffer = buffer; /* We don't know the rest of these */ res->system_buffer = 0; res->actual_local_rank = rank; res->actual_global_rank = -1; res->actual_tag = tag; - res->actual_length = -1; + res->actual_length = buf_count; res->extra_text[0][0] = 0; res->status = (is_complete != 0) ? mqs_st_pending : mqs_st_complete; @@ -795,7 +804,7 @@ static int fetch_send (mqs_process *proc, mpich_process_info *p_info, #ifdef DEBUG_LIST_ITER if (base) { initLogFile(); - fprintf( debugf, "comm ptr = %p, comm context = %d\n", + fprintf( debugfp, "comm ptr = %p, comm context = %d\n", comm, comm->context_id ); } #endif @@ -818,13 +827,13 @@ static int fetch_send (mqs_process *proc, mpich_process_info *p_info, mqs_taddr_t data = 0; mqs_taddr_t sreq = fetch_pointer(proc, base+i_info->sendq_req_offs, p_info ); mqs_tword_t is_complete = fetch_int( proc, sreq+i_info->req_cc_offs, p_info ); - data = fetch_pointer( proc, sreq+i_info->req_user_buf_offs, p_info ); - length = fetch_int( proc, sreq+i_info->req_user_count_offs, p_info ); + data = fetch_pointer( proc, sreq+i_info->req_userbuf_offs, p_info ); + length = fetch_int( proc, sreq+i_info->req_userbufcount_offs, p_info ); /* mqs_tword_t complete=0; */ #ifdef DEBUG_LIST_ITER initLogFile(); - fprintf( debugpf, "sendq entry = %p, rank off = %d, tag off = %d, context = %d\n", + fprintf( debugfp, "sendq entry = %p, rank off = %d, tag off = %d, context = %d\n", base, i_info->sendq_rank_offs, i_info->sendq_tag_offs, actual_context ); #endif @@ -1101,14 +1110,14 @@ static mqs_tword_t fetch_int (mqs_process * proc, mqs_taddr_t addr, dbgr_target_to_host (proc, buffer, ((char *)&res) + (host_is_big_endian ? sizeof(mqs_tword_t)-isize : 0), isize); - + return res; } static mqs_tword_t fetch_int16 (mqs_process * proc, mqs_taddr_t addr, mpich_process_info *p_info) { char buffer[8]; /* ASSUME an integer fits in 8 bytes */ - int16_t res = 0; + mqs_tword_t res = 0; if (mqs_ok == dbgr_fetch_data (proc, addr, 2, buffer)) dbgr_target_to_host (proc, buffer, diff --git a/src/mpi/debugger/mpich_dll_defs.h b/src/mpi/debugger/mpich_dll_defs.h index c66c39a..561dfba 100644 --- a/src/mpi/debugger/mpich_dll_defs.h +++ b/src/mpi/debugger/mpich_dll_defs.h @@ -32,14 +32,16 @@ typedef struct /* Fields in MPID_Request (including structures within the request) */ int req_status_offs; int req_cc_offs; - int req_dev_offs; + int req_mpid_offs; int req_next_offs; int req_tag_offs; int req_rank_offs; int req_context_id_offs; - int req_user_buf_offs; - int req_user_count_offs; + int req_userbuf_offs; + int req_userbufcount_offs; int req_datatype_offs; + int req_uebuf_offs; + int req_uebuflen_offs; /* Fields in MPIR_Sendq */ int sendq_next_offs; ----------------------------------------------------------------------- Summary of changes: src/mpi/debugger/dbginit.c | 32 +++++----- src/mpi/debugger/dll_mpich.c | 117 ++++++++++++++++++++----------------- src/mpi/debugger/mpich_dll_defs.h | 8 ++- 3 files changed, 85 insertions(+), 72 deletions(-) hooks/post-receive -- MPICH primary repository

1 0