Skip to content

Commit

Permalink
Remove support for clang-10
Browse files Browse the repository at this point in the history
  • Loading branch information
bernhardmgruber committed Nov 13, 2023
1 parent de6724e commit fb776c8
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 9 deletions.
4 changes: 0 additions & 4 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -200,10 +200,6 @@ jobs:
add_toolchain_repo: true
asan: ON
install_extra: g++-13
- name: build-ubuntu-clang10
os: ubuntu-20.04 # clang-10 is not available on ubuntu-22.04
cxx: clang++-10
install_extra: clang-10 libomp-10-dev
- name: build-ubuntu-clang11
cxx: clang++-11
install_extra: clang-11 libomp-11-dev
Expand Down
5 changes: 1 addition & 4 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -87,9 +87,6 @@ if (BUILD_TESTING)
endforeach()
endif()

# clang-10 does not link pthreads by default, which is needed by std::thread in the tests
find_package(Threads REQUIRED)

file(GLOB_RECURSE testSources "${CMAKE_CURRENT_SOURCE_DIR}/tests/**")
add_executable(tests ${testSources})
catch_discover_tests(tests)
Expand Down Expand Up @@ -129,7 +126,7 @@ if (BUILD_TESTING)
target_compile_options(tests PRIVATE -Wno-dangling-reference) # triggered by an access involving RecordRef, so basically everywhere
endif()
endif()
target_link_libraries(tests PRIVATE Catch2::Catch2WithMain Threads::Threads llama::llama)
target_link_libraries(tests PRIVATE Catch2::Catch2WithMain llama::llama)

option(LLAMA_ENABLE_ASAN_FOR_TESTS "Enables address sanitizer for tests" OFF)
if (LLAMA_ENABLE_ASAN_FOR_TESTS)
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ The following compilers are supported by LLAMA and tested as part of our CI:

| Linux | Windows | MacOS |
|----------------------------------------------------------------------------------------------|-----------------------------------------------------|----------------------------------|
| g++ 9 - 13 </br> clang++ 10 - 16 </br> icpx (latest) </br> nvc++ 23.5 </br> nvcc 11.4 - 12.2 | Visual Studio 2022 </br> (latest on GitHub actions) | clang++ </br> (latest from brew) |
| g++ 9 - 13 </br> clang++ 11 - 17 </br> icpx (latest) </br> nvc++ 23.5 </br> nvcc 11.4 - 12.2 | Visual Studio 2022 </br> (latest on GitHub actions) | clang++ </br> (latest from brew) |


Single header
Expand Down

0 comments on commit fb776c8

Please sign in to comment.