Skip to content

Commit 8f9a834

Browse files
ggerganovtinglou
authored andcommitted
ggml : do not install metal source when embed library (ggml/1054)
1 parent 0eef2a1 commit 8f9a834

File tree

2 files changed

+16
-20
lines changed

2 files changed

+16
-20
lines changed

ggml/CMakeLists.txt

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -257,26 +257,6 @@ set_target_properties(ggml PROPERTIES PUBLIC_HEADER "${GGML_PUBLIC_HEADERS}")
257257
install(TARGETS ggml LIBRARY PUBLIC_HEADER)
258258
install(TARGETS ggml-base LIBRARY)
259259

260-
# FIXME: this should be done in the backend cmake files
261-
if (GGML_METAL)
262-
# FIXME: does this need to be installed with GGML_METAL_EMBED_LIBRARY?
263-
install(
264-
FILES src/ggml-metal/ggml-metal.metal
265-
PERMISSIONS
266-
OWNER_READ
267-
OWNER_WRITE
268-
GROUP_READ
269-
WORLD_READ
270-
DESTINATION ${CMAKE_INSTALL_BINDIR})
271-
272-
if (NOT GGML_METAL_EMBED_LIBRARY)
273-
install(
274-
FILES ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/default.metallib
275-
DESTINATION ${CMAKE_INSTALL_BINDIR}
276-
)
277-
endif()
278-
endif()
279-
280260
if (GGML_STANDALONE)
281261
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/ggml.pc.in
282262
${CMAKE_CURRENT_BINARY_DIR}/ggml.pc

ggml/src/ggml-metal/CMakeLists.txt

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -103,3 +103,19 @@ else()
103103
DEPENDS ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/default.metallib
104104
)
105105
endif() # GGML_METAL_EMBED_LIBRARY
106+
107+
if (NOT GGML_METAL_EMBED_LIBRARY)
108+
install(
109+
FILES src/ggml-metal/ggml-metal.metal
110+
PERMISSIONS
111+
OWNER_READ
112+
OWNER_WRITE
113+
GROUP_READ
114+
WORLD_READ
115+
DESTINATION ${CMAKE_INSTALL_BINDIR})
116+
117+
install(
118+
FILES ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/default.metallib
119+
DESTINATION ${CMAKE_INSTALL_BINDIR}
120+
)
121+
endif()

0 commit comments

Comments
 (0)