Skip to content

Commit a9f5f6a

Browse files
Merge pull request #1329 from roboflow/revert-1325-perception-encoder
Revert "feat: add PerceptionEncoder model implementation with tests"
2 parents 64b7b4b + 841c7bd commit a9f5f6a

17 files changed

Lines changed: 16 additions & 821 deletions

.github/workflows/integration_tests_inference_cli_depending_on_inference_x86.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,7 @@ jobs:
3838
- name: 📦 Install dependencies
3939
run: |
4040
python -m pip install --upgrade pip
41-
pip install uv
42-
uv pip install --system --upgrade setuptools
43-
uv pip install --system --extra-index-url https://download.pytorch.org/whl/cpu -r requirements/_requirements.txt -r requirements/requirements.cpu.txt -r requirements/requirements.sdk.http.txt -r requirements/requirements.test.unit.txt -r requirements/requirements.http.txt -r requirements/requirements.yolo_world.txt -r requirements/requirements.doctr.txt -r requirements/requirements.sam.txt -r requirements/requirements.transformers.txt -r requirements/requirements.cli.txt -r requirements/requirements.sdk.http.txt
41+
pip install --upgrade setuptools
42+
pip install --extra-index-url https://download.pytorch.org/whl/cpu -r requirements/_requirements.txt -r requirements/requirements.cpu.txt -r requirements/requirements.sdk.http.txt -r requirements/requirements.test.unit.txt -r requirements/requirements.http.txt -r requirements/requirements.yolo_world.txt -r requirements/requirements.doctr.txt -r requirements/requirements.sam.txt -r requirements/requirements.transformers.txt -r requirements/requirements.cli.txt -r requirements/requirements.sdk.http.txt
4443
- name: 🧪 Integration Tests of Inference CLI
4544
run: RUN_TESTS_WITH_INFERENCE_PACKAGE=True INFERENCE_CLI_TESTS_API_KEY=${{ secrets.LOAD_TEST_PRODUCTION_API_KEY }} python -m pytest tests/inference_cli/integration_tests/test_workflows.py

.github/workflows/integration_tests_inference_cli_x86.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,7 @@ jobs:
3838
- name: 📦 Install dependencies
3939
run: |
4040
python -m pip install --upgrade pip
41-
pip install uv
42-
uv pip install --system --upgrade setuptools
43-
uv pip install --system -r requirements/requirements.cli.txt -r requirements/requirements.sdk.http.txt -r requirements/requirements.test.unit.txt
41+
pip install --upgrade setuptools
42+
pip install -r requirements/requirements.cli.txt -r requirements/requirements.sdk.http.txt -r requirements/requirements.test.unit.txt
4443
- name: 🧪 Integration Tests of Inference CLI
4544
run: RUN_TESTS_EXPECTING_ERROR_WHEN_INFERENCE_NOT_INSTALLED=True INFERENCE_CLI_TESTS_API_KEY=${{ secrets.LOAD_TEST_PRODUCTION_API_KEY }} python -m pytest tests/inference_cli/integration_tests

.github/workflows/integration_tests_inference_models.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,8 @@ jobs:
4040
- name: 📦 Install dependencies
4141
run: |
4242
python -m pip install --upgrade pip
43-
pip install uv
44-
uv pip install --system --upgrade setuptools
45-
uv pip install --system --extra-index-url https://download.pytorch.org/whl/cpu -r requirements/_requirements.txt -r requirements/requirements.cpu.txt -r requirements/requirements.sdk.http.txt -r requirements/requirements.test.unit.txt -r requirements/requirements.http.txt -r requirements/requirements.yolo_world.txt -r requirements/requirements.sam.txt -r requirements/requirements.transformers.txt
43+
pip install --upgrade setuptools
44+
pip install --extra-index-url https://download.pytorch.org/whl/cpu -r requirements/_requirements.txt -r requirements/requirements.cpu.txt -r requirements/requirements.sdk.http.txt -r requirements/requirements.test.unit.txt -r requirements/requirements.http.txt -r requirements/requirements.yolo_world.txt -r requirements/requirements.sam.txt -r requirements/requirements.transformers.txt
4645
- name: 🧪 Integration Tests of Inference models
4746
timeout-minutes: 45
4847
run: MAX_BATCH_SIZE=6 python -m pytest tests/inference/models_predictions_tests

.github/workflows/integration_tests_workflows_x86.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,7 @@ jobs:
4242
- name: 📦 Install dependencies
4343
run: |
4444
python -m pip install --upgrade pip
45-
pip install uv
46-
uv pip install --system --upgrade setuptools
47-
uv pip install --system --extra-index-url https://download.pytorch.org/whl/cpu --index-strategy unsafe-best-match -r requirements/_requirements.txt -r requirements/requirements.sam.txt -r requirements/requirements.cpu.txt -r requirements/requirements.http.txt -r requirements/requirements.test.unit.txt -r requirements/requirements.doctr.txt -r requirements/requirements.yolo_world.txt -r requirements/requirements.transformers.txt -r requirements/requirements.sdk.http.txt
45+
pip install --upgrade setuptools
46+
pip install --extra-index-url https://download.pytorch.org/whl/cpu -r requirements/_requirements.txt -r requirements/requirements.sam.txt -r requirements/requirements.cpu.txt -r requirements/requirements.http.txt -r requirements/requirements.test.unit.txt -r requirements/requirements.doctr.txt -r requirements/requirements.yolo_world.txt -r requirements/requirements.transformers.txt -r requirements/requirements.sdk.http.txt
4847
- name: 🧪 Integration Tests of Workflows
4948
run: ROBOFLOW_API_KEY=${{ secrets.API_KEY }} SKIP_FLORENCE2_TEST=FALSE LOAD_ENTERPRISE_BLOCKS=TRUE python -m pytest tests/workflows/integration_tests

