Re: [QGIS-Developer] unable to build MacOS master (OpenCL)

2018-12-03 Thread Peter Petrik
Thanks, looks that it works with this patch, please see
https://github.com/qgis/QGIS/pull/8590

P.

On Mon, Dec 3, 2018 at 9:51 AM Alessandro Pasotti 
wrote:

> On Mon, Dec 3, 2018 at 9:43 AM Peter Petrik <
> peter.pet...@lutraconsulting.co.uk> wrote:
>
>> Looks like 1.2 (compiled
>> https://github.com/yohanesgultom/parallel-programming-assignment/blob/master/PR2/opencl/device_query.c
>> )
>>
>
>
> So, please try to #ifdef for mac and set
>
> #define CL_HPP_MINIMUM_OPENCL_VERSION 120
> #define CL_HPP_TARGET_OPENCL_VERSION 120
> #define CL_TARGET_OPENCL_VERSION 120
>
> if that doesn't work, try with 110 instead of 120.
>
> You can run an OpenCL smoke test by enabling it in the
> options->acceleration and by using the hillshade renderer on a DEM raster
> (also enable rendering debug log in options->rendering and you'll see in
> the log is the hillshade is really using opencl).
>
>
> Please let me know if this works for you.
>
>
>
>>
>> Platform - 1
>>
>>   1.1 CL_PLATFORM_NAME: Apple
>>
>>   1.2 CL_PLATFORM_VENDOR: Apple
>>
>>   1.3 CL_PLATFORM_VERSION: OpenCL 1.2 (Oct 11 2018 21:04:03)
>>
>>   1.4 CL_PLATFORM_PROFILE: FULL_PROFILE
>>
>>   1.5 CL_PLATFORM_EXTENSIONS: cl_APPLE_SetMemObjectDestructor
>> cl_APPLE_ContextLoggingFunctions cl_APPLE_clut cl_APPLE_query_kernel_names
>> cl_APPLE_gl_sharing cl_khr_gl_event
>>
>>   Device - 1:
>>
>> CL_DEVICE_NAME: Intel(R) UHD Graphics 630
>>
>> CL_DEVICE_VENDOR: Intel Inc.
>>
>> CL_DRIVER_VERSION: 1.2(Oct 11 2018 20:55:51)
>>
>> CL_DEVICE_VERSION: OpenCL 1.2
>>
>> CL_DEVICE_MAX_COMPUTE_UNITS: 24
>>
>>   Device - 2:
>>
>> CL_DEVICE_NAME: AMD Radeon Pro 560X Compute Engine
>>
>> CL_DEVICE_VENDOR: AMD
>>
>> CL_DRIVER_VERSION: 1.2 (Oct 16 2018 21:18:14)
>>
>> CL_DEVICE_VERSION: OpenCL 1.2
>>
>> CL_DEVICE_MAX_COMPUTE_UNITS: 16
>>
>>
>>
>> On Mon, Dec 3, 2018 at 9:19 AM Alessandro Pasotti 
>> wrote:
>>
>>> Hi Peter,
>>>
>>> the only change that come up to my mind is that we are now supporting
>>> also opencl versions > 1.1,
>>> can you please check what is the opencl version implemented on mac?
>>>
>>> It might be necessary to add a ifdef for mac to set
>>>
>>>
>>> #define CL_HPP_MINIMUM_OPENCL_VERSION 110
>>> #define CL_HPP_TARGET_OPENCL_VERSION 110
>>> #define CL_TARGET_OPENCL_VERSION 110
>>>
>>> as it was before the changes.
>>>
>>>
>>>
>>> On Mon, Dec 3, 2018 at 9:02 AM Peter Petrik <
>>> peter.pet...@lutraconsulting.co.uk> wrote:
>>>
 Hi,

 I am unable to build QGIS master after Friday's changes in opencl
 header. Any idea if I can still use official MACOS CL headers or how to
 proceed?

 Thanks.
 Peter

 [ 19%] Building CXX object
 src/core/CMakeFiles/qgis_core.dir/geometry/qgsabstractgeometry.cpp.o

 In file included from
 /Users/peter/Projects/qgis1/QGIS/src/core/raster/qgshillshaderenderer.cpp:33:

 In file included from
 /Users/peter/Projects/qgis1/QGIS/src/core/qgsopenclutils.h:25:

 /Users/peter/Projects/qgis1/QGIS/external/opencl-clhpp/include/CL/cl2.hpp:1323:1:
 error: use of undeclared identifier 'CL_DEVICE_QUEUE_ON_HOST_PROPERTIES'

 CL_HPP_PARAM_NAME_INFO_2_0_(CL_HPP_DECLARE_PARAM_TRAITS_)

 ^

 /Users/peter/Projects/qgis1/QGIS/external/opencl-clhpp/include/CL/cl2.hpp:1277:23:
 note: expanded from macro 'CL_HPP_PARAM_NAME_INFO_2_0_'

 F(cl_device_info, CL_DEVICE_QUEUE_ON_HOST_PROPERTIES,
 cl_command_queue_properties) \

   ^

 /Users/peter/Projects/qgis1/QGIS/external/opencl-clhpp/include/CL/cl2.hpp:1323:1:
 error: use of undeclared identifier 'CL_DEVICE_QUEUE_ON_DEVICE_PROPERTIES'

 /Users/peter/Projects/qgis1/QGIS/external/opencl-clhpp/include/CL/cl2.hpp:1278:23:
 note: expanded from macro 'CL_HPP_PARAM_NAME_INFO_2_0_'

 F(cl_device_info, CL_DEVICE_QUEUE_ON_DEVICE_PROPERTIES,
 cl_command_queue_properties) \

   ^

 /Users/peter/Projects/qgis1/QGIS/external/opencl-clhpp/include/CL/cl2.hpp:1323:1:
 error: use of undeclared identifier
 'CL_DEVICE_QUEUE_ON_DEVICE_PREFERRED_SIZE'

 /Users/peter/Projects/qgis1/QGIS/external/opencl-clhpp/include/CL/cl2.hpp:1279:23:
 note: expanded from macro 'CL_HPP_PARAM_NAME_INFO_2_0_'

 F(cl_device_info, CL_DEVICE_QUEUE_ON_DEVICE_PREFERRED_SIZE,
 cl_uint) \

   ^

 /Users/peter/Projects/qgis1/QGIS/external/opencl-clhpp/include/CL/cl2.hpp:1323:1:
 error: use of undeclared identifier 'CL_DEVICE_QUEUE_ON_DEVICE_MAX_SIZE'

 /Users/peter/Projects/qgis1/QGIS/external/opencl-clhpp/include/CL/cl2.hpp:1280:23:
 note: expanded from macro 'CL_HPP_PARAM_NAME_INFO_2_0_'

 F(cl_device_info, CL_DEVICE_QUEUE_ON_DEVICE_MAX_SIZE, cl_uint) \

   ^

 /Users/peter/Projects/qgis1/QGIS/external/opencl-clhpp/include/CL/cl2.hpp:1323:1:
 error: use 

