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

[mpich] MPICH primary repository branch, master, updated. v3.1rc1-24-g0b12666
by noreply＠mpich.org 15 Nov '13

15 Nov '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 0b126663cc56320edc34d1cd9a6d50bc765a600c (commit) from a5412fec1e0e2f15b0d38369c2f489686e90d36c (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/0b126663cc56320edc34d1cd9a6d50bc7… commit 0b126663cc56320edc34d1cd9a6d50bc765a600c Author: Xin Zhao <xinzhao3(a)illinois.edu> Date: Thu Nov 14 23:57:32 2013 -0600 Fix ticket-1960: delete redundant MPIU_Assert. MPIU_Assert at L2311 checks if rma_ops_list is empty before exiting MPIDI_Win_flush. It causes /test/mpi/threads/rma/multirma to fail because while one thread is executing the loop of poking progress engine at L2293 ~ L2302, another thread may enqueue new RMA operations to rma_ops_list. rma_ops_list has already been checked for empty before exiting MPIDI_CH3I_Do_passive_target_rma (L2724) to ensure that all enqueued operations are issued out, therefore it does not need to be checked again here. Signed-off-by: Wesley Bland <wbland(a)mcs.anl.gov> diff --git a/src/mpid/ch3/src/ch3u_rma_sync.c b/src/mpid/ch3/src/ch3u_rma_sync.c index beb5a6c..7a2553a 100644 --- a/src/mpid/ch3/src/ch3u_rma_sync.c +++ b/src/mpid/ch3/src/ch3u_rma_sync.c @@ -2308,7 +2308,6 @@ int MPIDI_Win_flush(int rank, MPID_Win *win_ptr) } fn_exit: - MPIU_Assert(MPIDI_CH3I_RMA_Ops_isempty(&win_ptr->targets[rank].rma_ops_list)); MPIDI_RMA_FUNC_EXIT(MPID_STATE_MPIDI_WIN_FLUSH); return mpi_errno; /* --BEGIN ERROR HANDLING-- */ ----------------------------------------------------------------------- Summary of changes: src/mpid/ch3/src/ch3u_rma_sync.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) hooks/post-receive -- MPICH primary repository

1 0

[mpich] MPICH primary repository branch, master, updated. v3.1rc1-23-ga5412fe
by noreply＠mpich.org 15 Nov '13

15 Nov '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 a5412fec1e0e2f15b0d38369c2f489686e90d36c (commit) from fe5ff951ef10d30793ac3d89b03d269503d22573 (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/a5412fec1e0e2f15b0d38369c2f489686… commit a5412fec1e0e2f15b0d38369c2f489686e90d36c Author: Antonio J. Pena <apenya(a)mcs.anl.gov> Date: Thu Nov 14 17:21:24 2013 -0600 Fix manpages not installed for VPATH builds Fixes #1976 Signed-off-by: Ken Raffenetti <raffenet(a)mcs.anl.gov> diff --git a/Makefile.am b/Makefile.am index 04773d2..a655575 100644 --- a/Makefile.am +++ b/Makefile.am @@ -355,7 +355,7 @@ htmldoc-local: $(mpi_sources:.c=.html-phony) $(doc1_src_txt:.txt=.html1-phony) INSTALL_DATA_LOCAL_TARGETS += install-man-local # this is a variation on the recipe that was previously generated by simplemake install-man-local: - @if test -d $(builddir)/man && cd $(builddir)/man ; then \ + @if test -d $(srcdir)/man && cd $(srcdir)/man ; then \ for name in * ; do \ if [ "$$name" = "*" ] ; then continue ; fi ; \ if [ -f $$name ] ; then \ ----------------------------------------------------------------------- Summary of changes: Makefile.am | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) hooks/post-receive -- MPICH primary repository

1 0

[mpich] MPICH primary repository branch, master, updated. v3.1rc1-22-gfe5ff95
by noreply＠mpich.org 14 Nov '13

