Fixed on master and PR'ed for v2.0.0.  Thanks.

> On May 2, 2016, at 4:45 PM, Paul Hargrove <phhargr...@lbl.gov> wrote:
> 
> It appears that 2.0.0rc2 contains the same sort of alloca()-related error I 
> reported against 1.10.2rc1 in 
> https://www.open-mpi.org/community/lists/devel/2015/12/18440.php
> 
> This time the problem is in osc_rdma_peer.c, which *does* attempt the 
> appropriate conditional include of alloca.h, but incorrectly does so before 
> (indirect) inclusion of ompi_config.h (to define HAVE_ALLOCA_H).
> 
> The simple patch below reorders the includes to resolve the problem.
> 
> -Paul
> 
> --- ompi/mca/osc/rdma/osc_rdma_peer.c~  Mon May  2 13:37:30 2016
> +++ ompi/mca/osc/rdma/osc_rdma_peer.c   Mon May  2 13:37:41 2016
> @@ -11,14 +11,14 @@
>   * $HEADER$
>   */
> 
> -#ifdef HAVE_ALLOCA_H
> -#include <alloca.h>
> -#endif
> -
>  #include "osc_rdma_comm.h"
> 
>  #include "ompi/mca/bml/base/base.h"
> 
> +#ifdef HAVE_ALLOCA_H
> +#include <alloca.h>
> +#endif
> +
>  #define NODE_ID_TO_RANK(module, node_id) ((node_id) * ((ompi_comm_size 
> ((module)->comm) + (module)->node_count - 1) / (module)->node_count))
> 
>  /**
> 
> 
> 
> -- 
> Paul H. Hargrove                          phhargr...@lbl.gov
> Computer Languages & Systems Software (CLaSS) Group
> Computer Science Department               Tel: +1-510-495-2352
> Lawrence Berkeley National Laboratory     Fax: +1-510-486-6900
> _______________________________________________
> devel mailing list
> de...@open-mpi.org
> Subscription: https://www.open-mpi.org/mailman/listinfo.cgi/devel
> Link to this post: 
> http://www.open-mpi.org/community/lists/devel/2016/05/18873.php


-- 
Jeff Squyres
jsquy...@cisco.com
For corporate legal information go to: 
http://www.cisco.com/web/about/doing_business/legal/cri/

Reply via email to