Skip to content

Commit 5970a26

Browse files
committed
fix msvc build
1 parent 5ddbd18 commit 5970a26

File tree

2 files changed

+1
-4
lines changed

2 files changed

+1
-4
lines changed

CMakeLists.txt

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -301,9 +301,7 @@ if (LLAMA_OPENMP)
301301
if(OpenMP_FOUND)
302302
message(STATUS "OpenMP found")
303303
add_compile_definitions(GGML_USE_OPENMP)
304-
305-
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${OpenMP_C_FLAGS}")
306-
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${OpenMP_CXX_FLAGS}")
304+
set(LLAMA_EXTRA_LIBS ${LLAMA_EXTRA_LIBS} OpenMP::OpenMP_C OpenMP::OpenMP_CXX)
307305
else()
308306
message(WARNING "OpenMP not found")
309307
endif()

ggml.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19733,7 +19733,6 @@ enum ggml_status ggml_graph_compute(struct ggml_cgraph * cgraph, struct ggml_cpl
1973319733

1973419734
#if defined(GGML_USE_OPENMP)
1973519735
n_threads = MIN(n_threads, omp_get_max_threads());
19736-
n_threads = MIN(n_threads, omp_get_thread_limit());
1973719736
#endif
1973819737

1973919738
struct ggml_compute_state_shared state_shared = {

0 commit comments

Comments
 (0)