-
-
Notifications
You must be signed in to change notification settings - Fork 13
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
1 parent
b98fdb0
commit 5696ddb
Showing
6 changed files
with
103 additions
and
35 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,12 +1,69 @@ | ||
| diff --git a/thirdparty/CMakeLists.txt b/thirdparty/CMakeLists.txt | ||
| index edbcb824f4..b21569956d 100644 | ||
| index 95d80a6fbd..5c827d7da2 100644 | ||
| --- a/thirdparty/CMakeLists.txt | ||
| +++ b/thirdparty/CMakeLists.txt | ||
| @@ -44,6 +44,7 @@ if(ENABLE_INTEL_GPU) | ||
| find_package(OpenCLHeaders QUIET) | ||
| if(NOT OpenCLHeaders_FOUND) | ||
| message(WARNING "OpenCLHeaders not found, but OpenCLICDLoader is installed. Please, install OpenCL headers") | ||
| + find_package(OpenCL QUIET) | ||
| else() | ||
| set_target_properties(OpenCL::Headers PROPERTIES IMPORTED_GLOBAL ON) | ||
| endif() | ||
| @@ -58,44 +58,7 @@ endif() | ||
|
|
||
| if(ENABLE_INTEL_GPU) | ||
| if(ENABLE_SYSTEM_OPENCL) | ||
| - # try to find system OpenCL: | ||
| - # - 'brew install opencl-icd-loader' | ||
| - # - 'conan install opencl-icd-loader' | ||
| - find_package(OpenCLICDLoader QUIET) | ||
| - | ||
| - if(OpenCLICDLoader_FOUND) | ||
| - # examples: | ||
| - # - 'brew install opencl-headers' | ||
| - # - 'conan install opencl-headers' | ||
| - find_package(OpenCLHeaders QUIET) | ||
| - if(NOT OpenCLHeaders_FOUND) | ||
| - message(WARNING "OpenCLHeaders not found, but OpenCLICDLoader is installed. Please, install OpenCL headers") | ||
| - else() | ||
| - set_target_properties(OpenCL::Headers PROPERTIES IMPORTED_GLOBAL ON) | ||
| - set_property(TARGET OpenCL::OpenCL APPEND PROPERTY INTERFACE_LINK_LIBRARIES OpenCL::Headers) | ||
| - endif() | ||
| - | ||
| - # examples: | ||
| - # - 'brew install opencl-clhpp-headers' | ||
| - # - 'conan install opencl-clhpp-headers' | ||
| - find_package(OpenCLHeadersCpp QUIET) | ||
| - if(NOT OpenCLHeadersCpp_FOUND) | ||
| - message(WARNING "OpenCLHeadersCpp not found, but OpenCLICDLoader is installed. Please, install OpenCL C++ headers") | ||
| - else() | ||
| - set_target_properties(OpenCL::HeadersCpp PROPERTIES IMPORTED_GLOBAL ON) | ||
| - get_target_property(opencl_cpp_include_dirs OpenCL::HeadersCpp INTERFACE_INCLUDE_DIRECTORIES) | ||
| - set_property(TARGET OpenCL::OpenCL APPEND PROPERTY INTERFACE_LINK_LIBRARIES OpenCL::HeadersCpp) | ||
| - endif() | ||
| - | ||
| - # set OpenCLICDLoader_FOUND to parent scope to generate proper OpenVINOConfig.cmake for static libraries case | ||
| - set(OpenCLICDLoader_FOUND ON PARENT_SCOPE) | ||
| - else() | ||
| - # try to find system OpenCL: | ||
| - # - 'apt-get install opencl-headers ocl-icd-opencl-dev' | ||
| - # - 'yum install ocl-icd-devel opencl-headers' | ||
| - # - 'conda install khronos-opencl-icd-loader -c conda-forge' | ||
| - find_package(OpenCL QUIET) | ||
| - endif() | ||
| + find_package(OpenCL QUIET) | ||
| endif() | ||
|
|
||
| if(TARGET OpenCL::OpenCL) | ||
| @@ -120,18 +83,6 @@ if(ENABLE_INTEL_GPU) | ||
| set_target_properties(OpenCL::OpenCL PROPERTIES | ||
| INTERFACE_COMPILE_DEFINITIONS "${opencl_interface_definitions}") | ||
| endif() | ||
| - | ||
| - # set variables for onednn_gpu | ||
| - if(OpenCLHeaders_FOUND) | ||
| - set(OpenCL_INCLUDE_DIR "$<TARGET_PROPERTY:OpenCL::Headers,INTERFACE_INCLUDE_DIRECTORIES>" PARENT_SCOPE) | ||
| - set(OpenCL_LIBRARY "$<TARGET_PROPERTY:OpenCL::OpenCL,IMPORTED_LOCATION_RELEASE>" PARENT_SCOPE) | ||
| - elseif(OpenCL_FOUND) | ||
| - # find_package(OpenCL) already defines OpenCL_INCLUDE_DIR and OpenCL_LIBRARY | ||
| - # see https://cmake.org/cmake/help/latest/module/FindOpenCL.html | ||
| - message(STATUS "Found OpenCL (ver. ${OpenCL_VERSION_STRING}, include dirs ${OpenCL_INCLUDE_DIRS})") | ||
| - else() | ||
| - message(FATAL_ERROR "Internal error: cannot find OpenCL headers") | ||
| - endif() | ||
| else() | ||
| add_subdirectory(ocl) | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,13 @@ | ||
| diff --git a/cmake/templates/OpenVINOConfig.cmake.in b/cmake/templates/OpenVINOConfig.cmake.in | ||
| index 986232d414..e6786f5a9d 100644 | ||
| --- a/cmake/templates/OpenVINOConfig.cmake.in | ||
| +++ b/cmake/templates/OpenVINOConfig.cmake.in | ||
| @@ -409,7 +409,7 @@ function(_ov_target_no_deprecation_error) | ||
| else() | ||
| set(flags "-Wno-error=deprecated-declarations") | ||
| endif() | ||
| - if(CMAKE_CROSSCOMPILING) | ||
| + if(CMAKE_CROSSCOMPILING AND NOT APPLE) | ||
| set_target_properties(${ARGV} PROPERTIES | ||
| INTERFACE_LINK_OPTIONS "-Wl,--allow-shlib-undefined") | ||
| endif() |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,13 @@ | ||
| diff --git a/cmake/developer_package/compile_flags/os_flags.cmake b/cmake/developer_package/compile_flags/os_flags.cmake | ||
| index 7d34c308f3..5119da0717 100644 | ||
| --- a/cmake/developer_package/compile_flags/os_flags.cmake | ||
| +++ b/cmake/developer_package/compile_flags/os_flags.cmake | ||
| @@ -346,7 +346,7 @@ if(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC") | ||
| # Increase Number of Sections in .Obj file | ||
| ie_add_compiler_flags(/bigobj) | ||
| # Build with multiple processes | ||
| - ie_add_compiler_flags(/MP) | ||
| + # ie_add_compiler_flags(/MP) | ||
|
|
||
| if(AARCH64 AND NOT MSVC_VERSION LESS 1930) | ||
| # otherwise, _ARM64_EXTENDED_INTRINSICS is defined, which defines 'mvn' macro |
5696ddbThere was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Hi! This is the friendly automated conda-forge-webservice.
I updated the Github team because of this commit.
Go to https://github.com/orgs/conda-forge/invitation see your invitation.
You should get push access to this feedstock and CI services.
Your package won't be available for installation locally until it is built
and synced to the anaconda.org CDN (takes 1-2 hours after the build finishes).
Feel free to join the community Element channel.
NOTE: Please make sure to not push to the repository directly.
Use branches in your fork for any changes and send a PR.
More details on this are here.