Switch from git submodule to system library for zstd dependency

Fixes: microsoft#311
pabs3 · Apr 1, 2023 · 9c7bc2c · 9c7bc2c
1 parent 83d3dbb
commit 9c7bc2c
Show file tree

Hide file tree

Showing 8 changed files with 6 additions and 21 deletions.
diff --git a/.gitmodules b/.gitmodules
diff --git a/AnnService/CMakeLists.txt b/AnnService/CMakeLists.txt
@@ -2,10 +2,8 @@
 # Licensed under the MIT License.
 
 set(AnnService ${PROJECT_SOURCE_DIR}/AnnService)
-set(Zstd ${PROJECT_SOURCE_DIR}/ThirdParty/zstd)
 
 include_directories(${AnnService})
-include_directories(${Zstd}/lib)
 
 file(GLOB_RECURSE HDR_FILES ${AnnService}/inc/Core/*.h  ${AnnService}/inc/Helper/*.h)
 file(GLOB_RECURSE SRC_FILES ${AnnService}/src/Core/*.cpp ${AnnService}/src/Helper/*.cpp)
@@ -38,9 +36,9 @@ if(${CMAKE_CXX_COMPILER_ID} STREQUAL "GNU")
 endif()
 
 add_library (SPTAGLib SHARED ${SRC_FILES} ${HDR_FILES})
-target_link_libraries (SPTAGLib DistanceUtils libzstd_shared ${NUMA_LIBRARY})
+target_link_libraries (SPTAGLib DistanceUtils zstd ${NUMA_LIBRARY})
 add_library (SPTAGLibStatic STATIC ${SRC_FILES} ${HDR_FILES})
-target_link_libraries (SPTAGLibStatic DistanceUtils libzstd_static ${NUMA_LIBRARY_STATIC})
+target_link_libraries (SPTAGLibStatic DistanceUtils zstd ${NUMA_LIBRARY_STATIC})
 if(${CMAKE_CXX_COMPILER_ID} STREQUAL "GNU")
     target_compile_options(SPTAGLibStatic PRIVATE -fPIC)
 endif()

diff --git a/AnnService/inc/Core/SPANN/Compressor.h b/AnnService/inc/Core/SPANN/Compressor.h
@@ -5,8 +5,6 @@
 #define _SPTAG_SPANN_COMPRESSOR_H_
 
 #include <string>
-//#include "zstd.h"
-//#include "zdict.h"
 #include <zstd.h>
 #include <zdict.h>
 #include "inc/Core/Common.h"

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -124,8 +124,6 @@ endif()
 option(GPU "GPU" ON)
 option(LIBRARYONLY "LIBRARYONLY" OFF)
 
-add_subdirectory (ThirdParty/zstd/build/cmake)
-
 add_subdirectory (AnnService)
 add_subdirectory (Test)
 add_subdirectory (GPUSupport)

diff --git a/Dockerfile b/Dockerfile
@@ -5,7 +5,7 @@ ENV DEBIAN_FRONTEND=noninteractive
 
 RUN apt-get update && apt-get -y install wget build-essential \
     swig cmake git libnuma libnuma-dev \
-    libboost-filesystem-dev libboost-test-dev libboost-serialization-dev libboost-regex-dev libboost-serialization-dev libboost-regex-dev libboost-thread-dev libboost-system-dev
+    libboost-filesystem-dev libboost-test-dev libboost-serialization-dev libboost-regex-dev libboost-serialization-dev libboost-regex-dev libboost-thread-dev libboost-system-dev libzstd-dev
 
 ENV PYTHONPATH=/app/Release
 
@@ -14,6 +14,5 @@ COPY AnnService ./AnnService/
 COPY Test ./Test/
 COPY Wrappers ./Wrappers/
 COPY GPUSupport ./GPUSupport/
-COPY ThirdParty ./ThirdParty/
 
 RUN mkdir build && cd build && cmake .. && make -j$(nproc) && cd ..
diff --git a/Dockerfile.cuda b/Dockerfile.cuda
@@ -5,7 +5,7 @@ ENV DEBIAN_FRONTEND=noninteractive
 
 RUN apt-get update && apt-get -y install build-essential \
     swig cmake git libnuma libnuma-dev \
-    libboost-filesystem-dev libboost-test-dev libboost-serialization-dev libboost-regex-dev libboost-serialization-dev libboost-regex-dev libboost-thread-dev libboost-system-dev
+    libboost-filesystem-dev libboost-test-dev libboost-serialization-dev libboost-regex-dev libboost-serialization-dev libboost-regex-dev libboost-thread-dev libboost-system-dev libzstd-dev
 
 ENV PYTHONPATH=/app/Release
 
@@ -14,6 +14,5 @@ COPY AnnService ./AnnService/
 COPY Test ./Test/
 COPY Wrappers ./Wrappers/
 COPY GPUSupport ./GPUSupport/
-COPY ThirdParty ./ThirdParty/
 
 RUN mkdir build && cd build && cmake .. && -j$(nproc) && cd ..
diff --git a/GPUSupport/CMakeLists.txt b/GPUSupport/CMakeLists.txt
@@ -29,8 +29,6 @@ if (CUDA_FOUND)
 
     include_directories(${AnnService})
 
-    include_directories(${PROJECT_SOURCE_DIR}/ThirdParty/zstd/lib)   
-
     file(GLOB_RECURSE GPU_HDR_FILES ${AnnService}/inc/Core/*.h  ${AnnService}/inc/Helper/*.h ${AnnService}/inc/Core/Common/cuda/*)
     file(GLOB_RECURSE GPU_SRC_FILES ${AnnService}/src/Core/*.cpp ${AnnService}/src/Helper/*.cpp ${AnnService}/src/Core/Common/Kernel.cu)
 
@@ -54,11 +52,11 @@ if (CUDA_FOUND)
     endif()
 
     CUDA_ADD_LIBRARY(GPUSPTAGLib SHARED ${GPU_SRC_FILES} ${GPU_HDR_FILES})
-    target_link_libraries(GPUSPTAGLib DistanceUtils ${Boost_LIBRARIES} ${CUDA_LIBRARIES} libzstd_shared ${NUMA_LIBRARY})
+    target_link_libraries(GPUSPTAGLib DistanceUtils ${Boost_LIBRARIES} ${CUDA_LIBRARIES} zstd ${NUMA_LIBRARY})
     target_compile_definitions(GPUSPTAGLib PRIVATE ${Definition})
 
     CUDA_ADD_LIBRARY(GPUSPTAGLibStatic STATIC ${GPU_SRC_FILES} ${GPU_HDR_FILES})
-    target_link_libraries(GPUSPTAGLibStatic DistanceUtils ${Boost_LIBRARIES} ${CUDA_LIBRARIES} libzstd_static ${NUMA_LIBRARY_STATIC})
+    target_link_libraries(GPUSPTAGLibStatic DistanceUtils ${Boost_LIBRARIES} ${CUDA_LIBRARIES} zstd ${NUMA_LIBRARY_STATIC})
     target_compile_definitions(GPUSPTAGLibStatic PRIVATE ${Definition})
     add_dependencies(GPUSPTAGLibStatic GPUSPTAGLib)
 

diff --git a/ThirdParty/zstd b/ThirdParty/zstd