Use new install strategy to remove onnxruntime and then install post wheels

This commit is contained in:
Nicolas Mowen 2024-09-17 12:42:35 -06:00
parent 514716807a
commit 5c2d382638
4 changed files with 16 additions and 36 deletions

View File

@ -170,8 +170,8 @@ RUN /build_pysqlite3.sh
COPY docker/main/requirements-wheels.txt /requirements-wheels.txt COPY docker/main/requirements-wheels.txt /requirements-wheels.txt
RUN pip3 wheel --wheel-dir=/wheels -r /requirements-wheels.txt RUN pip3 wheel --wheel-dir=/wheels -r /requirements-wheels.txt
COPY docker/main/requirements-wheels-nodeps.txt /requirements-wheels-nodeps.txt COPY docker/main/requirements-wheels-post.txt /requirements-wheels-post.txt
RUN pip3 wheel --no-deps --wheel-dir=/wheels -r /requirements-wheels-nodeps.txt RUN pip3 wheel --no-deps --wheel-dir=/wheels-post -r /requirements-wheels-post.txt
# Collect deps in a single layer # Collect deps in a single layer
@ -215,6 +215,14 @@ RUN --mount=type=bind,from=wheels,source=/wheels,target=/deps/wheels \
python3 -m pip install --upgrade pip && \ python3 -m pip install --upgrade pip && \
pip3 install -U /deps/wheels/*.whl pip3 install -U /deps/wheels/*.whl
# We have to uninstall this dependency specifically
# as it will break onnxruntime-openvino
RUN pip3 uninstall -y onnxruntime
RUN --mount=type=bind,from=wheels,source=/wheels-post,target=/deps/wheels \
python3 -m pip install --upgrade pip && \
pip3 install -U /deps/wheels/*.whl
COPY --from=deps-rootfs / / COPY --from=deps-rootfs / /
RUN ldconfig RUN ldconfig

View File

@ -1,32 +0,0 @@
# Embeddings
chromadb == 0.5.0
onnx_clip == 4.0.*
# chromadb dependencies
bcrypt>=4.0.1
chroma-hnswlib==0.7.6
fastapi>=0.95.2
graphlib_backport==1.0.3; python_version < '3.9'
grpcio>=1.58.0
httpx>=0.27.0
importlib-resources
kubernetes>=28.1.0
mmh3>=4.0.1
numpy>=1.22.5, <2.0.0
opentelemetry-api>=1.2.0
opentelemetry-exporter-otlp-proto-grpc>=1.24.0
opentelemetry-instrumentation-fastapi>=0.41b0
opentelemetry-sdk>=1.2.0
orjson>=3.9.12, < 3.10.6 # 3.10.7 is currently missing a wheel for x86 glibc
overrides>=7.3.1
posthog>=2.4.0
pydantic>=1.9
pypika>=0.48.9
PyYAML>=6.0.0
rich>=10.11.0
tenacity>=8.2.3
tokenizers>=0.13.2
tqdm>=4.65.0
typer>=0.9.0
typing_extensions>=4.5.0
uvicorn[standard]>=0.18.3

View File

@ -0,0 +1,3 @@
# ONNX
onnxruntime-openvino == 1.18.* ; platform_machine == 'x86_64'
onnxruntime == 1.18.* ; platform_machine == 'aarch64'

View File

@ -30,8 +30,9 @@ ws4py == 0.5.*
unidecode == 1.3.* unidecode == 1.3.*
# OpenVino & ONNX # OpenVino & ONNX
openvino == 2024.1.* openvino == 2024.1.*
onnxruntime-openvino == 1.18.* ; platform_machine == 'x86_64' # Embeddings
onnxruntime == 1.18.* ; platform_machine == 'aarch64' chromadb == 0.5.0
onnx_clip == 4.0.*
# Generative AI # Generative AI
google-generativeai == 0.6.* google-generativeai == 0.6.*
ollama == 0.2.* ollama == 0.2.*