From 3a108c3210b329c2ab0b5cacce8e27eee140c2b2 Mon Sep 17 00:00:00 2001 From: Ben Ashbaugh Date: Fri, 26 Apr 2024 08:37:51 +0200 Subject: [PATCH 1/9] update submodules --- external/OpenCL-CLHPP | 2 +- external/OpenCL-Headers | 2 +- external/OpenCL-ICD-Loader | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/external/OpenCL-CLHPP b/external/OpenCL-CLHPP index 83cc072d..0bdbbfe5 160000 --- a/external/OpenCL-CLHPP +++ b/external/OpenCL-CLHPP @@ -1 +1 @@ -Subproject commit 83cc072d8240aad47ef4663d572a31ef27d0411a +Subproject commit 0bdbbfe5ecda42cff50c96cc5e33527f42fcbd45 diff --git a/external/OpenCL-Headers b/external/OpenCL-Headers index 2368105c..8275634c 160000 --- a/external/OpenCL-Headers +++ b/external/OpenCL-Headers @@ -1 +1 @@ -Subproject commit 2368105c0531069fe927989505de7d125ec58c55 +Subproject commit 8275634cf9ec31b6484c2e6be756237cb583999d diff --git a/external/OpenCL-ICD-Loader b/external/OpenCL-ICD-Loader index 229410f8..861b68b2 160000 --- a/external/OpenCL-ICD-Loader +++ b/external/OpenCL-ICD-Loader @@ -1 +1 @@ -Subproject commit 229410f86a8c8c9e0f86f195409e5481a2bae067 +Subproject commit 861b68b290e76d08e7241608479c16431f529945 From eb0a21da714cae4755ef0567b86e8ab381b30f13 Mon Sep 17 00:00:00 2001 From: Ben Ashbaugh Date: Fri, 26 Apr 2024 08:39:02 +0200 Subject: [PATCH 2/9] update project version for upcoming release --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 333b5297..f5a506a7 100644 --- 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.04.26 LANGUAGES C CXX ) From a1f23eea379175b6141ab0bdc5c708faddd584d7 Mon Sep 17 00:00:00 2001 From: Ben Ashbaugh Date: Fri, 26 Apr 2024 09:57:11 +0200 Subject: [PATCH 3/9] add check for C11 atomics support --- samples/core/callback/CMakeLists.txt | 24 ++++++++++++++++++++---- 1 file changed, 20 insertions(+), 4 deletions(-) diff --git a/samples/core/callback/CMakeLists.txt b/samples/core/callback/CMakeLists.txt index 54d05d84..f02e776f 100644 --- 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 +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 $) -else() - message(WARNING - "Skipping callback sample, C11 standard threads are not supported with the current toolset") endif() add_sample( From 13f8144c00730cf33c09dc4dd3b7742bb112f976 Mon Sep 17 00:00:00 2001 From: Ben Ashbaugh Date: Mon, 29 Apr 2024 08:33:19 -0700 Subject: [PATCH 4/9] temporarily disable Python and Ruby testing on macos --- .github/workflows/presubmit.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/presubmit.yml b/.github/workflows/presubmit.yml index 29cb45f7..9375dfde 100644 --- 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] steps: - uses: actions/checkout@v2 with: From cf2f6e819d34b31e32f9bb3f2e28896e656bb472 Mon Sep 17 00:00:00 2001 From: Ben Ashbaugh Date: Mon, 29 Apr 2024 14:21:44 -0700 Subject: [PATCH 5/9] try the older macos-13 runner vs. disabling completely --- .github/workflows/presubmit.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/presubmit.yml b/.github/workflows/presubmit.yml index 9375dfde..385c1df0 100644 --- a/.github/workflows/presubmit.yml +++ b/.github/workflows/presubmit.yml @@ -104,7 +104,7 @@ jobs: strategy: matrix: #os: [ubuntu-latest, macos-latest] - os: [ubuntu-latest] + os: [ubuntu-latest, macos-13] runs-on: ${{ matrix.os }} steps: - uses: actions/checkout@v2 @@ -142,7 +142,7 @@ jobs: strategy: matrix: #os: [ubuntu-latest, macos-latest] - os: [ubuntu-latest] + os: [ubuntu-latest, macos-13] steps: - uses: actions/checkout@v2 with: From 7e1280d1bfa11b617a14d978065f64985cb60f70 Mon Sep 17 00:00:00 2001 From: Ben Ashbaugh Date: Mon, 29 Apr 2024 14:27:39 -0700 Subject: [PATCH 6/9] take the Python workflow back to macos-12 --- .github/workflows/presubmit.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/presubmit.yml b/.github/workflows/presubmit.yml index 385c1df0..0a04798e 100644 --- a/.github/workflows/presubmit.yml +++ b/.github/workflows/presubmit.yml @@ -104,7 +104,7 @@ jobs: strategy: matrix: #os: [ubuntu-latest, macos-latest] - os: [ubuntu-latest, macos-13] + os: [ubuntu-latest, macos-12] runs-on: ${{ matrix.os }} steps: - uses: actions/checkout@v2 From c7cc0507c90a4e7442ac4eda859d6e07fecad9f1 Mon Sep 17 00:00:00 2001 From: Ben Ashbaugh Date: Mon, 29 Apr 2024 14:44:51 -0700 Subject: [PATCH 7/9] take the Python workflow back to macos-11 --- .github/workflows/presubmit.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/presubmit.yml b/.github/workflows/presubmit.yml index 0a04798e..a4cb9a62 100644 --- a/.github/workflows/presubmit.yml +++ b/.github/workflows/presubmit.yml @@ -104,7 +104,7 @@ jobs: strategy: matrix: #os: [ubuntu-latest, macos-latest] - os: [ubuntu-latest, macos-12] + os: [ubuntu-latest, macos-11] runs-on: ${{ matrix.os }} steps: - uses: actions/checkout@v2 From 7ec7feab14dab6fb8b4b58b4b73d6a760dd69be2 Mon Sep 17 00:00:00 2001 From: Ben Ashbaugh Date: Mon, 29 Apr 2024 16:06:17 -0700 Subject: [PATCH 8/9] re-disable the Python workflow --- .github/workflows/presubmit.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/presubmit.yml b/.github/workflows/presubmit.yml index a4cb9a62..03bca891 100644 --- a/.github/workflows/presubmit.yml +++ b/.github/workflows/presubmit.yml @@ -104,7 +104,7 @@ jobs: strategy: matrix: #os: [ubuntu-latest, macos-latest] - os: [ubuntu-latest, macos-11] + os: [ubuntu-latest] runs-on: ${{ matrix.os }} steps: - uses: actions/checkout@v2 From 960d7c667ef9578a22e3e3863e0e98d5c2f2c0b1 Mon Sep 17 00:00:00 2001 From: Ben Ashbaugh Date: Tue, 7 May 2024 09:42:40 -0700 Subject: [PATCH 9/9] update the project version date --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index f5a506a7..cdaa68bf 100644 --- 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 2024.04.26 + VERSION 2024.05.08 LANGUAGES C CXX )