From 4f33f7283c73589d4c4bf7159991523a2301175c Mon Sep 17 00:00:00 2001
From: Nicolas Mowen <nickmowen213@gmail.com>
Date: Wed, 9 Oct 2024 15:02:22 -0600
Subject: [PATCH] Remove onnx clip

---
 docker/main/Dockerfile                   | 8 --------
 docker/main/requirements-wheels-post.txt | 3 ---
 docker/main/requirements-wheels.txt      | 5 +++--
 3 files changed, 3 insertions(+), 13 deletions(-)
 delete mode 100644 docker/main/requirements-wheels-post.txt

diff --git a/docker/main/Dockerfile b/docker/main/Dockerfile
index 128159d5f..aca2a02ee 100644
--- a/docker/main/Dockerfile
+++ b/docker/main/Dockerfile
@@ -225,14 +225,6 @@ RUN --mount=type=bind,from=wheels,source=/wheels,target=/deps/wheels \
     python3 -m pip install --upgrade pip && \
     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 / /
 
 RUN ldconfig
diff --git a/docker/main/requirements-wheels-post.txt b/docker/main/requirements-wheels-post.txt
deleted file mode 100644
index a1686f091..000000000
--- a/docker/main/requirements-wheels-post.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-# ONNX
-onnxruntime-openvino == 1.19.* ; platform_machine == 'x86_64'
-onnxruntime == 1.19.* ; platform_machine == 'aarch64'
\ No newline at end of file
diff --git a/docker/main/requirements-wheels.txt b/docker/main/requirements-wheels.txt
index 5db2e8886..11ad94f3f 100644
--- a/docker/main/requirements-wheels.txt
+++ b/docker/main/requirements-wheels.txt
@@ -30,11 +30,12 @@ norfair == 2.2.*
 setproctitle == 1.3.*
 ws4py == 0.5.*
 unidecode == 1.3.*
-# OpenVino (ONNX installed in wheels-post)
+# OpenVino & ONNX
 openvino == 2024.3.*
+onnxruntime-openvino == 1.19.* ; platform_machine == 'x86_64'
+onnxruntime == 1.19.* ; platform_machine == 'aarch64'
 # Embeddings
 transformers == 4.45.*
-onnx_clip == 4.0.*
 # Generative AI
 google-generativeai == 0.8.*
 ollama == 0.3.*