forked from microsoft/vcpkg
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #1842 from microsoft/master
Merge from microsoft-master
- Loading branch information
Showing
62 changed files
with
605 additions
and
273 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
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
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
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 |
|---|---|---|
| @@ -0,0 +1,36 @@ | ||
| diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt | ||
| index dfb336d..ef97f82 100644 | ||
| --- a/lib/CMakeLists.txt | ||
| +++ b/lib/CMakeLists.txt | ||
| @@ -114,13 +114,6 @@ foreach(UTIL_LIB_NAME IN ITEMS Utils UtilsCpp) | ||
| DESTINATION ${config_package_location} | ||
| COMPONENT binary | ||
| ) | ||
| - | ||
| - # For packaging the utils libraries | ||
| - install( | ||
| - TARGETS ${UTIL_LIB_TARGET} | ||
| - DESTINATION ${CMAKE_INSTALL_LIBDIR} | ||
| - COMPONENT binary | ||
| - ) | ||
| endforeach() | ||
|
|
||
| if(OPENCL_SDK_BUILD_SAMPLES) | ||
| diff --git a/lib/src/Extensions/CMakeLists.txt b/lib/src/Extensions/CMakeLists.txt | ||
| index e05d4e7..017f7ad 100644 | ||
| --- a/lib/src/Extensions/CMakeLists.txt | ||
| +++ b/lib/src/Extensions/CMakeLists.txt | ||
| @@ -151,13 +151,6 @@ if (OPENCL_EXTENSION_LOADER_INSTALL) | ||
| DESTINATION ${OPENCL_EXTENSION_LOADER_CONFIG_PATH} | ||
| COMPONENT binary | ||
| ) | ||
| - | ||
| - # For packaging the extensions library | ||
| - install( | ||
| - TARGETS OpenCLExt | ||
| - DESTINATION ${CMAKE_INSTALL_LIBDIR} | ||
| - COMPONENT binary | ||
| - ) | ||
| endif() | ||
|
|
||
| if (CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME AND BUILD_TESTING) |
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
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,15 @@ | ||
| diff --git a/util/mkbuildinf.pl b/util/mkbuildinf.pl | ||
| index a57c80a..5cecf83 100755 | ||
| --- a/util/mkbuildinf.pl | ||
| +++ b/util/mkbuildinf.pl | ||
| @@ -9,7 +9,9 @@ | ||
| use strict; | ||
| use warnings; | ||
|
|
||
| -my ($cflags, $platform) = @ARGV; | ||
| +my $platform = pop @ARGV; | ||
| +my $cflags = join(' ', @ARGV); | ||
| +$cflags =~ s(\\)(\\\\)g; | ||
| $cflags = "compiler: $cflags"; | ||
|
|
||
| # Use the value of the envvar SOURCE_DATE_EPOCH, even if it's |
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 |
|---|---|---|
| @@ -0,0 +1,64 @@ | ||
| commit 255202328d39490f2cdca0d646b2e12b17ac9b69 | ||
| Author: Ilya Lavrenov <[email protected]> | ||
| Date: Mon Jan 6 09:56:08 2025 +0100 | ||
|
|
||
| Migrate to OpenCL v2024.10.24 | ||
|
|
||
| diff --git a/src/plugins/intel_gpu/src/runtime/ocl/ocl_ext.hpp b/src/plugins/intel_gpu/src/runtime/ocl/ocl_ext.hpp | ||
| index 759d796a5e..7246a6f6df 100644 | ||
| --- a/src/plugins/intel_gpu/src/runtime/ocl/ocl_ext.hpp | ||
| +++ b/src/plugins/intel_gpu/src/runtime/ocl/ocl_ext.hpp | ||
| @@ -16,6 +16,10 @@ | ||
| #include <CL/cl2.hpp> | ||
| #endif | ||
|
|
||
| +#ifndef CL_HPP_PARAM_NAME_CL_INTEL_UNIFIED_SHARED_MEMORY_ | ||
| +#define OPENVINO_CLHPP_HEADERS_ARE_OLDER_THAN_V2024_10_24 | ||
| +#endif | ||
| + | ||
| #include <CL/cl_ext.h> | ||
|
|
||
| #ifdef _WIN32 | ||
| @@ -45,12 +49,16 @@ typedef cl_va_api_device_set_intel cl_device_set_intel; | ||
|
|
||
| #endif // cl_intel_required_subgroup_size | ||
|
|
||
| +#ifdef OPENVINO_CLHPP_HEADERS_ARE_OLDER_THAN_V2024_10_24 | ||
| + | ||
| namespace cl { | ||
| namespace detail { | ||
| -CL_HPP_DECLARE_PARAM_TRAITS_(cl_device_info, CL_DEVICE_SUB_GROUP_SIZES_INTEL, vector<size_type>) | ||
| +CL_HPP_DECLARE_PARAM_TRAITS_(cl_device_info, CL_DEVICE_SUB_GROUP_SIZES_INTEL, cl::vector<size_type>) | ||
| } // namespace detail | ||
| } // namespace cl | ||
|
|
||
| +#endif // OPENVINO_CLHPP_HEADERS_ARE_OLDER_THAN_V2024_10_24 | ||
| + | ||
| /*************************************************************** | ||
| * cl_intel_command_queue_families | ||
| ***************************************************************/ | ||
| @@ -260,11 +268,15 @@ typedef cl_bitfield cl_device_feature_capabilities_intel; | ||
|
|
||
| #endif // cl_intel_device_attribute_query | ||
|
|
||
| +#ifndef CL_HPP_PARAM_NAME_CL_INTEL_COMMAND_QUEUE_FAMILIES_ | ||
| #define CL_HPP_PARAM_NAME_CL_INTEL_COMMAND_QUEUE_FAMILIES_(F) \ | ||
| F(cl_device_info, CL_DEVICE_QUEUE_FAMILY_PROPERTIES_INTEL, cl::vector<cl_queue_family_properties_intel>) \ | ||
| \ | ||
| F(cl_command_queue_info, CL_QUEUE_FAMILY_INTEL, cl_uint) \ | ||
| F(cl_command_queue_info, CL_QUEUE_INDEX_INTEL, cl_uint) | ||
| +#endif // CL_HPP_PARAM_NAME_CL_INTEL_COMMAND_QUEUE_FAMILIES_ | ||
| + | ||
| +#ifdef OPENVINO_CLHPP_HEADERS_ARE_OLDER_THAN_V2024_10_24 | ||
|
|
||
| namespace cl { | ||
| namespace detail { | ||
| @@ -279,6 +291,8 @@ CL_HPP_PARAM_NAME_CL_INTEL_COMMAND_QUEUE_FAMILIES_(CL_HPP_DECLARE_PARAM_TRAITS_) | ||
| } // namespace detail | ||
| } // namespace cl | ||
|
|
||
| +#endif // OPENVINO_CLHPP_HEADERS_ARE_OLDER_THAN_V2024_10_24 | ||
| + | ||
| #include <memory> | ||
|
|
||
| namespace { |
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 |
|---|---|---|
|
|
@@ -2,7 +2,7 @@ | |
| "$schema": "https://raw.githubusercontent.com/microsoft/vcpkg-tool/main/docs/vcpkg.schema.json", | ||
| "name": "openvino", | ||
| "version": "2024.4.0", | ||
| "port-version": 5, | ||
| "port-version": 6, | ||
| "maintainers": "OpenVINO Developers <[email protected]>", | ||
| "summary": "This is a port for Open Visual Inference And Optimization toolkit for AI inference", | ||
| "description": [ | ||
|
|
||
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
Oops, something went wrong.