Fix: openvino (#475)

* undo openvino * add poetry lock
michaelfeil · Nov 20, 2024 · 28725ac · 28725ac
1 parent c2ccffe
commit 28725ac
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 105 deletions.
diff --git a/libs/infinity_emb/Docker.template.yaml b/libs/infinity_emb/Docker.template.yaml
@@ -12,11 +12,12 @@ cpu:
   #   RUN sed -i 's|torch = "2.4.1"|torch = "2.5.0"|' pyproject.toml 
   #   RUN sed -i 's|"pypi"|"pytorch_cpu"|' pyproject.toml
   #   RUN poetry lock --no-update
-  poetry_extras: "all openvino"
+  poetry_extras: "all"
   main_install: |
     # "RUN poetry install --no-interaction --no-ansi --no-root --extras \"${EXTRAS}\" --without lint,test && poetry cache clear pypi --all"
     COPY requirements_install_from_poetry.sh requirements_install_from_poetry.sh
     RUN ./requirements_install_from_poetry.sh --no-root --without lint,test "https://download.pytorch.org/whl/cpu"
+    RUN poetry run $PYTHON -m pip install --no-cache-dir onnxruntime-openvino
   extra_env_variables: |
     # Sets default to onnx
     ENV INFINITY_ENGINE="optimum"

diff --git a/libs/infinity_emb/Dockerfile.cpu_auto b/libs/infinity_emb/Dockerfile.cpu_auto
@@ -17,7 +17,7 @@ ENV PYTHONUNBUFFERED=1 \
     POETRY_VIRTUALENVS_IN_PROJECT="true" \
     # do not ask any interactive question
     POETRY_NO_INTERACTION=1 \
-    EXTRAS="all openvino" \
+    EXTRAS="all" \
     PYTHON="python3.11"
 RUN apt-get update && apt-get install --no-install-recommends -y build-essential python3-dev libsndfile1 $PYTHON-venv $PYTHON curl
 # Sets default to onnx
@@ -43,12 +43,14 @@ COPY poetry.lock poetry.toml pyproject.toml README.md /app/
 # "RUN poetry install --no-interaction --no-ansi --no-root --extras \"${EXTRAS}\" --without lint,test && poetry cache clear pypi --all"
 COPY requirements_install_from_poetry.sh requirements_install_from_poetry.sh
 RUN ./requirements_install_from_poetry.sh --no-root --without lint,test "https://download.pytorch.org/whl/cpu"
+RUN poetry run $PYTHON -m pip install --no-cache-dir onnxruntime-openvino
 
 COPY infinity_emb infinity_emb
 # Install dependency with infinity_emb package
 # "RUN poetry install --no-interaction --no-ansi  --extras \"${EXTRAS}\" --without lint,test && poetry cache clear pypi --all"
 COPY requirements_install_from_poetry.sh requirements_install_from_poetry.sh
 RUN ./requirements_install_from_poetry.sh  --without lint,test "https://download.pytorch.org/whl/cpu"
+RUN poetry run $PYTHON -m pip install --no-cache-dir onnxruntime-openvino
 
 #
 
@@ -58,6 +60,7 @@ FROM builder as testing
 # "RUN poetry install --no-interaction --no-ansi  --extras \"${EXTRAS}\" --with lint,test && poetry cache clear pypi --all"
 COPY requirements_install_from_poetry.sh requirements_install_from_poetry.sh
 RUN ./requirements_install_from_poetry.sh  --with lint,test "https://download.pytorch.org/whl/cpu"
+RUN poetry run $PYTHON -m pip install --no-cache-dir onnxruntime-openvino
 
 # lint 
 RUN poetry run ruff check .

diff --git a/libs/infinity_emb/Makefile b/libs/infinity_emb/Makefile
@@ -54,6 +54,9 @@ build-amd:
 build-trt:
 	docker buildx build -t michaelf34/infinity:$(VERSION)-trt-onnx -f Dockerfile.trt_onnx_auto --push .
 
+build-cpu:
+	docker buildx build -t michaelf34/infinity:$(VERSION)-cpu -f Dockerfile.cpu_auto --push .
+
 # Combined target to build both
 build-all-docker: 
 	docker buildx build -t michaelf34/infinity:$(VERSION)-amd -f Dockerfile.amd_auto --push . & \

diff --git a/libs/infinity_emb/poetry.lock b/libs/infinity_emb/poetry.lock
diff --git a/libs/infinity_emb/pyproject.toml b/libs/infinity_emb/pyproject.toml
@@ -41,9 +41,9 @@ timm = {version = "*", optional=true}
 colpali-engine = {version="^0.3.1", optional=true}
 # openvino
 # optimum-intel = {version=">=1.20.0", optional=true, extras=["openvino"]}
-onnxruntime-openvino = {version=">=1.19.0", optional=true}
-openvino = {version="2024.4.0", optional=true}
-openvino-tokenizers = {version="2024.4.0.0", optional=true}
+# onnxruntime-openvino = {version=">=1.19.0", optional=true}
+# openvino = {version="2024.4.0", optional=true}
+# openvino-tokenizers = {version="2024.4.0.0", optional=true}
 
 
 # pin torchvision to a specific source, but default to pypi. use sed to overwrite.
@@ -106,7 +106,7 @@ einops=["einops"]
 logging=["rich"]
 cache=["diskcache"]
 vision=["colpali-engine","pillow","timm","torchvision"]
-openvino=["onnxruntime-openvino","openvino","openvino-tokenizers"]
+# openvino=["onnxruntime-openvino","openvino","openvino-tokenizers"]
 audio=["soundfile"]
 server=[
     "fastapi",