I'm pretty sure I was clear it's a hack. But removing from subdirs is how we disable a project, not by adding a big fixed around a makefile (see ORTE).

Brian



Sent with Good (www.good.com)


-----Original Message-----
From: Mike Dubman [miked@dev.mellanox.co.il]
Sent: Saturday, November 23, 2013 07:49 PM Mountain Standard Time
To: Open MPI Developers
Subject: [EXTERNAL] Re: [OMPI devel] [OMPI svn] svn:open-mpi r29733 - in trunk: config oshmem

Hi
Looking into Brian's fix it seems more hack then fix.
Could please explain what is wrong in one we committed?

Thanks

On Nov 22, 2013 10:44 AM, "Ralph Castain" <rhc@open-mpi.org> wrote:
Hey Mike

This fix is incorrect - Brian already committed the correct way to disable oshmem. Please revert this.

Thanks
Ralph


On Nov 22, 2013, at 5:51 AM, svn-commit-mailer@open-mpi.org wrote:

> Author: miked (Mike Dubman)
> Date: 2013-11-22 08:51:46 EST (Fri, 22 Nov 2013)
> New Revision: 29733
> URL: https://svn.open-mpi.org/trac/ompi/changeset/29733
>
> Log:
> add support for --without-oshmem in configure
>
> Text files modified:
>   trunk/config/oshmem_configure_options.m4 |    16 ++++++++++++++++
>   trunk/oshmem/Makefile.am                 |     5 +++++
>   2 files changed, 21 insertions(+), 0 deletions(-)
>
> Modified: trunk/config/oshmem_configure_options.m4
> ==============================================================================
> --- trunk/config/oshmem_configure_options.m4  Fri Nov 22 07:37:31 2013        (r29732)
> +++ trunk/config/oshmem_configure_options.m4  2013-11-22 08:51:46 EST (Fri, 22 Nov 2013)      (r29733)
> @@ -25,6 +25,22 @@
>      [Disable building the OpenSHMEM interface])])
>
> #
> +# OSHMEM support
> +#
> +AC_MSG_CHECKING([if want OSHMEM support])
> +AC_ARG_WITH([oshmem],
> +    [AC_HELP_STRING([--with-oshmem],
> +                    [Build with OSHMEM support (default=yes)])])
> +if test "$with_oshmem" != "no"; then
> +    AC_MSG_RESULT([yes])
> +    oshmem_with_support=1
> +else
> +    AC_MSG_RESULT([no])
> +    oshmem_with_support=0
> +fi
> +AM_CONDITIONAL(OSHMEM_SUPPORT, test "$oshmem_with_support" = 1)
> +
> +#
> # Enable compatibility mode
> #
> AC_MSG_CHECKING([if want SGI/Quadrix compatibility mode])
>
> Modified: trunk/oshmem/Makefile.am
> ==============================================================================
> --- trunk/oshmem/Makefile.am  Fri Nov 22 07:37:31 2013        (r29732)
> +++ trunk/oshmem/Makefile.am  2013-11-22 08:51:46 EST (Fri, 22 Nov 2013)      (r29733)
> @@ -9,6 +9,9 @@
> # $HEADER$
> #
>
> +# Do we need to build OSHMEM?
> +if OSHMEM_SUPPORT
> +
> # Do we have profiling?
> if OSHMEM_PROFILING
> c_pshmem_lib = shmem/c/profile/libshmem_c_pshmem.la
> @@ -99,3 +102,5 @@
> # Remove the generated man pages
> distclean-local:
>       rm -f $(nodist_man_MANS) $(dir_stamp)
> +
> +endif # OSHMEM_SUPPORT
> _______________________________________________
> svn mailing list
> svn@open-mpi.org
> http://www.open-mpi.org/mailman/listinfo.cgi/svn

_______________________________________________
devel mailing list
devel@open-mpi.org
http://www.open-mpi.org/mailman/listinfo.cgi/devel