Re: [QGIS-Developer] unable to build MacOS master (OpenCL)

2018-12-03 Thread Alessandro Pasotti
On Mon, Dec 3, 2018 at 9:43 AM Peter Petrik <
peter.pet...@lutraconsulting.co.uk> wrote:

> Looks like 1.2 (compiled
> https://github.com/yohanesgultom/parallel-programming-assignment/blob/master/PR2/opencl/device_query.c
> )
>


So, please try to #ifdef for mac and set

#define CL_HPP_MINIMUM_OPENCL_VERSION 120
#define CL_HPP_TARGET_OPENCL_VERSION 120
#define CL_TARGET_OPENCL_VERSION 120

if that doesn't work, try with 110 instead of 120.

You can run an OpenCL smoke test by enabling it in the
options->acceleration and by using the hillshade renderer on a DEM raster
(also enable rendering debug log in options->rendering and you'll see in
the log is the hillshade is really using opencl).


Please let me know if this works for you.



>
> Platform - 1
>
>   1.1 CL_PLATFORM_NAME: Apple
>
>   1.2 CL_PLATFORM_VENDOR: Apple
>
>   1.3 CL_PLATFORM_VERSION: OpenCL 1.2 (Oct 11 2018 21:04:03)
>
>   1.4 CL_PLATFORM_PROFILE: FULL_PROFILE
>
>   1.5 CL_PLATFORM_EXTENSIONS: cl_APPLE_SetMemObjectDestructor
> cl_APPLE_ContextLoggingFunctions cl_APPLE_clut cl_APPLE_query_kernel_names
> cl_APPLE_gl_sharing cl_khr_gl_event
>
>   Device - 1:
>
> CL_DEVICE_NAME: Intel(R) UHD Graphics 630
>
> CL_DEVICE_VENDOR: Intel Inc.
>
> CL_DRIVER_VERSION: 1.2(Oct 11 2018 20:55:51)
>
> CL_DEVICE_VERSION: OpenCL 1.2
>
> CL_DEVICE_MAX_COMPUTE_UNITS: 24
>
>   Device - 2:
>
> CL_DEVICE_NAME: AMD Radeon Pro 560X Compute Engine
>
> CL_DEVICE_VENDOR: AMD
>
> CL_DRIVER_VERSION: 1.2 (Oct 16 2018 21:18:14)
>
> CL_DEVICE_VERSION: OpenCL 1.2
>
> CL_DEVICE_MAX_COMPUTE_UNITS: 16
>
>
>
> On Mon, Dec 3, 2018 at 9:19 AM Alessandro Pasotti 
> wrote:
>
>> Hi Peter,
>>
>> the only change that come up to my mind is that we are now supporting
>> also opencl versions > 1.1,
>> can you please check what is the opencl version implemented on mac?
>>
>> It might be necessary to add a ifdef for mac to set
>>
>>
>> #define CL_HPP_MINIMUM_OPENCL_VERSION 110
>> #define CL_HPP_TARGET_OPENCL_VERSION 110
>> #define CL_TARGET_OPENCL_VERSION 110
>>
>> as it was before the changes.
>>
>>
>>
>> On Mon, Dec 3, 2018 at 9:02 AM Peter Petrik <
>> peter.pet...@lutraconsulting.co.uk> wrote:
>>
>>> Hi,
>>>
>>> I am unable to build QGIS master after Friday's changes in opencl
>>> header. Any idea if I can still use official MACOS CL headers or how to
>>> proceed?
>>>
>>> Thanks.
>>> Peter
>>>
>>> [ 19%] Building CXX object
>>> src/core/CMakeFiles/qgis_core.dir/geometry/qgsabstractgeometry.cpp.o
>>>
>>> In file included from
>>> /Users/peter/Projects/qgis1/QGIS/src/core/raster/qgshillshaderenderer.cpp:33:
>>>
>>> In file included from
>>> /Users/peter/Projects/qgis1/QGIS/src/core/qgsopenclutils.h:25:
>>>
>>> /Users/peter/Projects/qgis1/QGIS/external/opencl-clhpp/include/CL/cl2.hpp:1323:1:
>>> error: use of undeclared identifier 'CL_DEVICE_QUEUE_ON_HOST_PROPERTIES'
>>>
>>> CL_HPP_PARAM_NAME_INFO_2_0_(CL_HPP_DECLARE_PARAM_TRAITS_)
>>>
>>> ^
>>>
>>> /Users/peter/Projects/qgis1/QGIS/external/opencl-clhpp/include/CL/cl2.hpp:1277:23:
>>> note: expanded from macro 'CL_HPP_PARAM_NAME_INFO_2_0_'
>>>
>>> F(cl_device_info, CL_DEVICE_QUEUE_ON_HOST_PROPERTIES,
>>> cl_command_queue_properties) \
>>>
>>>   ^
>>>
>>> /Users/peter/Projects/qgis1/QGIS/external/opencl-clhpp/include/CL/cl2.hpp:1323:1:
>>> error: use of undeclared identifier 'CL_DEVICE_QUEUE_ON_DEVICE_PROPERTIES'
>>>
>>> /Users/peter/Projects/qgis1/QGIS/external/opencl-clhpp/include/CL/cl2.hpp:1278:23:
>>> note: expanded from macro 'CL_HPP_PARAM_NAME_INFO_2_0_'
>>>
>>> F(cl_device_info, CL_DEVICE_QUEUE_ON_DEVICE_PROPERTIES,
>>> cl_command_queue_properties) \
>>>
>>>   ^
>>>
>>> /Users/peter/Projects/qgis1/QGIS/external/opencl-clhpp/include/CL/cl2.hpp:1323:1:
>>> error: use of undeclared identifier
>>> 'CL_DEVICE_QUEUE_ON_DEVICE_PREFERRED_SIZE'
>>>
>>> /Users/peter/Projects/qgis1/QGIS/external/opencl-clhpp/include/CL/cl2.hpp:1279:23:
>>> note: expanded from macro 'CL_HPP_PARAM_NAME_INFO_2_0_'
>>>
>>> F(cl_device_info, CL_DEVICE_QUEUE_ON_DEVICE_PREFERRED_SIZE, cl_uint)
>>> \
>>>
>>>   ^
>>>
>>> /Users/peter/Projects/qgis1/QGIS/external/opencl-clhpp/include/CL/cl2.hpp:1323:1:
>>> error: use of undeclared identifier 'CL_DEVICE_QUEUE_ON_DEVICE_MAX_SIZE'
>>>
>>> /Users/peter/Projects/qgis1/QGIS/external/opencl-clhpp/include/CL/cl2.hpp:1280:23:
>>> note: expanded from macro 'CL_HPP_PARAM_NAME_INFO_2_0_'
>>>
>>> F(cl_device_info, CL_DEVICE_QUEUE_ON_DEVICE_MAX_SIZE, cl_uint) \
>>>
>>>   ^
>>>
>>> /Users/peter/Projects/qgis1/QGIS/external/opencl-clhpp/include/CL/cl2.hpp:1323:1:
>>> error: use of undeclared identifier 'CL_DEVICE_MAX_ON_DEVICE_QUEUES'
>>>
>>> /Users/peter/Projects/qgis1/QGIS/external/opencl-clhpp/include/CL/cl2.hpp:1281:23:
>>> note: expanded from macro 'CL_HPP_PARAM_NAME_INFO_2_0_'
>>>
>>> F(cl_device_info, CL_DEVICE_MAX_ON_DEVICE_QUEUES, cl_uint) \
>>>
>>>   ^
>>>
>>> 

