From 4207618b69d9cccbad4895b51c67ff79653ca908 Mon Sep 17 00:00:00 2001 From: Ben Ashbaugh Date: Tue, 22 Jul 2025 11:29:58 -0700 Subject: [PATCH 1/5] update project version and submodules - July 2025 --- CMakeLists.txt | 2 +- external/OpenCL-CLHPP | 2 +- external/OpenCL-Headers | 2 +- external/OpenCL-ICD-Loader | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 9f19c7ea..3d9e01ef 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -17,7 +17,7 @@ cmake_minimum_required(VERSION 3.16) set(CMAKE_CXX_STANDARD 14) project(OpenCL-SDK - VERSION 2024.10.24 + VERSION 2025.07.22 LANGUAGES C CXX ) diff --git a/external/OpenCL-CLHPP b/external/OpenCL-CLHPP index c7b4aded..2a608428 160000 --- a/external/OpenCL-CLHPP +++ b/external/OpenCL-CLHPP @@ -1 +1 @@ -Subproject commit c7b4aded1cab9560b226041dd962f63375a9a384 +Subproject commit 2a608428f725cad7903ef55e1ce5b995895838f5 diff --git a/external/OpenCL-Headers b/external/OpenCL-Headers index 4ea6df13..8a97ebc8 160000 --- a/external/OpenCL-Headers +++ b/external/OpenCL-Headers @@ -1 +1 @@ -Subproject commit 4ea6df132107e3b4b9407f903204b5522fdffcd6 +Subproject commit 8a97ebc88daa3495d6f57ec10bb515224400186f diff --git a/external/OpenCL-ICD-Loader b/external/OpenCL-ICD-Loader index 5907ac11..9482bbe9 160000 --- a/external/OpenCL-ICD-Loader +++ b/external/OpenCL-ICD-Loader @@ -1 +1 @@ -Subproject commit 5907ac1114079de4383cecddf1c8640e3f52f92b +Subproject commit 9482bbe926b1560d7a9911573cf05bf723ecb166 From dcc4481e698bc9ee62d070c8e22442d331c1f391 Mon Sep 17 00:00:00 2001 From: Ben Ashbaugh Date: Tue, 22 Jul 2025 11:43:02 -0700 Subject: [PATCH 2/5] update clinfo version and patched ext.h file --- cmake/Dependencies/clinfo/clinfo.cmake | 2 +- cmake/Dependencies/clinfo/ext.h | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/cmake/Dependencies/clinfo/clinfo.cmake b/cmake/Dependencies/clinfo/clinfo.cmake index 4ea210eb..7b47223a 100644 --- a/cmake/Dependencies/clinfo/clinfo.cmake +++ b/cmake/Dependencies/clinfo/clinfo.cmake @@ -13,7 +13,7 @@ if(NOT clinfo_FOUND) FetchContent_Declare( clinfo GIT_REPOSITORY https://github.com/Oblomov/clinfo.git - GIT_TAG 3.0.23.01.25 + GIT_TAG 3.0.25.02.14 PATCH_COMMAND ${CMAKE_COMMAND} -P "${CMAKE_CURRENT_LIST_DIR}/patch.cmake" ) FetchContent_MakeAvailable(clinfo) diff --git a/cmake/Dependencies/clinfo/ext.h b/cmake/Dependencies/clinfo/ext.h index 10337b23..57a88be9 100644 --- a/cmake/Dependencies/clinfo/ext.h +++ b/cmake/Dependencies/clinfo/ext.h @@ -35,6 +35,7 @@ #include #else #define CL_USE_DEPRECATED_OPENCL_1_1_APIS +#define CL_ENABLE_BETA_EXTENSIONS #include #include #endif From 0492ba881b8a422bb95102383943130adc46ae82 Mon Sep 17 00:00:00 2001 From: Ben Ashbaugh Date: Tue, 22 Jul 2025 12:02:41 -0700 Subject: [PATCH 3/5] temporarily update the OpenCL-ICD-Loader submodule --- external/OpenCL-ICD-Loader | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/external/OpenCL-ICD-Loader b/external/OpenCL-ICD-Loader index 9482bbe9..d1160f42 160000 --- a/external/OpenCL-ICD-Loader +++ b/external/OpenCL-ICD-Loader @@ -1 +1 @@ -Subproject commit 9482bbe926b1560d7a9911573cf05bf723ecb166 +Subproject commit d1160f42334cc8e0e4463ae445820446a2899e90 From 1b53b2abf8c9c6048faaa58369c0a400dfd639dd Mon Sep 17 00:00:00 2001 From: Ben Ashbaugh Date: Tue, 22 Jul 2025 12:13:03 -0700 Subject: [PATCH 4/5] add the beta extensions define for macOS builds also --- cmake/Dependencies/clinfo/ext.h | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/cmake/Dependencies/clinfo/ext.h b/cmake/Dependencies/clinfo/ext.h index 57a88be9..03e80677 100644 --- a/cmake/Dependencies/clinfo/ext.h +++ b/cmake/Dependencies/clinfo/ext.h @@ -18,6 +18,10 @@ #define CL_TARGET_OPENCL_VERSION 220 #endif +#ifndef CL_ENABLE_BETA_EXTENSIONS +#define CL_ENABLE_BETA_EXTENSIONS +#endif + /* We will use the deprecated clGetExtensionFunctionAddress, * so let the headers know that we don't care about it being deprecated. * The standard CL_USE_DEPRECATED_OPENCL_1_1_APIS define apparently @@ -35,7 +39,6 @@ #include #else #define CL_USE_DEPRECATED_OPENCL_1_1_APIS -#define CL_ENABLE_BETA_EXTENSIONS #include #include #endif From 5cea9d3ff4609e7b2eec832686e2232a548fee51 Mon Sep 17 00:00:00 2001 From: Ben Ashbaugh Date: Tue, 22 Jul 2025 12:28:10 -0700 Subject: [PATCH 5/5] bump OpenCL-ICD-Loader submodule --- external/OpenCL-ICD-Loader | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/external/OpenCL-ICD-Loader b/external/OpenCL-ICD-Loader index d1160f42..ad770a1b 160000 --- a/external/OpenCL-ICD-Loader +++ b/external/OpenCL-ICD-Loader @@ -1 +1 @@ -Subproject commit d1160f42334cc8e0e4463ae445820446a2899e90 +Subproject commit ad770a1b64c6b8d5f2ed4e153f22e4f45939f27f