vbatts/llama.cpp
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

wip

Browse source
This commit is contained in:
mike dupont 2023-12-09 11:29:16 -05:00
parent da1d8459be
commit 1f522319c5
2 changed files with 8 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

10
CMakeLists.txt
View file

@ -728,11 +728,11 @@ if (GGML_USE_CPU_HBM)
find_library(memkind memkind REQUIRED) find_library(memkind memkind REQUIRED)
endif() endif()
add_library(libmetacall SHARED IMPORTED) add_library(libmetacalld SHARED IMPORTED)
add_dependencies(libmetacall metacall) add_dependencies(libmetacalld metacall)
set_property( set_property(
TARGET libmetacall TARGET libmetacalld
PROPERTY IMPORTED_LOCATION ${CMAKE_INSTALL_PREFIX}/lib/${CMAKE_SHARED_LIBRARY_PREFIX}metacall${CMAKE_SHARED_LIBRARY_SUFFIX} PROPERTY IMPORTED_LOCATION ${CMAKE_INSTALL_PREFIX}/lib/${CMAKE_SHARED_LIBRARY_PREFIX}metacalld${CMAKE_SHARED_LIBRARY_SUFFIX}
) )
add_library(ggml OBJECT add_library(ggml OBJECT
@ -759,7 +759,7 @@ add_library(ggml OBJECT
target_include_directories(ggml PUBLIC "/usr/include/node/" . ${LLAMA_EXTRA_INCLUDES} ) target_include_directories(ggml PUBLIC "/usr/include/node/" . ${LLAMA_EXTRA_INCLUDES} )
target_compile_features(ggml PUBLIC c_std_23) # always bump target_compile_features(ggml PUBLIC c_std_23) # always bump
target_link_libraries(ggml PUBLIC Threads::Threads ${LLAMA_EXTRA_LIBS} libmetacall) target_link_libraries(ggml PUBLIC Threads::Threads ${LLAMA_EXTRA_LIBS} libmetacalld)
if (GGML_USE_CPU_HBM) if (GGML_USE_CPU_HBM)
target_link_libraries(ggml PUBLIC memkind) target_link_libraries(ggml PUBLIC memkind)
endif() endif()

3
plugin_nodejs_metacall.cpp
View file

@ -55,12 +55,14 @@ void process_output_plugin_metacall_init()
// Define log stream // Define log stream
if (metacall_log(METACALL_LOG_STDIO, (void *)&context.log_stdio) != 0) if (metacall_log(METACALL_LOG_STDIO, (void *)&context.log_stdio) != 0)
{ {
printf("error setting log");
//return cleanup(1); //return cleanup(1);
} }
// Initialize MetaCall // Initialize MetaCall
if (metacall_initialize() != 0) if (metacall_initialize() != 0)
{ {
printf("error init");
//return cleanup(2); //return cleanup(2);
} }
@ -77,6 +79,7 @@ void process_output_plugin_metacall_init()
js_scripts, js_scripts,
sizeof(js_scripts) / sizeof(js_scripts[0]), &context.handle) != 0) sizeof(js_scripts) / sizeof(js_scripts[0]), &context.handle) != 0)
{ {
printf("error loading scripts!");
//return cleanup(3); //return cleanup(3);
//return "error loading"; //return "error loading";
} }