Re: [QGIS-Developer] unable to build MacOS master (OpenCL)

2018-12-03 Thread Peter Petrik
Looks like 1.2 (compiled
https://github.com/yohanesgultom/parallel-programming-assignment/blob/master/PR2/opencl/device_query.c
)

Platform - 1

  1.1 CL_PLATFORM_NAME: Apple

  1.2 CL_PLATFORM_VENDOR: Apple

  1.3 CL_PLATFORM_VERSION: OpenCL 1.2 (Oct 11 2018 21:04:03)

  1.4 CL_PLATFORM_PROFILE: FULL_PROFILE

  1.5 CL_PLATFORM_EXTENSIONS: cl_APPLE_SetMemObjectDestructor
cl_APPLE_ContextLoggingFunctions cl_APPLE_clut cl_APPLE_query_kernel_names
cl_APPLE_gl_sharing cl_khr_gl_event

  Device - 1:

CL_DEVICE_NAME: Intel(R) UHD Graphics 630

CL_DEVICE_VENDOR: Intel Inc.

CL_DRIVER_VERSION: 1.2(Oct 11 2018 20:55:51)

CL_DEVICE_VERSION: OpenCL 1.2

CL_DEVICE_MAX_COMPUTE_UNITS: 24

  Device - 2:

CL_DEVICE_NAME: AMD Radeon Pro 560X Compute Engine

