From 80dcbf602f92eed01b0072f2d5cdd27316061b48 Mon Sep 17 00:00:00 2001 From: liulx20 <519459125@qq.com> Date: Wed, 15 Jan 2025 10:49:51 +0800 Subject: [PATCH] fix cmake --- flex/CMakeLists.txt | 2 +- .../runtime/common/operators/retrieve/edge_expand.cc | 2 -- flex/utils/CMakeLists.txt | 10 ++-------- 3 files changed, 3 insertions(+), 11 deletions(-) diff --git a/flex/CMakeLists.txt b/flex/CMakeLists.txt index 5c36064513bb..be400f0c6c32 100644 --- a/flex/CMakeLists.txt +++ b/flex/CMakeLists.txt @@ -15,7 +15,7 @@ option(BUILD_DOC "Whether to build doc" OFF) option(BUILD_ODPS_FRAGMENT_LOADER "Whether to build odps fragment loader" OFF) option(USE_PTHASH "Whether to use pthash" OFF) option(OPTIMIZE_FOR_HOST "Whether to optimize on host" ON) # Whether to build optimized code on host -option(USE_STATIC_ARROW "Whether to use static arrow" ON) # Whether to link arrow statically, default is ON +option(USE_STATIC_ARROW "Whether to use static arrow" OFF) # Whether to link arrow statically, default is OFF option(BUILD_WITH_OTEL "Whether to build with opentelemetry-cpp" OFF) # Whether to build with opentelemetry-cpp, default is OFF #print options diff --git a/flex/engines/graph_db/runtime/common/operators/retrieve/edge_expand.cc b/flex/engines/graph_db/runtime/common/operators/retrieve/edge_expand.cc index 9ea9caf59ff2..d3369f58de61 100644 --- a/flex/engines/graph_db/runtime/common/operators/retrieve/edge_expand.cc +++ b/flex/engines/graph_db/runtime/common/operators/retrieve/edge_expand.cc @@ -795,7 +795,6 @@ Context EdgeExpand::expand_vertex_ep_gt(const GraphReadInterface& graph, } } SLVertexColumnBuilder builder(std::get<0>(label_dirs[0])); - size_t csr_idx = 0; std::vector offsets; for (auto& csr : views) { size_t idx = 0; @@ -806,7 +805,6 @@ Context EdgeExpand::expand_vertex_ep_gt(const GraphReadInterface& graph, }); ++idx; } - ++csr_idx; } std::shared_ptr col = builder.finish(); ctx.set_with_reshuffle(params.alias, col, offsets); diff --git a/flex/utils/CMakeLists.txt b/flex/utils/CMakeLists.txt index 5ade3a963d26..4a7cddef5c49 100644 --- a/flex/utils/CMakeLists.txt +++ b/flex/utils/CMakeLists.txt @@ -24,10 +24,10 @@ set(GIE_COMPILER_PROTO_DIR ${CMAKE_CURRENT_SOURCE_DIR}/proto/) set(GIE_COMPILER_PROTO_JOB_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../../interactive_engine/executor/engine/pegasus/server/proto/) # proto files of gie compiler set(CODE_GEN_PROTOBUF_FILES - ${GIE_COMPILER_PROTO_DIR}/physical.proto ${GIE_COMPILER_PROTO_DIR}/algebra.proto ${GIE_COMPILER_PROTO_DIR}/common.proto ${GIE_COMPILER_PROTO_DIR}/expr.proto + ${GIE_COMPILER_PROTO_DIR}/physical.proto ${GIE_COMPILER_PROTO_DIR}/results.proto ${GIE_COMPILER_PROTO_DIR}/schema.proto ${GIE_COMPILER_PROTO_DIR}/type.proto @@ -71,13 +71,7 @@ target_include_directories(flex_utils PUBLIC $ $) # Link the static library of arrow, to save the trouble of linking the shared library of arrow -if (ARROW_SHARED_LIB) - target_link_libraries(flex_utils PRIVATE ${ARROW_SHARED_LIB}) -else() - target_link_libraries(flex_utils PRIVATE ${ARROW_STATIC_LIB}) -endif() - -target_link_libraries(flex_utils PUBLIC ${YAML_CPP_LIBRARIES} ${Boost_LIBRARIES} ${GLOG_LIBRARIES} ${Protobuf_LIBRARIES}) +target_link_libraries(flex_utils PUBLIC ${Protobuf_LIBRARIES} ${ARROW_LIB} ${YAML_CPP_LIBRARIES} ${Boost_LIBRARIES} ${GLOG_LIBRARIES}) #find_package(mimalloc 1.8 REQUIRED)