Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
99 commits
Select commit Hold shift + click to select a range
fadd868
Merge pull request #2 from TuGraph-family/master
Jant1L Jul 25, 2024
c6108ba
support vector index
Jant1L Jul 26, 2024
e3fcbaa
update camke
Jant1L Jul 26, 2024
12d290a
fix cpplint
Jant1L Jul 29, 2024
8867ea0
fix cpplint
Jant1L Jul 29, 2024
cdc323d
fix cpplint
Jant1L Jul 30, 2024
6f676a3
fix cpplint
Jant1L Jul 30, 2024
71d2241
fix cpplint && rename vector index counter
Jant1L Jul 30, 2024
b44bee7
support vector index blob to store in the index list table
Jant1L Jul 30, 2024
70c2a69
update dockerfile to support faiss dynamic library
PPPoint-t Aug 2, 2024
43b57d2
change the procedure function
Jant1L Aug 8, 2024
d096b79
Merge branch 'dev-vector-index' of https://github.com/zebra-uestc/tug…
Jant1L Aug 8, 2024
4dcce4a
change vim name && ready for incremental update index algorithms
Jant1L Aug 15, 2024
5a75dd3
HNSW interface
Jant1L Aug 15, 2024
56ffece
HNSW interface ready
Jant1L Aug 16, 2024
b3a3863
update procedure
Jant1L Aug 16, 2024
0f7bb36
update cmake file
Jant1L Aug 21, 2024
fc1b74f
remove faiss && update cmake file
PPPoint-t Aug 21, 2024
8a77275
update cmake file
Jant1L Aug 23, 2024
8e417e1
support vsag interface
PPPoint-t Aug 26, 2024
0486e12
support procedure for hnsw
Jant1L Aug 26, 2024
f116017
Completed merge with resolved conflicts
PPPoint-t Aug 26, 2024
ea11386
Merge branch 'dev-vector-index' of github.com:zebra-uestc/tugraph-db …
PPPoint-t Aug 26, 2024
d46ed31
update hnsw
Jant1L Aug 26, 2024
46d23b5
supports vsag Add's delete opertion
PPPoint-t Aug 28, 2024
afb518f
update vsag add
PPPoint-t Aug 28, 2024
07c7458
update vsag delete_ids
PPPoint-t Aug 29, 2024
a0b9791
update vsag serialize
PPPoint-t Aug 29, 2024
fb542b0
Fix bug and Submit test case
PPPoint-t Aug 29, 2024
742de73
fix some bug
Jant1L Aug 29, 2024
3e92940
Merge branch 'master' into dev-vector-index
Jant1L Aug 29, 2024
f3b11c2
fix format
Jant1L Aug 29, 2024
ec6323a
fix format
Jant1L Aug 29, 2024
f44cd23
fix format
Jant1L Aug 30, 2024
75fd972
Update index_manager.cpp
Jant1L Aug 30, 2024
b117144
Update field_extractor.cpp
Jant1L Aug 30, 2024
9d7c717
Update field_extractor.cpp
Jant1L Aug 30, 2024
2eea41c
Update field_extractor.cpp
Jant1L Aug 30, 2024
f87150c
Update field_extractor.cpp
Jant1L Aug 30, 2024
73f22f2
Merge branch 'TuGraph-family:master' into master
lipanpan03 Sep 13, 2024
20bfbfb
support faiss hnsw
PPPoint-t Sep 22, 2024
14f436f
merge
Jant1L Oct 8, 2024
4da61f3
merge
Jant1L Oct 8, 2024
6faa539
merge
Jant1L Oct 8, 2024
6ab7908
support faiss ivf_flat
Jant1L Oct 11, 2024
1c8405e
delete file
Jant1L Oct 11, 2024
03896b6
fix bug
Jant1L Oct 11, 2024
b114639
fix ci
Jant1L Oct 11, 2024
f67f79e
Merge branch 'master' into dev-faiss-vsag
Jant1L Oct 11, 2024
489b826
fix ci
Jant1L Oct 11, 2024
38110d8
Merge branch 'dev-faiss-vsag' of https://github.com/zebra-uestc/tugra…
Jant1L Oct 11, 2024
118a279
fix test_faiss_index
Jant1L Oct 11, 2024
12910c7
fix some bug
Jant1L Oct 15, 2024
a0dea19
support ivf_flat range search
Jant1L Oct 15, 2024
2bf4858
fix ci
Jant1L Oct 15, 2024
ca331f9
fix procedure
Jant1L Oct 18, 2024
163c39c
fix test
Jant1L Oct 18, 2024
8afca0c
fix ci
Jant1L Oct 18, 2024
b46f016
fix test
Jant1L Oct 18, 2024
1de9429
Merge branch 'master' into dev-faiss-vsag
Jant1L Oct 18, 2024
c85d82a
fix test
Jant1L Oct 18, 2024
69a75f9
fix test
Jant1L Oct 18, 2024
425e1bb
fix test
Jant1L Oct 19, 2024
e41ac99
fix test
Jant1L Oct 19, 2024
e651497
fix memory leak
Jant1L Oct 19, 2024
0782912
fix memory leak
Jant1L Oct 19, 2024
ee902a5
fix memory leak
Jant1L Oct 19, 2024
788c450
fix memory leak
Jant1L Oct 19, 2024
6d979c6
fix memory leak
Jant1L Oct 19, 2024
77843d7
fix memory leak
Jant1L Oct 20, 2024
24cebaf
fix memory leak bug
Jant1L Oct 20, 2024
9b79c45
fix memory leak
Jant1L Oct 21, 2024
ab819d4
Merge branch 'master' into dev-faiss-vsag
Jant1L Oct 21, 2024
98bb8fb
fix memory leak
Jant1L Oct 21, 2024
6e89463
Merge branch 'master' into dev-faiss-vsag
Jant1L Oct 21, 2024
f679c45
Merge branch 'master' into dev-faiss-vsag
lipanpan03 Oct 25, 2024
299e50a
Update field_extractor.h
Jant1L Nov 4, 2024
e7484d7
fix conflict
Jant1L Nov 4, 2024
5ec821e
fix ci
Jant1L Nov 4, 2024
5592f21
Merge branch 'master' into dev-faiss-vsag
Jant1L Nov 4, 2024
30f44a8
fix bug
Jant1L Nov 4, 2024
7c5b9ca
fix bug
Jant1L Nov 4, 2024
f5889e5
fix test
Jant1L Nov 5, 2024
f2d2c2c
fix test
Jant1L Nov 5, 2024
5b3e41b
Merge branch 'master' into dev-faiss-vsag
PPPoint-t Dec 18, 2024
00964db
Merge branch 'master' into dev-faiss-vsag
Jant1L Dec 20, 2024
e5065f1
cmake fix
Jant1L Dec 20, 2024
fe95bfc
fix makefile
Jant1L Dec 20, 2024
722e07d
fix cmake
PPPoint-t Dec 20, 2024
cdff29a
Merge branch 'master' of https://github.com/zebra-uestc/tugraph-db
Jant1L Apr 1, 2025
18df61b
Merge branch 'master' of https://github.com/zebra-uestc/tugraph-db
Jant1L Apr 1, 2025
4d345e0
update vsag static ilb
Jant1L Apr 22, 2025
310de70
Merge branch 'TuGraph-family:master' into master
Jant1L Apr 22, 2025
4d211ce
Merge branch 'dev-faiss-vsag' into update-vsag-lib
Jant1L Apr 22, 2025
381999d
Update tugraph-compile-ubuntu18.04-Dockerfile
Jant1L Apr 22, 2025
edcfdd7
update vsag version
Jant1L Apr 23, 2025
98b6ed1
fix bug
Jant1L Apr 24, 2025
4d5c24d
Merge branch 'update-vsag-lib' into dev-faiss-vsag
Jant1L Apr 24, 2025
3ed0c2e
Merge pull request #7 from zebra-uestc/dev-faiss-vsag
Jant1L Apr 24, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions ci/images/tugraph-compile-arm64v8-centos7-Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -386,11 +386,12 @@ RUN wget -O /tmp/openblas-faiss.tar.gz https://tugraph-web.oss-cn-beijing.aliyun
&& rm -rf /tmp/openblas-faiss /tmp/openblas-faiss.tar.gz && ldconfig

# install vsag
RUN wget https://tugraph-web.oss-cn-beijing.aliyuncs.com/tugraph/deps/vsag-0.11.5.tar.gz -O /tmp/vsag.tar.gz && \
RUN wget https://vsagcache.oss-rg-china-mainland.aliyuncs.com/vsag/v0.14.4.tar.gz -O /tmp/vsag.tar.gz && \
cd /tmp && mkdir vsag && tar -xzf vsag.tar.gz --strip-components=1 -C vsag && cd vsag && \
chmod +x /tmp/vsag/scripts/deps/install_deps_centos.sh && ./tmp/vsag/scripts/deps/install_deps_centos.sh && \
yum install -y libgfortran5.aarch64 && ln -s /usr/lib64/libgfortran.so.5.0.0 /usr/local/lib/libgfortran.so && ldconfig && \
mkdir build && cd build && cmake -DCMAKE_BUILD_TYPE=Release -DENABLE_INTEL_MKL=OFF -DDISABLE_AVX2_FORCE=ON -DDISABLE_AVX512_FORCE=ON .. && \
make ${JFLAG} && make install && \
mkdir build && cd build && cmake -DCMAKE_BUILD_TYPE=Release -DENABLE_WERROR=OFF -DENABLE_TOOLS=OFF -DENABLE_TESTS=OFF -DENABLE_INTEL_MKL=OFF -DDISABLE_AVX2_FORCE=ON -DDISABLE_AVX512_FORCE=ON .. && \
make ${JFLAG} && make install && cp /tmp/vsag/build/_deps/roaringbitmap-build/src/libroaring.a /usr/local/lib/ && \
cd / && rm -rf /tmp/vsag*

RUN sed -i '3 s/-lgomp/-l:libgomp.a/' /usr/local/lib64/libgomp.spec
Expand Down
9 changes: 5 additions & 4 deletions ci/images/tugraph-compile-centos-stream-9-Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -338,11 +338,12 @@ RUN wget https://tugraph-web.oss-cn-beijing.aliyuncs.com/tugraph/deps/tabulate-3
&& rm -rf /tabulate*

# install vsag
RUN wget https://tugraph-web.oss-cn-beijing.aliyuncs.com/tugraph/deps/vsag-0.11.5.tar.gz -O /tmp/vsag.tar.gz && \
RUN wget https://vsagcache.oss-rg-china-mainland.aliyuncs.com/vsag/v0.14.4.tar.gz -O /tmp/vsag.tar.gz && \
cd /tmp && mkdir vsag && tar -xzf vsag.tar.gz --strip-components=1 -C vsag && cd vsag && \
yum install -y libgfortran.x86_64 && ln -s /usr/lib64/libgfortran.so.5.0.0 /usr/local/lib/libgfortran.so && ldconfig && \
mkdir build && cd build && cmake -DCMAKE_BUILD_TYPE=Release -DENABLE_INTEL_MKL=OFF -DDISABLE_AVX2_FORCE=ON -DDISABLE_AVX512_FORCE=ON .. && \
make ${JFLAG} && make install && \
chmod +x /tmp/vsag/scripts/deps/install_deps_centos.sh && ./tmp/vsag/scripts/deps/install_deps_centos.sh && \
yum install -y libgfortran5.aarch64 && ln -s /usr/lib64/libgfortran.so.5.0.0 /usr/local/lib/libgfortran.so && ldconfig && \
mkdir build && cd build && cmake -DCMAKE_BUILD_TYPE=Release -DENABLE_WERROR=OFF -DENABLE_TOOLS=OFF -DENABLE_TESTS=OFF -DENABLE_INTEL_MKL=OFF -DDISABLE_AVX2_FORCE=ON -DDISABLE_AVX512_FORCE=ON .. && \
make ${JFLAG} && make install && cp /tmp/vsag/build/_deps/roaringbitmap-build/src/libroaring.a /usr/local/lib/ && \
cd / && rm -rf /tmp/vsag*

RUN sed -i '3 s/-lgomp/-l:libgomp.a/' /usr/local/lib64/libgomp.spec
Expand Down
9 changes: 5 additions & 4 deletions ci/images/tugraph-compile-centos7-Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -353,11 +353,12 @@ RUN wget -O /tmp/openblas-faiss.tar.gz https://tugraph-web.oss-cn-beijing.aliyun
&& rm -rf /tmp/openblas-faiss /tmp/openblas-faiss.tar.gz && ldconfig

# install vsag
RUN wget https://tugraph-web.oss-cn-beijing.aliyuncs.com/tugraph/deps/vsag-0.11.5.tar.gz -O /tmp/vsag.tar.gz && \
RUN wget https://vsagcache.oss-rg-china-mainland.aliyuncs.com/vsag/v0.14.4.tar.gz -O /tmp/vsag.tar.gz && \
cd /tmp && mkdir vsag && tar -xzf vsag.tar.gz --strip-components=1 -C vsag && cd vsag && \
yum install -y libgfortran5.x86_64 && ln -s /usr/lib64/libgfortran.so.5.0.0 /usr/local/lib/libgfortran.so && ldconfig && \
mkdir build && cd build && cmake -DCMAKE_BUILD_TYPE=Release -DENABLE_INTEL_MKL=OFF -DDISABLE_AVX2_FORCE=ON -DDISABLE_AVX512_FORCE=ON .. && \
make ${JFLAG} && make install && \
chmod +x /tmp/vsag/scripts/deps/install_deps_centos.sh && ./tmp/vsag/scripts/deps/install_deps_centos.sh && \
yum install -y libgfortran5.aarch64 && ln -s /usr/lib64/libgfortran.so.5.0.0 /usr/local/lib/libgfortran.so && ldconfig && \
mkdir build && cd build && cmake -DCMAKE_BUILD_TYPE=Release -DENABLE_WERROR=OFF -DENABLE_TOOLS=OFF -DENABLE_TESTS=OFF -DENABLE_INTEL_MKL=OFF -DDISABLE_AVX2_FORCE=ON -DDISABLE_AVX512_FORCE=ON .. && \
make ${JFLAG} && make install && cp /tmp/vsag/build/_deps/roaringbitmap-build/src/libroaring.a /usr/local/lib/ && \
cd / && rm -rf /tmp/vsag*

RUN sed -i '3 s/-lgomp/-l:libgomp.a/' /usr/local/lib64/libgomp.spec
Expand Down
9 changes: 5 additions & 4 deletions ci/images/tugraph-compile-centos8-Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -358,11 +358,12 @@ RUN wget -O /tmp/openblas-faiss.tar.gz https://tugraph-web.oss-cn-beijing.aliyun
&& rm -rf /tmp/openblas-faiss /tmp/openblas-faiss.tar.gz && ldconfig

# install vsag
RUN wget https://tugraph-web.oss-cn-beijing.aliyuncs.com/tugraph/deps/vsag-0.11.5.tar.gz -O /tmp/vsag.tar.gz && \
RUN wget https://vsagcache.oss-rg-china-mainland.aliyuncs.com/vsag/v0.14.4.tar.gz -O /tmp/vsag.tar.gz && \
cd /tmp && mkdir vsag && tar -xzf vsag.tar.gz --strip-components=1 -C vsag && cd vsag && \
yum install -y libgfortran.x86_64 && ln -s /usr/lib64/libgfortran.so.5.0.0 /usr/local/lib/libgfortran.so && ldconfig && \
mkdir build && cd build && cmake -DCMAKE_BUILD_TYPE=Release -DENABLE_INTEL_MKL=OFF -DDISABLE_AVX2_FORCE=ON -DDISABLE_AVX512_FORCE=ON .. && \
make ${JFLAG} && make install && \
chmod +x /tmp/vsag/scripts/deps/install_deps_centos.sh && ./tmp/vsag/scripts/deps/install_deps_centos.sh && \
yum install -y libgfortran5.aarch64 && ln -s /usr/lib64/libgfortran.so.5.0.0 /usr/local/lib/libgfortran.so && ldconfig && \
mkdir build && cd build && cmake -DCMAKE_BUILD_TYPE=Release -DENABLE_WERROR=OFF -DENABLE_TOOLS=OFF -DENABLE_TESTS=OFF -DENABLE_INTEL_MKL=OFF -DDISABLE_AVX2_FORCE=ON -DDISABLE_AVX512_FORCE=ON .. && \
make ${JFLAG} && make install && cp /tmp/vsag/build/_deps/roaringbitmap-build/src/libroaring.a /usr/local/lib/ && \
cd / && rm -rf /tmp/vsag*

RUN sed -i '3 s/-lgomp/-l:libgomp.a/' /usr/local/lib64/libgomp.spec
Expand Down
7 changes: 4 additions & 3 deletions ci/images/tugraph-compile-ubuntu18.04-Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -362,10 +362,11 @@ RUN wget -O /tmp/openblas-faiss.tar.gz https://tugraph-web.oss-cn-beijing.aliyun
# install vsag
RUN apt-get install -y gfortran && ln -s /usr/lib/x86_64-linux-gnu/libgfortran.so.4 /usr/local/lib/libgfortran.so

RUN wget https://tugraph-web.oss-cn-beijing.aliyuncs.com/tugraph/deps/vsag-0.11.5.tar.gz -O /tmp/vsag.tar.gz && \
RUN wget https://vsagcache.oss-rg-china-mainland.aliyuncs.com/vsag/v0.14.4.tar.gz -O /tmp/vsag.tar.gz && \
cd /tmp && mkdir vsag && tar -xzf vsag.tar.gz --strip-components=1 -C vsag && cd vsag && \
mkdir build && cd build && cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_LIBDIR=lib64 -DENABLE_INTEL_MKL=OFF -DDISABLE_AVX2_FORCE=ON -DDISABLE_AVX512_FORCE=ON .. && \
make -j10 && make install && \
chmod +x /tmp/vsag/scripts/deps/install_deps_ubuntu.sh && ./tmp/vsag/scripts/deps/install_deps_ubuntu.sh && \
mkdir build && cd build && cmake -DCMAKE_BUILD_TYPE=Release -DENABLE_WERROR=OFF -DENABLE_TOOLS=OFF -DENABLE_TESTS=OFF -DENABLE_INTEL_MKL=OFF -DDISABLE_AVX2_FORCE=ON -DDISABLE_AVX512_FORCE=ON .. && \
make -j10 && make install && cp /tmp/vsag/build/_deps/roaringbitmap-build/src/libroaring.a /usr/local/lib/ && \
cd / && rm -rf /tmp/vsag*

RUN sed -i '3 s/-lgomp/-l:libgomp.a/' /usr/local/lib64/libgomp.spec
Expand Down
24 changes: 21 additions & 3 deletions src/BuildLGraphApi.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,13 @@ target_include_directories(${TARGET_LGRAPH} PUBLIC

if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
target_link_libraries(${TARGET_LGRAPH} PUBLIC
vsag
-laio
/usr/local/lib64/libvsag_static.a
/usr/local/lib64/libvsag_mockimpl.a
libdiskann.a
libcpuinfo.a
libsimd.a
libroaring.a
libgomp.a
-static-libstdc++
-static-libgcc
Expand All @@ -131,7 +137,13 @@ if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
elseif (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
if (CMAKE_SYSTEM_NAME STREQUAL "Darwin")
target_link_libraries(${TARGET_LGRAPH} PUBLIC
vsag
-laio
/usr/local/lib64/libvsag_static.a
/usr/local/lib64/libvsag_mockimpl.a
libdiskann.a
libcpuinfo.a
libsimd.a
libroaring.a
/opt/OpenBLAS/lib/libopenblas.a
faiss
${Boost_LIBRARIES}
Expand All @@ -142,7 +154,13 @@ elseif (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
${JAVA_JVM_LIBRARY})
else ()
target_link_libraries(${TARGET_LGRAPH} PUBLIC
vsag
-laio
/usr/local/lib64/libvsag_static.a
/usr/local/lib64/libvsag_mockimpl.a
libdiskann.a
libcpuinfo.a
libsimd.a
libroaring.a
/opt/OpenBLAS/lib/libopenblas.a
faiss
rt
Expand Down
16 changes: 14 additions & 2 deletions src/BuildLGraphServer.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,13 @@ if (NOT (CMAKE_SYSTEM_NAME STREQUAL "Darwin"))
lgraph_cypher_lib
geax_isogql
bolt
vsag
-laio
/usr/local/lib64/libvsag_static.a
/usr/local/lib64/libvsag_mockimpl.a
libdiskann.a
libcpuinfo.a
libsimd.a
libroaring.a
/opt/OpenBLAS/lib/libopenblas.a
faiss
# begin static linking
Expand Down Expand Up @@ -142,7 +148,13 @@ add_executable(${TARGET_SERVER}
target_link_libraries(${TARGET_SERVER}
${TARGET_SERVER_LIB}
librocksdb.a
vsag
-laio
/usr/local/lib64/libvsag_static.a
/usr/local/lib64/libvsag_mockimpl.a
libdiskann.a
libcpuinfo.a
libsimd.a
libroaring.a
/opt/OpenBLAS/lib/libopenblas.a
faiss
)
4 changes: 1 addition & 3 deletions src/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -44,9 +44,7 @@ install(FILES
install(FILES
${CMAKE_CURRENT_LIST_DIR}/../release/local/etc/lgraph.json
DESTINATION etc)
install(FILES
/usr/local/lib64/libvsag.so
DESTINATION lib64/lgraph)
install(FILES DESTINATION lib64/lgraph)
install(DIRECTORY ${CMAKE_CURRENT_LIST_DIR}/../include
DESTINATION ./)

Expand Down
8 changes: 7 additions & 1 deletion test/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,13 @@ add_executable(unit_test
)

target_link_libraries(unit_test
vsag
-laio
/usr/local/lib64/libvsag_static.a
/usr/local/lib64/libvsag_mockimpl.a
libdiskann.a
libcpuinfo.a
libsimd.a
libroaring.a
/opt/OpenBLAS/lib/libopenblas.a
faiss
lgraph_server_lib
Expand Down
Loading