CL_DEVICE_VENDOR: AMD

CL_DRIVER_VERSION: 1.2 (Oct 16 2018 21:18:14)

CL_DEVICE_VERSION: OpenCL 1.2

CL_DEVICE_MAX_COMPUTE_UNITS: 16



On Mon, Dec 3, 2018 at 9:19 AM Alessandro Pasotti 
wrote:

> Hi Peter,
>
> the only change that come up to my mind is that we are now supporting also
> opencl versions > 1.1,
> can you please check what is the opencl version implemented on mac?
>
> It might be necessary to add a ifdef for mac to set
>
>
> #define CL_HPP_MINIMUM_OPENCL_VERSION 110
> #define CL_HPP_TARGET_OPENCL_VERSION 110
> #define CL_TARGET_OPENCL_VERSION 110
>
> as it was before the changes.
>
>
>
> On Mon, Dec 3, 2018 at 9:02 AM Peter Petrik <
> peter.pet...@lutraconsulting.co.uk> wrote:
>
>> Hi,
>>
>> I am unable to build QGIS master after Friday's changes in opencl header.
>> Any idea if I can still use official MACOS CL headers or how to proceed?
>>
>> Thanks.
>> Peter
>>
>> [ 19%] Building CXX object
>> src/core/CMakeFiles/qgis_core.dir/geometry/qgsabstractgeometry.cpp.o
>>
>> In file included from
>> /Users/peter/Projects/qgis1/QGIS/src/core/raster/qgshillshaderenderer.cpp:33:
>>
>> In file included from
>> /Users/peter/Projects/qgis1/QGIS/src/core/qgsopenclutils.h:25:
>>
>> /Users/peter/Projects/qgis1/QGIS/external/opencl-clhpp/include/CL/cl2.hpp:1323:1:
>> error: use of undeclared identifier 'CL_DEVICE_QUEUE_ON_HOST_PROPERTIES'
>>
>> CL_HPP_PARAM_NAME_INFO_2_0_(CL_HPP_DECLARE_PARAM_TRAITS_)
>>
>> ^
>>
>> /Users/peter/Projects/qgis1/QGIS/external/opencl-clhpp/include/CL/cl2.hpp:1277:23:
>> note: expanded from macro 'CL_HPP_PARAM_NAME_INFO_2_0_'
>>
>> F(cl_device_info, CL_DEVICE_QUEUE_ON_HOST_PROPERTIES,
>> cl_command_queue_properties) \
>>
>>   ^
>>
>> /Users/peter/Projects/qgis1/QGIS/external/opencl-clhpp/include/CL/cl2.hpp:1323:1:
>> error: use of undeclared identifier 'CL_DEVICE_QUEUE_ON_DEVICE_PROPERTIES'
>>
>> /Users/peter/Projects/qgis1/QGIS/external/opencl-clhpp/include/CL/cl2.hpp:1278:23:
>> note: expanded from macro 'CL_HPP_PARAM_NAME_INFO_2_0_'
>>
>> F(cl_device_info, CL_DEVICE_QUEUE_ON_DEVICE_PROPERTIES,
>> cl_command_queue_properties) \
>>
>>   ^
>>
>> /Users/peter/Projects/qgis1/QGIS/external/opencl-clhpp/include/CL/cl2.hpp:1323:1:
>> error: use of undeclared identifier
>> 'CL_DEVICE_QUEUE_ON_DEVICE_PREFERRED_SIZE'
>>
>> /Users/peter/Projects/qgis1/QGIS/external/opencl-clhpp/include/CL/cl2.hpp:1279:23:
>> note: expanded from macro 'CL_HPP_PARAM_NAME_INFO_2_0_'
>>
>> F(cl_device_info, CL_DEVICE_QUEUE_ON_DEVICE_PREFERRED_SIZE, cl_uint) \
>>
>>   ^
>>
>> /Users/peter/Projects/qgis1/QGIS/external/opencl-clhpp/include/CL/cl2.hpp:1323:1:
>> error: use of undeclared identifier 'CL_DEVICE_QUEUE_ON_DEVICE_MAX_SIZE'
>>
>> /Users/peter/Projects/qgis1/QGIS/external/opencl-clhpp/include/CL/cl2.hpp:1280:23:
>> note: expanded from macro 'CL_HPP_PARAM_NAME_INFO_2_0_'
>>
>> F(cl_device_info, CL_DEVICE_QUEUE_ON_DEVICE_MAX_SIZE, cl_uint) \
>>
>>   ^
>>
>> /Users/peter/Projects/qgis1/QGIS/external/opencl-clhpp/include/CL/cl2.hpp:1323:1:
>> error: use of undeclared identifier 'CL_DEVICE_MAX_ON_DEVICE_QUEUES'
>>
>> /Users/peter/Projects/qgis1/QGIS/external/opencl-clhpp/include/CL/cl2.hpp:1281:23:
>> note: expanded from macro 'CL_HPP_PARAM_NAME_INFO_2_0_'
>>
>> F(cl_device_info, CL_DEVICE_MAX_ON_DEVICE_QUEUES, cl_uint) \
>>
>>   ^
>>
>> /Users/peter/Projects/qgis1/QGIS/external/opencl-clhpp/include/CL/cl2.hpp:1323:1:
>> error: use of undeclared identifier 'CL_DEVICE_MAX_ON_DEVICE_EVENTS'
>>
>> /Users/peter/Projects/qgis1/QGIS/external/opencl-clhpp/include/CL/cl2.hpp:1282:23:
>> note: expanded from macro 'CL_HPP_PARAM_NAME_INFO_2_0_'
>>
>> F(cl_device_info, CL_DEVICE_MAX_ON_DEVICE_EVENTS, cl_uint) \
>>
>>   ^
>>
>> /Users/peter/Projects/qgis1/QGIS/external/opencl-clhpp/include/CL/cl2.hpp:1323:1:
>> error: use of undeclared identifier 'CL_DEVICE_MAX_PIPE_ARGS'
>>
>> /Users/peter/Projects/qgis1/QGIS/external/opencl-clhpp/include/CL/cl2.hpp:1283:23:
>> note: expanded from macro 'CL_HPP_PARAM_NAME_INFO_2_0_'
>>
>> F(cl_device_info, CL_DEVICE_MAX_PIPE_ARGS, cl_uint) \
>>
>>   

