update project version and submodules - April 2024 (#103)

* update submodules * update project version for upcoming release * add check for C11 atomics support * temporarily disable Python and Ruby testing on macos * try the older macos-13 runner vs. disabling completely * take the Python workflow back to macos-12 * take the Python workflow back to macos-11 * re-disable the Python workflow * update the project version date
KhronosGroup · May 7, 2024 · 78e494f · 78e494f
1 parent 2db34c2
commit 78e494f
Show file tree

Hide file tree

Showing 6 changed files with 28 additions and 10 deletions.
diff --git a/.github/workflows/presubmit.yml b/.github/workflows/presubmit.yml
@@ -103,7 +103,8 @@ jobs:
     name: Exercise Python examples on ${{matrix.os}}
     strategy:
       matrix:
-        os: [ubuntu-latest, macos-latest]
+        #os: [ubuntu-latest, macos-latest]
+        os: [ubuntu-latest]
     runs-on: ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v2
@@ -140,7 +141,8 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [ubuntu-latest, macos-latest]
+        #os: [ubuntu-latest, macos-latest]
+        os: [ubuntu-latest, macos-13]
     steps:
       - uses: actions/checkout@v2
         with:

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -17,7 +17,7 @@ cmake_minimum_required(VERSION 3.0)
 set(CMAKE_CXX_STANDARD 14)
 
 project(OpenCL-SDK
-  VERSION 2023.12.14
+  VERSION 2024.05.08
   LANGUAGES
     C CXX
 )

diff --git a/external/OpenCL-CLHPP b/external/OpenCL-CLHPP
diff --git a/external/OpenCL-Headers b/external/OpenCL-Headers
diff --git a/external/OpenCL-ICD-Loader b/external/OpenCL-ICD-Loader
diff --git a/samples/core/callback/CMakeLists.txt b/samples/core/callback/CMakeLists.txt
@@ -20,6 +20,11 @@ file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/threads.c"
 int main(void) { thrd_sleep(&(struct timespec){.tv_nsec=1}, NULL); }
 ")
 
+file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/atomic.c"
+"#include <stdatomic.h>
+int main() { return 0; }
+")
+
 # Signature can be modernized at CMake version 3.25
 try_compile(
     HAS_C11_THREADS
@@ -29,7 +34,21 @@ try_compile(
     C_STANDARD_REQUIRED ON
 )
 
-if (HAS_C11_THREADS)
+try_compile(
+    HAS_C11_ATOMICS
+    "${CMAKE_CURRENT_BINARY_DIR}"
+    SOURCES "${CMAKE_CURRENT_BINARY_DIR}/atomic.c"
+    C_STANDARD 11
+    C_STANDARD_REQUIRED ON
+)
+
+if (NOT HAS_C11_THREADS)
+    message(WARNING
+    "Skipping callback sample, C11 standard threads are not supported with the current toolset")
+elseif (NOT HAS_C11_ATOMICS)
+    message(WARNING
+    "Skipping callback sample, C11 standard atomics are not supported with the current toolset")
+else()
     add_sample(
         TEST
         TARGET callback
@@ -38,9 +57,6 @@ if (HAS_C11_THREADS)
         KERNELS reaction_diffusion.cl)
     target_link_libraries(callback PRIVATE
         $<TARGET_NAME_IF_EXISTS:Threads::Threads>)
-else()
-    message(WARNING
-    "Skipping callback sample, C11 standard threads are not supported with the current toolset")
 endif()
 
 add_sample(
+2 −8		.github/workflows/linux.yml
+1 −4		.github/workflows/macos.yml
+2 −8		.github/workflows/windows.yml
+161 −17		include/CL/opencl.hpp
+488 −44		tests/test_openclhpp.cpp
+1 −1		loader/windows/icd_windows.c
+3 −1		test/driver_stub/cl.c
+17 −3		test/loader_test/test_create_calls.c
+5 −0		test/loader_test/test_program_objects.c