From 8e69669007eb3d33d95b15093f58e1c39b18cf2f Mon Sep 17 00:00:00 2001 From: Mika Pi Date: Sun, 15 Dec 2024 00:43:30 -0800 Subject: [PATCH] Fix compilation on Pop!_OS 22.04 LTS CUDA Downgrade the C++ version from 17 to 14, and also update the code to remove compilation warnings. --- ggml/CMakeLists.txt | 6 +++++- ggml/src/ggml-cuda/ggml-cuda.cu | 2 ++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/ggml/CMakeLists.txt b/ggml/CMakeLists.txt index 3442142ad..0dc9e917c 100644 --- a/ggml/CMakeLists.txt +++ b/ggml/CMakeLists.txt @@ -195,7 +195,11 @@ option(GGML_BUILD_EXAMPLES "ggml: build examples" ${GGML_STANDALONE}) set(CMAKE_C_STANDARD 11) set(CMAKE_C_STANDARD_REQUIRED true) -set(CMAKE_CXX_STANDARD 17) +if (GGML_SYCL) + set(CMAKE_CXX_STANDARD 17) +else() + set(CMAKE_CXX_STANDARD 14) +endif() set(CMAKE_CXX_STANDARD_REQUIRED true) set(THREADS_PREFER_PTHREAD_FLAG ON) diff --git a/ggml/src/ggml-cuda/ggml-cuda.cu b/ggml/src/ggml-cuda/ggml-cuda.cu index c180adc84..0ee15f982 100644 --- a/ggml/src/ggml-cuda/ggml-cuda.cu +++ b/ggml/src/ggml-cuda/ggml-cuda.cu @@ -2693,6 +2693,8 @@ bool ggml_backend_cuda_register_host_buffer(void * buffer, size_t size) { } return true; #else + (void)buffer; + (void)size; return false; #endif }