Skip to content

Commit 50b87af

Browse files
committed
build: fix dependency issue
Signed-off-by: DwyaneShi <[email protected]>
1 parent 4d10d45 commit 50b87af

5 files changed

+34
-5
lines changed

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -745,7 +745,7 @@ if (${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
745745
endif()
746746

747747
# boost is only required by some components
748-
if(BUILD_VINEYARD_SERVER OR BUILD_VINEYARD_IO OR BUILD_VINEYARD_GRAPH)
748+
if(BUILD_VINEYARD_SERVER OR BUILD_VINEYARD_IO OR BUILD_VINEYARD_GRAPH OR BUILD_VINEYARD_LLM_CACHE)
749749
find_boost()
750750
endif()
751751

docker/Dockerfile.vineyard-python-dev

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
# limitations under the License.
1414

1515
# build vineyard-python-dev
16-
FROM ghcr.io/aibrix/v6d/vineyard-manylinux2014:20241014 as wheel
16+
FROM ghcr.io/aibrix/v6d/vineyard-manylinux2014:20241108 as wheel
1717

1818
ENV python=cp310-cp310
1919

docker/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ ALPINE_TAG := $(ALPINE_MANIFEST_TAG)_$(PLATFORM)
1818

1919
WHEEL_BUILDER_REGISTRY := $(REGISTRY)
2020
WHEEL_BUILDER_IMAGE := vineyard-manylinux2014
21-
WHEEL_BUILDER_MANIFEST_TAG := 20241014
21+
WHEEL_BUILDER_MANIFEST_TAG := 20241108
2222
WHEEL_BUILDER_TAG := $(WHEEL_BUILDER_MANIFEST_TAG)_$(PLATFORM)
2323

2424
WHEEL_PYTHON := cp311-cp311

docker/pypa/Dockerfile.manylinux1

Lines changed: 30 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ RUN mv /etc/yum.repos.d/CentOS-Base.repo /etc/yum.repos.d/CentOS-Base.repo.backu
2626
curl -o /etc/yum.repos.d/CentOS-Base.repo http://mirrors.aliyun.com/repo/Centos-altarch-7.repo; \
2727
fi && \
2828
yum -y update && \
29-
yum -y install devtoolset-10-libatomic-devel libtool
29+
yum -y install devtoolset-10-libatomic-devel libtool openmpi-devel wget
3030

3131
# target: ghcr.io/aibrix/v6d/vineyard-manylinux2014:20240218_$PLATFORM
3232

@@ -67,6 +67,35 @@ RUN echo "Installing gflags ..." && \
6767
make install -j`nproc` && \
6868
rm -rf /deps
6969

70+
# Install boost
71+
RUN echo "Installing boost ..." && \
72+
cd /tmp && \
73+
wget -q https://boostorg.jfrog.io/artifactory/main/release/1.75.0/source/boost_1_75_0.tar.gz && \
74+
tar zxf boost_1_75_0.tar.gz && \
75+
cd boost_1_75_0 && \
76+
./bootstrap.sh && \
77+
./b2 install -j`nproc` link=static runtime-link=static variant=release threading=multi \
78+
--with-atomic \
79+
--with-chrono \
80+
--with-date_time \
81+
--with-filesystem \
82+
--with-random \
83+
--with-system \
84+
--with-thread && \
85+
cd /tmp && \
86+
rm -rf boost_1_75_0.tar.gz boost_1_75_0
87+
88+
# Install openssl
89+
RUN echo "Installing openssl ..." && \
90+
cd /tmp && \
91+
wget -q --no-check-certificate https://www.openssl.org/source/openssl-1.1.1j.tar.gz && \
92+
tar zxf openssl-1.1.1j.tar.gz && \
93+
cd openssl-1.1.1j && \
94+
./config -no-shared -no-tests && \
95+
make -j`nproc` && make install -j`nproc` || true && \
96+
cd /tmp && \
97+
rm -rf openssl-1.1.1j.tar.gz openssl-1.1.1j
98+
7099
RUN echo "Installing apache-arrow ..." && \
71100
mkdir -p /deps && \
72101
cd /deps && \

docker/pypa/Dockerfile.manylinux1-wheel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ ADD . /work/v6d
3232
RUN cd /work/v6d && \
3333
mkdir build && \
3434
cd build && \
35-
export PATH=/opt/python/$python/bin:$PATH && \
35+
export PATH=/usr/lib64/openmpi/bin/:/opt/python/$python/bin:$PATH && \
3636
pip install -U pip setuptools wheel libclang parsec && \
3737
cmake .. -DCMAKE_CXX_STANDARD=17 \
3838
-DBUILD_SHARED_LIBS=OFF \

0 commit comments

Comments
 (0)