Hybrid shmem rewrite

CMakeLists.txt

@@ -2,11 +2,13 @@ cmake_minimum_required(VERSION 3.15)
 project(DynamicQueriesCC)
 include (FetchContent)
 
+set(Boost_USE_STATIC_LIBS ON)
+find_package(Boost REQUIRED COMPONENTS regex context)
 # Force IPO is enabled
 cmake_policy(SET CMP0069 NEW) 
 set(CMAKE_POLICY_DEFAULT_CMP0069 NEW)
 
-set(CMAKE_CXX_STANDARD 17)
+set(CMAKE_CXX_STANDARD 20)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 set(CMAKE_CXX_EXTENSIONS ON)
 #set(INTERPROCEDURAL_OPTIMIZATION TRUE)
@@ -20,16 +22,23 @@ if(NOT CMAKE_BUILD_TYPE)
 endif()
 message(STATUS "DynamicQueries Build Type: ${CMAKE_BUILD_TYPE}")
 
+# controversial choice: return-type warnings should be promoted to errors
 if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
   message("Adding GNU compiler flags")
-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -W -Wall")
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -W -Wall -Werror=return-type")
 elseif("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC")
   message("Adding MSVC compiler flags")
   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /Wall")
 else()
   message("${CMAKE_CXX_COMPILER_ID} not recognized, no flags added")
 endif()
 
+
+# add_compile_options(-fsanitize=address)
+# add_link_options(-fsanitize=address)
+# add_compile_options(-fsanitize=undefined)
+# add_link_options(-fsanitize=undefined)
+
 ######
 # Get MPI for distributed communication
 ######
@@ -47,15 +56,32 @@ FetchContent_Declare(
   GraphZeppelinVerifyCC
 
   GIT_REPOSITORY      https://github.com/GraphStreamingProject/GraphZeppelin
-  GIT_TAG             db06e662aa7563716e49e3f5036e773a97a7dd64 #main
+  # GIT_TAG             2c633f5814f7edc79632cceb629280f6221b0281 #ksparse_recovery
+  # GIT_TAG             892b5b71b139100c309c79bb6ab94a5596fc606d
+  GIT_TAG            c31add74bae9d826b07216acca0558747d34efc0
+)
+add_compile_definitions(GLOG_USE_GLOG_EXPORT)
+
+
+# NOTE - not sure if this is gonna work
+# Install DynamicConnectivity Package
+# it doesn't. the
+
+FetchContent_Declare(
+  dycon
+  GIT_REPOSITORY  https://github.com/GraphStreamingProject/DynamicConnectivity
+  GIT_TAG         733d99e4a6985ef656df716ffe23719a1f29786b
 )
 
+
+# TODO - THERE should be a better way to do this that doesn't rely on populate and add_subdirectory
+FetchContent_Populate(dycon)
+add_subdirectory(${dycon_SOURCE_DIR} ${dycon_BINARY_DIR} EXCLUDE_FROM_ALL)
+
 FetchContent_MakeAvailable(GraphZeppelinVerifyCC)
 
