Skip to content

Commit 2a470fa

Browse files
author
mike dupont
committed
compiles with hacks, many fixmes
1 parent 42cd49c commit 2a470fa

File tree

3 files changed

+580
-571
lines changed

3 files changed

+580
-571
lines changed

CMakeLists.txt

+16-13
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,9 @@ set(LLAMA_FMA OFF)
1919
set(LLAMA_F16C OFF)
2020
set(CMAKE_CUDA_FLAGS "--verbose") #
2121
set(CMAKE_CUDA_ARCHITECTURES "60;61;70") # needed for f16 CUDA intrinsics
22-
set(CUDACXX /usr/local/cuda-12.2/bin/nvcc)
22+
set(CUDACXX /usr/local/cuda-12.3/bin/nvcc)
23+
set(CMAKE_CUDA_COMPILER /usr/local/cuda-12.3/bin/nvcc)
24+
set(CUDA_TOOLKIT_ROOT_DIR /usr/local/cuda-12.3)
2325
#GGML_USE_CUBLAS
2426

2527
#set(CMAKE_EXE_LINKER_FLAGS -pg)
@@ -128,7 +130,7 @@ option(LLAMA_BUILD_SERVER "llama: build server example"
128130
# Compile flags
129131
#
130132

131-
set(CMAKE_CXX_STANDARD 11)
133+
set(CMAKE_CXX_STANDARD 17)
132134
set(CMAKE_CXX_STANDARD_REQUIRED true)
133135
set(CMAKE_C_STANDARD 11)
134136
set(CMAKE_C_STANDARD_REQUIRED true)
@@ -420,14 +422,15 @@ endif()
420422

421423
if (LLAMA_ALL_WARNINGS)
422424
if (NOT MSVC)
423-
set(warning_flags -Wall -Wextra -Wpedantic -Wcast-qual -Wno-unused-function)
425+
# -Wpedantic
426+
set(warning_flags -Wall -Wextra -Wcast-qual -Wno-unused-function)
424427
set(c_flags -Wshadow -Wstrict-prototypes -Wpointer-arith -Wmissing-prototypes -Werror=implicit-int -Werror=implicit-function-declaration)
425-
set(cxx_flags -Wmissing-declarations -Wmissing-noreturn)
428+
set(cxx_flags -Wmissing-declarations -Wmissing-noreturn -fpermissive)
426429
set(host_cxx_flags "")
427430

428431
if (CMAKE_C_COMPILER_ID MATCHES "Clang")
429432
set(warning_flags ${warning_flags} -Wunreachable-code-break -Wunreachable-code-return)
430-
set(host_cxx_flags ${host_cxx_flags} -Wmissing-prototypes -Wextra-semi)
433+
set(host_cxx_flags ${host_cxx_flags} -Wmissing-prototypes -Wextra-semi -fpermissive)
431434

432435
if (
433436
(CMAKE_C_COMPILER_ID STREQUAL "Clang" AND CMAKE_C_COMPILER_VERSION VERSION_GREATER_EQUAL 3.8.0) OR
@@ -437,21 +440,21 @@ if (LLAMA_ALL_WARNINGS)
437440
endif()
438441
elseif (CMAKE_C_COMPILER_ID STREQUAL "GNU")
439442
set(c_flags ${c_flags} -Wdouble-promotion)
440-
set(host_cxx_flags ${host_cxx_flags} -Wno-array-bounds)
443+
set(host_cxx_flags ${host_cxx_flags} -Wno-array-bounds -fpermissive)
441444

442445
if (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 7.1.0)
443-
set(host_cxx_flags ${host_cxx_flags} -Wno-format-truncation)
446+
set(host_cxx_flags ${host_cxx_flags} -Wno-format-truncation -fpermissive)
444447
endif()
445448
if (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 8.1.0)
446-
set(host_cxx_flags ${host_cxx_flags} -Wextra-semi)
449+
set(host_cxx_flags ${host_cxx_flags} -Wextra-semi -fpermissive)
447450
endif()
448451
endif()
449452
else()
450453
# todo : msvc
451454
endif()
452455

453456
set(c_flags ${c_flags} -save-temps --verbose ${warning_flags})
454-
set(cxx_flags ${cxx_flags} -save-temps --verbose ${warning_flags})
457+
set(cxx_flags ${cxx_flags} -fpermissive -save-temps --verbose ${warning_flags})
455458
add_compile_options("$<$<COMPILE_LANGUAGE:C>:${c_flags}>"
456459
"$<$<COMPILE_LANGUAGE:CXX>:${cxx_flags}>"
457460
"$<$<COMPILE_LANGUAGE:CXX>:${host_cxx_flags}>")
@@ -677,13 +680,13 @@ if (GGML_USE_CPU_HBM)
677680
endif()
678681

679682
add_library(ggml OBJECT
680-
ggml.c
683+
ggml.cpp
681684
ggml.h
682-
ggml-alloc.c
685+
ggml-alloc.cpp
683686
ggml-alloc.h
684-
ggml-backend.c
687+
ggml-backend.cpp
685688
ggml-backend.h
686-
ggml-quants.c
689+
ggml-quants.cpp
687690
ggml-quants.h
688691
${GGML_SOURCES_CUDA} ${GGML_HEADERS_CUDA}
689692
${GGML_SOURCES_OPENCL} ${GGML_HEADERS_OPENCL}

0 commit comments

Comments
 (0)