Re: [QGIS-Developer] unable to build MacOS master (OpenCL)

2018-12-03 Thread Alessandro Pasotti
Hi Peter,

the only change that come up to my mind is that we are now supporting also
opencl versions > 1.1,
can you please check what is the opencl version implemented on mac?

It might be necessary to add a ifdef for mac to set


#define CL_HPP_MINIMUM_OPENCL_VERSION 110
#define CL_HPP_TARGET_OPENCL_VERSION 110
#define CL_TARGET_OPENCL_VERSION 110

as it was before the changes.



On Mon, Dec 3, 2018 at 9:02 AM Peter Petrik <
peter.pet...@lutraconsulting.co.uk> wrote:

> Hi,
>
> I am unable to build QGIS master after Friday's changes in opencl header.
> Any idea if I can still use official MACOS CL headers or how to proceed?
>
> Thanks.
> Peter
>
> [ 19%] Building CXX object
> src/core/CMakeFiles/qgis_core.dir/geometry/qgsabstractgeometry.cpp.o
>
> In file included from
> /Users/peter/Projects/qgis1/QGIS/src/core/raster/qgshillshaderenderer.cpp:33:
>
> In file included from
> /Users/peter/Projects/qgis1/QGIS/src/core/qgsopenclutils.h:25:
>
> /Users/peter/Projects/qgis1/QGIS/external/opencl-clhpp/include/CL/cl2.hpp:1323:1:
> error: use of undeclared identifier 'CL_DEVICE_QUEUE_ON_HOST_PROPERTIES'
>
> CL_HPP_PARAM_NAME_INFO_2_0_(CL_HPP_DECLARE_PARAM_TRAITS_)
>
> ^
>
> /Users/peter/Projects/qgis1/QGIS/external/opencl-clhpp/include/CL/cl2.hpp:1277:23:
> note: expanded from macro 'CL_HPP_PARAM_NAME_INFO_2_0_'
>
> F(cl_device_info, CL_DEVICE_QUEUE_ON_HOST_PROPERTIES,
> cl_command_queue_properties) \
>
>   ^
>
> /Users/peter/Projects/qgis1/QGIS/external/opencl-clhpp/include/CL/cl2.hpp:1323:1:
> error: use of undeclared identifier 'CL_DEVICE_QUEUE_ON_DEVICE_PROPERTIES'
>
> /Users/peter/Projects/qgis1/QGIS/external/opencl-clhpp/include/CL/cl2.hpp:1278:23:
> note: expanded from macro 'CL_HPP_PARAM_NAME_INFO_2_0_'
>
> F(cl_device_info, CL_DEVICE_QUEUE_ON_DEVICE_PROPERTIES,
> cl_command_queue_properties) \
>
>   ^
>
> /Users/peter/Projects/qgis1/QGIS/external/opencl-clhpp/include/CL/cl2.hpp:1323:1:
> error: use of undeclared identifier
> 'CL_DEVICE_QUEUE_ON_DEVICE_PREFERRED_SIZE'
>
> /Users/peter/Projects/qgis1/QGIS/external/opencl-clhpp/include/CL/cl2.hpp:1279:23:
> note: expanded from macro 'CL_HPP_PARAM_NAME_INFO_2_0_'
>
> F(cl_device_info, CL_DEVICE_QUEUE_ON_DEVICE_PREFERRED_SIZE, cl_uint) \
>
>   ^
>
> /Users/peter/Projects/qgis1/QGIS/external/opencl-clhpp/include/CL/cl2.hpp:1323:1:
> error: use of undeclared identifier 'CL_DEVICE_QUEUE_ON_DEVICE_MAX_SIZE'
>
> /Users/peter/Projects/qgis1/QGIS/external/opencl-clhpp/include/CL/cl2.hpp:1280:23:
> note: expanded from macro 'CL_HPP_PARAM_NAME_INFO_2_0_'
>
> F(cl_device_info, CL_DEVICE_QUEUE_ON_DEVICE_MAX_SIZE, cl_uint) \
>
>   ^
>
> /Users/peter/Projects/qgis1/QGIS/external/opencl-clhpp/include/CL/cl2.hpp:1323:1:
> error: use of undeclared identifier 'CL_DEVICE_MAX_ON_DEVICE_QUEUES'
>
> /Users/peter/Projects/qgis1/QGIS/external/opencl-clhpp/include/CL/cl2.hpp:1281:23:
> note: expanded from macro 'CL_HPP_PARAM_NAME_INFO_2_0_'
>
> F(cl_device_info, CL_DEVICE_MAX_ON_DEVICE_QUEUES, cl_uint) \
>
>   ^
>
> /Users/peter/Projects/qgis1/QGIS/external/opencl-clhpp/include/CL/cl2.hpp:1323:1:
> error: use of undeclared identifier 'CL_DEVICE_MAX_ON_DEVICE_EVENTS'
>
> /Users/peter/Projects/qgis1/QGIS/external/opencl-clhpp/include/CL/cl2.hpp:1282:23:
> note: expanded from macro 'CL_HPP_PARAM_NAME_INFO_2_0_'
>
> F(cl_device_info, CL_DEVICE_MAX_ON_DEVICE_EVENTS, cl_uint) \
>
>   ^
>
> /Users/peter/Projects/qgis1/QGIS/external/opencl-clhpp/include/CL/cl2.hpp:1323:1:
> error: use of undeclared identifier 'CL_DEVICE_MAX_PIPE_ARGS'
>
> /Users/peter/Projects/qgis1/QGIS/external/opencl-clhpp/include/CL/cl2.hpp:1283:23:
> note: expanded from macro 'CL_HPP_PARAM_NAME_INFO_2_0_'
>
> F(cl_device_info, CL_DEVICE_MAX_PIPE_ARGS, cl_uint) \
>
>   ^
>
> /Users/peter/Projects/qgis1/QGIS/external/opencl-clhpp/include/CL/cl2.hpp:1323:1:
> error: use of undeclared identifier 'CL_DEVICE_PIPE_MAX_ACTIVE_RESERVATIONS'
>
> /Users/peter/Projects/qgis1/QGIS/external/opencl-clhpp/include/CL/cl2.hpp:1284:23:
> note: expanded from macro 'CL_HPP_PARAM_NAME_INFO_2_0_'
>
> F(cl_device_info, CL_DEVICE_PIPE_MAX_ACTIVE_RESERVATIONS, cl_uint) \
>
>   ^
>
> /Users/peter/Projects/qgis1/QGIS/external/opencl-clhpp/include/CL/cl2.hpp:1323:1:
> error: use of undeclared identifier 'CL_DEVICE_PIPE_MAX_PACKET_SIZE'
>
> /Users/peter/Projects/qgis1/QGIS/external/opencl-clhpp/include/CL/cl2.hpp:1285:23:
> note: expanded from macro 'CL_HPP_PARAM_NAME_INFO_2_0_'
>
> F(cl_device_info, CL_DEVICE_PIPE_MAX_PACKET_SIZE, cl_uint) \
>
>   ^
>
> /Users/peter/Projects/qgis1/QGIS/external/opencl-clhpp/include/CL/cl2.hpp:1323:1:
> error: use of undeclared identifier 'CL_DEVICE_SVM_CAPABILITIES'
>
> /Users/peter/Projects/qgis1/QGIS/external/opencl-clhpp/include/CL/cl2.hpp:1286:23:
> note: expanded from macro 

