thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-09-19 16:20:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix CMake for QATlib

Browse Source
This commit is contained in:
Robert Schulze 2024-08-09 08:50:52 +00:00
parent a497a23914
commit eec5fe087c
No known key found for this signature in database
GPG Key ID: 26703B55FB13728A
7 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
contrib/QAT-ZSTD-Plugin-cmake/CMakeLists.txt
View File

@ -27,7 +27,7 @@ if (ENABLE_QAT_OUT_OF_TREE_BUILD)
${QAT_AL_INCLUDE_DIR} ${QAT_AL_INCLUDE_DIR}
${QAT_USDM_INCLUDE_DIR} ${QAT_USDM_INCLUDE_DIR}
${ZSTD_LIBRARY_DIR}) ${ZSTD_LIBRARY_DIR})
target_compile_definitions(_qatzstd_plugin PRIVATE -DDEBUGLEVEL=0 PUBLIC -DENABLE_ZSTD_QAT_CODEC) target_compile_definitions(_qatzstd_plugin PRIVATE -DDEBUGLEVEL=0)
add_library (ch_contrib::qatzstd_plugin ALIAS _qatzstd_plugin) add_library (ch_contrib::qatzstd_plugin ALIAS _qatzstd_plugin)
else () # In-tree build else () # In-tree build
message(STATUS "Intel QATZSTD in-tree build") message(STATUS "Intel QATZSTD in-tree build")
@ -78,7 +78,7 @@ else () # In-tree build
${QAT_USDM_INCLUDE_DIR} ${QAT_USDM_INCLUDE_DIR}
${ZSTD_LIBRARY_DIR} ${ZSTD_LIBRARY_DIR}
${LIBQAT_HEADER_DIR}) ${LIBQAT_HEADER_DIR})
target_compile_definitions(_qatzstd_plugin PRIVATE -DDEBUGLEVEL=0 PUBLIC -DENABLE_ZSTD_QAT_CODEC -DINTREE) target_compile_definitions(_qatzstd_plugin PRIVATE -DDEBUGLEVEL=0 PUBLIC -DINTREE)
target_include_directories(_qatzstd_plugin SYSTEM PUBLIC $<BUILD_INTERFACE:${QATZSTD_SRC_DIR}> $<INSTALL_INTERFACE:include>) target_include_directories(_qatzstd_plugin SYSTEM PUBLIC $<BUILD_INTERFACE:${QATZSTD_SRC_DIR}> $<INSTALL_INTERFACE:include>)
add_library (ch_contrib::qatzstd_plugin ALIAS _qatzstd_plugin) add_library (ch_contrib::qatzstd_plugin ALIAS _qatzstd_plugin)
endif () endif ()

7
src/CMakeLists.txt
View File

@ -560,12 +560,9 @@ if (TARGET ch_contrib::qpl)
target_link_libraries (clickhouse_compression PUBLIC ch_contrib::accel-config) target_link_libraries (clickhouse_compression PUBLIC ch_contrib::accel-config)
endif () endif ()
if (TARGET ch_contrib::accel-config) if (TARGET ch_contrib::accel-config AND TARGET ch_contrib::qatzstd_plugin)
dbms_target_link_libraries(PUBLIC ch_contrib::accel-config)
endif ()
if (TARGET ch_contrib::qatzstd_plugin)
dbms_target_link_libraries(PUBLIC ch_contrib::qatzstd_plugin) dbms_target_link_libraries(PUBLIC ch_contrib::qatzstd_plugin)
dbms_target_link_libraries(PUBLIC ch_contrib::accel-config)
target_link_libraries(clickhouse_common_io PUBLIC ch_contrib::qatzstd_plugin) target_link_libraries(clickhouse_common_io PUBLIC ch_contrib::qatzstd_plugin)
endif () endif ()

1
src/Common/config.h.in
View File

@ -33,6 +33,7 @@
#cmakedefine01 USE_NLP #cmakedefine01 USE_NLP
#cmakedefine01 USE_VECTORSCAN #cmakedefine01 USE_VECTORSCAN
#cmakedefine01 USE_QPL #cmakedefine01 USE_QPL
#cmakedefine01 USE_QATLIB
#cmakedefine01 USE_LIBURING #cmakedefine01 USE_LIBURING
#cmakedefine01 USE_AVRO #cmakedefine01 USE_AVRO
#cmakedefine01 USE_CAPNP #cmakedefine01 USE_CAPNP

