Skip to content

Commit

Permalink
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
fix cmake
Browse files Browse the repository at this point in the history
liulx20 committed Jan 15, 2025
1 parent 81e2649 commit 80dcbf6
Showing 3 changed files with 3 additions and 11 deletions.
2 changes: 1 addition & 1 deletion flex/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -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
Original file line number Diff line number Diff line change
@@ -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<size_t> 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<IContextColumn> col = builder.finish();
ctx.set_with_reshuffle(params.alias, col, offsets);
10 changes: 2 additions & 8 deletions flex/utils/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -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
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
$<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}>)
# 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)

0 comments on commit 80dcbf6

Please sign in to comment.