[QGIS-Developer] unable to build MacOS master (OpenCL)

2018-12-03 Thread Peter Petrik
Hi,

I am unable to build QGIS master after Friday's changes in opencl header.
Any idea if I can still use official MACOS CL headers or how to proceed?

Thanks.
Peter

[ 19%] Building CXX object
src/core/CMakeFiles/qgis_core.dir/geometry/qgsabstractgeometry.cpp.o

In file included from
/Users/peter/Projects/qgis1/QGIS/src/core/raster/qgshillshaderenderer.cpp:33:

In file included from
/Users/peter/Projects/qgis1/QGIS/src/core/qgsopenclutils.h:25:

/Users/peter/Projects/qgis1/QGIS/external/opencl-clhpp/include/CL/cl2.hpp:1323:1:
error: use of undeclared identifier 'CL_DEVICE_QUEUE_ON_HOST_PROPERTIES'

CL_HPP_PARAM_NAME_INFO_2_0_(CL_HPP_DECLARE_PARAM_TRAITS_)

^

/Users/peter/Projects/qgis1/QGIS/external/opencl-clhpp/include/CL/cl2.hpp:1277:23:
note: expanded from macro 'CL_HPP_PARAM_NAME_INFO_2_0_'

F(cl_device_info, CL_DEVICE_QUEUE_ON_HOST_PROPERTIES,
cl_command_queue_properties) \

  ^