5
src/Compression/CompressionCodecZSTDQAT.cpp
View File

@ -1,4 +1,6 @@
#ifdef ENABLE_ZSTD_QAT_CODEC #include "config.h"
#if USE_QATLIB
#include <Common/logger_useful.h> #include <Common/logger_useful.h>
#include <Compression/CompressionCodecZSTD.h> #include <Compression/CompressionCodecZSTD.h>
@ -6,6 +8,7 @@
#include <Parsers/ASTLiteral.h> #include <Parsers/ASTLiteral.h>
#include <Parsers/IAST.h> #include <Parsers/IAST.h>
#include <Poco/Logger.h> #include <Poco/Logger.h>
#include <qatseqprod.h> #include <qatseqprod.h>
#include <zstd.h> #include <zstd.h>

4
src/Compression/CompressionFactory.cpp
View File

@ -175,7 +175,7 @@ void registerCodecNone(CompressionCodecFactory & factory);
void registerCodecLZ4(CompressionCodecFactory & factory); void registerCodecLZ4(CompressionCodecFactory & factory);
void registerCodecLZ4HC(CompressionCodecFactory & factory); void registerCodecLZ4HC(CompressionCodecFactory & factory);
void registerCodecZSTD(CompressionCodecFactory & factory); void registerCodecZSTD(CompressionCodecFactory & factory);
#ifdef ENABLE_ZSTD_QAT_CODEC #if USE_QATLIB
void registerCodecZSTDQAT(CompressionCodecFactory & factory); void registerCodecZSTDQAT(CompressionCodecFactory & factory);
#endif #endif
void registerCodecMultiple(CompressionCodecFactory & factory); void registerCodecMultiple(CompressionCodecFactory & factory);
@ -198,7 +198,7 @@ CompressionCodecFactory::CompressionCodecFactory()
registerCodecNone(*this); registerCodecNone(*this);
registerCodecLZ4(*this); registerCodecLZ4(*this);
registerCodecZSTD(*this); registerCodecZSTD(*this);
#ifdef ENABLE_ZSTD_QAT_CODEC #if USE_QATLIB
registerCodecZSTDQAT(*this); registerCodecZSTDQAT(*this);
#endif #endif
registerCodecLZ4HC(*this); registerCodecLZ4HC(*this);

2
src/Storages/System/StorageSystemBuildOptions.cpp.in
View File

@ -63,7 +63,7 @@ const char * auto_config_build[]
"USE_ORC", "@USE_ORC@", "USE_ORC", "@USE_ORC@",
"USE_MSGPACK", "@USE_MSGPACK@", "USE_MSGPACK", "@USE_MSGPACK@",
"USE_QPL", "@USE_QPL@", "USE_QPL", "@USE_QPL@",
"USE_QAT", "@ENABLE_QATLIB@", "USE_QATLIB", "@USE_QATLIB@",
"GIT_HASH", "@GIT_HASH@", "GIT_HASH", "@GIT_HASH@",
"GIT_BRANCH", R"IRjaNsZIL9Yh7FQ4(@GIT_BRANCH@)IRjaNsZIL9Yh7FQ4", "GIT_BRANCH", R"IRjaNsZIL9Yh7FQ4(@GIT_BRANCH@)IRjaNsZIL9Yh7FQ4",
"GIT_DATE", "@GIT_DATE@", "GIT_DATE", "@GIT_DATE@",

3
src/configure_config.cmake
View File

@ -138,6 +138,9 @@ endif()
if (TARGET ch_contrib::qpl) if (TARGET ch_contrib::qpl)
set(USE_QPL 1) set(USE_QPL 1)
endif() endif()
if (TARGET ch_contrib::qatlib)
set(USE_QATLIB 1)
endif()
if (TARGET ch_contrib::avrocpp) if (TARGET ch_contrib::avrocpp)
set(USE_AVRO 1) set(USE_AVRO 1)
endif() endif()