Mellanox -- I realize that we're not always super careful about separating commits, but this one commit contained 2 wholly separate things.
Can you please separate such obvious different things into multiple commits in the future? Thanks. On Mar 11, 2014, at 1:27 PM, <svn-commit-mai...@open-mpi.org> wrote: > Author: miked (Mike Dubman) > Date: 2014-03-11 13:27:33 EDT (Tue, 11 Mar 2014) > New Revision: 30995 > URL: https://svn.open-mpi.org/trac/ompi/changeset/30995 > > Log: > OSHMEM: various fixes > > - -check-shmem-params is OFF by default. It checks OSHMEM API params and will > abort on bad input > - hcoll do not save fallback coll pointers for unsupported collectives. > > fixed by Val, Roman, reviewed by Miked/Igor > > cmr=v1.7.5:reviewer=ompi-rm1.7 > > Text files modified: > trunk/config/oshmem_configure_options.m4 | 10 +++++----- > > trunk/ompi/mca/coll/hcoll/coll_hcoll_module.c | 37 > +++++++++++++++++++++++-------------- > 2 files changed, 28 insertions(+), 19 deletions(-) > > Modified: trunk/config/oshmem_configure_options.m4 > ============================================================================== > --- trunk/config/oshmem_configure_options.m4 Tue Mar 11 12:35:08 2014 > (r30994) > +++ trunk/config/oshmem_configure_options.m4 2014-03-11 13:27:33 EDT (Tue, > 11 Mar 2014) (r30995) > @@ -49,15 +49,15 @@ > AC_MSG_CHECKING([if want OSHMEM API parameter checking]) > AC_ARG_WITH(oshmem-param-check, > AC_HELP_STRING([--oshmem-param-check(=VALUE)], > - [behavior of OSHMEM API function parameter checking. > Valid values are: always, never. If --with-oshmem-param-check is specified > with no VALUE argument, it is equivalent to a VALUE of "always"; > --without-oshmem-param-check is equivalent to "never" (default: always).])) > -shmem_param_check=1 > + [behavior of OSHMEM API function parameter checking. > Valid values are: always, never. If --with-oshmem-param-check is specified > with no VALUE argument, it is equivalent to a VALUE of "always"; > --without-oshmem-param-check is equivalent to "never" (default: never).])) > +shmem_param_check=0 > if test "$with_oshmem_param_check" = "no" -o \ > - "$with_oshmem_param_check" = "never"; then > + "$with_oshmem_param_check" = "never" -o \ > + -z "$with_oshmem_param_check"; then > shmem_param_check=0 > AC_MSG_RESULT([never]) > elif test "$with_oshmem_param_check" = "yes" -o \ > - "$with_oshmem_param_check" = "always" -o \ > - -z "$with_oshmem_param_check"; then > + "$with_oshmem_param_check" = "always"; then > shmem_param_check=1 > AC_MSG_RESULT([always]) > else > > Modified: trunk/ompi/mca/coll/hcoll/coll_hcoll_module.c > ============================================================================== > --- trunk/ompi/mca/coll/hcoll/coll_hcoll_module.c Tue Mar 11 12:35:08 > 2014 (r30994) > +++ trunk/ompi/mca/coll/hcoll/coll_hcoll_module.c 2014-03-11 13:27:33 EDT > (Tue, 11 Mar 2014) (r30995) > @@ -67,9 +67,15 @@ > if (hcoll_module->hcoll_context != NULL){ > OBJ_RELEASE(hcoll_module->previous_barrier_module); > OBJ_RELEASE(hcoll_module->previous_bcast_module); > - OBJ_RELEASE(hcoll_module->previous_reduce_module); > OBJ_RELEASE(hcoll_module->previous_allreduce_module); > OBJ_RELEASE(hcoll_module->previous_allgather_module); > + > + OBJ_RELEASE(hcoll_module->previous_ibarrier_module); > + OBJ_RELEASE(hcoll_module->previous_ibcast_module); > + OBJ_RELEASE(hcoll_module->previous_iallreduce_module); > + OBJ_RELEASE(hcoll_module->previous_iallgather_module); > + > + /* > OBJ_RELEASE(hcoll_module->previous_allgatherv_module); > OBJ_RELEASE(hcoll_module->previous_gather_module); > OBJ_RELEASE(hcoll_module->previous_gatherv_module); > @@ -77,10 +83,8 @@ > OBJ_RELEASE(hcoll_module->previous_alltoallv_module); > OBJ_RELEASE(hcoll_module->previous_alltoallw_module); > OBJ_RELEASE(hcoll_module->previous_reduce_scatter_module); > - OBJ_RELEASE(hcoll_module->previous_ibarrier_module); > - OBJ_RELEASE(hcoll_module->previous_ibcast_module); > - OBJ_RELEASE(hcoll_module->previous_iallreduce_module); > - OBJ_RELEASE(hcoll_module->previous_iallgather_module); > + OBJ_RELEASE(hcoll_module->previous_reduce_module); > + */ > > context_destroyed = 0; > hcoll_destroy_context(hcoll_module->hcoll_context, > @@ -108,21 +112,26 @@ > > HCOL_SAVE_PREV_COLL_API(barrier); > HCOL_SAVE_PREV_COLL_API(bcast); > - HCOL_SAVE_PREV_COLL_API(reduce); > HCOL_SAVE_PREV_COLL_API(allreduce); > HCOL_SAVE_PREV_COLL_API(allgather); > - HCOL_SAVE_PREV_COLL_API(allgatherv); > - HCOL_SAVE_PREV_COLL_API(gather); > - HCOL_SAVE_PREV_COLL_API(gatherv); > - HCOL_SAVE_PREV_COLL_API(alltoall); > - HCOL_SAVE_PREV_COLL_API(alltoallv); > - HCOL_SAVE_PREV_COLL_API(alltoallw); > - HCOL_SAVE_PREV_COLL_API(reduce_scatter); > + > HCOL_SAVE_PREV_COLL_API(ibarrier); > HCOL_SAVE_PREV_COLL_API(ibcast); > HCOL_SAVE_PREV_COLL_API(iallreduce); > HCOL_SAVE_PREV_COLL_API(iallgather); > > + /* > + These collectives are not yet part of hcoll, so > + don't retain them on hcoll module > + HCOL_SAVE_PREV_COLL_API(reduce_scatter); > + HCOL_SAVE_PREV_COLL_API(gather); > + HCOL_SAVE_PREV_COLL_API(reduce); > + HCOL_SAVE_PREV_COLL_API(allgatherv); > + HCOL_SAVE_PREV_COLL_API(gatherv); > + HCOL_SAVE_PREV_COLL_API(alltoall); > + HCOL_SAVE_PREV_COLL_API(alltoallv); > + HCOL_SAVE_PREV_COLL_API(alltoallw); > + */ > return OMPI_SUCCESS; > } > > @@ -275,7 +284,7 @@ > hcoll_module->super.coll_ibcast = hcoll_collectives.coll_ibcast ? > mca_coll_hcoll_ibcast : NULL; > hcoll_module->super.coll_iallgather = hcoll_collectives.coll_iallgather ? > mca_coll_hcoll_iallgather : NULL; > hcoll_module->super.coll_iallreduce = hcoll_collectives.coll_iallreduce ? > mca_coll_hcoll_iallreduce : NULL; > - hcoll_module->super.coll_gather = hcoll_collectives.coll_gather ? > mca_coll_hcoll_gather : NULL; > + hcoll_module->super.coll_gather = /*hcoll_collectives.coll_gather ? > mca_coll_hcoll_gather :*/ NULL; > > *priority = cm->hcoll_priority; > module = &hcoll_module->super; > _______________________________________________ > svn-full mailing list > svn-f...@open-mpi.org > http://www.open-mpi.org/mailman/listinfo.cgi/svn-full -- Jeff Squyres jsquy...@cisco.com For corporate legal information go to: http://www.cisco.com/web/about/doing_business/legal/cri/