/Users/peter/Projects/qgis1/QGIS/external/opencl-clhpp/include/CL/cl2.hpp:1323:1:
error: use of undeclared identifier 'CL_DEVICE_QUEUE_ON_DEVICE_PROPERTIES'

/Users/peter/Projects/qgis1/QGIS/external/opencl-clhpp/include/CL/cl2.hpp:1278:23:
note: expanded from macro 'CL_HPP_PARAM_NAME_INFO_2_0_'

F(cl_device_info, CL_DEVICE_QUEUE_ON_DEVICE_PROPERTIES,
cl_command_queue_properties) \

  ^

/Users/peter/Projects/qgis1/QGIS/external/opencl-clhpp/include/CL/cl2.hpp:1323:1:
error: use of undeclared identifier
'CL_DEVICE_QUEUE_ON_DEVICE_PREFERRED_SIZE'

/Users/peter/Projects/qgis1/QGIS/external/opencl-clhpp/include/CL/cl2.hpp:1279:23:
note: expanded from macro 'CL_HPP_PARAM_NAME_INFO_2_0_'

F(cl_device_info, CL_DEVICE_QUEUE_ON_DEVICE_PREFERRED_SIZE, cl_uint) \

  ^

/Users/peter/Projects/qgis1/QGIS/external/opencl-clhpp/include/CL/cl2.hpp:1323:1:
error: use of undeclared identifier 'CL_DEVICE_QUEUE_ON_DEVICE_MAX_SIZE'

