Skip to content

Commit

Permalink
fix(interactive): Install nlohmann/json.hpp as it is needed by proc…
Browse files Browse the repository at this point in the history
…edure compilation (#3872)

- Install `nlohmann/json.hpp` to system as it is needed by procedure
compilation.
- Skip building tests when building docker image.
  • Loading branch information
zhanglei1949 authored Jun 4, 2024
1 parent a93146b commit bae1819
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 1 deletion.
2 changes: 2 additions & 0 deletions flex/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -250,6 +250,8 @@ set(CPACK_DEB_COMPONENT_INSTALL YES)

#install CMakeLists.txt.template to resources/
install(FILES resources/hqps/CMakeLists.txt.template DESTINATION lib/flex/)
#install header-only nlohmann-json.hpp to include/
install(FILES ${CMAKE_SOURCE_DIR}/third_party/nlohmann-json/single_include/nlohmann/json.hpp DESTINATION include/nlohmann)

if(USE_PTHASH)
install(DIRECTORY ${PROJECT_SOURCE_DIR}/third_party/murmurhash
Expand Down
2 changes: 1 addition & 1 deletion flex/interactive/docker/interactive-runtime.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ cmake . -DCMAKE_INSTALL_PREFIX=/opt/flex -DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_

# install flex
RUN . ${HOME}/.cargo/env && cd ${HOME}/GraphScope/flex && \
git submodule update --init && mkdir build && cd build && cmake .. -DCMAKE_INSTALL_PREFIX=/opt/flex -DBUILD_DOC=OFF && make -j && make install && \
git submodule update --init && mkdir build && cd build && cmake .. -DCMAKE_INSTALL_PREFIX=/opt/flex -DBUILD_DOC=OFF -DBUILD_TEST=OFF && make -j && make install && \
cd ~/GraphScope/interactive_engine/ && mvn clean package -Pexperimental -DskipTests && \
cd ~/GraphScope/interactive_engine/compiler && cp target/compiler-0.0.1-SNAPSHOT.jar /opt/flex/lib/ && \
cp target/libs/*.jar /opt/flex/lib/ && \
Expand Down

0 comments on commit bae1819

Please sign in to comment.