Skip to content

Commit 78e494f

Browse files
authored
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
1 parent 2db34c2 commit 78e494f

File tree

6 files changed

+28
-10
lines changed

6 files changed

+28
-10
lines changed

.github/workflows/presubmit.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,8 @@ jobs:
103103
name: Exercise Python examples on ${{matrix.os}}
104104
strategy:
105105
matrix:
106-
os: [ubuntu-latest, macos-latest]
106+
#os: [ubuntu-latest, macos-latest]
107+
os: [ubuntu-latest]
107108
runs-on: ${{ matrix.os }}
108109
steps:
109110
- uses: actions/checkout@v2
@@ -140,7 +141,8 @@ jobs:
140141
runs-on: ${{ matrix.os }}
141142
strategy:
142143
matrix:
143-
os: [ubuntu-latest, macos-latest]
144+
#os: [ubuntu-latest, macos-latest]
145+
os: [ubuntu-latest, macos-13]
144146
steps:
145147
- uses: actions/checkout@v2
146148
with:

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ cmake_minimum_required(VERSION 3.0)
1717
set(CMAKE_CXX_STANDARD 14)
1818

1919
project(OpenCL-SDK
20-
VERSION 2023.12.14
20+
VERSION 2024.05.08
2121
LANGUAGES
2222
C CXX
2323
)

external/OpenCL-Headers

samples/core/callback/CMakeLists.txt

Lines changed: 20 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,11 @@ file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/threads.c"
2020
int main(void) { thrd_sleep(&(struct timespec){.tv_nsec=1}, NULL); }
2121
")
2222

23+
file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/atomic.c"
24+
"#include <stdatomic.h>
25+
int main() { return 0; }
26+
")
27+
2328
# Signature can be modernized at CMake version 3.25
2429
try_compile(
2530
HAS_C11_THREADS
@@ -29,7 +34,21 @@ try_compile(
2934
C_STANDARD_REQUIRED ON
3035
)
3136

32-
if (HAS_C11_THREADS)
37+
try_compile(
38+
HAS_C11_ATOMICS
39+
"${CMAKE_CURRENT_BINARY_DIR}"
40+
SOURCES "${CMAKE_CURRENT_BINARY_DIR}/atomic.c"
41+
C_STANDARD 11
42+
C_STANDARD_REQUIRED ON
43+
)
44+
45+
if (NOT HAS_C11_THREADS)
46+
message(WARNING
47+
"Skipping callback sample, C11 standard threads are not supported with the current toolset")
48+
elseif (NOT HAS_C11_ATOMICS)
49+
message(WARNING
50+
"Skipping callback sample, C11 standard atomics are not supported with the current toolset")
51+
else()
3352
add_sample(
3453
TEST
3554
TARGET callback
@@ -38,9 +57,6 @@ if (HAS_C11_THREADS)
3857
KERNELS reaction_diffusion.cl)
3958
target_link_libraries(callback PRIVATE
4059
$<TARGET_NAME_IF_EXISTS:Threads::Threads>)
41-
else()
42-
message(WARNING
43-
"Skipping callback sample, C11 standard threads are not supported with the current toolset")
4460
endif()
4561

4662
add_sample(

0 commit comments

Comments
 (0)