From 34460642a50a6f6fbc471e0a84e9ed21e8b2e73a Mon Sep 17 00:00:00 2001 From: Fazzie <1240419984@qq.com> Date: Tue, 20 Jul 2021 16:29:57 +0800 Subject: [PATCH] dlete vulkan --- Third_Party_Open_Source_Software_Notice | 219 ------------------ cmake/external_libs/vulkan.cmake | 41 ---- mindspore/lite/CMakeLists.txt | 12 +- mindspore/lite/src/CMakeLists.txt | 11 - mindspore/lite/src/lite_session.cc | 17 -- mindspore/lite/src/lite_session.h | 4 - .../lite/src/runtime/gpu/cuda/cuda_device.h | 1 - mindspore/lite/src/runtime/gpu/gpu_runtime.h | 2 +- mindspore/lite/src/scheduler.cc | 3 - mindspore/lite/test/CMakeLists.txt | 20 -- 10 files changed, 3 insertions(+), 327 deletions(-) delete mode 100644 cmake/external_libs/vulkan.cmake diff --git a/Third_Party_Open_Source_Software_Notice b/Third_Party_Open_Source_Software_Notice index a38f22e9076..bfdb6645f0f 100644 --- a/Third_Party_Open_Source_Software_Notice +++ b/Third_Party_Open_Source_Software_Notice @@ -6181,225 +6181,6 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -Software: Vulkan-Headers v1.2.144 -Copyright notice: -Copyright (c) 2018 Valve Corporation -Copyright (c) 2018 LunarG, Inc. -Copyright (c) 2015-2016 The Khronos Group Inc. -Copyright (c) 2015-2016 Valve Corporation -Copyright (c) 2015-2016 LunarG, Inc. -Copyright (c) 2015-2017 The Khronos Group Inc. -Copyright (c) 2015-2017 Valve Corporation -Copyright (c) 2015-2017 LunarG, Inc. -Copyright (c) 2014-2020 The Khronos Group Inc. -Copyright (c) 2015-2020 The Khronos Group Inc. -Copyright (c) 2013-2020 The Khronos Group Inc. -Copyright 2013-2020 The Khronos Group Inc. -Copyright (c) 2018-2019 Collabora, Ltd. -Copyright 2000-2018 Kitware, Inc. and Contributors - - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - -TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - -1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - -2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - -3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - -4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - -5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - -6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - -7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - -8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - -9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - -END OF TERMS AND CONDITIONS - -APPENDIX: How to apply the Apache License to your work. - - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "[]" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. - -Copyright [yyyy] [name of copyright owner] - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. - Software: OpenCL-Headers v2020.12.18 Copyright notice: Copyright (c) 2008-2020 The Khronos Group Inc. diff --git a/cmake/external_libs/vulkan.cmake b/cmake/external_libs/vulkan.cmake deleted file mode 100644 index a37d44d8587..00000000000 --- a/cmake/external_libs/vulkan.cmake +++ /dev/null @@ -1,41 +0,0 @@ -if(ENABLE_GITEE) - set(REQ_URL "https://gitee.com/mirrors/Vulkan-Headers/archive/v1.2.144.zip") - set(MD5 "8797a525aff953ea536ebe338a9f5ef6") - set(PKG_GIT_TAG "") - __download_pkg_with_git(Vulkan-Headers ${REQ_URL} ${PKG_GIT_TAG} ${MD5}) -else() - set(REQ_URL "https://github.com/KhronosGroup/Vulkan-Headers/archive/v1.2.144.zip") - set(MD5 "c6e4a281e0b7be3fe2a433c73a9b778b") - __download_pkg(Vulkan-Headers ${REQ_URL} ${MD5}) -endif() - -function(gene_spirv BASEPATH) - string(CONCAT CL_SRC_DIR "${BASEPATH}" "/src/runtime/kernel/vulkan/glsl") - message(STATUS "**********gene spirv*********base path: " "${BASEPATH}" ", glsl path: " "${CL_SRC_DIR}") - if(NOT EXISTS ${CL_SRC_DIR}) - return() - endif() - file(GLOB_RECURSE CL_LIST ${CL_SRC_DIR}/*.cl) - foreach(file_path ${CL_LIST}) - file(REMOVE ${file_path}.inc) - string(REGEX REPLACE ".+/(.+)\\..*" "\\1" kernel_name "${file_path}") - set(inc_file_ex "${kernel_name}.cl.inc") - execute_process( - COMMAND bash -c "sed 's/\\\\/\\\\\\\\/g' " - COMMAND bash -c "sed 's/\\\"/\\\\\\\"/g' " - COMMAND bash -c "sed 's/$/\\\\n\\\" \\\\/' " - COMMAND bash -c "sed 's/^/\\\"/' " - WORKING_DIRECTORY ${CL_SRC_DIR} - INPUT_FILE ${file_path} - OUTPUT_FILE ${inc_file_ex} - RESULT_VARIABLE RESULT) - if(NOT RESULT EQUAL "0") - message(FATAL_ERROR "error! when generate ${inc_file_ex}") - endif() - __exec_cmd(COMMAND sed -i - "1i\\static const char *${kernel_name}_source =\\\"\\\\n\\\" \\\\" - ${inc_file_ex} WORKING_DIRECTORY ${CL_SRC_DIR} - ) - __exec_cmd(COMMAND sed -i "$a\\\\\;" ${inc_file_ex} WORKING_DIRECTORY ${CL_SRC_DIR}) - endforeach() -endfunction() diff --git a/mindspore/lite/CMakeLists.txt b/mindspore/lite/CMakeLists.txt index 5b24be5ad87..d107f8dd4bd 100644 --- a/mindspore/lite/CMakeLists.txt +++ b/mindspore/lite/CMakeLists.txt @@ -20,7 +20,7 @@ endif() # Options that can be configured through environment variables or manually set(MSLITE_GPU_BACKEND "" CACHE STRING "enable gpu backend, \ - only arm64 support opencl, only x86_64 support tensorrt, opencl/vulkan/cuda/tensorrt/off") + only arm64 support opencl, only x86_64 support tensorrt, opencl/cuda/tensorrt/off") option(MSLITE_ENABLE_NPU "enable npu, only arm64 or arm32 support" off) option(MSLITE_ENABLE_TRAIN "enable train" on) option(MSLITE_ENABLE_SSE "enable SSE instruction set, only x86_64 support" off) @@ -217,9 +217,6 @@ endif() if(MSLITE_GPU_BACKEND STREQUAL opencl) include(${TOP_DIR}/cmake/external_libs/opencl.cmake) endif() -if(MSLITE_GPU_BACKEND STREQUAL vulkan) - include(${TOP_DIR}/cmake/external_libs/vulkan.cmake) -endif() if(MSLITE_ENABLE_CONVERTER OR BUILD_MINDDATA STREQUAL "full" OR BUILD_MINDDATA STREQUAL "wrapper" OR MSLITE_ENABLE_TOOLS) @@ -281,12 +278,7 @@ if(MSLITE_GPU_BACKEND STREQUAL opencl) include_directories(${CMAKE_BINARY_DIR}/_deps/opencl-headers-src/) include_directories(${CMAKE_BINARY_DIR}/_deps/opencl-clhpp-src/include) endif() -if(MSLITE_GPU_BACKEND STREQUAL vulkan) - add_definitions(-DGPU_VULKAN) - add_definitions(-DVK_NO_PROTOTYPES) - add_compile_definitions(SUPPORT_GPU) - include_directories(${CMAKE_CURRENT_SOURCE_DIR}/build/_deps/vulkan-headers-src/include) -endif() + if(MSLITE_GPU_BACKEND STREQUAL cuda) add_definitions(-DGPU_CUDA) add_compile_definitions(SUPPORT_GPU) diff --git a/mindspore/lite/src/CMakeLists.txt b/mindspore/lite/src/CMakeLists.txt index b5c74428f95..ddd59c302d4 100644 --- a/mindspore/lite/src/CMakeLists.txt +++ b/mindspore/lite/src/CMakeLists.txt @@ -109,17 +109,6 @@ if(MSLITE_GPU_BACKEND STREQUAL opencl) ) endif() -if(MSLITE_GPU_BACKEND STREQUAL vulkan) - file(GLOB VULKAN_RUNTIME_SRC - ${CMAKE_CURRENT_SOURCE_DIR}/runtime/gpu/*.cc - ${CMAKE_CURRENT_SOURCE_DIR}/runtime/gpu/vulkan/*.cc - ) - set(LITE_SRC - ${LITE_SRC} - ${VULKAN_RUNTIME_SRC} - ) -endif() - if(MSLITE_GPU_BACKEND STREQUAL cuda) file(GLOB CUDA_RUNTIME_SRC ${CMAKE_CURRENT_SOURCE_DIR}/runtime/gpu/*.cc diff --git a/mindspore/lite/src/lite_session.cc b/mindspore/lite/src/lite_session.cc index f52f040ea57..4e117d1d253 100644 --- a/mindspore/lite/src/lite_session.cc +++ b/mindspore/lite/src/lite_session.cc @@ -926,23 +926,6 @@ int LiteSession::InitGPURuntime() { MS_LOG(WARNING) << "GPU do not support shared memory!"; } } -#elif GPU_VULKAN - if (this->context_->IsGpuEnabled()) { - auto gpu_device_info = this->context_->GetGpuInfo(); - vk_runtime_wrap_ = new (std::nothrow) gpu::GpuRuntimeWrapper; - if (vk_runtime_wrap_ == nullptr) { - MS_LOG(ERROR) << "create vk_runtime failed"; - return RET_ERROR; - } - auto vk_runtime = vk_runtime_wrap_->GetInstance(); - vk_runtime->SetFp16Enable(gpu_device_info.enable_float16_); - if (vk_runtime->Init() != RET_OK) { - this->context_->device_list_ = {{DT_CPU, {gpu_device_info.enable_float16_, MID_CPU}}}; - MS_LOG(WARNING) << "Init Vulkan runtime failed, change to CPU mode."; - } else { - MS_LOG(INFO) << "Init Vulkan runtime success."; - } - } #endif // Setting the binding core will affect the opencl drive scheduling. thread_pool->SetProcessAffinity(static_cast(NO_BIND)); diff --git a/mindspore/lite/src/lite_session.h b/mindspore/lite/src/lite_session.h index 8d84df1b62f..63f93b58a15 100644 --- a/mindspore/lite/src/lite_session.h +++ b/mindspore/lite/src/lite_session.h @@ -34,8 +34,6 @@ #include "include/api/delegate.h" #if GPU_OPENCL #include "src/runtime/gpu/opencl/opencl_runtime.h" -#elif GPU_VULKAN -#include "src/runtime/gpu/vulkan/vulkan_runtime.h" #endif #include "src/scheduler_cb.h" @@ -148,8 +146,6 @@ class LiteSession : public session::LiteSession { friend class TransferSession; #if GPU_OPENCL opencl::OpenCLRuntimeWrapper *opencl_runtime_wrapper_{nullptr}; -#elif GPU_VULKAN - gpu::GpuRuntimeWrapper *vk_runtime_wrap_{nullptr}; #endif std::unique_ptr sched_cb_; std::shared_ptr delegate_ = nullptr; diff --git a/mindspore/lite/src/runtime/gpu/cuda/cuda_device.h b/mindspore/lite/src/runtime/gpu/cuda/cuda_device.h index be7236504dc..4c3d1d13979 100644 --- a/mindspore/lite/src/runtime/gpu/cuda/cuda_device.h +++ b/mindspore/lite/src/runtime/gpu/cuda/cuda_device.h @@ -16,7 +16,6 @@ #ifndef MINDSPORE_LITE_SRC_CUDA_DEVICE_H_ #define MINDSPORE_LITE_SRC_CUDA_DEVICE_H_ -#include #include #include #include diff --git a/mindspore/lite/src/runtime/gpu/gpu_runtime.h b/mindspore/lite/src/runtime/gpu/gpu_runtime.h index 039ced6f872..cbb85fa4702 100644 --- a/mindspore/lite/src/runtime/gpu/gpu_runtime.h +++ b/mindspore/lite/src/runtime/gpu/gpu_runtime.h @@ -45,7 +45,7 @@ struct GpuInfo { bool support_fp16{false}; bool support_svm{false}; }; -enum class GpuBackendType { OPENCL = 0, CUDA = 1, VULKAN = 2 }; +enum class GpuBackendType { OPENCL = 0, CUDA = 1 }; class DevKey { public: std::string name{""}; diff --git a/mindspore/lite/src/scheduler.cc b/mindspore/lite/src/scheduler.cc index 0152b3cef44..a993db27b3b 100644 --- a/mindspore/lite/src/scheduler.cc +++ b/mindspore/lite/src/scheduler.cc @@ -874,9 +874,6 @@ kernel::SubGraphKernel *CreateSubGraphKernel(const std::vector