thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-11-24 08:32:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Improved code detals according to suggestions

Browse Source
This commit is contained in:
jinjunzh 2023-02-01 09:45:06 -05:00
parent 3bc0c13ea0
commit 2a42c1314b
4 changed files with 17 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.gitmodules vendored
View File

@ -257,6 +257,9 @@
[submodule "contrib/qpl"]
path = contrib/qpl
url = https://github.com/intel/qpl
[submodule "contrib/idxd-config"]
path = contrib/idxd-config
url = https://github.com/intel/idxd-config
[submodule "contrib/wyhash"]
path = contrib/wyhash
url = https://github.com/wangyi-fudan/wyhash
@ -330,6 +333,3 @@
[submodule "contrib/crc32-vpmsum"]
path = contrib/crc32-vpmsum
url = https://github.com/antonblanchard/crc32-vpmsum.git
[submodule "contrib/idxd-config"]
path = contrib/idxd-config
url = https://github.com/intel/idxd-config.git

23
contrib/idxd-config-cmake/CMakeLists.txt
View File

@ -1,26 +1,27 @@
## Utility library for controlling and configuring Intel® In-Memory Analytics Accelerator (Intel® IAA) available on Next Generation Intel® Xeon® Scalable processors.
## Utility library for controlling and configuring Intel® In-Memory Analytics Accelerator (Intel® IAA).
## This is to build libaccel-config which is only required by libqpl (./contrib/qpl).Hence, If ENABLE_QPL=False, this module should not be build as well.
if (NOT ENABLE_QPL)
message(STATUS "Not using idxd-config due to ENABLE_QPL=False")
return()
endif()
set(LIBACCEL_SOURCE_DIR "${ClickHouse_SOURCE_DIR}/contrib/idxd-config")
set(LIBACCEL_BINARY_DIR "${ClickHouse_BINARY_DIR}/contrib/idxd-config")
set(UUID_DIR "${ClickHouse_SOURCE_DIR}/contrib/idxd-config-cmake")
set(LIBACCEL_HEADER_DIR "${ClickHouse_SOURCE_DIR}/contrib/idxd-config-cmake/idxd-header")
#set(SYSROOT_HEADER_DIR "${ClickHouse_SOURCE_DIR}/contrib/sysroot/linux-x86_64/x86_64-linux-gnu/libc/usr/include")
set(SRCS
"${LIBACCEL_SOURCE_DIR}/accfg/lib/libaccfg.c"
"${LIBACCEL_SOURCE_DIR}/util/log.c"
"${LIBACCEL_SOURCE_DIR}/util/sysfs.c"
)
#"${LIBACCEL_SOURCE_DIR}/util/log.c"
#"${LIBACCEL_SOURCE_DIR}/util/sysfs.c"
add_library(_LIBACCEL ${SRCS})
#target_link_libraries(_LIBACCEL PRIVATE ch_contrib::zlib)
target_compile_options(_LIBACCEL PRIVATE "-D_GNU_SOURCE")
add_library(_libaccel ${SRCS})
target_include_directories(_LIBACCEL BEFORE
target_compile_options(_libaccel PRIVATE "-D_GNU_SOURCE")
target_include_directories(_libaccel BEFORE
PRIVATE ${UUID_DIR}
PRIVATE ${LIBACCEL_HEADER_DIR}
PRIVATE ${LIBACCEL_SOURCE_DIR})
#target_include_directories(_LIBACCEL BEFORE PUBLIC ${LIBACCEL_BINARY_DIR})
add_library(ch_contrib::LIBACCEL ALIAS _LIBACCEL)
add_library(ch_contrib::libaccel ALIAS _libaccel)

2
contrib/idxd-config-cmake/idxd-header/config.h
View File

@ -8,7 +8,7 @@
/* #undef ENABLE_DEBUG */
/* Documentation / man pages. */
#define ENABLE_DOCS 1
/* #define ENABLE_DOCS */
/* System logging. */
#define ENABLE_LOGGING 1

2
contrib/qpl-cmake/CMakeLists.txt
View File

@ -316,7 +316,7 @@ target_compile_definitions(_qpl
PUBLIC -DENABLE_QPL_COMPRESSION)
target_link_libraries(_qpl
PRIVATE ch_contrib::LIBACCEL
PRIVATE ch_contrib::libaccel
PRIVATE ${CMAKE_DL_LIBS})
add_library (ch_contrib::qpl ALIAS _qpl)