Skip to content

common: compile shared lib, and export some c functions #10353

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+13 −3
Open

common: compile shared lib, and export some c functions #10353

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion common/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ endif()

set(TARGET common)

add_library(${TARGET} STATIC
add_library(${TARGET}
arg.cpp
arg.h
base64.hpp
Expand All @@ -70,6 +70,8 @@ add_library(${TARGET} STATIC

if (BUILD_SHARED_LIBS)
set_target_properties(${TARGET} PROPERTIES POSITION_INDEPENDENT_CODE ON)
target_compile_definitions(${TARGET} PRIVATE LLAMA_BUILD)
target_compile_definitions(${TARGET} PUBLIC LLAMA_SHARED)
endif()

set(LLAMA_COMMON_EXTRA_LIBS build_info)
Expand Down
12 changes: 10 additions & 2 deletions common/common.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,10 @@ extern char const * LLAMA_BUILD_TARGET;

struct common_control_vector_load_info;

#ifdef __cplusplus
extern "C" {
#endif

//
// CPU utils
//
Expand All @@ -54,8 +58,12 @@ struct cpu_params {
uint32_t poll = 50; // Polling (busywait) level (0 - no polling, 100 - mostly polling)
};

int32_t cpu_get_num_physical_cores();
int32_t cpu_get_num_math();
LLAMA_API int32_t cpu_get_num_physical_cores();
LLAMA_API int32_t cpu_get_num_math();

#ifdef __cplusplus
}
#endif

//
// Common params
Expand Down