fixing

Committed-by: xiaolei.zl from Dev container
alibaba · Jun 17, 2024 · 03e5f40 · 03e5f40
1 parent 66d09a9
commit 03e5f40
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/flex/resources/hqps/CMakeLists.txt.template b/flex/resources/hqps/CMakeLists.txt.template
@@ -33,6 +33,12 @@ else ()
 endif()
 
 include_directories(${CMAKE_CURRENT_SOURCE_DIR})
+
+# Check if /opt/graphscope exists and include directory. Since grape headers may installed here.
+if(EXISTS "/opt/graphscope/include")
+    include_directories("/opt/graphscope/include")
+endif()
+
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++17")
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fopenmp -Wl,-rpath,$ORIGIN -O0 -flto -Werror=unused-result -fPIC -no-pie")
 

diff --git a/python/graphscope/gsctl/scripts/lib/install_thirdparty_dependencies.sh b/python/graphscope/gsctl/scripts/lib/install_thirdparty_dependencies.sh
@@ -440,10 +440,10 @@ install_hiactor() {
   pushd /tmp
   git clone https://github.com/alibaba/hiactor.git -b v0.1.1 --single-branch
   cd hiactor && git submodule update --init --recursive
-  sudo bash ./seastar/seastar/install-dependencies.sh
+  bash ./seastar/seastar/install-dependencies.sh
   mkdir build && cd build
   cmake -DHiactor_DEMOS=OFF -DHiactor_TESTING=OFF -DHiactor_DPDK=OFF -DCMAKE_INSTALL_PREFIX="${install_prefix}" \
         -DHiactor_CXX_DIALECT=gnu++17 -DSeastar_CXX_FLAGS="-DSEASTAR_DEFAULT_ALLOCATOR -mno-avx512" ..
-  make -j ${parallelism} && sudo make install
+  make -j ${parallelism} && make install
   popd && rm -rf /tmp/hiactor
 }