Spaces:
Sleeping
Sleeping
cmake : enable warnings in llama (llama/10474)
Browse files* cmake : enable warnings in llama
ggml-ci
* cmake : add llama_get_flags and respect LLAMA_FATAL_WARNINGS
* cmake : get_flags -> ggml_get_flags
* speculative-simple : fix warnings
* cmake : reuse ggml_get_flags
ggml-ci
* speculative-simple : fix compile warning
ggml-ci
ggml/src/CMakeLists.txt
CHANGED
|
@@ -24,7 +24,7 @@ if (NOT MSVC)
|
|
| 24 |
endif()
|
| 25 |
endif()
|
| 26 |
|
| 27 |
-
function(
|
| 28 |
set(C_FLAGS "")
|
| 29 |
set(CXX_FLAGS "")
|
| 30 |
|
|
@@ -41,6 +41,7 @@ function(get_flags CCID CCVER)
|
|
| 41 |
elseif (CCID STREQUAL "GNU")
|
| 42 |
set(C_FLAGS -Wdouble-promotion)
|
| 43 |
set(CXX_FLAGS -Wno-array-bounds)
|
|
|
|
| 44 |
if (CCVER VERSION_GREATER_EQUAL 8.1.0)
|
| 45 |
list(APPEND CXX_FLAGS -Wextra-semi)
|
| 46 |
endif()
|
|
@@ -69,7 +70,7 @@ if (GGML_ALL_WARNINGS)
|
|
| 69 |
list(APPEND C_FLAGS ${WARNING_FLAGS})
|
| 70 |
list(APPEND CXX_FLAGS ${WARNING_FLAGS})
|
| 71 |
|
| 72 |
-
|
| 73 |
|
| 74 |
add_compile_options("$<$<COMPILE_LANGUAGE:C>:${C_FLAGS};${GF_C_FLAGS}>"
|
| 75 |
"$<$<COMPILE_LANGUAGE:CXX>:${CXX_FLAGS};${GF_CXX_FLAGS}>")
|
|
|
|
| 24 |
endif()
|
| 25 |
endif()
|
| 26 |
|
| 27 |
+
function(ggml_get_flags CCID CCVER)
|
| 28 |
set(C_FLAGS "")
|
| 29 |
set(CXX_FLAGS "")
|
| 30 |
|
|
|
|
| 41 |
elseif (CCID STREQUAL "GNU")
|
| 42 |
set(C_FLAGS -Wdouble-promotion)
|
| 43 |
set(CXX_FLAGS -Wno-array-bounds)
|
| 44 |
+
|
| 45 |
if (CCVER VERSION_GREATER_EQUAL 8.1.0)
|
| 46 |
list(APPEND CXX_FLAGS -Wextra-semi)
|
| 47 |
endif()
|
|
|
|
| 70 |
list(APPEND C_FLAGS ${WARNING_FLAGS})
|
| 71 |
list(APPEND CXX_FLAGS ${WARNING_FLAGS})
|
| 72 |
|
| 73 |
+
ggml_get_flags(${CMAKE_CXX_COMPILER_ID} ${CMAKE_CXX_COMPILER_VERSION})
|
| 74 |
|
| 75 |
add_compile_options("$<$<COMPILE_LANGUAGE:C>:${C_FLAGS};${GF_C_FLAGS}>"
|
| 76 |
"$<$<COMPILE_LANGUAGE:CXX>:${CXX_FLAGS};${GF_CXX_FLAGS}>")
|
ggml/src/ggml-cuda/ggml/CMakeLists.txt
CHANGED
|
@@ -132,7 +132,7 @@ if (CUDAToolkit_FOUND)
|
|
| 132 |
|
| 133 |
message("-- CUDA host compiler is ${CUDA_CCID} ${CUDA_CCVER}")
|
| 134 |
|
| 135 |
-
|
| 136 |
list(APPEND CUDA_CXX_FLAGS ${CXX_FLAGS} ${GF_CXX_FLAGS}) # This is passed to -Xcompiler later
|
| 137 |
endif()
|
| 138 |
|
|
|
|
| 132 |
|
| 133 |
message("-- CUDA host compiler is ${CUDA_CCID} ${CUDA_CCVER}")
|
| 134 |
|
| 135 |
+
ggml_get_flags(${CUDA_CCID} ${CUDA_CCVER})
|
| 136 |
list(APPEND CUDA_CXX_FLAGS ${CXX_FLAGS} ${GF_CXX_FLAGS}) # This is passed to -Xcompiler later
|
| 137 |
endif()
|
| 138 |
|