From 120c7cf24f04918c23155a328a1b053332d2f5b1 Mon Sep 17 00:00:00 2001 From: Grzegorz Klimaszewski <166530809+grzegorz-roboflow@users.noreply.github.com> Date: Tue, 25 Mar 2025 12:29:44 +0100 Subject: [PATCH 1/9] Update pin on numpy version --- requirements/_requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements/_requirements.txt b/requirements/_requirements.txt index 010c20b2ae..8bd0784476 100644 --- a/requirements/_requirements.txt +++ b/requirements/_requirements.txt @@ -5,7 +5,7 @@ cachetools<6.0.0 cython~=3.0.0 python-dotenv~=1.0.0 fastapi>=0.100,<0.111 # be careful with upper pin - fastapi might remove support for on_event -numpy<=1.26.4 +numpy>=2.0.0,<3.0.0 opencv-python>=4.8.1.78,<=4.10.0.84 opencv-contrib-python>=4.8.1.78,<=4.10.0.84 # Note: opencv-python considers this as a bad practice, but since our dependencies rely on both we pin both here pillow<11.0 From 5035607da69d803a9b0f900a7d630c2081d9ab15 Mon Sep 17 00:00:00 2001 From: Grzegorz Klimaszewski <166530809+grzegorz-roboflow@users.noreply.github.com> Date: Tue, 25 Mar 2025 12:33:33 +0100 Subject: [PATCH 2/9] update numpy pin in all affected requirements --- requirements/requirements.sdk.http.txt | 2 +- requirements/requirements.test.integration.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/requirements/requirements.sdk.http.txt b/requirements/requirements.sdk.http.txt index 3d947edd95..c79f18d3be 100644 --- a/requirements/requirements.sdk.http.txt +++ b/requirements/requirements.sdk.http.txt @@ -3,7 +3,7 @@ dataclasses-json~=0.6.0 opencv-python>=4.8.1.78,<=4.10.0.84 pillow>=9.0.0,<11.0 supervision>=0.25.1,<=0.30.0 -numpy<=1.26.4 +numpy>=2.0.0,<3.0.0 aiohttp>=3.9.0,<=3.10.11 backoff~=2.2.0 py-cpuinfo~=9.0.0 diff --git a/requirements/requirements.test.integration.txt b/requirements/requirements.test.integration.txt index 57203398d3..205fc78c56 100644 --- a/requirements/requirements.test.integration.txt +++ b/requirements/requirements.test.integration.txt @@ -3,6 +3,6 @@ requests pytest pillow requests_toolbelt -numpy<=1.26.4 +numpy>=2.0.0,<3.0.0 pytest-retry<=1.6.3 structlog>=24.1.0,<25.0.0 \ No newline at end of file From 6b802b21f02aaade6659eedc53dd3124d91ab131 Mon Sep 17 00:00:00 2001 From: Grzegorz Klimaszewski <166530809+grzegorz-roboflow@users.noreply.github.com> Date: Tue, 25 Mar 2025 12:48:18 +0100 Subject: [PATCH 3/9] Fix tests --- .../core/workflows/core_steps/sampling/identify_changes/v1.py | 3 ++- .../workflows/core_steps/transformations/bounding_rect/v1.py | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/inference/core/workflows/core_steps/sampling/identify_changes/v1.py b/inference/core/workflows/core_steps/sampling/identify_changes/v1.py index b814d300f4..506ace9f69 100644 --- a/inference/core/workflows/core_steps/sampling/identify_changes/v1.py +++ b/inference/core/workflows/core_steps/sampling/identify_changes/v1.py @@ -1,3 +1,4 @@ +import math from typing import List, Literal, Optional, Type, Union import numpy as np @@ -210,7 +211,7 @@ def run( ) z_score = (cs - self.cosine_similarity_avg) / self.cosine_similarity_std - percentile = 1 - 0.5 * (1 + np.math.erf(z_score / np.sqrt(2))) + percentile = 1 - 0.5 * (1 + math.erf(z_score / np.sqrt(2))) # print(f"Z-score: {z_score}, Percentile: {percentile}, Cosine Similarity: {cs}, Average: {self.cosine_similarity_avg}, Std: {self.cosine_similarity_std}") diff --git a/inference/core/workflows/core_steps/transformations/bounding_rect/v1.py b/inference/core/workflows/core_steps/transformations/bounding_rect/v1.py index 8c0b56b616..ae24327cd3 100644 --- a/inference/core/workflows/core_steps/transformations/bounding_rect/v1.py +++ b/inference/core/workflows/core_steps/transformations/bounding_rect/v1.py @@ -82,7 +82,7 @@ def calculate_minimum_bounding_rectangle( rect = cv.minAreaRect(largest_contour) box = cv.boxPoints(rect) - box = np.int0(box) + box = np.array(box, dtype=int) width, height = rect[1] angle = rect[2] From f004f47a759cd7c3cd7d1d0afa19075eb8267dc1 Mon Sep 17 00:00:00 2001 From: Grzegorz Klimaszewski <166530809+grzegorz-roboflow@users.noreply.github.com> Date: Tue, 25 Mar 2025 12:55:28 +0100 Subject: [PATCH 4/9] 0.44.0rc3 --- inference/core/version.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/inference/core/version.py b/inference/core/version.py index 176c92595d..7453f91a5d 100644 --- a/inference/core/version.py +++ b/inference/core/version.py @@ -1,4 +1,4 @@ -__version__ = "0.43.0" +__version__ = "0.44.0rc3" if __name__ == "__main__": From 39393e63026432636507f9b395e5b2e19df9aa83 Mon Sep 17 00:00:00 2001 From: Grzegorz Klimaszewski <166530809+grzegorz-roboflow@users.noreply.github.com> Date: Tue, 25 Mar 2025 16:47:26 +0100 Subject: [PATCH 5/9] update onnxruntime pin to exclude versions below (and including) 1.17.1 --- requirements/requirements.cpu.txt | 2 +- requirements/requirements.gpu.txt | 2 +- requirements/requirements.jetson.txt | 2 +- requirements/requirements.vino.txt | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/requirements/requirements.cpu.txt b/requirements/requirements.cpu.txt index cc5958eec2..52aab83422 100644 --- a/requirements/requirements.cpu.txt +++ b/requirements/requirements.cpu.txt @@ -1,2 +1,2 @@ -onnxruntime>=1.15.1,<1.20.0 +onnxruntime>1.17.1,<1.20.0 nvidia-ml-py<13.0.0 diff --git a/requirements/requirements.gpu.txt b/requirements/requirements.gpu.txt index 38ef96ec06..9b32b36b8e 100644 --- a/requirements/requirements.gpu.txt +++ b/requirements/requirements.gpu.txt @@ -1 +1 @@ -onnxruntime-gpu>=1.15.1,<1.20.0 \ No newline at end of file +onnxruntime-gpu>1.17.1,<1.20.0 \ No newline at end of file diff --git a/requirements/requirements.jetson.txt b/requirements/requirements.jetson.txt index c67662ca5c..8db1e60d45 100644 --- a/requirements/requirements.jetson.txt +++ b/requirements/requirements.jetson.txt @@ -1,4 +1,4 @@ pypdfium2~=4.0.0 jupyterlab>=4.3.0,<5.0.0 PyYAML~=6.0.0 -onnxruntime-gpu>=1.15.1,<1.20.0 +onnxruntime-gpu>1.17.1,<1.20.0 diff --git a/requirements/requirements.vino.txt b/requirements/requirements.vino.txt index 1d791666a3..5d75a16029 100644 --- a/requirements/requirements.vino.txt +++ b/requirements/requirements.vino.txt @@ -1 +1 @@ -onnxruntime-openvino>=1.15.0,<1.20.0 \ No newline at end of file +onnxruntime-openvino>1.17.1,<1.20.0 \ No newline at end of file From 5f5babd7a64d42312545950b8f950f013e649276 Mon Sep 17 00:00:00 2001 From: Grzegorz Klimaszewski <166530809+grzegorz-roboflow@users.noreply.github.com> Date: Tue, 25 Mar 2025 16:48:00 +0100 Subject: [PATCH 6/9] 0.44.0rc4 --- inference/core/version.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/inference/core/version.py b/inference/core/version.py index 7453f91a5d..3f5eb31d04 100644 --- a/inference/core/version.py +++ b/inference/core/version.py @@ -1,4 +1,4 @@ -__version__ = "0.44.0rc3" +__version__ = "0.44.0rc4" if __name__ == "__main__": From 6e483a75099640a79044a3c7c763a41175875abc Mon Sep 17 00:00:00 2001 From: Grzegorz Klimaszewski <166530809+grzegorz-roboflow@users.noreply.github.com> Date: Tue, 25 Mar 2025 17:08:28 +0100 Subject: [PATCH 7/9] Update upper bound on onnxruntime version --- requirements/requirements.cpu.txt | 2 +- requirements/requirements.gpu.txt | 2 +- requirements/requirements.jetson.txt | 2 +- requirements/requirements.vino.txt | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/requirements/requirements.cpu.txt b/requirements/requirements.cpu.txt index 52aab83422..d01acbf9d2 100644 --- a/requirements/requirements.cpu.txt +++ b/requirements/requirements.cpu.txt @@ -1,2 +1,2 @@ -onnxruntime>1.17.1,<1.20.0 +onnxruntime>1.17.1,<=1.21.0 nvidia-ml-py<13.0.0 diff --git a/requirements/requirements.gpu.txt b/requirements/requirements.gpu.txt index 9b32b36b8e..4e08bdba79 100644 --- a/requirements/requirements.gpu.txt +++ b/requirements/requirements.gpu.txt @@ -1 +1 @@ -onnxruntime-gpu>1.17.1,<1.20.0 \ No newline at end of file +onnxruntime-gpu>1.17.1,<=1.21.0 \ No newline at end of file diff --git a/requirements/requirements.jetson.txt b/requirements/requirements.jetson.txt index 8db1e60d45..fc64258224 100644 --- a/requirements/requirements.jetson.txt +++ b/requirements/requirements.jetson.txt @@ -1,4 +1,4 @@ pypdfium2~=4.0.0 jupyterlab>=4.3.0,<5.0.0 PyYAML~=6.0.0 -onnxruntime-gpu>1.17.1,<1.20.0 +onnxruntime-gpu>1.17.1,<=1.21.0 diff --git a/requirements/requirements.vino.txt b/requirements/requirements.vino.txt index 5d75a16029..4ebbd98105 100644 --- a/requirements/requirements.vino.txt +++ b/requirements/requirements.vino.txt @@ -1 +1 @@ -onnxruntime-openvino>1.17.1,<1.20.0 \ No newline at end of file +onnxruntime-openvino>1.17.1,<=1.21.0 \ No newline at end of file From 9ad5594e8e1185a0e84cf58fb7a1d287f0cc5ba2 Mon Sep 17 00:00:00 2001 From: Grzegorz Klimaszewski <166530809+grzegorz-roboflow@users.noreply.github.com> Date: Thu, 27 Mar 2025 11:13:22 +0100 Subject: [PATCH 8/9] Debug pip --- docker/dockerfiles/Dockerfile.onnx.cpu | 8 ++++---- docker/dockerfiles/Dockerfile.onnx.gpu | 6 +++--- docker/dockerfiles/Dockerfile.onnx.gpu.dev | 6 +++--- docker/dockerfiles/Dockerfile.onnx.jetson.4.6.1 | 4 ++-- docker/dockerfiles/Dockerfile.onnx.jetson.5.1.1 | 4 ++-- .../Dockerfile.onnx.jetson.5.1.1.stream_manager | 4 ++-- docker/dockerfiles/Dockerfile.onnx.jetson.6.0.0 | 4 ++-- docker/dockerfiles/Dockerfile.onnx.lambda | 2 +- docker/dockerfiles/Dockerfile.onnx.trt | 2 +- 9 files changed, 20 insertions(+), 20 deletions(-) diff --git a/docker/dockerfiles/Dockerfile.onnx.cpu b/docker/dockerfiles/Dockerfile.onnx.cpu index c20a75da5b..a4ba341f1b 100644 --- a/docker/dockerfiles/Dockerfile.onnx.cpu +++ b/docker/dockerfiles/Dockerfile.onnx.cpu @@ -27,7 +27,7 @@ COPY requirements/requirements.sam.txt \ requirements/_requirements.txt \ ./ -RUN pip3 install --upgrade pip && pip3 install \ +RUN pip3 install --upgrade pip && pip3 install --verbose \ -r _requirements.txt \ -r requirements.sam.txt \ -r requirements.clip.txt \ @@ -52,9 +52,9 @@ COPY --from=base / / WORKDIR /build COPY . . RUN make create_wheels -RUN pip3 install dist/inference_cli*.whl dist/inference_core*.whl dist/inference_cpu*.whl dist/inference_sdk*.whl "setuptools<=75.5.0" +RUN pip3 install --verbose dist/inference_cli*.whl dist/inference_core*.whl dist/inference_cpu*.whl dist/inference_sdk*.whl "setuptools<=75.5.0" -RUN if [ "${TARGETPLATFORM}" = "linux/amd64" ]; then pip3 install -r requirements/requirements.vino.txt; rm -rf ~/.cache/pip; fi +RUN if [ "${TARGETPLATFORM}" = "linux/amd64" ]; then pip3 install --verbose -r requirements/requirements.vino.txt; rm -rf ~/.cache/pip; fi WORKDIR /notebooks @@ -78,4 +78,4 @@ ENV ENABLE_STREAM_API=True ENV ENABLE_WORKFLOWS_PROFILING=True ENV ENABLE_PROMETHEUS=True -ENTRYPOINT uvicorn cpu_http:app --workers $NUM_WORKERS --host $HOST --port $PORT \ No newline at end of file +ENTRYPOINT uvicorn cpu_http:app --workers $NUM_WORKERS --host $HOST --port $PORT diff --git a/docker/dockerfiles/Dockerfile.onnx.gpu b/docker/dockerfiles/Dockerfile.onnx.gpu index 600f37da7c..fc24baa5f0 100644 --- a/docker/dockerfiles/Dockerfile.onnx.gpu +++ b/docker/dockerfiles/Dockerfile.onnx.gpu @@ -29,7 +29,7 @@ COPY requirements/requirements.sam.txt \ ./ RUN python3 -m pip install -U pip -RUN python3 -m pip install \ +RUN python3 -m pip install --verbose \ --extra-index-url https://download.pytorch.org/whl/cu118 \ --extra-index-url https://aiinfra.pkgs.visualstudio.com/PublicPackages/_packaging/onnxruntime-cuda-11/pypi/simple/ \ -r _requirements.txt \ @@ -49,10 +49,10 @@ RUN python3 -m pip install \ && rm -rf ~/.cache/pip # Install setup.py requirements for flash_attn -RUN python3 -m pip install packaging==24.1 && rm -rf ~/.cache/pip +RUN python3 -m pip install --verbose packaging==24.1 && rm -rf ~/.cache/pip # Install flash_attn required for Paligemma and Florence2 -RUN python3 -m pip install -r requirements.pali.flash_attn.txt --no-dependencies --no-build-isolation && rm -rf ~/.cache/pip +RUN python3 -m pip install --verbose -r requirements.pali.flash_attn.txt --no-dependencies --no-build-isolation && rm -rf ~/.cache/pip # Start runtime stage FROM nvcr.io/nvidia/cuda:11.8.0-cudnn8-runtime-ubuntu22.04 as runtime diff --git a/docker/dockerfiles/Dockerfile.onnx.gpu.dev b/docker/dockerfiles/Dockerfile.onnx.gpu.dev index bb626c9100..e38c05b982 100644 --- a/docker/dockerfiles/Dockerfile.onnx.gpu.dev +++ b/docker/dockerfiles/Dockerfile.onnx.gpu.dev @@ -32,7 +32,7 @@ COPY requirements/requirements.sam.txt \ ./ RUN python3 -m pip install -U pip -RUN python3 -m pip install \ +RUN python3 -m pip install --verbose \ --extra-index-url https://download.pytorch.org/whl/cu118 \ --extra-index-url https://aiinfra.pkgs.visualstudio.com/PublicPackages/_packaging/onnxruntime-cuda-11/pypi/simple/ \ -r _requirements.txt \ @@ -54,10 +54,10 @@ RUN python3 -m pip install \ && rm -rf ~/.cache/pip # Install setup.py requirements for flash_attn -RUN python3 -m pip install packaging==24.1 && rm -rf ~/.cache/pip +RUN python3 -m pip install --verbose packaging==24.1 && rm -rf ~/.cache/pip # Install flash_attn required for Paligemma and Florence2 -RUN python3 -m pip install -r requirements.pali.flash_attn.txt --no-dependencies --no-build-isolation && rm -rf ~/.cache/pip +RUN python3 -m pip install --verbose -r requirements.pali.flash_attn.txt --no-dependencies --no-build-isolation && rm -rf ~/.cache/pip WORKDIR /app/ COPY inference inference diff --git a/docker/dockerfiles/Dockerfile.onnx.jetson.4.6.1 b/docker/dockerfiles/Dockerfile.onnx.jetson.4.6.1 index 604f9ce1e4..6824b72d1a 100644 --- a/docker/dockerfiles/Dockerfile.onnx.jetson.4.6.1 +++ b/docker/dockerfiles/Dockerfile.onnx.jetson.4.6.1 @@ -51,7 +51,7 @@ COPY requirements/requirements.clip.txt \ RUN python3.9 -m pip install --ignore-installed PyYAML && rm -rf ~/.cache/pip -RUN python3.9 -m pip install --upgrade pip "h5py<=3.10.0" && python3.9 -m pip install \ +RUN python3.9 -m pip install --upgrade pip "h5py<=3.10.0" && python3.9 -m pip install --verbose \ -r _requirements.txt \ -r requirements.clip.txt \ -r requirements.http.txt \ @@ -66,7 +66,7 @@ RUN python3.9 -m pip install --upgrade pip "h5py<=3.10.0" && python3.9 -m pip in RUN python3.9 -m pip uninstall --yes onnxruntime RUN wget https://nvidia.box.com/shared/static/jmomlpcctmjojz14zbwa12lxmeh2h6o5.whl -O onnxruntime_gpu-1.11.0-cp39-cp39-linux_aarch64.whl -RUN python3.9 -m pip install onnxruntime_gpu-1.11.0-cp39-cp39-linux_aarch64.whl \ +RUN python3.9 -m pip install --verbose onnxruntime_gpu-1.11.0-cp39-cp39-linux_aarch64.whl \ && rm -rf ~/.cache/pip \ && rm onnxruntime_gpu-1.11.0-cp39-cp39-linux_aarch64.whl diff --git a/docker/dockerfiles/Dockerfile.onnx.jetson.5.1.1 b/docker/dockerfiles/Dockerfile.onnx.jetson.5.1.1 index 76e6a1a550..348c4c554c 100644 --- a/docker/dockerfiles/Dockerfile.onnx.jetson.5.1.1 +++ b/docker/dockerfiles/Dockerfile.onnx.jetson.5.1.1 @@ -44,7 +44,7 @@ RUN wget https://storage.googleapis.com/roboflow-tests-assets/zxing_cpp_library_ && mv zxingcpp.cpython-39-aarch64-linux-gnu.so /usr/local/lib/python3.9/dist-packages/ \ && rm zxing_cpp_library_compiled_for_inference_v0.12.1.tar.gz -RUN python3.9 -m pip install --upgrade pip && python3.9 -m pip install \ +RUN python3.9 -m pip install --upgrade pip && python3.9 -m pip install --verbose \ -r _requirements.txt \ -r requirements.clip.txt \ -r requirements.http.txt \ @@ -59,7 +59,7 @@ RUN python3.9 -m pip install --upgrade pip && python3.9 -m pip install \ RUN python3.9 -m pip uninstall --yes onnxruntime RUN wget https://nvidia.box.com/shared/static/67zek28z497hs9aev7xg2c1wngdeyv4h.whl -O onnxruntime_gpu-1.16.0-cp39-cp39-linux_aarch64.whl -RUN python3.9 -m pip install onnxruntime_gpu-1.16.0-cp39-cp39-linux_aarch64.whl "opencv-python-headless>4,<=4.10.0.84" \ +RUN python3.9 -m pip install --verbose onnxruntime_gpu-1.16.0-cp39-cp39-linux_aarch64.whl "opencv-python-headless>4,<=4.10.0.84" \ && rm -rf ~/.cache/pip \ && rm onnxruntime_gpu-1.16.0-cp39-cp39-linux_aarch64.whl diff --git a/docker/dockerfiles/Dockerfile.onnx.jetson.5.1.1.stream_manager b/docker/dockerfiles/Dockerfile.onnx.jetson.5.1.1.stream_manager index bb9412dce0..0797c8c6a7 100644 --- a/docker/dockerfiles/Dockerfile.onnx.jetson.5.1.1.stream_manager +++ b/docker/dockerfiles/Dockerfile.onnx.jetson.5.1.1.stream_manager @@ -40,7 +40,7 @@ RUN wget https://storage.googleapis.com/roboflow-tests-assets/zxing_cpp_library_ && mv zxingcpp.cpython-39-aarch64-linux-gnu.so /usr/local/lib/python3.9/dist-packages/ \ && rm zxing_cpp_library_compiled_for_inference_v0.12.1.tar.gz -RUN python3.9 -m pip install --upgrade pip && python3.9 -m pip install \ +RUN python3.9 -m pip install --upgrade pip && python3.9 -m pip install --verbose \ -r _requirements.txt \ -r requirements.clip.txt \ -r requirements.http.txt \ @@ -50,7 +50,7 @@ RUN python3.9 -m pip install --upgrade pip && python3.9 -m pip install \ RUN python3.9 -m pip uninstall --yes onnxruntime RUN wget https://nvidia.box.com/shared/static/67zek28z497hs9aev7xg2c1wngdeyv4h.whl -O onnxruntime_gpu-1.16.0-cp39-cp39-linux_aarch64.whl -RUN python3.9 -m pip install onnxruntime_gpu-1.16.0-cp39-cp39-linux_aarch64.whl "opencv-python-headless>4,<=4.10.0.84" \ +RUN python3.9 -m pip install --verbose onnxruntime_gpu-1.16.0-cp39-cp39-linux_aarch64.whl "opencv-python-headless>4,<=4.10.0.84" \ && rm -rf ~/.cache/pip \ && rm onnxruntime_gpu-1.16.0-cp39-cp39-linux_aarch64.whl diff --git a/docker/dockerfiles/Dockerfile.onnx.jetson.6.0.0 b/docker/dockerfiles/Dockerfile.onnx.jetson.6.0.0 index 82f496665c..3893b0c7c4 100644 --- a/docker/dockerfiles/Dockerfile.onnx.jetson.6.0.0 +++ b/docker/dockerfiles/Dockerfile.onnx.jetson.6.0.0 @@ -28,7 +28,7 @@ RUN sed -i '/^opencv-python/d;/^onnxruntime/d;/^opencv-python-contrib/d' require # Upgrade pip and install Python packages RUN python3 -m pip install --upgrade pip && \ - python3 -m pip install --upgrade \ + python3 -m pip install --verbose --upgrade \ -r requirements/_requirements.txt \ -r requirements/requirements.clip.txt \ -r requirements/requirements.http.txt \ @@ -48,7 +48,7 @@ RUN rm -f dist/* && \ python3 .release/pypi/inference.gpu.setup.py bdist_wheel && \ python3 .release/pypi/inference.sdk.setup.py bdist_wheel && \ python3 .release/pypi/inference.cli.setup.py bdist_wheel && \ - python3 -m pip install dist/inference_cli*.whl dist/inference_core*.whl dist/inference_gpu*.whl dist/inference_sdk*.whl "setuptools<=75.5.0" + python3 -m pip install --verbose dist/inference_cli*.whl dist/inference_core*.whl dist/inference_gpu*.whl dist/inference_sdk*.whl "setuptools<=75.5.0" # Set up the application runtime WORKDIR /app diff --git a/docker/dockerfiles/Dockerfile.onnx.lambda b/docker/dockerfiles/Dockerfile.onnx.lambda index 26444adc53..196dbfba91 100644 --- a/docker/dockerfiles/Dockerfile.onnx.lambda +++ b/docker/dockerfiles/Dockerfile.onnx.lambda @@ -36,7 +36,7 @@ COPY requirements/requirements.clip.txt \ RUN if [ "${TARGETPLATFORM}" == "linux/amd64" ]; then mv requirements.vino.txt requirements.cpu.txt; fi RUN /var/lang/bin/python3.10 -m pip install --upgrade pip && rm -rf ~/.cache/pip -RUN pip3 install \ +RUN pip3 install --verbose \ --extra-index-url https://download.pytorch.org/whl/cpu \ certifi==2022.12.07 \ -r _requirements.txt \ diff --git a/docker/dockerfiles/Dockerfile.onnx.trt b/docker/dockerfiles/Dockerfile.onnx.trt index 4a3beca708..343d72ba19 100644 --- a/docker/dockerfiles/Dockerfile.onnx.trt +++ b/docker/dockerfiles/Dockerfile.onnx.trt @@ -22,7 +22,7 @@ COPY requirements/requirements.sam.txt \ requirements/requirements.sdk.http.txt \ ./ -RUN pip install --upgrade pip && pip install \ +RUN pip install --upgrade pip && pip install --verbose \ --extra-index-url https://download.pytorch.org/whl/cu118 \ --extra-index-url https://aiinfra.pkgs.visualstudio.com/PublicPackages/_packaging/onnxruntime-cuda-11/pypi/simple/ \ -r _requirements.txt \ From 7843e40c4163597d64814bcf52b39237577c486f Mon Sep 17 00:00:00 2001 From: Grzegorz Klimaszewski <166530809+grzegorz-roboflow@users.noreply.github.com> Date: Thu, 27 Mar 2025 11:44:03 +0100 Subject: [PATCH 9/9] Remove pins --- requirements/_requirements.txt | 82 +++++++++---------- requirements/requirements.cli.txt | 32 ++++---- requirements/requirements.clip.txt | 2 +- requirements/requirements.cpu.txt | 4 +- requirements/requirements.doctr.txt | 4 +- requirements/requirements.gaze.txt | 2 +- requirements/requirements.groundingdino.txt | 2 +- requirements/requirements.hosted.txt | 4 +- requirements/requirements.http.txt | 10 +-- requirements/requirements.jetson.txt | 6 +- requirements/requirements.pali.flash_attn.txt | 4 +- requirements/requirements.parallel.txt | 4 +- requirements/requirements.sam.txt | 10 +-- requirements/requirements.sdk.http.txt | 12 +-- requirements/requirements.transformers.txt | 16 ++-- requirements/requirements.waf.txt | 2 +- requirements/requirements.yolo_world.txt | 6 +- 17 files changed, 101 insertions(+), 101 deletions(-) diff --git a/requirements/_requirements.txt b/requirements/_requirements.txt index 8bd0784476..66d6fb356e 100644 --- a/requirements/_requirements.txt +++ b/requirements/_requirements.txt @@ -1,46 +1,46 @@ -aiortc~=1.9.0 -APScheduler>=3.10.1,<4.0.0 -asyncua~=1.1.5 -cachetools<6.0.0 -cython~=3.0.0 -python-dotenv~=1.0.0 -fastapi>=0.100,<0.111 # be careful with upper pin - fastapi might remove support for on_event +aiortc +APScheduler +asyncua +cachetools +cython +python-dotenv +fastapi # be careful with upper pin - fastapi might remove support for on_event numpy>=2.0.0,<3.0.0 opencv-python>=4.8.1.78,<=4.10.0.84 opencv-contrib-python>=4.8.1.78,<=4.10.0.84 # Note: opencv-python considers this as a bad practice, but since our dependencies rely on both we pin both here -pillow<11.0 -prometheus-fastapi-instrumentator<=6.0.0 -redis~=5.0.0 -requests>=2.32.0,<3.0.0 -rich>=13.0.0,<13.10.0 -supervision>=0.25.1,<=0.30.0 -pybase64~=1.0.0 -scikit-image>=0.19.0,<=0.24.0 -requests-toolbelt~=1.0.0 -wheel>=0.38.1,<=0.45.0 -setuptools>=70.0.0 # lack of upper-bound to ensure compatibility with Google Colab (builds to define one if needed) -networkx~=3.1 -pydantic~=2.6 -pydantic-settings~=2.2 -openai>=1.12.0,<2.0.0 -structlog>=24.1.0,<25.0.0 -zxing-cpp~=2.2.0 -boto3<=1.35.60 -typing_extensions>=4.8.0,<=4.12.2 -pydot~=2.0.0 -shapely>=2.0.0,<2.1.0 -tldextract~=5.1.2 -packaging~=24.0 -anthropic~=0.34.2 -pandas>=2.0.0,<2.3.0 -paho-mqtt~=1.6.1 -pytest>=8.0.0,<9.0.0 # this is not a joke, sam2 requires this as the fork we are using is dependent on that, yet +pillow +prometheus-fastapi-instrumentator +redis +requests +rich +supervision +pybase64 +scikit-image +requests-toolbelt +wheel +setuptools # lack of upper-bound to ensure compatibility with Google Colab (builds to define one if needed) +networkx +pydantic +pydantic-settings +openai +structlog +zxing-cpp +boto3 +typing_extensions +pydot +shapely +tldextract +packaging +anthropic +pandas +paho-mqtt +pytest # this is not a joke, sam2 requires this as the fork we are using is dependent on that, yet # do not mark the dependency: https://github.com/SauravMaheshkar/samv2/blob/main/sam2/utils/download.py -tokenizers>=0.19.0,<0.22.0 -slack-sdk~=3.33.4 -twilio~=9.3.7 +tokenizers +slack-sdk +twilio httpx>=0.25.1,<0.28.0 # must be pinned as bc in 0.28.0 is causing Anthropics to fail -pylogix==1.0.5 -pymodbus>=3.6.9,<=3.8.3 -backoff~=2.2.0 -filelock>=3.12.0,<=3.17.0 +pylogix +pymodbus +backoff +filelock diff --git a/requirements/requirements.cli.txt b/requirements/requirements.cli.txt index 150ca7a155..26eaf5a19b 100644 --- a/requirements/requirements.cli.txt +++ b/requirements/requirements.cli.txt @@ -1,16 +1,16 @@ -requests>=2.32.0,<3.0.0 -docker>=7.0.0,<8.0.0 -typer>=0.9.0,<=0.12.5 -rich>=13.0.0,<13.10.0 -PyYAML~=6.0.0 -supervision>=0.25.1,<=0.30.0 -opencv-python>=4.8.1.78,<=4.10.0.84 -tqdm>=4.0.0,<5.0.0 -nvidia-ml-py<13.0.0 -py-cpuinfo~=9.0.0 -aiohttp>=3.9.0,<=3.10.11 -backoff~=2.2.0 -pandas>=2.0.0,<2.3.0 -rich~=13.0.0 -pybase64~=1.0.0 -pydantic~=2.6 +requests +docker +typer +rich +PyYAML +supervision +opencv-python +tqdm +nvidia-ml-py +py-cpuinfo +aiohttp +backoff +pandas +rich +pybase64 +pydantic diff --git a/requirements/requirements.clip.txt b/requirements/requirements.clip.txt index 2ada1eccc6..717ad94a83 100644 --- a/requirements/requirements.clip.txt +++ b/requirements/requirements.clip.txt @@ -1 +1 @@ -rf-clip==1.1 \ No newline at end of file +rf-clip \ No newline at end of file diff --git a/requirements/requirements.cpu.txt b/requirements/requirements.cpu.txt index d01acbf9d2..80f1787a7e 100644 --- a/requirements/requirements.cpu.txt +++ b/requirements/requirements.cpu.txt @@ -1,2 +1,2 @@ -onnxruntime>1.17.1,<=1.21.0 -nvidia-ml-py<13.0.0 +onnxruntime +nvidia-ml-py diff --git a/requirements/requirements.doctr.txt b/requirements/requirements.doctr.txt index bd1d66c377..c361bf0919 100644 --- a/requirements/requirements.doctr.txt +++ b/requirements/requirements.doctr.txt @@ -1,2 +1,2 @@ -python-doctr[torch]>=0.7.0,<=0.10.0 -tf2onnx~=1.16.0 \ No newline at end of file +python-doctr[torch] +tf2onnx \ No newline at end of file diff --git a/requirements/requirements.gaze.txt b/requirements/requirements.gaze.txt index c7a90b5dcc..afae328f16 100644 --- a/requirements/requirements.gaze.txt +++ b/requirements/requirements.gaze.txt @@ -1 +1 @@ -mediapipe>=0.9,<0.11 +mediapipe diff --git a/requirements/requirements.groundingdino.txt b/requirements/requirements.groundingdino.txt index 358e3c32a1..82cd04063e 100644 --- a/requirements/requirements.groundingdino.txt +++ b/requirements/requirements.groundingdino.txt @@ -1 +1 @@ -rf_groundingdino==0.2.0 +rf_groundingdino diff --git a/requirements/requirements.hosted.txt b/requirements/requirements.hosted.txt index da447936e5..182449a8d0 100644 --- a/requirements/requirements.hosted.txt +++ b/requirements/requirements.hosted.txt @@ -1,2 +1,2 @@ -pymemcache~=4.0.0 -elasticache_auto_discovery~=1.0.0 +pymemcache +elasticache_auto_discovery diff --git a/requirements/requirements.http.txt b/requirements/requirements.http.txt index 99649f99c8..97da8ae8d8 100644 --- a/requirements/requirements.http.txt +++ b/requirements/requirements.http.txt @@ -1,5 +1,5 @@ -uvicorn[standard]<=0.34.0 -python-multipart==0.0.19 -fastapi-cprofile<=0.0.2 -orjson>=3.9.10,<=3.10.11 -asgi_correlation_id~=4.3.1 +uvicorn[standard] +python-multipart +fastapi-cprofile +orjson +asgi_correlation_id diff --git a/requirements/requirements.jetson.txt b/requirements/requirements.jetson.txt index fc64258224..fc47064745 100644 --- a/requirements/requirements.jetson.txt +++ b/requirements/requirements.jetson.txt @@ -1,4 +1,4 @@ -pypdfium2~=4.0.0 -jupyterlab>=4.3.0,<5.0.0 -PyYAML~=6.0.0 +pypdfium2 +jupyterlab +PyYAML onnxruntime-gpu>1.17.1,<=1.21.0 diff --git a/requirements/requirements.pali.flash_attn.txt b/requirements/requirements.pali.flash_attn.txt index e226a0a30b..b808553563 100644 --- a/requirements/requirements.pali.flash_attn.txt +++ b/requirements/requirements.pali.flash_attn.txt @@ -1,2 +1,2 @@ -flash-attn==2.5.9.post1 -xformers>=0.0.27.post2 \ No newline at end of file +flash-attn +xformers \ No newline at end of file diff --git a/requirements/requirements.parallel.txt b/requirements/requirements.parallel.txt index 6c576396f0..d330682d7e 100644 --- a/requirements/requirements.parallel.txt +++ b/requirements/requirements.parallel.txt @@ -1,2 +1,2 @@ -celery>=5.4.0,<6.0.0 -gunicorn~=23.0.0 \ No newline at end of file +celery +gunicorn \ No newline at end of file diff --git a/requirements/requirements.sam.txt b/requirements/requirements.sam.txt index f855282e4a..0558c41769 100644 --- a/requirements/requirements.sam.txt +++ b/requirements/requirements.sam.txt @@ -1,5 +1,5 @@ -rf-segment-anything==1.0 -samv2==0.0.4 -rasterio~=1.3 -torch>=2.0.1,<=2.4.0 -torchvision>=0.15.2 +rf-segment-anything +samv2 +rasterio +torch +torchvision diff --git a/requirements/requirements.sdk.http.txt b/requirements/requirements.sdk.http.txt index c79f18d3be..f8c0099410 100644 --- a/requirements/requirements.sdk.http.txt +++ b/requirements/requirements.sdk.http.txt @@ -1,9 +1,9 @@ requests>=2.32.0,<3.0.0 dataclasses-json~=0.6.0 opencv-python>=4.8.1.78,<=4.10.0.84 -pillow>=9.0.0,<11.0 -supervision>=0.25.1,<=0.30.0 -numpy>=2.0.0,<3.0.0 -aiohttp>=3.9.0,<=3.10.11 -backoff~=2.2.0 -py-cpuinfo~=9.0.0 +pillow +supervision +numpy +aiohttp +backoff +py-cpuinfo diff --git a/requirements/requirements.transformers.txt b/requirements/requirements.transformers.txt index 90e68304a2..32d1601d8b 100644 --- a/requirements/requirements.transformers.txt +++ b/requirements/requirements.transformers.txt @@ -1,8 +1,8 @@ -torch>=2.0.1,<=2.4.0 -torchvision>=0.15.0 -transformers>=4.48.1 -timm~=1.0.0 -accelerate>=0.25.0,<=0.32.1 -einops>=0.7.0,<=0.8.0 -peft~=0.11.1 -bitsandbytes>=0.42.0,<0.44.0 \ No newline at end of file +torch +torchvision +transformers +timm +accelerate +einops +peft +bitsandbytes \ No newline at end of file diff --git a/requirements/requirements.waf.txt b/requirements/requirements.waf.txt index d5b5e0631a..e4f807a3df 100644 --- a/requirements/requirements.waf.txt +++ b/requirements/requirements.waf.txt @@ -1 +1 @@ -metlo>=0.0.17,<=0.1.5 \ No newline at end of file +metlo \ No newline at end of file diff --git a/requirements/requirements.yolo_world.txt b/requirements/requirements.yolo_world.txt index 368b32c280..df61aa2f92 100644 --- a/requirements/requirements.yolo_world.txt +++ b/requirements/requirements.yolo_world.txt @@ -1,3 +1,3 @@ -ultralytics>=8.1.27,<=8.3.40 -dill==0.3.8 -rf-clip==1.1 \ No newline at end of file +ultralytics +dill +rf-clip \ No newline at end of file