.github/workflows/unit_tests_inference_cli_x86.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,8 @@ jobs:
4040
- name: 📦 Install dependencies
4141
run: |
4242
python -m pip install --upgrade pip
43-
pip install uv
44-
uv pip install --system --upgrade setuptools
45-
uv pip install --system -r requirements/requirements.cli.txt -r requirements/requirements.test.unit.txt -r requirements/requirements.sdk.http.txt
43+
pip install --upgrade setuptools
44+
pip install -r requirements/requirements.cli.txt -r requirements/requirements.test.unit.txt -r requirements/requirements.sdk.http.txt
4645
- name: 🧪 Unit Tests of Inference CLI
4746
timeout-minutes: 30
4847
run: python -m pytest tests/inference_cli/unit_tests

.github/workflows/unit_tests_inference_sdk_x86.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,8 @@ jobs:
4040
- name: 📦 Install dependencies
4141
run: |
4242
python -m pip install --upgrade pip
43-
pip install uv
44-
uv pip install --system --upgrade setuptools
45-
uv pip install --system -r requirements/requirements.sdk.http.txt -r requirements/requirements.test.unit.txt
43+
pip install --upgrade setuptools
44+
pip install -r requirements/requirements.sdk.http.txt -r requirements/requirements.test.unit.txt
4645
- name: 🧪 Unit Tests of Inference SDK
4746
timeout-minutes: 30
4847
run: python -m pytest tests/inference_sdk/unit_tests

.github/workflows/unit_tests_inference_x86.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,8 @@ jobs:
4141
- name: 📦 Install dependencies
4242
run: |
4343
python -m pip install --upgrade pip
44-
pip install uv
45-
uv pip install --system --upgrade setuptools
46-
uv pip install --system -r requirements/_requirements.txt -r requirements/requirements.cpu.txt -r requirements/requirements.sdk.http.txt -r requirements/requirements.test.unit.txt -r requirements/requirements.http.txt -r requirements/requirements.transformers.txt
44+
pip install --upgrade setuptools
45+
pip install -r requirements/_requirements.txt -r requirements/requirements.cpu.txt -r requirements/requirements.sdk.http.txt -r requirements/requirements.test.unit.txt -r requirements/requirements.http.txt -r requirements/requirements.transformers.txt
4746
- name: 🧪 Unit Tests of Inference
4847
timeout-minutes: 30
4948
run: python -m pytest tests/inference/unit_tests

.github/workflows/unit_tests_workflows_x86.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,8 @@ jobs:
4141
- name: 📦 Install dependencies
4242
run: |
4343
python -m pip install --upgrade pip
44-
pip install uv
45-
uv pip install --system --upgrade setuptools
46-
uv pip install --system -r requirements/_requirements.txt -r requirements/requirements.cpu.txt -r requirements/requirements.sdk.http.txt -r requirements/requirements.test.unit.txt -r requirements/requirements.http.txt -r requirements/requirements.transformers.txt
44+
pip install --upgrade setuptools
45+
pip install -r requirements/_requirements.txt -r requirements/requirements.cpu.txt -r requirements/requirements.sdk.http.txt -r requirements/requirements.test.unit.txt -r requirements/requirements.http.txt -r requirements/requirements.transformers.txt
4746
- name: 🧪 Unit Tests of Workflows
4847
timeout-minutes: 30
4948
run: python -m pytest tests/workflows/unit_tests

docs/foundation/perception_encoder.md

Lines changed: 0 additions & 104 deletions
This file was deleted.

inference/core/env.py

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -82,14 +82,6 @@
8282
# CLIP model ID
8383
CLIP_MODEL_ID = f"clip/{CLIP_VERSION_ID}"
8484

85-
# Perception Encoder version ID, default is "PE-Core-L14-336"
86-
PERCEPTION_ENCODER_VERSION_ID = os.getenv(
87-
"PERCEPTION_ENCODER_VERSION_ID", "PE-Core-L14-336"
88-
)
89-
90-
# Perception Encoder model ID
91-
PERCEPTION_ENCODER_MODEL_ID = f"perception-encoder/{PERCEPTION_ENCODER_VERSION_ID}"
92-
9385
# Gaze version ID, default is "L2CS"
9486
GAZE_VERSION_ID = os.getenv("GAZE_VERSION_ID", "L2CS")
9587

0 commit comments

Comments
 (0)