From c3480f548012eec11097f3a8cab2eb36f45801a7 Mon Sep 17 00:00:00 2001 From: GuangJie1 Date: Tue, 19 Nov 2024 19:25:31 +0800 Subject: [PATCH 1/2] ChatAna: support for multi architectures --- chatqna-ui/meta.yml | 3 +- chatqna/meta.yml | 3 +- .../0.3.4-redis5.1.1/24.03-lts/Dockerfile | 65 ++++++++++++++----- dataprep-redis-langchain/meta.yml | 3 +- .../0.3.3/24.03-lts/Dockerfile | 30 ++++++--- embedding-tei-langchain/meta.yml | 3 +- 6 files changed, 71 insertions(+), 36 deletions(-) diff --git a/chatqna-ui/meta.yml b/chatqna-ui/meta.yml index e3709ef9..05addfa6 100644 --- a/chatqna-ui/meta.yml +++ b/chatqna-ui/meta.yml @@ -1,3 +1,2 @@ 1.0-oe2403lts: - path: chatqna-ui/1.0/24.03-lts/Dockerfile - arch: x86_64 \ No newline at end of file + path: chatqna-ui/1.0/24.03-lts/Dockerfile \ No newline at end of file diff --git a/chatqna/meta.yml b/chatqna/meta.yml index 33875eab..9b63f5d4 100644 --- a/chatqna/meta.yml +++ b/chatqna/meta.yml @@ -1,3 +1,2 @@ 1.0-oe2403lts: - path: chatqna/1.0/24.03-lts/Dockerfile - arch: x86_64 \ No newline at end of file + path: chatqna/1.0/24.03-lts/Dockerfile \ No newline at end of file diff --git a/dataprep-redis-langchain/0.3.4-redis5.1.1/24.03-lts/Dockerfile b/dataprep-redis-langchain/0.3.4-redis5.1.1/24.03-lts/Dockerfile index 8e77baf2..d7e447e9 100644 --- a/dataprep-redis-langchain/0.3.4-redis5.1.1/24.03-lts/Dockerfile +++ b/dataprep-redis-langchain/0.3.4-redis5.1.1/24.03-lts/Dockerfile @@ -18,22 +18,52 @@ RUN yum update -y && \ python-pip python \ tesseract \ tesseract-langpack-eng \ - git - + git \ + java-1.8.0-openjdk-devel \ + gtk3-devel \ + glib2-devel \ + glibmm24-devel \ + libtool \ + cmake gcc-c++ \ + python3-devel \ + python3-pip \ + gperf \ + boost-devel \ + gstreamer1-devel \ + gstreamer1-plugins-base-devel \ + libpng-devel \ + libjpeg-devel \ + libtiff-devel \ + libxml2-devel \ + libxslt-devel \ + cups-devel \ + libSM-devel \ + libICE-devel \ + nss-devel nspr-devel \ + libXt-devel \ + bison \ + flex \ + diffutils \ + patch \ + unzip \ + ant \ + junit + +RUN cd /tmp && git clone --depth 1 https://github.com/trimesh/vhacdx && cd vhacdx && \ + CFLAGS="-I /tmp/vhacdx" pip install . && \ + rm -rf /tmp/vhacdx + +RUN python -m pip install scikit-build-core numpy && \ + cd /tmp && git clone --depth 1 https://github.com/elalish/manifold.git && \ + cd manifold && git clone --depth 1 --branch v2021.10.0 https://github.com/oneapi-src/oneTBB.git && \ + python -m pip install --upgrade pip setuptools wheel build nanobind ninja && \ + python -m build --no-isolation --sdist --wheel && \ + python -m pip install dist/manifold3d-*.whl -RUN mkdir -p /tmp/LibreOffice/LibreOffice && \ - wget -O /tmp/LibreOffice/LibreOffice.tar.gz https://mirrors.cloud.tencent.com/libreoffice/libreoffice/stable/24.8.2/rpm/x86_64/LibreOffice_24.8.2_Linux_x86-64_rpm.tar.gz && \ - tar -zxvf /tmp/LibreOffice/LibreOffice.tar.gz -C /tmp/LibreOffice/LibreOffice/ --strip-components 1 && \ - yum -y install /tmp/LibreOffice/LibreOffice/RPMS/*.rpm && \ - mkdir -p /tmp/LibreOffice/langpack_zh-CN && \ - wget -O /tmp/LibreOffice/langpack_zh-CN.tar.gz https://mirrors.cloud.tencent.com/libreoffice/libreoffice/stable/24.8.2/rpm/x86_64/LibreOffice_24.8.2_Linux_x86-64_rpm_langpack_zh-CN.tar.gz && \ - tar -zxvf /tmp/LibreOffice/langpack_zh-CN.tar.gz -C /tmp/LibreOffice/langpack_zh-CN/ --strip-components 1 && \ - yum -y install /tmp/LibreOffice/langpack_zh-CN/RPMS/*.rpm && \ - mkdir -p /tmp/LibreOffice/helppack_zh-CN && \ - wget -O /tmp/LibreOffice/helppack_zh-CN.tar.gz https://mirrors.cloud.tencent.com/libreoffice/libreoffice/stable/24.8.2/rpm/x86_64/LibreOffice_24.8.2_Linux_x86-64_rpm_helppack_zh-CN.tar.gz && \ - tar -zxvf /tmp/LibreOffice/helppack_zh-CN.tar.gz -C /tmp/LibreOffice/helppack_zh-CN/ --strip-components 1 && \ - yum -y install /tmp/LibreOffice/helppack_zh-CN/RPMS/*.rpm && \ - rm -rf /tmp/LibreOffice +RUN git clone --depth 1 https://git.libreoffice.org/core /tmp/libreoffice && \ + cd /tmp/libreoffice && chmod +x ./autogen.sh && bash -x ./autogen.sh && \ + make -j "$(nproc)" && make install && \ + rm -rf /tmp/libreoffice RUN useradd -m -s /bin/bash user && \ mkdir -p /home/user && \ @@ -43,9 +73,8 @@ USER user WORKDIR /home/user/ -RUN git clone https://github.com/opea-project/GenAIComps.git && cd GenAIComps && git checkout v1.0 - -RUN cp -r GenAIComps/comps . && \ +RUN git clone https://gitee.com/zhihang161013/GenAIComps.git && \ + cp -r GenAIComps/comps . && \ rm -rf GenAIComps RUN pip install --no-cache-dir --upgrade pip setuptools && \ diff --git a/dataprep-redis-langchain/meta.yml b/dataprep-redis-langchain/meta.yml index 079bce74..1d60ced3 100644 --- a/dataprep-redis-langchain/meta.yml +++ b/dataprep-redis-langchain/meta.yml @@ -1,3 +1,2 @@ 0.3.4-redis5.1.1-oe2403lts: - path: dataprep-redis-langchain/0.3.4-redis5.1.1/24.03-lts/Dockerfile - arch: x86_64 \ No newline at end of file + path: dataprep-redis-langchain/0.3.4-redis5.1.1/24.03-lts/Dockerfile \ No newline at end of file diff --git a/embedding-tei-langchain/0.3.3/24.03-lts/Dockerfile b/embedding-tei-langchain/0.3.3/24.03-lts/Dockerfile index 5825344d..e6200f0d 100644 --- a/embedding-tei-langchain/0.3.3/24.03-lts/Dockerfile +++ b/embedding-tei-langchain/0.3.3/24.03-lts/Dockerfile @@ -8,27 +8,37 @@ ARG ARCH="cpu" RUN yum update -y && \ yum install -y \ --setopt=install_weak_deps=False \ - python-pip python \ + python-pip python python3-devel \ + cmake gcc-c++ git \ shadow-utils \ mesa-libGL \ jemalloc-devel \ git -RUN useradd -m -s /bin/bash user && \ - mkdir -p /home/user && \ - chown -R user /home/user/ +RUN cd /tmp && git clone --depth 1 https://github.com/trimesh/vhacdx && cd vhacdx && \ + CFLAGS="-I /tmp/vhacdx" pip install . && \ + rm -rf /tmp/vhacdx -USER user +RUN python -m pip install scikit-build-core numpy && \ + cd /tmp && git clone --depth 1 https://github.com/elalish/manifold.git && \ + cd manifold && git clone --depth 1 --branch v2021.10.0 https://github.com/oneapi-src/oneTBB.git && \ + python -m pip install --upgrade pip setuptools wheel build nanobind ninja && \ + python -m build --no-isolation --sdist --wheel && \ + python -m pip install dist/manifold3d-*.whl WORKDIR /home/user/ -RUN git clone https://github.com/opea-project/GenAIComps.git && cd GenAIComps && git checkout v1.0 - -RUN cp -r GenAIComps/comps . && \ +RUN git clone https://gitee.com/zhihang161013/GenAIComps.git && \ + cp -r GenAIComps/comps . && \ rm -rf GenAIComps -RUN pip install --no-cache-dir --upgrade pip && \ - if [ ${ARCH} = "cpu" ]; then pip install --no-cache-dir torch --index-url https://download.pytorch.org/whl/cpu; fi && \ +RUN useradd -m -s /bin/bash user && \ + mkdir -p /home/user && \ + chown -R user /home/user/ + +USER user + +RUN if [ ${ARCH} = "cpu" ]; then pip install --no-cache-dir torch --index-url https://download.pytorch.org/whl/cpu; fi && \ pip install --no-cache-dir -r /home/user/comps/embeddings/tei/langchain/requirements.txt ENV PYTHONPATH=/usr/bin/python:/home/user diff --git a/embedding-tei-langchain/meta.yml b/embedding-tei-langchain/meta.yml index 945e7c91..1192bf09 100644 --- a/embedding-tei-langchain/meta.yml +++ b/embedding-tei-langchain/meta.yml @@ -1,3 +1,2 @@ 0.3.3-oe2403lts: - path: embedding-tei-langchain/0.3.3/24.03-lts/Dockerfile - arch: x86_64 \ No newline at end of file + path: embedding-tei-langchain/0.3.3/24.03-lts/Dockerfile \ No newline at end of file -- Gitee From 1b8f455615803643bd21cdc8bd47f6ac2fa33151 Mon Sep 17 00:00:00 2001 From: GuangJie1 Date: Thu, 21 Nov 2024 11:50:02 +0800 Subject: [PATCH 2/2] update upstream --- dataprep-redis-langchain/0.3.4-redis5.1.1/24.03-lts/Dockerfile | 2 +- embedding-tei-langchain/0.3.3/24.03-lts/Dockerfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dataprep-redis-langchain/0.3.4-redis5.1.1/24.03-lts/Dockerfile b/dataprep-redis-langchain/0.3.4-redis5.1.1/24.03-lts/Dockerfile index d7e447e9..83f0eddf 100644 --- a/dataprep-redis-langchain/0.3.4-redis5.1.1/24.03-lts/Dockerfile +++ b/dataprep-redis-langchain/0.3.4-redis5.1.1/24.03-lts/Dockerfile @@ -73,7 +73,7 @@ USER user WORKDIR /home/user/ -RUN git clone https://gitee.com/zhihang161013/GenAIComps.git && \ +RUN git clone --depth=1 --branch v1.0 https://github.com/opea-project/GenAIComps.git && \ cp -r GenAIComps/comps . && \ rm -rf GenAIComps diff --git a/embedding-tei-langchain/0.3.3/24.03-lts/Dockerfile b/embedding-tei-langchain/0.3.3/24.03-lts/Dockerfile index e6200f0d..54e1bfd3 100644 --- a/embedding-tei-langchain/0.3.3/24.03-lts/Dockerfile +++ b/embedding-tei-langchain/0.3.3/24.03-lts/Dockerfile @@ -28,7 +28,7 @@ RUN python -m pip install scikit-build-core numpy && \ WORKDIR /home/user/ -RUN git clone https://gitee.com/zhihang161013/GenAIComps.git && \ +RUN git clone --depth=1 --branch v1.0 https://github.com/opea-project/GenAIComps.git && \ cp -r GenAIComps/comps . && \ rm -rf GenAIComps -- Gitee