/Users/peter/Projects/qgis1/QGIS/external/opencl-clhpp/include/CL/cl2.hpp:1280:23:
note: expanded from macro 'CL_HPP_PARAM_NAME_INFO_2_0_'

F(cl_device_info, CL_DEVICE_QUEUE_ON_DEVICE_MAX_SIZE, cl_uint) \

  ^

/Users/peter/Projects/qgis1/QGIS/external/opencl-clhpp/include/CL/cl2.hpp:1323:1:
error: use of undeclared identifier 'CL_DEVICE_MAX_ON_DEVICE_QUEUES'

/Users/peter/Projects/qgis1/QGIS/external/opencl-clhpp/include/CL/cl2.hpp:1281:23:
note: expanded from macro 'CL_HPP_PARAM_NAME_INFO_2_0_'

F(cl_device_info, CL_DEVICE_MAX_ON_DEVICE_QUEUES, cl_uint) \

  ^

/Users/peter/Projects/qgis1/QGIS/external/opencl-clhpp/include/CL/cl2.hpp:1323:1:
error: use of undeclared identifier 'CL_DEVICE_MAX_ON_DEVICE_EVENTS'

/Users/peter/Projects/qgis1/QGIS/external/opencl-clhpp/include/CL/cl2.hpp:1282:23:
note: expanded from macro 'CL_HPP_PARAM_NAME_INFO_2_0_'

F(cl_device_info, CL_DEVICE_MAX_ON_DEVICE_EVENTS, cl_uint) \

  ^

/Users/peter/Projects/qgis1/QGIS/external/opencl-clhpp/include/CL/cl2.hpp:1323:1:
error: use of undeclared identifier 'CL_DEVICE_MAX_PIPE_ARGS'

/Users/peter/Projects/qgis1/QGIS/external/opencl-clhpp/include/CL/cl2.hpp:1283:23:
note: expanded from macro 'CL_HPP_PARAM_NAME_INFO_2_0_'

F(cl_device_info, CL_DEVICE_MAX_PIPE_ARGS, cl_uint) \

  ^

/Users/peter/Projects/qgis1/QGIS/external/opencl-clhpp/include/CL/cl2.hpp:1323:1:
error: use of undeclared identifier 'CL_DEVICE_PIPE_MAX_ACTIVE_RESERVATIONS'

/Users/peter/Projects/qgis1/QGIS/external/opencl-clhpp/include/CL/cl2.hpp:1284:23:
note: expanded from macro 'CL_HPP_PARAM_NAME_INFO_2_0_'

F(cl_device_info, CL_DEVICE_PIPE_MAX_ACTIVE_RESERVATIONS, cl_uint) \

  ^

/Users/peter/Projects/qgis1/QGIS/external/opencl-clhpp/include/CL/cl2.hpp:1323:1:
error: use of undeclared identifier 'CL_DEVICE_PIPE_MAX_PACKET_SIZE'

/Users/peter/Projects/qgis1/QGIS/external/opencl-clhpp/include/CL/cl2.hpp:1285:23:
note: expanded from macro 'CL_HPP_PARAM_NAME_INFO_2_0_'

F(cl_device_info, CL_DEVICE_PIPE_MAX_PACKET_SIZE, cl_uint) \

  ^

/Users/peter/Projects/qgis1/QGIS/external/opencl-clhpp/include/CL/cl2.hpp:1323:1:
error: use of undeclared identifier 'CL_DEVICE_SVM_CAPABILITIES'

/Users/peter/Projects/qgis1/QGIS/external/opencl-clhpp/include/CL/cl2.hpp:1286:23:
note: expanded from macro 'CL_HPP_PARAM_NAME_INFO_2_0_'

F(cl_device_info, CL_DEVICE_SVM_CAPABILITIES,
cl_device_svm_capabilities) \

  ^

/Users/peter/Projects/qgis1/QGIS/external/opencl-clhpp/include/CL/cl2.hpp:1323:1:
error: use of undeclared identifier
'CL_DEVICE_PREFERRED_PLATFORM_ATOMIC_ALIGNMENT'

/Users/peter/Projects/qgis1/QGIS/external/opencl-clhpp/include/CL/cl2.hpp:1287:23:
note: expanded from macro 'CL_HPP_PARAM_NAME_INFO_2_0_'

F(cl_device_info, CL_DEVICE_PREFERRED_PLATFORM_ATOMIC_ALIGNMENT,
cl_uint) \

  ^

/Users/peter/Projects/qgis1/QGIS/external/opencl-clhpp/include/CL/cl2.hpp:1323:1:
error: use of undeclared identifier