Re: [hwloc-devel] [SCM] open-mpi/hwloc branch master updated. 14e727976867931a2eb74f2630b0ce9137182874

2018-02-05 Thread Samuel Thibault
Brice Goglin, on lun. 05 févr. 2018 14:25:58 +0100, wrote:
> configure only looks for CL/cl_ext.h before enabling the OpenCL backend.
> Did it enable OpenCL on your machine?

Possibly not, we just happen to have had StarPU build errors when
including opencl.h.

Samuel
___
hwloc-devel mailing list
hwloc-devel@lists.open-mpi.org
https://lists.open-mpi.org/mailman/listinfo/hwloc-devel

Re: [hwloc-devel] [SCM] open-mpi/hwloc branch master updated. 14e727976867931a2eb74f2630b0ce9137182874

2018-02-05 Thread Brice Goglin
configure only looks for CL/cl_ext.h before enabling the OpenCL backend.
Did it enable OpenCL on your machine?

On my VMs, there's
/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/System/Library/Frameworks/OpenCL.framework/Versions/A/Headers/cl_ext.h
(and OpenCL currently doesn't get enabled in hwloc)

Brice


Le 05/02/2018 à 11:57, 'Gitdub ' a écrit :
> 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 "open-mpi/hwloc".
>
> The branch, master has been updated
>via  14e727976867931a2eb74f2630b0ce9137182874 (commit)
>   from  24214085271f0cc9865300ba0a4e34699e4ad892 (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 -
> https://github.com/open-mpi/hwloc/commit/14e727976867931a2eb74f2630b0ce9137182874
>
> commit 14e727976867931a2eb74f2630b0ce9137182874
> Author: Samuel Thibault 
> Date:   Mon Feb 5 11:56:42 2018 +0100
>
> Fix including OpenCL headers on MacOS
>
> diff --git a/hwloc/topology-opencl.c b/hwloc/topology-opencl.c
> index 3931977..e11dc60 100644
> --- a/hwloc/topology-opencl.c
> +++ b/hwloc/topology-opencl.c
> @@ -1,6 +1,6 @@
>  /*
>   * Copyright © 2012-2018 Inria.  All rights reserved.
> - * Copyright © 2013 Université Bordeaux.  All right reserved.
> + * Copyright © 2013, 2018 Université Bordeaux.  All right reserved.
>   * See COPYING in top-level directory.
>   */
>  
> @@ -12,7 +12,11 @@
>  #include 
>  #include 
>  
> +#ifdef __APPLE__
> +#include 
> +#else
>  #include 
> +#endif
>  
>  static int
>  hwloc_opencl_discover(struct hwloc_backend *backend)
> diff --git a/include/hwloc/opencl.h b/include/hwloc/opencl.h
> index d97fe5d..058968d 100644
> --- a/include/hwloc/opencl.h
> +++ b/include/hwloc/opencl.h
> @@ -1,6 +1,6 @@
>  /*
>   * Copyright © 2012-2018 Inria.  All rights reserved.
> - * Copyright © 2013 Université Bordeaux.  All right reserved.
> + * Copyright © 2013, 2018 Université Bordeaux.  All right reserved.
>   * See COPYING in top-level directory.
>   */
>  
> @@ -21,8 +21,13 @@
>  #include 
>  #endif
>  
> +#ifdef __APPLE__
> +#include 
> +#include 
> +#else
>  #include 
>  #include 
> +#endif
>  
>  #include 
>  
> diff --git a/tests/hwloc/opencl.c b/tests/hwloc/opencl.c
> index 87400e9..74592b7 100644
> --- a/tests/hwloc/opencl.c
> +++ b/tests/hwloc/opencl.c
> @@ -5,7 +5,11 @@
>  
>  #include 
>  #include 
> +#ifdef __APPLE__
> +#include 
> +#else
>  #include 
> +#endif
>  #include 
>  #include 
>  
>
>
> ---
>
> Summary of changes:
>  hwloc/topology-opencl.c | 6 +-
>  include/hwloc/opencl.h  | 7 ++-
>  tests/hwloc/opencl.c| 4 
>  3 files changed, 15 insertions(+), 2 deletions(-)
>
>
> hooks/post-receive

___
hwloc-devel mailing list
hwloc-devel@lists.open-mpi.org
https://lists.open-mpi.org/mailman/listinfo/hwloc-devel