cmake : minor [no ci]

ggerganov · Jun 24, 2024 · 1f859b8 · 1f859b8
1 parent 7ef5da1
commit 1f859b8
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 7 deletions.
diff --git a/Makefile b/Makefile
@@ -81,11 +81,6 @@ GGML_METAL := 1
 DEPRECATE_WARNING := 1
 endif
 
-ifdef LLAMA_METAL_EMBED_LIBRARY
-GGML_METAL_EMBED_LIBRARY := 1
-DEPRECATE_WARNING := 1
-endif
-
 ifdef LLAMA_OPENMP
 GGML_OPENMP := 1
 DEPRECATE_WARNING := 1
@@ -183,6 +178,10 @@ ifeq ($(UNAME_S),Darwin)
 	endif
 endif
 
+ifdef GGML_METAL
+	GGML_METAL_EMBED_LIBRARY := 1
+endif
+
 ifdef GGML_RPC
 	BUILD_TARGETS += rpc-server
 endif

diff --git a/ci/run.sh b/ci/run.sh
@@ -36,7 +36,7 @@ SRC=`pwd`
 CMAKE_EXTRA="-DLLAMA_FATAL_WARNINGS=ON"
 
 if [ ! -z ${GG_BUILD_METAL} ]; then
-    CMAKE_EXTRA="${CMAKE_EXTRA} -DGGML_METAL=ON -DGGML_METAL_EMBED_LIBRARY=ON"
+    CMAKE_EXTRA="${CMAKE_EXTRA} -DGGML_METAL=ON"
 fi
 
 if [ ! -z ${GG_BUILD_CUDA} ]; then

diff --git a/ggml/CMakeLists.txt b/ggml/CMakeLists.txt
@@ -133,7 +133,7 @@ option(GGML_KOMPUTE                         "ggml: use Kompute"
 option(GGML_METAL                           "ggml: use Metal"                                 ${GGML_METAL_DEFAULT})
 option(GGML_METAL_NDEBUG                    "ggml: disable Metal debugging"                   OFF)
 option(GGML_METAL_SHADER_DEBUG              "ggml: compile Metal with -fno-fast-math"         OFF)
-option(GGML_METAL_EMBED_LIBRARY             "ggml: embed Metal library"                       OFF)
+option(GGML_METAL_EMBED_LIBRARY             "ggml: embed Metal library"                       ${GGML_METAL})
 set   (GGML_METAL_MACOSX_VERSION_MIN "" CACHE STRING
                                             "ggml: metal minimum macOS version")
 set   (GGML_METAL_STD "" CACHE STRING       "ggml: metal standard version (-std flag)")
@@ -219,6 +219,7 @@ if (GGML_METAL)
             GROUP_READ
             WORLD_READ
         DESTINATION ${CMAKE_INSTALL_BINDIR})
+
     if (NOT GGML_METAL_EMBED_LIBRARY)
         install(
             FILES ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/default.metallib

diff --git a/ggml/src/CMakeLists.txt b/ggml/src/CMakeLists.txt
@@ -1144,6 +1144,10 @@ add_library(ggml OBJECT
             ${GGML_SOURCES_LLAMAFILE} ${GGML_HEADERS_LLAMAFILE}
             )
 
+if (EMSCRIPTEN)
+    set_target_properties(ggml PROPERTIES COMPILE_FLAGS "-msimd128")
+endif()
+
 target_compile_definitions(ggml PUBLIC  ${GGML_CDEF_PUBLIC})
 target_compile_definitions(ggml PRIVATE ${GGML_CDEF_PRIVATE})