14 Nov '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 fe5ff951ef10d30793ac3d89b03d269503d22573 (commit) via b60f15e1073d64823254385dec4b26cb831ecdac (commit) from a95629278a2478ef7b6da223353ea0c8a9e69434 (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/fe5ff951ef10d30793ac3d89b03d26950… commit fe5ff951ef10d30793ac3d89b03d269503d22573 Author: Junchao Zhang <jczhang(a)mcs.anl.gov> Date: Wed Nov 13 16:14:31 2013 -0600 Add missing manpages for MPI_T routines Fixes #1969 Signed-off-by: Antonio J. Pena <apenya(a)mcs.anl.gov> diff --git a/src/mpi_t/cat_changed.c b/src/mpi_t/cat_changed.c index aebff45..9717d76 100644 --- a/src/mpi_t/cat_changed.c +++ b/src/mpi_t/cat_changed.c @@ -28,16 +28,21 @@ #undef FCNAME #define FCNAME MPIU_QUOTE(FUNCNAME) /*@ -MPI_T_category_changed - XXX description here +MPI_T_category_changed - Get the timestamp indicating the last change to the categories Output Parameters: . stamp - a virtual time stamp to indicate the last change to the categories (integer) -.N ThreadSafe +Notes: +If two subsequent calls to this routine return the same timestamp, it is guaranteed that +the category information has not changed between the two calls. If the timestamp retrieved +from the second call is higher, then some categories have been added or expanded. -.N Fortran +.N ThreadSafe .N Errors +.N MPI_SUCCESS +.N MPI_T_ERR_NOT_INITIALIZED @*/ int MPI_T_category_changed(int *stamp) { diff --git a/src/mpi_t/cat_get_categories.c b/src/mpi_t/cat_get_categories.c index 93e088a..743f5cb 100644 --- a/src/mpi_t/cat_get_categories.c +++ b/src/mpi_t/cat_get_categories.c @@ -55,7 +55,7 @@ fn_fail: #undef FCNAME #define FCNAME MPIU_QUOTE(FUNCNAME) /*@ -MPI_T_category_get_categories - XXX description here +MPI_T_category_get_categories - Get sub-categories in a category Input Parameters: + cat_index - index of the category to be queried, in the range [0,N-1] (integer) @@ -66,9 +66,10 @@ Output Parameters: .N ThreadSafe -.N Fortran - .N Errors +.N MPI_SUCCESS +.N MPI_T_ERR_NOT_INITIALIZED +.N MPI_T_ERR_INVALID_INDEX @*/ int MPI_T_category_get_categories(int cat_index, int len, int indices[]) { diff --git a/src/mpi_t/cat_get_cvars.c b/src/mpi_t/cat_get_cvars.c index 5117c30..b1f4f98 100644 --- a/src/mpi_t/cat_get_cvars.c +++ b/src/mpi_t/cat_get_cvars.c @@ -55,7 +55,7 @@ fn_fail: #undef FCNAME #define FCNAME MPIU_QUOTE(FUNCNAME) /*@ -MPI_T_category_get_cvars - XXX description here +MPI_T_category_get_cvars - Get control variables in a category Input Parameters: + cat_index - index of the category to be queried, in the range [0,N-1] (integer) @@ -66,9 +66,10 @@ Output Parameters: .N ThreadSafe -.N Fortran - .N Errors +.N MPI_SUCCESS +.N MPI_T_ERR_NOT_INITIALIZED +.N MPI_T_ERR_INVALID_INDEX @*/ int MPI_T_category_get_cvars(int cat_index, int len, int indices[]) { diff --git a/src/mpi_t/cat_get_info.c b/src/mpi_t/cat_get_info.c index 4bdb274..a4f05d9 100644 --- a/src/mpi_t/cat_get_info.c +++ b/src/mpi_t/cat_get_info.c @@ -28,7 +28,7 @@ #undef FCNAME #define FCNAME MPIU_QUOTE(FUNCNAME) /*@ -MPI_T_category_get_info - XXX description here +MPI_T_category_get_info - Get the information about a category Input/Output Parameters: + name_len - length of the string and/or buffer for name (integer) @@ -46,9 +46,10 @@ Output Parameters: .N ThreadSafe -.N Fortran - .N Errors +.N MPI_SUCCESS +.N MPI_T_ERR_NOT_INITIALIZED +.N MPI_T_ERR_INVALID_INDEX @*/ int MPI_T_category_get_info(int cat_index, char *name, int *name_len, char *desc, int *desc_len, int *num_cvars, int *num_pvars, int *num_categories) diff --git a/src/mpi_t/cat_get_num.c b/src/mpi_t/cat_get_num.c index f0f3e9c..3bad314 100644 --- a/src/mpi_t/cat_get_num.c +++ b/src/mpi_t/cat_get_num.c @@ -28,16 +28,16 @@ #undef FCNAME #define FCNAME MPIU_QUOTE(FUNCNAME) /*@ -MPI_T_category_get_num - XXX description here +MPI_T_category_get_num - Get the number of categories Output Parameters: . num_cat - current number of categories (integer) .N ThreadSafe -.N Fortran - .N Errors +.N MPI_SUCCESS +.N MPI_T_ERR_NOT_INITIALIZED @*/ int MPI_T_category_get_num(int *num_cat) { diff --git a/src/mpi_t/cat_get_pvars.c b/src/mpi_t/cat_get_pvars.c index 9190ec5..7e8010c 100644 --- a/src/mpi_t/cat_get_pvars.c +++ b/src/mpi_t/cat_get_pvars.c @@ -55,7 +55,7 @@ fn_fail: #undef FCNAME #define FCNAME MPIU_QUOTE(FUNCNAME) /*@ -MPI_T_category_get_pvars - XXX description here +MPI_T_category_get_pvars - Get performance variables in a category Input Parameters: + cat_index - index of the category to be queried, in the range [0,N-1] (integer) @@ -66,9 +66,10 @@ Output Parameters: .N ThreadSafe -.N Fortran - .N Errors +.N MPI_SUCCESS +.N MPI_T_ERR_NOT_INITIALIZED +.N MPI_T_ERR_INVALID_INDEX @*/ int MPI_T_category_get_pvars(int cat_index, int len, int indices[]) { diff --git a/src/mpi_t/cvar_get_info.c b/src/mpi_t/cvar_get_info.c index ef2f1ab..1c5ca38 100644 --- a/src/mpi_t/cvar_get_info.c +++ b/src/mpi_t/cvar_get_info.c @@ -28,7 +28,7 @@ #undef FCNAME #define FCNAME MPIU_QUOTE(FUNCNAME) /*@ -MPI_T_cvar_get_info - XXX description here +MPI_T_cvar_get_info - Get the information about a control variable Input/Output Parameters: + name_len - length of the string and/or buffer for name (integer) @@ -48,9 +48,10 @@ Output Parameters: .N ThreadSafe -.N Fortran - .N Errors +.N MPI_SUCCESS +.N MPI_T_ERR_NOT_INITIALIZED +.N MPI_T_ERR_INVALID_INDEX @*/ int MPI_T_cvar_get_info(int cvar_index, char *name, int *name_len, int *verbosity, MPI_Datatype *datatype, MPI_T_enum *enumtype, diff --git a/src/mpi_t/cvar_get_num.c b/src/mpi_t/cvar_get_num.c index c1291b6..958f18a 100644 --- a/src/mpi_t/cvar_get_num.c +++ b/src/mpi_t/cvar_get_num.c @@ -28,16 +28,16 @@ #undef FCNAME #define FCNAME MPIU_QUOTE(FUNCNAME) /*@ -MPI_T_cvar_get_num - XXX description here +MPI_T_cvar_get_num - Get the number of control variables Output Parameters: . num_cvar - returns number of control variables (integer) .N ThreadSafe -.N Fortran - .N Errors +.N MPI_SUCCESS +.N MPI_T_ERR_NOT_INITIALIZED @*/ int MPI_T_cvar_get_num(int *num_cvar) { diff --git a/src/mpi_t/cvar_handle_alloc.c b/src/mpi_t/cvar_handle_alloc.c index 737815c..c9ac07d 100644 --- a/src/mpi_t/cvar_handle_alloc.c +++ b/src/mpi_t/cvar_handle_alloc.c @@ -74,7 +74,7 @@ fn_fail: #undef FCNAME #define FCNAME MPIU_QUOTE(FUNCNAME) /*@ -MPI_T_cvar_handle_alloc - XXX description here +MPI_T_cvar_handle_alloc - Allocate a handle for a control variable Input Parameters: + cvar_index - index of control variable for which handle is to be allocated (index) @@ -86,9 +86,12 @@ Output Parameters: .N ThreadSafe -.N Fortran - .N Errors +.N MPI_SUCCESS +.N MPI_T_ERR_NOT_INITIALIZED +.N MPI_T_ERR_INVALID_INDEX +.N MPI_T_ERR_INVALID_HANDLE +.N MPI_T_ERR_OUT_OF_HANDLES @*/ int MPI_T_cvar_handle_alloc(int cvar_index, void *obj_handle, MPI_T_cvar_handle *handle, int *count) { diff --git a/src/mpi_t/cvar_handle_free.c b/src/mpi_t/cvar_handle_free.c index 81c5f11..9c8a82a 100644 --- a/src/mpi_t/cvar_handle_free.c +++ b/src/mpi_t/cvar_handle_free.c @@ -28,16 +28,17 @@ #undef FCNAME #define FCNAME MPIU_QUOTE(FUNCNAME) /*@ -MPI_T_cvar_handle_free - XXX description here +MPI_T_cvar_handle_free - Free an existing handle for a control variable Input/Output Parameters: . handle - handle to be freed (handle) .N ThreadSafe -.N Fortran - .N Errors +.N MPI_SUCCESS +.N MPI_T_ERR_NOT_INITIALIZED +.N MPI_T_ERR_INVALID_HANDLE @*/ int MPI_T_cvar_handle_free(MPI_T_cvar_handle *handle) { diff --git a/src/mpi_t/cvar_read.c b/src/mpi_t/cvar_read.c index 7c92bb2..e963ef7 100644 --- a/src/mpi_t/cvar_read.c +++ b/src/mpi_t/cvar_read.c @@ -82,7 +82,7 @@ fn_fail: #undef FCNAME #define FCNAME MPIU_QUOTE(FUNCNAME) /*@ -MPI_T_cvar_read - XXX description here +MPI_T_cvar_read - Read the value of a control variable Input Parameters: . handle - handle to the control variable to be read (handle) @@ -92,9 +92,10 @@ Output Parameters: .N ThreadSafe -.N Fortran - .N Errors +.N MPI_SUCCESS +.N MPI_T_ERR_NOT_INITIALIZED +.N MPI_T_ERR_INVALID_HANDLE @*/ int MPI_T_cvar_read(MPI_T_cvar_handle handle, void *buf) { diff --git a/src/mpi_t/cvar_write.c b/src/mpi_t/cvar_write.c index fb616eb..0bfdc5d 100644 --- a/src/mpi_t/cvar_write.c +++ b/src/mpi_t/cvar_write.c @@ -90,7 +90,7 @@ fn_fail: #undef FCNAME #define FCNAME MPIU_QUOTE(FUNCNAME) /*@ -MPI_T_cvar_write - XXX description here +MPI_T_cvar_write - Write a control variable Input Parameters: + handle - handle of the control variable to be written (handle) @@ -98,9 +98,12 @@ Input Parameters: .N ThreadSafe -.N Fortran - .N Errors +.N MPI_SUCCESS +.N MPI_T_ERR_NOT_INITIALIZED +.N MPI_T_ERR_INVALID_HANDLE +.N MPI_T_ERR_CVAR_SET_NOT_NOW +.N MPI_T_ERR_CVAR_SET_NEVER @*/ int MPI_T_cvar_write(MPI_T_cvar_handle handle, void *buf) { diff --git a/src/mpi_t/enum_get_info.c b/src/mpi_t/enum_get_info.c index 2e3bd66..a08cad6 100644 --- a/src/mpi_t/enum_get_info.c +++ b/src/mpi_t/enum_get_info.c @@ -28,7 +28,7 @@ #undef FCNAME #define FCNAME MPIU_QUOTE(FUNCNAME) /*@ -MPI_T_enum_get_info - XXX description here +MPI_T_enum_get_info - Get the information about an enumeration Input/Output Parameters: . name_len - length of the string and/or buffer for name (integer) @@ -42,9 +42,10 @@ Output Parameters: .N ThreadSafe -.N Fortran - .N Errors +.N MPI_SUCCESS +.N MPI_T_ERR_NOT_INITIALIZED +.N MPI_T_ERR_INVALID_HANDLE @*/ int MPI_T_enum_get_info(MPI_T_enum enumtype, int *num, char *name, int *name_len) { diff --git a/src/mpi_t/enum_get_item.c b/src/mpi_t/enum_get_item.c index da7e115..aa928c4 100644 --- a/src/mpi_t/enum_get_item.c +++ b/src/mpi_t/enum_get_item.c @@ -28,7 +28,7 @@ #undef FCNAME #define FCNAME MPIU_QUOTE(FUNCNAME) /*@ -MPI_T_enum_get_item - XXX description here +MPI_T_enum_get_item - Get the information about an item in an enumeration Input/Output Parameters: . name_len - length of the string and/or buffer for name (integer) @@ -43,9 +43,11 @@ Output Parameters: .N ThreadSafe -.N Fortran - .N Errors +.N MPI_SUCCESS +.N MPI_T_ERR_NOT_INITIALIZED +.N MPI_T_ERR_INVALID_HANDLE +.N MPI_T_ERR_INVALID_ITEM @*/ int MPI_T_enum_get_item(MPI_T_enum enumtype, int index, int *value, char *name, int *name_len) { diff --git a/src/mpi_t/mpit_finalize.c b/src/mpi_t/mpit_finalize.c index ea33a4e..0321cd0 100644 --- a/src/mpi_t/mpit_finalize.c +++ b/src/mpi_t/mpit_finalize.c @@ -170,13 +170,30 @@ void MPIR_T_env_finalize(void) #undef FCNAME #define FCNAME MPIU_QUOTE(FUNCNAME) /*@ -MPI_T_finalize - XXX description here +MPI_T_finalize - Finalize the MPI tool information interface + +Notes: +This routine may be called as often as the corresponding MPI_T_init_thread() routine +up to the current point of execution. Calling it more times returns a corresponding +error code. As long as the number of calls to MPI_T_finalize() is smaller than the +number of calls to MPI_T_init_thread() up to the current point of execution, the MPI +tool information interface remains initialized and calls to its routines are permissible. +Further, additional calls to MPI_T_init_thread() after one or more calls to MPI_T_finalize() +are permissible. Once MPI_T_finalize() is called the same number of times as the routine +MPI_T_init_thread() up to the current point of execution, the MPI tool information +interface is no longer initialized. The interface can be reinitialized by subsequent calls +to MPI_T_init_thread(). + +At the end of the program execution, unless MPI_Abort() is called, an application must +have called MPI_T_init_thread() and MPI_T_finalize() an equal number of times. .N ThreadSafe -.N Fortran - .N Errors +.N MPI_SUCCESS +.N MPI_T_ERR_NOT_INITIALIZED + +.seealso MPI_T_init_thread @*/ int MPI_T_finalize(void) { diff --git a/src/mpi_t/mpit_initthread.c b/src/mpi_t/mpit_initthread.c index 02aed27..23ab02e 100644 --- a/src/mpi_t/mpit_initthread.c +++ b/src/mpi_t/mpit_initthread.c @@ -83,7 +83,7 @@ void MPIR_T_env_init(void) #undef FCNAME #define FCNAME MPIU_QUOTE(FUNCNAME) /*@ -MPI_T_init_thread - XXX description here +MPI_T_init_thread - Initialize the MPI_T execution environment Input Parameters: . required - desired level of thread support (integer) @@ -91,11 +91,23 @@ Input Parameters: Output Parameters: . provided - provided level of thread support (integer) -.N ThreadSafe +Notes: + The valid values for the level of thread support are: ++ MPI_THREAD_SINGLE - Only one thread will execute. +. MPI_THREAD_FUNNELED - The process may be multi-threaded, but only the main + thread will make MPI_T calls (all MPI_T calls are funneled to the + main thread). +. MPI_THREAD_SERIALIZED - The process may be multi-threaded, and multiple + threads may make MPI_T calls, but only one at a time: MPI_T calls are not + made concurrently from two distinct threads (all MPI_T calls are serialized). +- MPI_THREAD_MULTIPLE - Multiple threads may call MPI_T, with no restrictions. -.N Fortran +.N ThreadSafe .N Errors +.N MPI_SUCCESS + +.seealso MPI_T_finalize @*/ int MPI_T_init_thread(int required, int *provided) { diff --git a/src/mpi_t/pvar_get_info.c b/src/mpi_t/pvar_get_info.c index 5df055f..af56992 100644 --- a/src/mpi_t/pvar_get_info.c +++ b/src/mpi_t/pvar_get_info.c @@ -28,7 +28,7 @@ #undef FCNAME #define FCNAME MPIU_QUOTE(FUNCNAME) /*@ -MPI_T_pvar_get_info - XXX description here +MPI_T_pvar_get_info - Get the inforamtion about a performance variable Input/Output Parameters: + name_len - length of the string and/or buffer for name (integer) @@ -51,9 +51,10 @@ Output Parameters: .N ThreadSafe -.N Fortran - .N Errors +.N MPI_SUCCESS +.N MPI_T_ERR_NOT_INITIALIZED +.N MPI_T_ERR_INVALID_INDEX @*/ int MPI_T_pvar_get_info(int pvar_index, char *name, int *name_len, int *verbosity, int *var_class, MPI_Datatype *datatype, MPI_T_enum *enumtype, char *desc, diff --git a/src/mpi_t/pvar_get_num.c b/src/mpi_t/pvar_get_num.c index c4a8fdd..1f69872 100644 --- a/src/mpi_t/pvar_get_num.c +++ b/src/mpi_t/pvar_get_num.c @@ -28,16 +28,16 @@ #undef FCNAME #define FCNAME MPIU_QUOTE(FUNCNAME) /*@ -MPI_T_pvar_get_num - XXX description here +MPI_T_pvar_get_num - Get the number of performance variables Output Parameters: . num_pvar - returns number of performance variables (integer) .N ThreadSafe -.N Fortran - .N Errors +.N MPI_SUCCESS +.N MPI_T_ERR_NOT_INITIALIZED @*/ int MPI_T_pvar_get_num(int *num_pvar) { diff --git a/src/mpi_t/pvar_handle_alloc.c b/src/mpi_t/pvar_handle_alloc.c index 151ca78..26ce0b8 100644 --- a/src/mpi_t/pvar_handle_alloc.c +++ b/src/mpi_t/pvar_handle_alloc.c @@ -167,7 +167,7 @@ fn_fail: #undef FCNAME #define FCNAME MPIU_QUOTE(FUNCNAME) /*@ -MPI_T_pvar_handle_alloc - XXX description here +MPI_T_pvar_handle_alloc - Allocate a handle for a performance variable Input Parameters: + session - identifier of performance experiment session (handle) @@ -180,9 +180,12 @@ Output Parameters: .N ThreadSafe -.N Fortran - .N Errors +.N MPI_SUCCESS +.N MPI_T_ERR_NOT_INITIALIZED +.N MPI_T_ERR_INVALID_SESSION +.N MPI_T_ERR_INVALID_INDEX +.N MPI_T_ERR_OUT_OF_HANDLES @*/ int MPI_T_pvar_handle_alloc(MPI_T_pvar_session session, int pvar_index, void *obj_handle, MPI_T_pvar_handle *handle, int *count) diff --git a/src/mpi_t/pvar_handle_free.c b/src/mpi_t/pvar_handle_free.c index d22df03..6563812 100644 --- a/src/mpi_t/pvar_handle_free.c +++ b/src/mpi_t/pvar_handle_free.c @@ -73,7 +73,7 @@ fn_fail: #undef FCNAME #define FCNAME MPIU_QUOTE(FUNCNAME) /*@ -MPI_T_pvar_handle_free - XXX description here +MPI_T_pvar_handle_free - Free an existing handle for a performance variable Input/Output Parameters: + session - identifier of performance experiment session (handle) @@ -81,9 +81,11 @@ Input/Output Parameters: .N ThreadSafe -.N Fortran - .N Errors +.N MPI_SUCCESS +.N MPI_T_ERR_NOT_INITIALIZED +.N MPI_T_ERR_INVALID_SESSION +.N MPI_T_ERR_INVALID_HANDLE @*/ int MPI_T_pvar_handle_free(MPI_T_pvar_session session, MPI_T_pvar_handle *handle) { diff --git a/src/mpi_t/pvar_read.c b/src/mpi_t/pvar_read.c index 0ef169c..ef0f7d5 100644 --- a/src/mpi_t/pvar_read.c +++ b/src/mpi_t/pvar_read.c @@ -208,7 +208,7 @@ fn_fail: #undef FCNAME #define FCNAME MPIU_QUOTE(FUNCNAME) /*@ -MPI_T_pvar_read - XXX description here +MPI_T_pvar_read - Read the value of a performance variable Input Parameters: + session - identifier of performance experiment session (handle) @@ -217,11 +217,24 @@ Input Parameters: Output Parameters: . buf - initial address of storage location for variable value (choice) -.N ThreadSafe +Notes: +The MPI_T_pvar_read() call queries the value of the performance variable with the +handle "handle" in the session identified by the parameter session and stores the result +in the buffer identified by the parameter buf. The user is responsible to ensure that the +buffer is of the appropriate size to hold the entire value of the performance variable +(based on the datatype and count returned by the corresponding previous calls to +MPI_T_pvar_get_info() and MPI_T_pvar_handle_alloc(), respectively). + +The constant MPI_T_PVAR_ALL_HANDLES cannot be used as an argument for the function +MPI_T_pvar_read(). -.N Fortran +.N ThreadSafe .N Errors +.N MPI_SUCCESS +.N MPI_T_ERR_NOT_INITIALIZED +.N MPI_T_ERR_INVALID_SESSION +.N MPI_T_ERR_INVALID_HANDLE @*/ int MPI_T_pvar_read(MPI_T_pvar_session session, MPI_T_pvar_handle handle, void *buf) { diff --git a/src/mpi_t/pvar_readreset.c b/src/mpi_t/pvar_readreset.c index 2347218..b01f220 100644 --- a/src/mpi_t/pvar_readreset.c +++ b/src/mpi_t/pvar_readreset.c @@ -51,7 +51,7 @@ fn_fail: #undef FCNAME #define FCNAME MPIU_QUOTE(FUNCNAME) /*@ -MPI_T_pvar_readreset - XXX description here +MPI_T_pvar_readreset - Read the value of a performance variable and then reset it Input Parameters: + session - identifier of performance experiment session (handle) @@ -62,9 +62,13 @@ Output Parameters: .N ThreadSafe -.N Fortran - .N Errors +.N MPI_SUCCESS +.N MPI_T_ERR_NOT_INITIALIZED +.N MPI_T_ERR_INVALID_SESSION +.N MPI_T_ERR_INVALID_HANDLE +.N MPI_T_ERR_PVAR_NO_WRITE +.N MPI_T_ERR_PVAR_NO_ATOMIC @*/ int MPI_T_pvar_readreset(MPI_T_pvar_session session, MPI_T_pvar_handle handle, void *buf) { diff --git a/src/mpi_t/pvar_reset.c b/src/mpi_t/pvar_reset.c index 783ccdd..00982e8 100644 --- a/src/mpi_t/pvar_reset.c +++ b/src/mpi_t/pvar_reset.c @@ -78,17 +78,30 @@ fn_fail: #undef FCNAME #define FCNAME MPIU_QUOTE(FUNCNAME) /*@ -MPI_T_pvar_reset - XXX description here +MPI_T_pvar_reset - Reset a performance variable Input Parameters: + session - identifier of performance experiment session (handle) - handle - handle of a performance variable (handle) -.N ThreadSafe +Notes: +The MPI_T_pvar_reset() call sets the performance variable with the handle identified +by the parameter handle to its starting value. If it is not possible +to change the variable, the function returns MPI_T_ERR_PVAR_NO_WRITE. +If the constant MPI_T_PVAR_ALL_HANDLES is passed in handle, the MPI implementation +attempts to reset all variables within the session identified by the parameter session for +which handles have been allocated. In this case, the routine returns MPI_SUCCESS if all +variables are reset successfully, otherwise MPI_T_ERR_PVAR_NO_WRITE is returned. Readonly +variables are ignored when MPI_T_PVAR_ALL_HANDLES is specified. -.N Fortran +.N ThreadSafe .N Errors +.N MPI_SUCCESS +.N MPI_T_ERR_NOT_INITIALIZED +.N MPI_T_ERR_INVALID_SESSION +.N MPI_T_ERR_INVALID_HANDLE +.N MPI_T_ERR_PVAR_NO_WRITE @*/ int MPI_T_pvar_reset(MPI_T_pvar_session session, MPI_T_pvar_handle handle) { diff --git a/src/mpi_t/pvar_session_create.c b/src/mpi_t/pvar_session_create.c index ec5f5b7..b6f9d07 100644 --- a/src/mpi_t/pvar_session_create.c +++ b/src/mpi_t/pvar_session_create.c @@ -55,16 +55,17 @@ fn_fail: #undef FCNAME #define FCNAME MPIU_QUOTE(FUNCNAME) /*@ -MPI_T_pvar_session_create - XXX description here +MPI_T_pvar_session_create - Create a new session for accessing performance variables Output Parameters: . session - identifier of performance session (handle) .N ThreadSafe -.N Fortran - .N Errors +.N MPI_SUCCESS +.N MPI_T_ERR_NOT_INITIALIZED +.N MPI_T_ERR_OUT_OF_SESSIONS @*/ int MPI_T_pvar_session_create(MPI_T_pvar_session *session) { diff --git a/src/mpi_t/pvar_session_free.c b/src/mpi_t/pvar_session_free.c index 968b1fa..4b86cd1 100644 --- a/src/mpi_t/pvar_session_free.c +++ b/src/mpi_t/pvar_session_free.c @@ -60,16 +60,22 @@ fn_fail: #undef FCNAME #define FCNAME MPIU_QUOTE(FUNCNAME) /*@ -MPI_T_pvar_session_free - XXX description here +MPI_T_pvar_session_free - Free an existing performance variable session Input/Output Parameters: . session - identifier of performance experiment session (handle) -.N ThreadSafe +Notes: +Calls to the MPI tool information interface can no longer be made +within the context of a session after it is freed. On a successful +return, MPI sets the session identifier to MPI_T_PVAR_SESSION_NULL. -.N Fortran +.N ThreadSafe .N Errors +.N MPI_SUCCESS +.N MPI_T_ERR_NOT_INITIALIZEDE +.N MPI_T_ERR_INVALID_SESSION @*/ int MPI_T_pvar_session_free(MPI_T_pvar_session *session) { diff --git a/src/mpi_t/pvar_start.c b/src/mpi_t/pvar_start.c index 21037c8..d94cde9 100644 --- a/src/mpi_t/pvar_start.c +++ b/src/mpi_t/pvar_start.c @@ -78,17 +78,28 @@ fn_fail: #undef FCNAME #define FCNAME MPIU_QUOTE(FUNCNAME) /*@ -MPI_T_pvar_start - XXX description here +MPI_T_pvar_start - Start a performance variable Input Parameters: + session - identifier of performance experiment session (handle) - handle - handle of a performance variable (handle) -.N ThreadSafe +Notes: +If the constant MPI_T_PVAR_ALL_HANDLES is passed in handle, the MPI implementation +attempts to start all variables within the session identified by the parameter session for +which handles have been allocated. In this case, the routine returns MPI_SUCCESS if all +variables are started successfully, otherwise MPI_T_ERR_PVAR_NO_STARTSTOP is returned. +Continuous variables and variables that are already started are ignored when +MPI_T_PVAR_ALL_HANDLES is specified. -.N Fortran +.N ThreadSafe .N Errors +.N MPI_SUCCESS +.N MPI_T_ERR_NOT_INITIALIZED +.N MPI_T_ERR_INVALID_SESSION +.N MPI_T_ERR_INVALID_HANDLE +.N MPI_T_ERR_PVAR_NO_STARTSTOP @*/ int MPI_T_pvar_start(MPI_T_pvar_session session, MPI_T_pvar_handle handle) { diff --git a/src/mpi_t/pvar_stop.c b/src/mpi_t/pvar_stop.c index 3b1599d..b8e4337 100644 --- a/src/mpi_t/pvar_stop.c +++ b/src/mpi_t/pvar_stop.c @@ -104,17 +104,31 @@ fn_fail: #undef FCNAME #define FCNAME MPIU_QUOTE(FUNCNAME) /*@ -MPI_T_pvar_stop - XXX description here +MPI_T_pvar_stop - Stop a performance variable Input Parameters: + session - identifier of performance experiment session (handle) - handle - handle of a performance variable (handle) -.N ThreadSafe +Notes: +This functions stops the performance variable with the handle identified by the parameter +handle in the session identified by the parameter session. + +If the constant MPI_T_PVAR_ALL_HANDLES is passed in handle, the MPI implementation +attempts to stop all variables within the session identified by the parameter session for +which handles have been allocated. In this case, the routine returns MPI_SUCCESS if all +variables are stopped successfully, otherwise MPI_T_ERR_PVAR_NO_STARTSTOP is returned. +Continuous variables and variables that are already stopped are ignored when +MPI_T_PVAR_ALL_HANDLES is specified. -.N Fortran +.N ThreadSafe .N Errors +.N MPI_SUCCESS +.N MPI_T_ERR_NOT_INITIALIZED +.N MPI_T_ERR_INVALID_SESSION +.N MPI_T_ERR_INVALID_HANDLE +.N MPI_T_ERR_PVAR_NO_STARTSTOP @*/ int MPI_T_pvar_stop(MPI_T_pvar_session session, MPI_T_pvar_handle handle) { diff --git a/src/mpi_t/pvar_write.c b/src/mpi_t/pvar_write.c index bf9f568..9548229 100644 --- a/src/mpi_t/pvar_write.c +++ b/src/mpi_t/pvar_write.c @@ -41,18 +41,32 @@ int MPIR_T_pvar_write_impl(MPI_T_pvar_session session, MPI_T_pvar_handle handle, #undef FCNAME #define FCNAME MPIU_QUOTE(FUNCNAME) /*@ -MPI_T_pvar_write - XXX description here +MPI_T_pvar_write - Write a performance variable Input Parameters: + session - identifier of performance experiment session (handle) . handle - handle of a performance variable (handle) - buf - initial address of storage location for variable value (choice) -.N ThreadSafe +Notes: +The MPI_T_pvar_write() call attempts to write the value of the performance variable +with the handle identified by the parameter handle in the session identified by the parameter +session. The value to be written is passed in the buffer identified by the parameter buf. The +user must ensure that the buffer is of the appropriate size to hold the entire value of the +performance variable (based on the datatype and count returned by the corresponding previous +calls to MPI_T_pvar_get_info() and MPI_T_pvar_handle_alloc(), respectively). + +The constant MPI_T_PVAR_ALL_HANDLES cannot be used as an argument for the function +MPI_T_pvar_write(). -.N Fortran +.N ThreadSafe .N Errors +.N MPI_SUCCESS +.N MPI_T_ERR_NOT_INITIALIZED +.N MPI_T_ERR_INVALID_SESSION +.N MPI_T_ERR_INVALID_HANDLE +.N MPI_T_ERR_PVAR_NO_WRITE @*/ int MPI_T_pvar_write(MPI_T_pvar_session session, MPI_T_pvar_handle handle, void *buf) { http://git.mpich.org/mpich.git/commitdiff/b60f15e1073d64823254385dec4b26cb8… commit b60f15e1073d64823254385dec4b26cb831ecdac Author: Junchao Zhang <jczhang(a)mcs.anl.gov> Date: Wed Nov 13 14:15:52 2013 -0600 Add new MPI_T error codes in doctext diff --git a/maint/docnotes b/maint/docnotes index 412221c..4279cbe 100644 --- a/maint/docnotes +++ b/maint/docnotes @@ -467,6 +467,62 @@ N*/ . MPI_ERR_UNSUPPORTED_DATAREP - N*/ +/*N MPI_T_ERR_NOT_INITIALIZED +. MPI_T_ERR_NOT_INITIALIZED - The MPI tool information interface is not initialized. +N*/ + +/*N MPI_T_ERR_MEMORY +. MPI_T_ERR_MEMORY - The MPI tool information interface is out of memory. +N*/ + +/*N MPI_T_ERR_CANNOT_INIT +. MPI_T_ERR_CANNOT_INIT - The MPI tool information interface is not in the state to be initialized. +N*/ + +/*N MPI_T_ERR_INVALID_INDEX +. MPI_T_ERR_INVALID_INDEX - Index is invalid or has been deleted. +N*/ + +/*N MPI_T_ERR_INVALID_ITEM +. MPI_T_ERR_INVALID_ITEM - Item index queried is out of range. +N*/ + +/*N MPI_T_ERR_INVALID_HANDLE +. MPI_T_ERR_INVALID_HANDLE - The handle is invalid. +N*/ + +/*N MPI_T_ERR_OUT_OF_HANDLES +. MPI_T_ERR_OUT_OF_HANDLES - No more handles available. +N*/ + +/*N MPI_T_ERR_OUT_OF_SESSIONS +. MPI_T_ERR_OUT_OF_SESSIONS - No more sessions available. +N*/ + +/*N MPI_T_ERR_INVALID_SESSION +. MPI_T_ERR_INVALID_SESSION - Session argument is not valid. +N*/ + +/*N MPI_T_ERR_CVAR_SET_NOT_NOW +. MPI_T_ERR_CVAR_SET_NOT_NOW - The control variable can't be set at this moment. +N*/ + +/*N MPI_T_ERR_CVAR_SET_NEVER +. MPI_T_ERR_CVAR_SET_NEVER - The control variable can't be set until end of execution. +N*/ + +/*N MPI_T_ERR_PVAR_NO_STARTSTOP +. MPI_T_ERR_PVAR_NO_STARTSTOP - The performance variable can't be started or stopped. +N*/ + +/*N MPI_T_ERR_PVAR_NO_WRITE +. MPI_T_ERR_PVAR_NO_WRITE - The performance variable can't be written or reset. +N*/ + +/*N MPI_T_ERR_PVAR_NO_ATOMIC +. MPI_T_ERR_PVAR_NO_ATOMIC - The performance variable can't be read/write atomically. +N*/ + /*N NULL Null Handles: The MPI 1.1 specification, in the section on opaque objects, explicitly ----------------------------------------------------------------------- Summary of changes: maint/docnotes | 56 +++++++++++++++++++++++++++++++++++++++ src/mpi_t/cat_changed.c | 11 +++++-- src/mpi_t/cat_get_categories.c | 7 +++-- src/mpi_t/cat_get_cvars.c | 7 +++-- src/mpi_t/cat_get_info.c | 7 +++-- src/mpi_t/cat_get_num.c | 6 ++-- src/mpi_t/cat_get_pvars.c | 7 +++-- src/mpi_t/cvar_get_info.c | 7 +++-- src/mpi_t/cvar_get_num.c | 6 ++-- src/mpi_t/cvar_handle_alloc.c | 9 ++++-- src/mpi_t/cvar_handle_free.c | 7 +++-- src/mpi_t/cvar_read.c | 7 +++-- src/mpi_t/cvar_write.c | 9 ++++-- src/mpi_t/enum_get_info.c | 7 +++-- src/mpi_t/enum_get_item.c | 8 +++-- src/mpi_t/mpit_finalize.c | 23 ++++++++++++++-- src/mpi_t/mpit_initthread.c | 18 ++++++++++-- src/mpi_t/pvar_get_info.c | 7 +++-- src/mpi_t/pvar_get_num.c | 6 ++-- src/mpi_t/pvar_handle_alloc.c | 9 ++++-- src/mpi_t/pvar_handle_free.c | 8 +++-- src/mpi_t/pvar_read.c | 19 +++++++++++-- src/mpi_t/pvar_readreset.c | 10 +++++-- src/mpi_t/pvar_reset.c | 19 +++++++++++-- src/mpi_t/pvar_session_create.c | 7 +++-- src/mpi_t/pvar_session_free.c | 12 ++++++-- src/mpi_t/pvar_start.c | 17 +++++++++-- src/mpi_t/pvar_stop.c | 20 ++++++++++++-- src/mpi_t/pvar_write.c | 20 ++++++++++++-- 29 files changed, 272 insertions(+), 84 deletions(-) hooks/post-receive -- MPICH primary repository

1 0

[mpich] MPICH primary repository branch, master, updated. v3.1rc1-20-ga956292
by noreply＠mpich.org 14 Nov '13

14 Nov '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 a95629278a2478ef7b6da223353ea0c8a9e69434 (commit) from a4c8f44235de1923ceb0cf113b17fd3bc9d4e33a (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/a95629278a2478ef7b6da223353ea0c8a… commit a95629278a2478ef7b6da223353ea0c8a9e69434 Author: Bob Cernohous <bobc(a)us.ibm.com> Date: Tue Sep 10 12:02:23 2013 -0500 Better detect no shared file support IBM Issue 9705: instead of checking "file system A or file system B", use the file-system feature. also closes #1724 Signed-off-by: Rob Latham <robl(a)mcs.anl.gov> diff --git a/src/mpi/romio/adio/include/adioi_error.h b/src/mpi/romio/adio/include/adioi_error.h index 9045282..300a063 100644 --- a/src/mpi/romio/adio/include/adioi_error.h +++ b/src/mpi/romio/adio/include/adioi_error.h @@ -120,9 +120,7 @@ if ((count*dtype_size) % fh->etype_size != 0) { \ } #define MPIO_CHECK_FS_SUPPORTS_SHARED(fh, myname, error_code) \ -if ((fh->file_system == ADIO_PIOFS) || \ - (fh->file_system == ADIO_PVFS) || \ - (fh->file_system == ADIO_PVFS2)) \ +if (!ADIO_Feature(fh, ADIO_SHARED_FP)) \ { \ error_code = MPIO_Err_create_code(MPI_SUCCESS, \ MPIR_ERR_RECOVERABLE, \ ----------------------------------------------------------------------- Summary of changes: src/mpi/romio/adio/include/adioi_error.h | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) hooks/post-receive -- MPICH primary repository

1 0

[mpich] MPICH primary repository branch, master, updated. v3.1rc1-19-ga4c8f44
by noreply＠mpich.org 14 Nov '13

14 Nov '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 a4c8f44235de1923ceb0cf113b17fd3bc9d4e33a (commit) from 9590e3700c32173721861697840b4b0ee689e5d4 (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/a4c8f44235de1923ceb0cf113b17fd3bc… commit a4c8f44235de1923ceb0cf113b17fd3bc9d4e33a Author: Jeff Hammond <jeff.science(a)gmail.com> Date: Sat Nov 9 14:33:01 2013 -0600 check for size!=0 when erroring out on new==NULL per http://stackoverflow.com/questions/2132273/what-does-malloc0-return, malloc(0) may or may not return NULL. it is implementation defined in C99. therefore, it is incorrect to throw an OoM error on !new when size=0. closes #1947 Signed-off-by: Rob Latham <robl(a)mcs.anl.gov> diff --git a/src/mpi/romio/adio/common/malloc.c b/src/mpi/romio/adio/common/malloc.c index 4541a35..73c5a70 100644 --- a/src/mpi/romio/adio/common/malloc.c +++ b/src/mpi/romio/adio/common/malloc.c @@ -50,7 +50,7 @@ void *ADIOI_Malloc_fn(size_t size, int lineno, const char *fname) new = (void *) malloc(size); #endif #endif - if (!new) { + if (!new && size) { FPRINTF(stderr, "Out of memory in file %s, line %d\n", fname, lineno); MPI_Abort(MPI_COMM_WORLD, 1); } @@ -68,7 +68,7 @@ void *ADIOI_Calloc_fn(size_t nelem, size_t elsize, int lineno, const char *fname #else new = (void *) calloc(nelem, elsize); #endif - if (!new) { + if (!new && nelem) { FPRINTF(stderr, "Out of memory in file %s, line %d\n", fname, lineno); MPI_Abort(MPI_COMM_WORLD, 1); } @@ -86,7 +86,7 @@ void *ADIOI_Realloc_fn(void *ptr, size_t size, int lineno, const char *fname) #else new = (void *) realloc(ptr, size); #endif - if (!new) { + if (!new && size) { FPRINTF(stderr, "realloc failed in file %s, line %d\n", fname, lineno); MPI_Abort(MPI_COMM_WORLD, 1); } ----------------------------------------------------------------------- Summary of changes: src/mpi/romio/adio/common/malloc.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) hooks/post-receive -- MPICH primary repository

1 0

[mpich] MPICH primary repository branch, master, updated. v3.1rc1-18-g9590e37
by noreply＠mpich.org 14 Nov '13

14 Nov '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 9590e3700c32173721861697840b4b0ee689e5d4 (commit) from cba9da608a3c256a8b10d717f55f18179d8d0bec (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/9590e3700c32173721861697840b4b0ee… commit 9590e3700c32173721861697840b4b0ee689e5d4 Author: Antonio J. Pena <apenya(a)mcs.anl.gov> Date: Tue Nov 5 19:07:21 2013 -0600 Fixed MPI_HOST/MPI_IO attributes Fixes #1781 Signed-off-by: Wesley Bland <wbland(a)mcs.anl.gov> diff --git a/src/mpi/init/initthread.c b/src/mpi/init/initthread.c index 74a0033..a765374 100644 --- a/src/mpi/init/initthread.c +++ b/src/mpi/init/initthread.c @@ -311,8 +311,8 @@ int MPIR_Init_thread(int * argc, char ***argv, int required, int * provided) /* Initialize necessary subsystems and setup the predefined attribute values. Subsystems may change these values. */ MPIR_Process.attrs.appnum = -1; - MPIR_Process.attrs.host = 0; - MPIR_Process.attrs.io = 0; + MPIR_Process.attrs.host = MPI_PROC_NULL; + MPIR_Process.attrs.io = MPI_PROC_NULL; MPIR_Process.attrs.lastusedcode = MPI_ERR_LASTCODE; MPIR_Process.attrs.tag_ub = 0; MPIR_Process.attrs.universe = MPIR_UNIVERSE_SIZE_NOT_SET; diff --git a/src/mpid/ch3/src/mpid_init.c b/src/mpid/ch3/src/mpid_init.c index 414734f..e423751 100644 --- a/src/mpid/ch3/src/mpid_init.c +++ b/src/mpid/ch3/src/mpid_init.c @@ -129,6 +129,7 @@ int MPID_Init(int *argc, char ***argv, int requested, int *provided, * if necessary. */ MPIR_Process.attrs.tag_ub = MPIDI_TAG_UB; /* see also mpidpre.h:NOTE-T1 */ + MPIR_Process.attrs.io = MPI_ANY_SOURCE; /* * Perform channel-independent PMI initialization ----------------------------------------------------------------------- Summary of changes: src/mpi/init/initthread.c | 4 ++-- src/mpid/ch3/src/mpid_init.c | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) hooks/post-receive -- MPICH primary repository

1 0

[mpich] MPICH primary repository branch, master, updated. v3.1rc1-17-gcba9da6
by noreply＠mpich.org 13 Nov '13

13 Nov '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 cba9da608a3c256a8b10d717f55f18179d8d0bec (commit) from 40c6fda95428adbaf8938d33031d24b160af9539 (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/cba9da608a3c256a8b10d717f55f18179… commit cba9da608a3c256a8b10d717f55f18179d8d0bec Author: Ken Raffenetti <raffenet(a)mcs.anl.gov> Date: Wed Nov 13 11:19:46 2013 -0600 increase timeout for large_type_sendrec test This should give our OSX build slaves enough time to pass. Signed-off-by: Rob Latham <robl(a)mcs.anl.gov> diff --git a/test/mpi/datatype/testlist b/test/mpi/datatype/testlist index 54e564f..0166018 100644 --- a/test/mpi/datatype/testlist +++ b/test/mpi/datatype/testlist @@ -52,4 +52,4 @@ large-count 1 mpiversion=3.0 xfail=ticket1767 cxx-types 1 mpiversion=3.0 large_type 1 mpiversion=3.0 large_type_sendrec 2 arg=31 mpiversion=3.0 -large_type_sendrec 2 arg=32 mpiversion=3.0 +large_type_sendrec 2 arg=32 mpiversion=3.0 timeLimit=300 ----------------------------------------------------------------------- Summary of changes: test/mpi/datatype/testlist | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) hooks/post-receive -- MPICH primary repository

1 0

[mpich] MPICH primary repository branch, master, updated. v3.1rc1-16-g40c6fda
by noreply＠mpich.org 13 Nov '13

13 Nov '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 40c6fda95428adbaf8938d33031d24b160af9539 (commit) via 85e4a5072e3b1edd3651357601e9e72c18f887b6 (commit) via ad44b6b335b1b07b4ef9c4baf22341ad6d76710e (commit) from 120bff0671e8d034262af5060a33cb7836a2513c (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/40c6fda95428adbaf8938d33031d24b16… commit 40c6fda95428adbaf8938d33031d24b160af9539 Author: Huiwei Lu <huiweilu(a)mcs.anl.gov> Date: Wed Nov 13 10:01:25 2013 -0600 Fix #1879 - fix test script fix testlist Signed-off-by: Junchao Zhang <jczhang(a)mcs.anl.gov> diff --git a/test/mpi/threads/pt2pt/testlist b/test/mpi/threads/pt2pt/testlist index ce8fc9c..b6ab43e 100644 --- a/test/mpi/threads/pt2pt/testlist +++ b/test/mpi/threads/pt2pt/testlist @@ -8,4 +8,4 @@ multisend3 5 multisend4 5 greq_wait 1 greq_test 1 -ibtest 2 +ibsend 2 http://git.mpich.org/mpich.git/commitdiff/85e4a5072e3b1edd3651357601e9e72c1… commit 85e4a5072e3b1edd3651357601e9e72c18f887b6 Author: Huiwei Lu <huiweilu(a)mcs.anl.gov> Date: Mon Nov 11 11:28:22 2013 -0600 Fix #1879 - false alarm, bug is in user code First, this ticket is caused in the user code of ibsend.c where multiple pthreads are created using the same pthread variable. This leads to unexpected behaviors where detached threads screw up with MPI_Comm_free when both of them calls ALLFUNC lock in unexpected order, thus leads to the assertion failure in initthread.c:213. Second, BSEND lock in the proposed patch in trac is unnecessary. Basically the patch is to create a new lock, BSEND, to lock the function of MPIR_Bsend_isend for thread safety; however, MPIR_Bsend_isend is already called inside a ALLFUNC lock both in MPI_Bsend and MPI_Ibsend. See attached test/mpi/threads/pt2pt/ibsend.c for correct use of pthread_create and pthread_join diff --git a/test/mpi/threads/pt2pt/ibsend.c b/test/mpi/threads/pt2pt/ibsend.c index 168c2fd..c21fd69 100644 --- a/test/mpi/threads/pt2pt/ibsend.c +++ b/test/mpi/threads/pt2pt/ibsend.c @@ -1,19 +1,19 @@ /* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil ; -*- */ /* - This program performs a short test of MPI_BSEND in a - multithreaded environment. + This program performs a short test of MPI_BSEND in a + multithreaded environment. - It starts a single receiver thread that expects - NUMSENDS messages and NUMSENDS sender threads, that - use MPI_Bsend to send a message of size MSGSIZE - to its right neigbour or rank 0 if (my_rank==comm_size-1), i.e. - target_rank = (my_rank+1)%size . + It starts a single receiver thread that expects + NUMSENDS messages and NUMSENDS sender threads, that + use MPI_Bsend to send a message of size MSGSIZE + to its right neigbour or rank 0 if (my_rank==comm_size-1), i.e. + target_rank = (my_rank+1)%size . - After all messages have been received, the - receiver thread prints a message, the threads - are joined into the main thread and the application - terminates. -*/ + After all messages have been received, the + receiver thread prints a message, the threads + are joined into the main thread and the application + terminates. + */ #include <stdio.h> #include <stdlib.h> @@ -37,7 +37,7 @@ void *receiver(void *ptr) MPI_Recv(buf, MSGSIZE, MPI_CHAR, MPI_ANY_SOURCE, MPI_ANY_TAG, MPI_COMM_WORLD, MPI_STATUS_IGNORE); - return NULL; + pthread_exit(NULL); } @@ -46,7 +46,8 @@ void *sender_bsend(void *ptr) char buffer[MSGSIZE]; MPI_Bsend(buffer, MSGSIZE, MPI_CHAR, (rank + 1) % size, 0, MPI_COMM_WORLD); - return NULL; + + pthread_exit(NULL); } void *sender_ibsend(void *ptr) @@ -57,7 +58,7 @@ void *sender_ibsend(void *ptr) MPI_COMM_WORLD, &req); MPI_Wait(&req, MPI_STATUS_IGNORE); - return NULL; + pthread_exit(NULL); } void *sender_isend(void *ptr) @@ -67,7 +68,8 @@ void *sender_isend(void *ptr) MPI_Isend(buffer, MSGSIZE, MPI_CHAR, (rank + 1) % size, 0, MPI_COMM_WORLD, &req); MPI_Wait(&req, MPI_STATUS_IGNORE); - return NULL; + + pthread_exit(NULL); } void *sender_send(void *ptr) @@ -75,16 +77,19 @@ void *sender_send(void *ptr) char buffer[MSGSIZE]; MPI_Send(buffer, MSGSIZE, MPI_CHAR, (rank + 1) % size, 0, MPI_COMM_WORLD); - return NULL; + + pthread_exit(NULL); } int main(int argc, char *argv[]) { int provided, i[2], k; - char *buffer; + char *buffer, *ptr_dt; + buffer = (char *) malloc(BUFSIZE * sizeof(char)); MPI_Status status; - pthread_t receiver_thread, sender_thread; + pthread_t receiver_thread, sender_thread[NUMSENDS]; + pthread_attr_t attr; MPI_Comm communicator; int bs; @@ -95,7 +100,7 @@ int main(int argc, char *argv[]) MPI_Abort(911, MPI_COMM_WORLD); } - MPI_Buffer_attach(malloc(BUFSIZE), BUFSIZE); + MPI_Buffer_attach(buffer, BUFSIZE); MPI_Comm_rank(MPI_COMM_WORLD, &rank); MPI_Comm_size(MPI_COMM_WORLD, &size); @@ -104,43 +109,48 @@ int main(int argc, char *argv[]) If the MPI_Comm_dup() call is commented out, it is still evident but does not appear that often (don't know why) */ - pthread_create(&receiver_thread, NULL, &receiver, NULL); + /* Initialize and set thread detached attribute */ + pthread_attr_init(&attr); + pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_JOINABLE); + + pthread_create(&receiver_thread, &attr, &receiver, NULL); for (k = 0; k < NUMSENDS; k++) - pthread_create(&sender_thread, NULL, &sender_bsend, NULL); + pthread_create(&sender_thread[k], &attr, &sender_bsend, NULL); pthread_join(receiver_thread, NULL); for (k = 0; k < NUMSENDS; k++) - pthread_join(sender_thread, NULL); + pthread_join(sender_thread[k], NULL); MPI_Barrier(MPI_COMM_WORLD); - pthread_create(&receiver_thread, NULL, &receiver, NULL); + pthread_create(&receiver_thread, &attr, &receiver, NULL); for (k = 0; k < NUMSENDS; k++) - pthread_create(&sender_thread, NULL, &sender_ibsend, NULL); + pthread_create(&sender_thread[k], &attr, &sender_ibsend, NULL); pthread_join(receiver_thread, NULL); for (k = 0; k < NUMSENDS; k++) - pthread_join(sender_thread, NULL); + pthread_join(sender_thread[k], NULL); MPI_Barrier(MPI_COMM_WORLD); - pthread_create(&receiver_thread, NULL, &receiver, NULL); + pthread_create(&receiver_thread, &attr, &receiver, NULL); for (k = 0; k < NUMSENDS; k++) - pthread_create(&sender_thread, NULL, &sender_isend, NULL); + pthread_create(&sender_thread[k], &attr, &sender_isend, NULL); pthread_join(receiver_thread, NULL); for (k = 0; k < NUMSENDS; k++) - pthread_join(sender_thread, NULL); + pthread_join(sender_thread[k], NULL); MPI_Barrier(MPI_COMM_WORLD); - pthread_create(&receiver_thread, NULL, &receiver, NULL); + pthread_create(&receiver_thread, &attr, &receiver, NULL); for (k = 0; k < NUMSENDS; k++) - pthread_create(&sender_thread, NULL, &sender_send, NULL); + pthread_create(&sender_thread[k], &attr, &sender_send, NULL); pthread_join(receiver_thread, NULL); for (k = 0; k < NUMSENDS; k++) - pthread_join(sender_thread, NULL); + pthread_join(sender_thread[k], NULL); MPI_Barrier(MPI_COMM_WORLD); + pthread_attr_destroy(&attr); if (!rank) printf( " No Errors\n" ); MPI_Comm_free(&communicator); - MPI_Buffer_detach(&buffer, &bs); + MPI_Buffer_detach(&ptr_dt, &bs); free(buffer); MPI_Finalize(); } http://git.mpich.org/mpich.git/commitdiff/ad44b6b335b1b07b4ef9c4baf22341ad6… commit ad44b6b335b1b07b4ef9c4baf22341ad6d76710e Author: Huiwei Lu <huiweilu(a)mcs.anl.gov> Date: Wed Nov 6 18:06:02 2013 -0600 Fix #1879 - Adds a test case for ibsend Adds a test case for ibsend/bsend/isend/send in threading execution. diff --git a/test/mpi/threads/pt2pt/Makefile.am b/test/mpi/threads/pt2pt/Makefile.am index efa573b..7030260 100644 --- a/test/mpi/threads/pt2pt/Makefile.am +++ b/test/mpi/threads/pt2pt/Makefile.am @@ -10,5 +10,5 @@ include $(top_srcdir)/threads/Makefile_threads.mtest EXTRA_DIST = testlist noinst_PROGRAMS = threads threaded_sr alltoall sendselfth greq_wait greq_test \ - multisend multisend2 multisend3 multisend4 + multisend multisend2 multisend3 multisend4 ibsend diff --git a/test/mpi/threads/pt2pt/ibsend.c b/test/mpi/threads/pt2pt/ibsend.c new file mode 100644 index 0000000..168c2fd --- /dev/null +++ b/test/mpi/threads/pt2pt/ibsend.c @@ -0,0 +1,146 @@ +/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil ; -*- */ +/* + This program performs a short test of MPI_BSEND in a + multithreaded environment. + + It starts a single receiver thread that expects + NUMSENDS messages and NUMSENDS sender threads, that + use MPI_Bsend to send a message of size MSGSIZE + to its right neigbour or rank 0 if (my_rank==comm_size-1), i.e. + target_rank = (my_rank+1)%size . + + After all messages have been received, the + receiver thread prints a message, the threads + are joined into the main thread and the application + terminates. +*/ + +#include <stdio.h> +#include <stdlib.h> +#include <mpi.h> +#include <string.h> +#include "mpitest.h" +#include "mpithreadtest.h" + +#define NUMSENDS 32 +#define BUFSIZE 10000000 +#define MSGSIZE 1024 + +int rank, size; + +void *receiver(void *ptr) +{ + int k; + char buf[MSGSIZE]; + + for (k = 0; k < NUMSENDS; k++) + MPI_Recv(buf, MSGSIZE, MPI_CHAR, MPI_ANY_SOURCE, MPI_ANY_TAG, + MPI_COMM_WORLD, MPI_STATUS_IGNORE); + + return NULL; +} + + +void *sender_bsend(void *ptr) +{ + char buffer[MSGSIZE]; + MPI_Bsend(buffer, MSGSIZE, MPI_CHAR, (rank + 1) % size, 0, + MPI_COMM_WORLD); + return NULL; +} + +void *sender_ibsend(void *ptr) +{ + char buffer[MSGSIZE]; + MPI_Request req; + MPI_Ibsend(buffer, MSGSIZE, MPI_CHAR, (rank + 1) % size, 0, + MPI_COMM_WORLD, &req); + MPI_Wait(&req, MPI_STATUS_IGNORE); + + return NULL; +} + +void *sender_isend(void *ptr) +{ + char buffer[MSGSIZE]; + MPI_Request req; + MPI_Isend(buffer, MSGSIZE, MPI_CHAR, (rank + 1) % size, 0, + MPI_COMM_WORLD, &req); + MPI_Wait(&req, MPI_STATUS_IGNORE); + return NULL; +} + +void *sender_send(void *ptr) +{ + char buffer[MSGSIZE]; + MPI_Send(buffer, MSGSIZE, MPI_CHAR, (rank + 1) % size, 0, + MPI_COMM_WORLD); + return NULL; +} + +int main(int argc, char *argv[]) +{ + + int provided, i[2], k; + char *buffer; + MPI_Status status; + pthread_t receiver_thread, sender_thread; + MPI_Comm communicator; + int bs; + + MPI_Init_thread(&argc, &argv, MPI_THREAD_MULTIPLE, &provided); + + if (provided != MPI_THREAD_MULTIPLE) { + printf("Error\n"); + MPI_Abort(911, MPI_COMM_WORLD); + } + + MPI_Buffer_attach(malloc(BUFSIZE), BUFSIZE); + + MPI_Comm_rank(MPI_COMM_WORLD, &rank); + MPI_Comm_size(MPI_COMM_WORLD, &size); + MPI_Comm_dup(MPI_COMM_WORLD, &communicator); /* We do not use this communicator in this program, but + with this call, the problem appears more reliably. + If the MPI_Comm_dup() call is commented out, it is still + evident but does not appear that often (don't know why) */ + + pthread_create(&receiver_thread, NULL, &receiver, NULL); + for (k = 0; k < NUMSENDS; k++) + pthread_create(&sender_thread, NULL, &sender_bsend, NULL); + pthread_join(receiver_thread, NULL); + for (k = 0; k < NUMSENDS; k++) + pthread_join(sender_thread, NULL); + MPI_Barrier(MPI_COMM_WORLD); + + pthread_create(&receiver_thread, NULL, &receiver, NULL); + for (k = 0; k < NUMSENDS; k++) + pthread_create(&sender_thread, NULL, &sender_ibsend, NULL); + pthread_join(receiver_thread, NULL); + for (k = 0; k < NUMSENDS; k++) + pthread_join(sender_thread, NULL); + MPI_Barrier(MPI_COMM_WORLD); + + pthread_create(&receiver_thread, NULL, &receiver, NULL); + for (k = 0; k < NUMSENDS; k++) + pthread_create(&sender_thread, NULL, &sender_isend, NULL); + pthread_join(receiver_thread, NULL); + for (k = 0; k < NUMSENDS; k++) + pthread_join(sender_thread, NULL); + MPI_Barrier(MPI_COMM_WORLD); + + pthread_create(&receiver_thread, NULL, &receiver, NULL); + for (k = 0; k < NUMSENDS; k++) + pthread_create(&sender_thread, NULL, &sender_send, NULL); + pthread_join(receiver_thread, NULL); + for (k = 0; k < NUMSENDS; k++) + pthread_join(sender_thread, NULL); + MPI_Barrier(MPI_COMM_WORLD); + + if (!rank) + printf( " No Errors\n" ); + + MPI_Comm_free(&communicator); + MPI_Buffer_detach(&buffer, &bs); + free(buffer); + MPI_Finalize(); +} diff --git a/test/mpi/threads/pt2pt/testlist b/test/mpi/threads/pt2pt/testlist index 760238f..ce8fc9c 100644 --- a/test/mpi/threads/pt2pt/testlist +++ b/test/mpi/threads/pt2pt/testlist @@ -8,3 +8,4 @@ multisend3 5 multisend4 5 greq_wait 1 greq_test 1 +ibtest 2 ----------------------------------------------------------------------- Summary of changes: test/mpi/threads/pt2pt/Makefile.am | 2 +- test/mpi/threads/pt2pt/ibsend.c | 156 ++++++++++++++++++++++++++++++++++++ test/mpi/threads/pt2pt/testlist | 1 + 3 files changed, 158 insertions(+), 1 deletions(-) create mode 100644 test/mpi/threads/pt2pt/ibsend.c hooks/post-receive -- MPICH primary repository

1 0

[mpich] MPICH primary repository branch, master, updated. v3.1rc1-13-g120bff0
by noreply＠mpich.org 12 Nov '13

12 Nov '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 120bff0671e8d034262af5060a33cb7836a2513c (commit) from ee5e30e4ed3cddd10e2ebf72087174284d8d590b (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/120bff0671e8d034262af5060a33cb783… commit 120bff0671e8d034262af5060a33cb7836a2513c Author: Antonio J. Pena <apenya(a)mcs.anl.gov> Date: Mon Nov 11 14:15:30 2013 -0600 Improved Hydra error reporting Fixes #1954 Signed-off-by: Ken Raffenetti <raffenet(a)mcs.anl.gov> diff --git a/src/pm/hydra/pm/pmiserv/pmiserv_cb.c b/src/pm/hydra/pm/pmiserv/pmiserv_cb.c index 473ee0d..364294a 100644 --- a/src/pm/hydra/pm/pmiserv/pmiserv_cb.c +++ b/src/pm/hydra/pm/pmiserv/pmiserv_cb.c @@ -251,6 +251,8 @@ static HYD_status control_cb(int fd, HYD_event_t events, void *userp) HYDU_dump_noprefix(stdout, "=================================\n"); HYDU_dump_noprefix (stdout, "= BAD TERMINATION OF ONE OF YOUR APPLICATION PROCESSES\n"); + HYDU_dump_noprefix(stdout, "= PID %d RUNNING AT %s\n", proxy->pid[i], + proxy->node->hostname); HYDU_dump_noprefix(stdout, "= EXIT CODE: %d\n", code); HYDU_dump_noprefix(stdout, "= CLEANING UP REMAINING PROCESSES\n"); HYDU_dump_noprefix(stdout, "= YOU CAN IGNORE THE BELOW CLEANUP MESSAGES\n"); ----------------------------------------------------------------------- Summary of changes: src/pm/hydra/pm/pmiserv/pmiserv_cb.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) hooks/post-receive -- MPICH primary repository

1 0

[mpich] MPICH primary repository branch, master, updated. v3.1rc1-12-gee5e30e
by noreply＠mpich.org 11 Nov '13

11 Nov '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 ee5e30e4ed3cddd10e2ebf72087174284d8d590b (commit) from ea66029303a939a907537013b811f7e99bf45ad1 (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/ee5e30e4ed3cddd10e2ebf72087174284… commit ee5e30e4ed3cddd10e2ebf72087174284d8d590b Author: Antonio J. Pena <apenya(a)mcs.anl.gov> Date: Thu Nov 7 18:21:03 2013 -0600 Fix --program-suffix/--program-prefix support Added support to handle --program-suffix and --program-prefix options. Fixes #1967. Signed-off-by: Ken Raffenetti <raffenet(a)mcs.anl.gov> diff --git a/Makefile.am b/Makefile.am index 779fad4..04773d2 100644 --- a/Makefile.am +++ b/Makefile.am @@ -161,8 +161,8 @@ install-exec-hook: rm -f $${e}.tmp ; \ fi ; \ done ; \ - if test -e ${DESTDIR}${bindir}/mpicxx ; then \ - cd ${DESTDIR}${bindir} && ln -f -s mpicxx mpic++ ; fi + if test -e ${DESTDIR}${bindir}/@MPICXX_NAME@ ; then \ + cd ${DESTDIR}${bindir} && ln -f -s @MPICXX_NAME@ @MPICPP_NAME@ ; fi # the configure step checks for the 'lib' dir to decide whether a source # directory has been previously used for an in-path build before allowing a @@ -179,7 +179,7 @@ DISTCLEANFILES += config.system # we can only have one clean-local, so we hook into it via conditionally # defined variables in the dependencies section clean-local: $(CLEAN_LOCAL_TARGETS) - rm -f ${DESTDIR}${bindir}/mpic++ + rm -f ${DESTDIR}${bindir}/@MPICPP_NAME@ # -------------------------------------------------------------------------- # coverage rules diff --git a/confdb/aclocal_mpi.m4 b/confdb/aclocal_mpi.m4 index a806062..a1adf4c 100644 --- a/confdb/aclocal_mpi.m4 +++ b/confdb/aclocal_mpi.m4 @@ -165,6 +165,8 @@ dnl MPI_FIND_COMPILER_SCRIPTS dnl which can fail (i.e., not find a script), and dnl MPI_FIND_COMPILERS dnl which runs the various PROC_xx for the compilers. +dnl WARNING: this function ignores --program-suffix and --program-prefix. +dnl However, this function is not currently used at all. AC_DEFUN([PAC_MPI_FIND_COMPILER_SCRIPTS],[ # Set defaults MPIRUN_NP="-np " diff --git a/confdb/aclocal_util.m4 b/confdb/aclocal_util.m4 index a0b0e14..7c96378 100644 --- a/confdb/aclocal_util.m4 +++ b/confdb/aclocal_util.m4 @@ -199,3 +199,17 @@ dnl I think that printf like this will be sufficiently portable, but I don't dnl have any guarantee of it. If not, we can fall back to AS_VAR_ARITH dnl and/or AC_COMPUTE_INT (the latter will probably be slow) AC_DEFUN([PAC_CONV_HEX_TO_DEC],[AS_VAR_SET([$2],[`printf "%d" $1`])]) + +dnl PAC_GET_EXENAME(exe_name, out_exe_name) +dnl +dnl Prepends and appends program prefix and suffix as supplied by --program_prefix +dnl and --program-sufix +AC_DEFUN([PAC_GET_EXENAME],[ +$2=$1 +if test "$program_prefix" != "NONE" ; then + $2="${program_prefix}$$2" +fi +if test "$program_suffix" != "NONE" ; then + $2="$$2$program_suffix" +fi +]) diff --git a/configure.ac b/configure.ac index 044ce8f..a3971c6 100644 --- a/configure.ac +++ b/configure.ac @@ -5925,6 +5925,12 @@ export MPI_NO_SPAWN MPI_NO_RMA=$MPID_NO_RMA export MPI_NO_RMA +# Attach program prefix and suffix to executable names for Makefile +AC_SUBST(MPICXX_NAME) +AC_SUBST(MPICPP_NAME) +PAC_GET_EXENAME("mpicxx", MPICXX_NAME) +PAC_GET_EXENAME("mpic++", MPICPP_NAME) + AC_CONFIG_SUBDIRS([test/mpi]) dnl dnl Generate the Makefiles from Makefile.in diff --git a/src/pm/hydra/Makefile.am b/src/pm/hydra/Makefile.am index 5f0d04c..450877f 100644 --- a/src/pm/hydra/Makefile.am +++ b/src/pm/hydra/Makefile.am @@ -38,9 +38,9 @@ DIST_SUBDIRS = ${external_dist_subdirs} # Provide an alias for mpirun to support tools that assume that # mpiexec is called mpirun install-exec-hook: - if [ -x ${DESTDIR}${bindir}/mpiexec.hydra ] ; then \ - cd ${DESTDIR}${bindir} && ln -f -s mpiexec.hydra mpiexec ; \ - cd ${DESTDIR}${bindir} && ln -f -s mpiexec.hydra mpirun ; \ + if [ -x ${DESTDIR}${bindir}/@MPIEXEC_HYDRA_NAME@ ] ; then \ + cd ${DESTDIR}${bindir} && ln -f -s @MPIEXEC_HYDRA_NAME@ @MPIEXEC_NAME@ ; \ + cd ${DESTDIR}${bindir} && ln -f -s @MPIEXEC_HYDRA_NAME@ @MPIRUN_NAME@ ; \ fi # A special alternate installation target when using multiple process @@ -50,7 +50,7 @@ install-alt: $(bin_PROGRAMS) @for foo in $? ; do $(MAKE) install $$foo ; done uninstall-local: - rm -f ${DESTDIR}${bindir}/mpirun ${DESTDIR}${bindir}/mpiexec + rm -f ${DESTDIR}${bindir}/@MPIRUN_NAME@ ${DESTDIR}${bindir}/@MPIEXEC_NAME@ htmldoc: if test "@DOXYGEN@" != "" ; then @DOXYGEN@ hydra-doxygen.cfg ; fi diff --git a/src/pm/hydra/configure.ac b/src/pm/hydra/configure.ac index a9d3776..d6028f8 100644 --- a/src/pm/hydra/configure.ac +++ b/src/pm/hydra/configure.ac @@ -82,6 +82,18 @@ AC_SUBST(HYDRA_VERSION) AC_DEFINE_UNQUOTED(HYDRA_VERSION,"$HYDRA_VERSION",[Hydra version information]) AC_DEFINE_UNQUOTED(HYDRA_RELEASE_DATE,"$HYDRA_RELEASE_DATE",[Hydra release date information]) +AC_SUBST(HYDRA_PMI_PROXY) +PAC_GET_EXENAME("hydra_pmi_proxy", HYDRA_PMI_PROXY) +AC_DEFINE_UNQUOTED(HYDRA_PMI_PROXY,"$HYDRA_PMI_PROXY",[Hydra PMI proxy executable]) + +# These substitutions are needed in the Makefile +AC_SUBST(MPIEXEC_NAME) +AC_SUBST(MPIEXEC_HYDRA_NAME) +AC_SUBST(MPIRUN_NAME) +PAC_GET_EXENAME("mpiexec", MPIEXEC_NAME) +PAC_GET_EXENAME("mpiexec.hydra", MPIEXEC_HYDRA_NAME) +PAC_GET_EXENAME("mpirun", MPIRUN_NAME) + PAC_PUSH_ALL_FLAGS PAC_RESET_ALL_FLAGS if test "$CC" != "" ; then diff --git a/src/pm/hydra/pm/pmiserv/pmiserv_utils.c b/src/pm/hydra/pm/pmiserv/pmiserv_utils.c index bee4a11..954a0fc 100644 --- a/src/pm/hydra/pm/pmiserv/pmiserv_utils.c +++ b/src/pm/hydra/pm/pmiserv/pmiserv_utils.c @@ -48,7 +48,7 @@ HYD_status HYD_pmcd_pmi_fill_in_proxy_args(struct HYD_string_stash *proxy_stash, HYD_STRING_STASH_INIT(stash); HYD_STRING_STASH(stash, HYDU_strdup(HYD_server_info.base_path), status); - HYD_STRING_STASH(stash, HYDU_strdup("hydra_pmi_proxy"), status); + HYD_STRING_STASH(stash, HYDU_strdup(HYDRA_PMI_PROXY), status); HYD_STRING_SPIT(stash, str, status); HYD_STRING_STASH(*proxy_stash, str, status); diff --git a/test/mpi/configure.ac b/test/mpi/configure.ac index 036e1bc..5f56462 100644 --- a/test/mpi/configure.ac +++ b/test/mpi/configure.ac @@ -448,6 +448,13 @@ AC_ARG_VAR([WRAPPER_FFLAGS],[]) AC_ARG_VAR([WRAPPER_FCFLAGS],[]) AC_ARG_VAR([WRAPPER_CXXFLAGS],[]) +# Attach program prefix and suffix to executable names +PAC_GET_EXENAME("mpicc", MPICC_NAME) +PAC_GET_EXENAME("mpif77", MPIF77_NAME) +PAC_GET_EXENAME("mpif90", MPIF90_NAME) +PAC_GET_EXENAME("mpicxx", MPICXX_NAME) +PAC_GET_EXENAME("mpiexec", MPIEXEC_NAME) + if test "$FROM_MPICH" = "yes" ; then # perform configure tests with the normal compilers ($CC/$F77/etc), but use # the WRAPPER_xFLAGS computed by MPICH as our flags instead. Then at the @@ -467,44 +474,44 @@ if test "$FROM_MPICH" = "yes" ; then elif test -n "$with_mpi" ; then if test -z "$MPICC" ; then - CC=$with_mpi/bin/mpicc + CC=$with_mpi/bin/$MPICC_NAME else CC=$MPICC fi if test -z "$MPIF77" ; then - F77=$with_mpi/bin/mpif77 + F77=$with_mpi/bin/$MPIF77_NAME else F77=$MPIF77 fi if test -z "$MPIFC" ; then - FC=$with_mpi/bin/mpif90 + FC=$with_mpi/bin/$MPIF90_NAME else FC=$MPIFC fi if test -z "$MPICXX" ; then - CXX=$with_mpi/bin/mpicxx + CXX=$with_mpi/bin/$MPICXX_NAME else CXX=$MPICXX fi if test -z "$MPIEXEC" ; then - MPIEXEC=$with_mpi/bin/mpiexec + MPIEXEC=$with_mpi/bin/$MPIEXEC_NAME fi else # Try to use mpicc etc names if test -z "$MPICC" ; then - AC_PATH_PROG(MPICC,mpicc mpcc) + AC_PATH_PROG(MPICC,$MPICC_NAME mpcc) fi if test "x$MPICC" != "x" ; then CC=$MPICC fi if test -z "$MPIF77" ; then - AC_PATH_PROG(MPIF77,mpif77 mpf77) + AC_PATH_PROG(MPIF77,$MPIF77_NAME mpf77) fi if test "x$MPIF77" != "x" ; then F77=$MPIF77 fi if test -z "$MPIFC" ; then - AC_PATH_PROG(MPIFC,mpif90 mpftn) + AC_PATH_PROG(MPIFC,$MPIF90_NAME mpftn) fi if test "x$MPIFC" != "x" ; then FC=$MPIFC @@ -512,13 +519,13 @@ else if test -z "$MPICXX" ; then # We left mpiCC off of this list because mpicc and mpiCC are the # same on Mac OSX systems. - AC_PATH_PROG(MPICXX,mpicxx mpCC) + AC_PATH_PROG(MPICXX,$MPICXX_NAME mpCC) fi if test "x$MPICXX" != "x" ; then CXX=$MPICXX fi if test -z "$MPIEXEC" ; then - AC_PATH_PROG(MPIEXEC,mpiexec) + AC_PATH_PROG(MPIEXEC,$MPIEXEC_NAME) fi fi @@ -1396,11 +1403,11 @@ if test "$FROM_MPICH" = yes ; then # we did our tests with the base compilers, now point the make system at the # installed compiler wrappers for actually building the tests - CC=$mpibindir/mpicc - F77=$mpibindir/mpif77 - FC=$mpibindir/mpif90 - CXX=$mpibindir/mpicxx - MPIEXEC=$mpibindir/mpiexec + CC=$mpibindir/$MPICC_NAME + F77=$mpibindir/$MPIF77_NAME + FC=$mpibindir/$MPIF90_NAME + CXX=$mpibindir/$MPICXX_NAME + MPIEXEC=$mpibindir/$MPIEXEC_NAME # Zero out the flags, since they are already contained in the compiler # wrapper scripts. Note that this will kill any flags that have been added @@ -1422,7 +1429,7 @@ if test "$FROM_MPICH" = yes ; then else # We need either mpiexec or mpirun. If we don't find them, # the user will need to determine how to run a program - AC_PATH_PROG(MPIEXEC,mpiexec) + AC_PATH_PROG(MPIEXEC,$MPIEXEC_NAME) fi AC_OUTPUT_COMMANDS([chmod a+x maint/testmerge]) ----------------------------------------------------------------------- Summary of changes: Makefile.am | 6 ++-- confdb/aclocal_mpi.m4 | 2 + confdb/aclocal_util.m4 | 14 +++++++++++ configure.ac | 6 ++++ src/pm/hydra/Makefile.am | 8 +++--- src/pm/hydra/configure.ac | 12 +++++++++ src/pm/hydra/pm/pmiserv/pmiserv_utils.c | 2 +- test/mpi/configure.ac | 39 ++++++++++++++++++------------ 8 files changed, 65 insertions(+), 24 deletions(-) hooks/post-receive -- MPICH primary repository

1 0