From 554994d8d7bdb5a659c1609fbbfc762ac87ac6f2 Mon Sep 17 00:00:00 2001 From: Su Yang Date: Tue, 2 Aug 2022 11:32:33 +0800 Subject: [PATCH] Remove invalid build parameters for openblas (https://github.com/milvus-io/milvus/issues/18360) (#18464) Signed-off-by: soulteary --- build/docker/openblas/centos7/Dockerfile | 2 +- build/docker/openblas/ubuntu18.04/Dockerfile | 2 +- build/rpm/setup-env.sh | 2 +- scripts/README.md | 2 +- scripts/install_deps_embd.sh | 4 ++-- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/build/docker/openblas/centos7/Dockerfile b/build/docker/openblas/centos7/Dockerfile index ad06f25a2c..6924de1c63 100644 --- a/build/docker/openblas/centos7/Dockerfile +++ b/build/docker/openblas/centos7/Dockerfile @@ -10,7 +10,7 @@ RUN yum install -y epel-release centos-release-scl-rh && yum install -y wget mak RUN source /etc/profile.d/devtoolset-7.sh && \ wget https://github.com/xianyi/OpenBLAS/archive/v0.3.9.tar.gz && \ tar zxvf v0.3.9.tar.gz && cd OpenBLAS-0.3.9 && \ - make TARGET=CORE2 DYNAMIC_ARCH=1 DYNAMIC_OLDER=1 USE_THREAD=0 USE_OPENMP=0 FC=gfortran CC=gcc COMMON_OPT="-O3 -g -fPIC" FCOMMON_OPT="-O3 -g -fPIC -frecursive" NMAX="NUM_THREADS=128" LIBPREFIX="libopenblas" LAPACKE="NO_LAPACKE=1" INTERFACE64=0 NO_STATIC=1 && \ + make TARGET=CORE2 DYNAMIC_ARCH=1 DYNAMIC_OLDER=1 USE_THREAD=0 USE_OPENMP=0 FC=gfortran CC=gcc COMMON_OPT="-O3 -g -fPIC" FCOMMON_OPT="-O3 -g -fPIC -frecursive" NMAX="NUM_THREADS=128" LIBPREFIX="libopenblas" INTERFACE64=0 NO_STATIC=1 && \ make PREFIX=/usr NO_STATIC=1 install && \ cd .. && rm -rf OpenBLAS-0.3.9 && rm v0.3.9.tar.gz diff --git a/build/docker/openblas/ubuntu18.04/Dockerfile b/build/docker/openblas/ubuntu18.04/Dockerfile index f9dd22ffd2..a20e33d896 100644 --- a/build/docker/openblas/ubuntu18.04/Dockerfile +++ b/build/docker/openblas/ubuntu18.04/Dockerfile @@ -12,7 +12,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends wget ca-certifi rm -rf /var/lib/apt/lists/* && \ wget https://github.com/xianyi/OpenBLAS/archive/v0.3.9.tar.gz && \ tar zxvf v0.3.9.tar.gz && cd OpenBLAS-0.3.9 && \ - make TARGET=CORE2 DYNAMIC_ARCH=1 DYNAMIC_OLDER=1 USE_THREAD=0 USE_OPENMP=0 FC=gfortran CC=gcc COMMON_OPT="-O3 -g -fPIC" FCOMMON_OPT="-O3 -g -fPIC -frecursive" NMAX="NUM_THREADS=128" LIBPREFIX="libopenblas" LAPACKE="NO_LAPACKE=1" INTERFACE64=0 NO_STATIC=1 && \ + make TARGET=CORE2 DYNAMIC_ARCH=1 DYNAMIC_OLDER=1 USE_THREAD=0 USE_OPENMP=0 FC=gfortran CC=gcc COMMON_OPT="-O3 -g -fPIC" FCOMMON_OPT="-O3 -g -fPIC -frecursive" NMAX="NUM_THREADS=128" LIBPREFIX="libopenblas" INTERFACE64=0 NO_STATIC=1 && \ make -j4 PREFIX=/usr NO_STATIC=1 install && \ cd .. && rm -rf OpenBLAS-0.3.9 && rm v0.3.9.tar.gz diff --git a/build/rpm/setup-env.sh b/build/rpm/setup-env.sh index c2b070f8ec..899ae13962 100755 --- a/build/rpm/setup-env.sh +++ b/build/rpm/setup-env.sh @@ -12,7 +12,7 @@ yum install -y epel-release centos-release-scl-rh && yum install -y wget make au source /etc/profile.d/devtoolset-7.sh && \ wget https://github.com/xianyi/OpenBLAS/archive/v0.3.9.tar.gz && \ tar zxvf v0.3.9.tar.gz && cd OpenBLAS-0.3.9 && \ - make TARGET=CORE2 DYNAMIC_ARCH=1 DYNAMIC_OLDER=1 USE_THREAD=0 USE_OPENMP=0 FC=gfortran CC=gcc COMMON_OPT="-O3 -g -fPIC" FCOMMON_OPT="-O3 -g -fPIC -frecursive" NMAX="NUM_THREADS=128" LIBPREFIX="libopenblas" LAPACKE="NO_LAPACKE=1" INTERFACE64=0 NO_STATIC=1 && \ + make TARGET=CORE2 DYNAMIC_ARCH=1 DYNAMIC_OLDER=1 USE_THREAD=0 USE_OPENMP=0 FC=gfortran CC=gcc COMMON_OPT="-O3 -g -fPIC" FCOMMON_OPT="-O3 -g -fPIC -frecursive" NMAX="NUM_THREADS=128" LIBPREFIX="libopenblas" INTERFACE64=0 NO_STATIC=1 && \ make PREFIX=/usr NO_STATIC=1 install && \ cd .. && rm -rf OpenBLAS-0.3.9 && rm v0.3.9.tar.gz diff --git a/scripts/README.md b/scripts/README.md index bcf5bea6fa..d1bf4bdf37 100644 --- a/scripts/README.md +++ b/scripts/README.md @@ -25,7 +25,7 @@ Install OpenBlas library ```shell $ wget https://github.com/xianyi/OpenBLAS/archive/v0.3.9.tar.gz && \ $ tar zxvf v0.3.9.tar.gz && cd OpenBLAS-0.3.9 && \ -$ make TARGET=CORE2 DYNAMIC_ARCH=1 DYNAMIC_OLDER=1 USE_THREAD=0 USE_OPENMP=0 FC=gfortran CC=gcc COMMON_OPT="-O3 -g -fPIC" FCOMMON_OPT="-O3 -g -fPIC -frecursive" NMAX="NUM_THREADS=128" LIBPREFIX="libopenblas" LAPACKE="NO_LAPACKE=1" INTERFACE64=0 NO_STATIC=1 && \ +$ make TARGET=CORE2 DYNAMIC_ARCH=1 DYNAMIC_OLDER=1 USE_THREAD=0 USE_OPENMP=0 FC=gfortran CC=gcc COMMON_OPT="-O3 -g -fPIC" FCOMMON_OPT="-O3 -g -fPIC -frecursive" NMAX="NUM_THREADS=128" LIBPREFIX="libopenblas" INTERFACE64=0 NO_STATIC=1 && \ $ make PREFIX=/usr install ``` diff --git a/scripts/install_deps_embd.sh b/scripts/install_deps_embd.sh index 88e037b70d..ea39819a39 100644 --- a/scripts/install_deps_embd.sh +++ b/scripts/install_deps_embd.sh @@ -25,7 +25,7 @@ function install_linux_deps() { # install OpenBLAS, this could take a while. wget https://github.com/xianyi/OpenBLAS/archive/v0.3.9.tar.gz && \ tar zxvf v0.3.9.tar.gz && cd OpenBLAS-0.3.9 && \ - sudo make TARGET=CORE2 DYNAMIC_ARCH=1 DYNAMIC_OLDER=1 USE_THREAD=0 USE_OPENMP=0 FC=gfortran CC=gcc COMMON_OPT="-O3 -g -fPIC" FCOMMON_OPT="-O3 -g -fPIC -frecursive" NMAX="NUM_THREADS=128" LIBPREFIX="libopenblas" LAPACKE="NO_LAPACKE=1" INTERFACE64=0 NO_STATIC=1 && \ + sudo make TARGET=CORE2 DYNAMIC_ARCH=1 DYNAMIC_OLDER=1 USE_THREAD=0 USE_OPENMP=0 FC=gfortran CC=gcc COMMON_OPT="-O3 -g -fPIC" FCOMMON_OPT="-O3 -g -fPIC -frecursive" NMAX="NUM_THREADS=128" LIBPREFIX="libopenblas" INTERFACE64=0 NO_STATIC=1 && \ sudo make PREFIX=/usr NO_STATIC=1 install && \ cd .. && rm -rf OpenBLAS-0.3.9 && rm v0.3.9.tar.gz elif [[ -x "$(command -v yum)" ]]; then @@ -45,7 +45,7 @@ function install_linux_deps() { source "/etc/profile.d/devtoolset-7.sh" && \ wget https://github.com/xianyi/OpenBLAS/archive/v0.3.9.tar.gz && \ tar zxvf v0.3.9.tar.gz && cd OpenBLAS-0.3.9 && \ - make TARGET=CORE2 DYNAMIC_ARCH=1 DYNAMIC_OLDER=1 USE_THREAD=0 USE_OPENMP=0 FC=gfortran CC=gcc COMMON_OPT="-O3 -g -fPIC" FCOMMON_OPT="-O3 -g -fPIC -frecursive" NMAX="NUM_THREADS=128" LIBPREFIX="libopenblas" LAPACKE="NO_LAPACKE=1" INTERFACE64=0 NO_STATIC=1 && \ + make TARGET=CORE2 DYNAMIC_ARCH=1 DYNAMIC_OLDER=1 USE_THREAD=0 USE_OPENMP=0 FC=gfortran CC=gcc COMMON_OPT="-O3 -g -fPIC" FCOMMON_OPT="-O3 -g -fPIC -frecursive" NMAX="NUM_THREADS=128" LIBPREFIX="libopenblas" INTERFACE64=0 NO_STATIC=1 && \ make PREFIX=/usr NO_STATIC=1 install && \ cd .. && rm -rf OpenBLAS-0.3.9 && rm v0.3.9.tar.gz