From 2aa7b06b2e959d3882b017dcd5124ddd38dc2245 Mon Sep 17 00:00:00 2001 From: Yanzhan Yang Date: Fri, 1 Nov 2019 19:13:04 +0800 Subject: [PATCH] checkout specific commit for opencl headers (#2341) * delete remaining opencl headers test=develop * checkout specific commit for opencl headers test=develop --- .../opencl/OpenCL-Headers/CL/cl_version.h | 86 ------------------- .../third_party/opencl/OpenCL-Headers/LICENSE | 25 ------ .../opencl/OpenCL-Headers/README.md | 50 ----------- mobile/tools/build.sh | 3 + 4 files changed, 3 insertions(+), 161 deletions(-) delete mode 100644 mobile/third_party/opencl/OpenCL-Headers/CL/cl_version.h delete mode 100644 mobile/third_party/opencl/OpenCL-Headers/LICENSE delete mode 100644 mobile/third_party/opencl/OpenCL-Headers/README.md diff --git a/mobile/third_party/opencl/OpenCL-Headers/CL/cl_version.h b/mobile/third_party/opencl/OpenCL-Headers/CL/cl_version.h deleted file mode 100644 index bb766cb9bb..0000000000 --- a/mobile/third_party/opencl/OpenCL-Headers/CL/cl_version.h +++ /dev/null @@ -1,86 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2018 The Khronos Group Inc. - * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and/or associated documentation files (the - * "Materials"), to deal in the Materials without restriction, including - * without limitation the rights to use, copy, modify, merge, publish, - * distribute, sublicense, and/or sell copies of the Materials, and to - * permit persons to whom the Materials are furnished to do so, subject to - * the following conditions: - * - * The above copyright notice and this permission notice shall be included - * in all copies or substantial portions of the Materials. - * - * MODIFICATIONS TO THIS FILE MAY MEAN IT NO LONGER ACCURATELY REFLECTS - * KHRONOS STANDARDS. THE UNMODIFIED, NORMATIVE VERSIONS OF KHRONOS - * SPECIFICATIONS AND HEADER INFORMATION ARE LOCATED AT - * https://www.khronos.org/registry/ - * - * THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, - * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF - * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. - * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY - * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, - * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE - * MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS. - ******************************************************************************/ - -#ifndef __CL_VERSION_H -#define __CL_VERSION_H - -/* Detect which version to target */ -#if !defined(CL_TARGET_OPENCL_VERSION) -#pragma message("cl_version.h: CL_TARGET_OPENCL_VERSION is not defined. Defaulting to 220 (OpenCL 2.2)") -#define CL_TARGET_OPENCL_VERSION 220 -#endif -#if CL_TARGET_OPENCL_VERSION != 100 && \ - CL_TARGET_OPENCL_VERSION != 110 && \ - CL_TARGET_OPENCL_VERSION != 120 && \ - CL_TARGET_OPENCL_VERSION != 200 && \ - CL_TARGET_OPENCL_VERSION != 210 && \ - CL_TARGET_OPENCL_VERSION != 220 -#pragma message("cl_version: CL_TARGET_OPENCL_VERSION is not a valid value (100, 110, 120, 200, 210, 220). Defaulting to 220 (OpenCL 2.2)") -#undef CL_TARGET_OPENCL_VERSION -#define CL_TARGET_OPENCL_VERSION 220 -#endif - - -/* OpenCL Version */ -#if CL_TARGET_OPENCL_VERSION >= 220 && !defined(CL_VERSION_2_2) -#define CL_VERSION_2_2 1 -#endif -#if CL_TARGET_OPENCL_VERSION >= 210 && !defined(CL_VERSION_2_1) -#define CL_VERSION_2_1 1 -#endif -#if CL_TARGET_OPENCL_VERSION >= 200 && !defined(CL_VERSION_2_0) -#define CL_VERSION_2_0 1 -#endif -#if CL_TARGET_OPENCL_VERSION >= 120 && !defined(CL_VERSION_1_2) -#define CL_VERSION_1_2 1 -#endif -#if CL_TARGET_OPENCL_VERSION >= 110 && !defined(CL_VERSION_1_1) -#define CL_VERSION_1_1 1 -#endif -#if CL_TARGET_OPENCL_VERSION >= 100 && !defined(CL_VERSION_1_0) -#define CL_VERSION_1_0 1 -#endif - -/* Allow deprecated APIs for older OpenCL versions. */ -#if CL_TARGET_OPENCL_VERSION <= 210 && !defined(CL_USE_DEPRECATED_OPENCL_2_1_APIS) -#define CL_USE_DEPRECATED_OPENCL_2_1_APIS -#endif -#if CL_TARGET_OPENCL_VERSION <= 200 && !defined(CL_USE_DEPRECATED_OPENCL_2_0_APIS) -#define CL_USE_DEPRECATED_OPENCL_2_0_APIS -#endif -#if CL_TARGET_OPENCL_VERSION <= 120 && !defined(CL_USE_DEPRECATED_OPENCL_1_2_APIS) -#define CL_USE_DEPRECATED_OPENCL_1_2_APIS -#endif -#if CL_TARGET_OPENCL_VERSION <= 110 && !defined(CL_USE_DEPRECATED_OPENCL_1_1_APIS) -#define CL_USE_DEPRECATED_OPENCL_1_1_APIS -#endif -#if CL_TARGET_OPENCL_VERSION <= 100 && !defined(CL_USE_DEPRECATED_OPENCL_1_0_APIS) -#define CL_USE_DEPRECATED_OPENCL_1_0_APIS -#endif - -#endif /* __CL_VERSION_H */ diff --git a/mobile/third_party/opencl/OpenCL-Headers/LICENSE b/mobile/third_party/opencl/OpenCL-Headers/LICENSE deleted file mode 100644 index 020ce65fca..0000000000 --- a/mobile/third_party/opencl/OpenCL-Headers/LICENSE +++ /dev/null @@ -1,25 +0,0 @@ -Copyright (c) 2008-2015 The Khronos Group Inc. - -Permission is hereby granted, free of charge, to any person obtaining a -copy of this software and/or associated documentation files (the -"Materials"), to deal in the Materials without restriction, including -without limitation the rights to use, copy, modify, merge, publish, -distribute, sublicense, and/or sell copies of the Materials, and to -permit persons to whom the Materials are furnished to do so, subject to -the following conditions: - -The above copyright notice and this permission notice shall be included -in all copies or substantial portions of the Materials. - -MODIFICATIONS TO THIS FILE MAY MEAN IT NO LONGER ACCURATELY REFLECTS -KHRONOS STANDARDS. THE UNMODIFIED, NORMATIVE VERSIONS OF KHRONOS -SPECIFICATIONS AND HEADER INFORMATION ARE LOCATED AT - https://www.khronos.org/registry/ - -THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. -IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY -CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, -TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE -MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS. diff --git a/mobile/third_party/opencl/OpenCL-Headers/README.md b/mobile/third_party/opencl/OpenCL-Headers/README.md deleted file mode 100644 index 757e56e152..0000000000 --- a/mobile/third_party/opencl/OpenCL-Headers/README.md +++ /dev/null @@ -1,50 +0,0 @@ -# OpenCLTM API Headers - -This repository contains C language headers for the OpenCL API. - -The authoritative public repository for these headers is located at: - -https://github.com/KhronosGroup/OpenCL-Headers - -Issues, proposed fixes for issues, and other suggested changes should be -created using Github. - -## Branch Structure - -The OpenCL API headers in this repository are Unified headers and are designed -to work with all released OpenCL versions. This differs from previous OpenCL -API headers, where version-specific API headers either existed in separate -branches, or in separate folders in a branch. - -## Compiling for a Specific OpenCL Version - -By default, the OpenCL API headers in this repository are for the latest -OpenCL version (currently OpenCL 2.2). To use these API headers to target -a different OpenCL version, an application may `#define` the preprocessor -value `CL_TARGET_OPENCL_VERSION` before including the OpenCL API headers. -The `CL_TARGET_OPENCL_VERSION` is a three digit decimal value representing -the OpenCL API version. - -For example, to enforce usage of no more than the OpenCL 1.2 APIs, you may -include the OpenCL API headers as follows: - -``` -#define CL_TARGET_OPENCL_VERSION 120 -#include -``` - -## Directory Structure - -``` -README.md This file -LICENSE Source license for the OpenCL API headers -CL/ Unified OpenCL API headers tree -``` - -## License - -See [LICENSE](LICENSE). - ---- - -OpenCL and the OpenCL logo are trademarks of Apple Inc. used by permission by Khronos. diff --git a/mobile/tools/build.sh b/mobile/tools/build.sh index 1c6140129e..741e6a590e 100755 --- a/mobile/tools/build.sh +++ b/mobile/tools/build.sh @@ -14,16 +14,19 @@ cd - # get cl headers opencl_header_dir="../third_party/opencl/OpenCL-Headers" +commit_id="320d7189b3e0e7b6a8fc5c10334c79ef364b5ef6" if [[ -d "$opencl_header_dir" && -d "$opencl_header_dir/.git" ]]; then echo "pulling opencl headers" cd $opencl_header_dir git stash git pull + git checkout $commit_id cd - else echo "cloning opencl headers" rm -rf $opencl_header_dir git clone https://github.com/KhronosGroup/OpenCL-Headers $opencl_header_dir + git checkout $commit_id fi build_for_mac() { -- GitLab