-#add_compile_options(-fsanitize=address)
-#add_link_options(-fsanitize=address)
-#add_compile_options(-fsanitize=undefined)
-#add_link_options(-fsanitize=undefined)
+
+find_package(TBB REQUIRED)
 
 add_executable(dynamicCC_tests
   test/test_runner.cpp
@@ -66,13 +92,18 @@ add_executable(dynamicCC_tests
 
   src/skiplist.cpp
   src/euler_tour_tree.cpp
+  src/sketchless_skiplist.cpp
+  src/sketchless_euler_tour_tree.cpp
   src/link_cut_tree.cpp
   src/graph_tiers.cpp
+  src/batch_tiers.cpp
 )
-
 target_include_directories(dynamicCC_tests PUBLIC include ${MPI_C_INCLUDE_PATH})
-add_dependencies(dynamicCC_tests GraphZeppelinVerifyCC)
-target_link_libraries(dynamicCC_tests PRIVATE GraphZeppelinVerifyCC ${MPI_LIBRARIES})
+add_dependencies(dynamicCC_tests GraphZeppelinVerifyCC dycon)
+target_link_libraries(dynamicCC_tests PRIVATE GraphZeppelinVerifyCC dycon ${MPI_LIBRARIES} TBB::tbb)
+
+target_compile_options(dynamicCC_tests PUBLIC -fopenmp)
+target_link_options(dynamicCC_tests PUBLIC -fopenmp)
 
 add_executable(mpi_dynamicCC_tests
   test/mpi_test_runner.cpp
@@ -86,10 +117,56 @@ add_executable(mpi_dynamicCC_tests
   src/input_node.cpp
   src/tier_node.cpp
 )
-
+target_compile_definitions(mpi_dynamicCC_tests PUBLIC SKETCH_BUFFER_SIZE=${SKETCH_BUFFER_SIZE})
 target_include_directories(mpi_dynamicCC_tests PUBLIC include ${MPI_C_INCLUDE_PATH})
-add_dependencies(mpi_dynamicCC_tests GraphZeppelinVerifyCC)
-target_link_libraries(mpi_dynamicCC_tests PRIVATE GraphZeppelinVerifyCC ${MPI_LIBRARIES})
+add_dependencies(mpi_dynamicCC_tests GraphZeppelinVerifyCC dycon)
+target_link_libraries(mpi_dynamicCC_tests PRIVATE GraphZeppelinVerifyCC dycon ${MPI_LIBRARIES})
+
+target_compile_options(mpi_dynamicCC_tests PUBLIC -fopenmp)
+target_link_options(mpi_dynamicCC_tests PUBLIC -fopenmp)
+
+
+add_executable(hybrid_mpi_dynamicCC_tests
+  test/hybrid_test_runner.cpp
+  test/hybrid_tests.cpp
+
+  src/skiplist.cpp
+  src/sketchless_skiplist.cpp
+  src/euler_tour_tree.cpp
+  src/sketchless_euler_tour_tree.cpp
+  src/link_cut_tree.cpp
+  src/input_node.cpp
+  src/tier_node.cpp
+)
+target_compile_definitions(hybrid_mpi_dynamicCC_tests PUBLIC SKETCH_BUFFER_SIZE=${SKETCH_BUFFER_SIZE})
+target_include_directories(hybrid_mpi_dynamicCC_tests PUBLIC include ${MPI_C_INCLUDE_PATH})
+add_dependencies(hybrid_mpi_dynamicCC_tests GraphZeppelinVerifyCC dycon)
+target_link_libraries(hybrid_mpi_dynamicCC_tests PRIVATE GraphZeppelinVerifyCC dycon ${MPI_LIBRARIES})
+
+target_compile_options(hybrid_mpi_dynamicCC_tests PUBLIC -fopenmp)
+target_link_options(hybrid_mpi_dynamicCC_tests PUBLIC -fopenmp)
+
+add_executable(hybrid_shmem_dynamicCC_tests
+  test/hybrid_shmem_test_runner.cpp
+  test/hybrid_shmem_tests.cpp
+
+  src/skiplist.cpp
+  src/graph_tiers.cpp
+  src/batch_tiers.cpp
+  src/sketchless_skiplist.cpp
+  src/euler_tour_tree.cpp
+  src/sketchless_euler_tour_tree.cpp
+  src/link_cut_tree.cpp
+  # src/input_node.cpp
+  # src/tier_node.cpp
+)
+target_compile_definitions(hybrid_shmem_dynamicCC_tests PUBLIC SKETCH_BUFFER_SIZE=${SKETCH_BUFFER_SIZE})
+target_include_directories(hybrid_shmem_dynamicCC_tests PUBLIC include ${MPI_C_INCLUDE_PATH})
+add_dependencies(hybrid_shmem_dynamicCC_tests GraphZeppelinVerifyCC dycon)
+target_link_libraries(hybrid_shmem_dynamicCC_tests PRIVATE GraphZeppelinVerifyCC dycon ${MPI_LIBRARIES} TBB::tbb)
+
+target_compile_options(hybrid_shmem_dynamicCC_tests PUBLIC -fopenmp)
+target_link_options(hybrid_shmem_dynamicCC_tests PUBLIC -fopenmp)
 
 #######
 # TODO: Is MPI INCLUDE PATH necessary?

Dockerfile

@@ -0,0 +1,119 @@
+# build
+FROM ubuntu:24.04 AS build
+ENV DEBIAN_FRONTEND=noninteractive
+
+RUN apt-get update \
+ && apt-get install -y --no-install-recommends \
+      build-essential \
+      ca-certificates \
+      cmake \
+      git \
+      sudo \
+      gnupg \
+    #   libboost-context-dev \
+    #   libboost-filesystem-dev \
+    #   libboost-program-options-dev \
+    #   libboost-system-dev \
+    #   libboost-thread-dev \
+      libboost-all-dev \
+      libdouble-conversion-dev \
+      libfast-float-dev \
+      libevent-dev \
+      libfmt-dev \
+      libgflags-dev \
+      libgoogle-glog-dev \
+      libjemalloc-dev \
+      libmimalloc-dev \
+      libssl-dev \
+      libunwind-dev \
+      libzstd-dev \
+      ninja-build \
+      openmpi-bin \
+      libopenmpi-dev \
+      python3 \
+      python3-venv \
+      wget \
+      libtbb-dev \
+ && rm -rf /var/lib/apt/lists/*
+
+
+WORKDIR /opt/deps
+
+# install the latest version of fast-float
+
+# TODO - checkout a specific tag/release
+RUN git clone https://github.com/fastfloat/fast_float.git \
+ && cd fast_float \
+ && cmake -B build -DFASTFLOAT_TEST=OFF \
+ && sudo cmake --build build --target install
+# build folly + install dependencies we may have missed
+# TODO - would be good to enumerate them
+# RUN git clone https://github.com/facebook/folly.git
+# WORKDIR /opt/deps/folly
+# RUN python3 ./build/fbcode_builder/getdeps.py install-system-deps --recursive
+# ENV FOLLY_PREFIX=/opt/deps/folly/_build/opt/facebook
+# ENV CMAKE_PREFIX_PATH=${FOLLY_PREFIX}:${CMAKE_PREFIX_PATH}
+
+
+# build DynamicQueriesCC in Release
+WORKDIR /opt/dynamiccc
+COPY . .
+# remove old build director
+RUN rm -rf build
+RUN cmake -S . -B build \
+      -DCMAKE_BUILD_TYPE=Release \
+      -DCMAKE_PREFIX_PATH=${FOLLY_PREFIX} \
+      -DSKETCH_BUFFER_SIZE=5 \
+      -DPARLAY_TBB=On \
+
+ && cmake --build build --target \
+      dynamicCC_tests \
+      mpi_dynamicCC_tests \
+      hybrid_mpi_dynamicCC_tests \
+      hybrid_shmem_dynamicCC_tests \
+      -j "$(nproc)"
+
+
+# ------------------------------
+
+# runtime
+FROM ubuntu:24.04 AS runtime
+ENV DEBIAN_FRONTEND=noninteractive
+
+RUN apt-get update \
+ && apt-get install -y --no-install-recommends \
+      ca-certificates \
+      git \
+      libboost-context-dev \
+      libboost-filesystem-dev \
+      libboost-program-options-dev \
+      libboost-system-dev \
+      libboost-thread-dev \
+      libdouble-conversion-dev \
+      libevent-dev \
+      libfmt-dev \
+      libgflags-dev \
+      libgoogle-glog-dev \
+      libjemalloc-dev \
+      libmimalloc-dev \
+      libssl-dev \
+      libunwind-dev \
+      libzstd-dev \
+      openmpi-bin \
+      libopenmpi-dev \
+      python3 \
+      wget \
+      libtbb-dev \
+ && rm -rf /var/lib/apt/lists/*
+
+WORKDIR /opt/dynamiccc
+
+# project binaries and libs
+COPY --from=build /opt/dynamiccc/build/*tests /opt/dynamiccc/bin/
+COPY scripts ./scripts
+
+ENV PATH="/opt/dynamiccc/bin:${PATH}"
+ENV LD_LIBRARY_PATH="/opt/dynamiccc/lib:${LD_LIBRARY_PATH}"
+
+
+ENTRYPOINT ["/bin/bash"]