Merge f9e9792f1d
into f0d4b29edf
This commit is contained in:
commit
a6ace0a0c4
2 changed files with 13 additions and 3 deletions
|
@ -52,7 +52,7 @@ endif()
|
|||
|
||||
set(TARGET common)
|
||||
|
||||
add_library(${TARGET} STATIC
|
||||
add_library(${TARGET}
|
||||
arg.cpp
|
||||
arg.h
|
||||
base64.hpp
|
||||
|
@ -76,6 +76,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)
|
||||
|
|
|
@ -41,6 +41,10 @@ extern const char * LLAMA_BUILD_TARGET;
|
|||
|
||||
struct common_control_vector_load_info;
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
#endif
|
||||
|
||||
//
|
||||
// CPU utils
|
||||
//
|
||||
|
@ -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
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue