From 7a162616871d551df9c8055186480326c7e13fc4 Mon Sep 17 00:00:00 2001 From: PPPoint_ <59258401+PPPoint-t@users.noreply.github.com> Date: Thu, 29 Aug 2024 09:47:26 +0800 Subject: [PATCH] Update the VSAG installation dockerfile (#649) Update the vsag installation dockerfile Co-authored-by: Jingxuan Su <102210932+Jant1L@users.noreply.github.com> --- ci/images/tugraph-compile-centos7-Dockerfile | 20 ++++++-------------- 1 file changed, 6 insertions(+), 14 deletions(-) diff --git a/ci/images/tugraph-compile-centos7-Dockerfile b/ci/images/tugraph-compile-centos7-Dockerfile index 8a3b7e992f..9dd4733d62 100644 --- a/ci/images/tugraph-compile-centos7-Dockerfile +++ b/ci/images/tugraph-compile-centos7-Dockerfile @@ -358,20 +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 -O /tmp/binutils-gcc-vsag.tar.gz https://tugraph-web.oss-cn-beijing.aliyuncs.com/tugraph/deps/binutils-gcc-vsag.tar.gz \ - && tar -xzvf /tmp/binutils-gcc-vsag.tar.gz -C /tmp && cd /tmp/gcc-14.2.0 \ - && yum install -y gmp-devel mpfr-devel libmpc-devel \ - && ./configure --disable-multilib --enable-languages=c,c++,fortran --prefix=/opt/gcc-14.2.0 \ - && make -j$(nproc) && make install && cd /tmp/binutils-2.43.1 \ - && ./configure --prefix=/usr/local/binutils-2.43.1 --with-sysroot=/opt/gcc-14.2.0 --libdir=/opt/gcc-14.2.0/lib64 --disable-multilib \ - && make -j$(nproc) && make install && cd /tmp/vsag && sh ./scripts/deps/install_deps_centos.sh \ - && PATH=/usr/local/binutils-2.43.1/bin:/opt/gcc-14.2.0/bin:$PATH \ - LD_LIBRARY_PATH=/opt/gcc-14.2.0/lib64:/usr/lib64:$LD_LIBRARY_PATH \ - LDFLAGS="-L/opt/gcc-14.2.0/lib64" \ - LD=/opt/gcc-14.2.0/bin/ld \ - make release && make install \ - && yum erase -y gmp-devel mpfr-devel libmpc-devel && yum clean all \ - && rm -rf /tmp/gcc-14.2.0 /tmp/binutils-2.43.1 /tmp/vsag /tmp/binutils-gcc-vsag.tar.gz /opt/gcc-14.2.0 /opt/intel /usr/local/binutils-2.43.1 +RUN wget -O /tmp/vsag.tar.gz https://tugraph-web.oss-cn-beijing.aliyuncs.com/tugraph/deps/vsag.tar.gz \ + && tar -xzvf /tmp/vsag.tar.gz -C /tmp \ + && cd /tmp/vsag && sh ./scripts/deps/install_deps_centos.sh \ + && yum install -y libgfortran5.x86_64 && ln -s /usr/lib64/libgfortran.so.5.0.0 /usr/local/lib/libgfortran.so \ + && ldconfig && make release VSAG_CMAKE_ARGS="-S. -Bbuild -DDISABLE_SSE_FORCE=OFF -DDISABLE_AVX_FORCE=OFF -DDISABLE_AVX2_FORCE=OFF -DDISABLE_AVX512_FORCE=ON" \ + && make install && rm -rf /tmp/vsag /tmp/vsag.tar.gz /opt/intel ENV JAVA_HOME=/usr/lib/jvm/java-11-openjdk \ LD_LIBRARY_PATH=/usr/local/lib64:/usr/local/lib:/usr/lib/jvm/java-11-openjdk/lib/server:$LD_LIBRARY_PATH \