P4 to Git Change 1410993 by lmoriche@lmoriche_opencl_dev2 on 2017/05/17 22:25:50

SWDEV-102733 - [OCL-LC-ROCm] Cmake build Write CMakeLists.txt to enable building with and without the DK environment
	- Make it possible to use cl2.hpp

Affected files ...

... //depot/stg/opencl/drivers/opencl/api/opencl/khronos/headers/opencl2.0/CL/cl2.hpp#2 edit
... //depot/stg/opencl/drivers/opencl/tools/clinfo/clinfo.cpp#3 edit


[ROCm/clr commit: 842f311464]
This commit is contained in:
foreman
2017-05-17 22:31:48 -04:00
parent fceec81e95
commit 6b2cb94b84
2 changed files with 15 additions and 4 deletions
+11 -3
View File
@@ -100,15 +100,23 @@ jurisdiction and venue of these courts.
#include <errno.h>
#endif
#define __CL_ENABLE_EXCEPTIONS
#define __MAX_DEFAULT_VECTOR_SIZE 50
#ifdef _MSC_VER
#pragma warning(disable: 4290)
#endif
#if defined(HAVE_CL2_HPP)
#define CL_HPP_ENABLE_EXCEPTIONS
#define CL_HPP_MINIMUM_OPENCL_VERSION 120
#define CL_HPP_TARGET_OPENCL_VERSION 200
#define CL_HPP_ENABLE_PROGRAM_CONSTRUCTION_FROM_ARRAY_COMPATIBILITY
#include "CL/cl2.hpp"
#else // !HAVE_CL2_HPP
#define __CL_ENABLE_EXCEPTIONS
#define __MAX_DEFAULT_VECTOR_SIZE 50
#define CL_USE_DEPRECATED_OPENCL_1_1_APIS
#define CL_USE_DEPRECATED_OPENCL_2_0_APIS
#include "cl.hpp"
#endif // !HAVE_CL2_HPP
bool verbose = false;