Skip to content

Commit c9a8047

Browse files
sovrasoveugene123twdependabot[bot]ashwinvaidya17kprokofi
authored
Bump torch to 2.7 in OTX 2.4 (#4377)
* Bump torch to 2.7 * Bump OTX version * Update dependency (#4357) * Bump the pip-others group across 1 directory with 4 updates Bumps the pip-others group with 4 updates in the / directory: [tox](https://github.com/tox-dev/tox), [onnxruntime](https://github.com/microsoft/onnxruntime), [torchmetrics](https://github.com/Lightning-AI/torchmetrics) and [mlflow](https://github.com/mlflow/mlflow). Updates `tox` from 4.24.2 to 4.25.0 - [Release notes](https://github.com/tox-dev/tox/releases) - [Changelog](https://github.com/tox-dev/tox/blob/main/docs/changelog.rst) - [Commits](tox-dev/tox@4.24.2...4.25.0) Updates `onnxruntime` from 1.21.0 to 1.21.1 - [Release notes](https://github.com/microsoft/onnxruntime/releases) - [Changelog](https://github.com/microsoft/onnxruntime/blob/main/docs/ReleaseManagement.md) - [Commits](https://github.com/microsoft/onnxruntime/commits) Updates `torchmetrics` from 1.6.0 to 1.7.1 - [Release notes](https://github.com/Lightning-AI/torchmetrics/releases) - [Changelog](https://github.com/Lightning-AI/torchmetrics/blob/master/CHANGELOG.md) - [Commits](Lightning-AI/torchmetrics@v1.6.0...v1.7.1) Updates `mlflow` from 2.20.4 to 2.21.3 - [Release notes](https://github.com/mlflow/mlflow/releases) - [Changelog](https://github.com/mlflow/mlflow/blob/master/CHANGELOG.md) - [Commits](mlflow/mlflow@v2.20.4...v2.21.3) --- updated-dependencies: - dependency-name: tox dependency-version: 4.25.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: pip-others - dependency-name: onnxruntime dependency-version: 1.21.1 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: pip-others - dependency-name: torchmetrics dependency-version: 1.7.1 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: pip-others - dependency-name: mlflow dependency-version: 2.21.3 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: pip-others ... Signed-off-by: dependabot[bot] <[email protected]> --------- Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * 🧹 Update workflows and configuration to use 'uv' for package installation (#4354) * 🧹 Update workflows and configuration to use 'uv' for package installation * 🧹 Replace pip install with astral-sh/setup-uv@v5 for 'uv' installation across workflows * revert uv installation * ✨ Upgrade setup python action in pre-merge check (#4371) * Update python and regenerate from pip-compile Signed-off-by: Ashwin Vaidya <[email protected]> * Revert requirements Signed-off-by: Ashwin Vaidya <[email protected]> * Remove pip-compile Signed-off-by: Ashwin Vaidya <[email protected]> --------- Signed-off-by: Ashwin Vaidya <[email protected]> * Try workflow from develop * Revert "Try workflow from develop" This reverts commit ccb9152. * Reduce Integration Test Scope (#4303) * Reduce Integration Test Scope to 2-3 recipes per task * Add PR comment trigger workflow * delete missing requirements --------- Signed-off-by: dependabot[bot] <[email protected]> Signed-off-by: Ashwin Vaidya <[email protected]> Co-authored-by: Eugene Liu <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Ashwin Vaidya <[email protected]> Co-authored-by: kprokofi <[email protected]>
1 parent bd2834d commit c9a8047

File tree

29 files changed

+217
-241
lines changed

29 files changed

+217
-241
lines changed

‎.ci/requirements.in‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎.ci/requirements.txt‎

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

‎.github/workflows/code_scan.yaml‎

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,10 @@ jobs:
2424
uses: actions/setup-python@0b93645e9fea7318ecaed2b359559ac225c90a2b # v5.3.0
2525
with:
2626
python-version: "3.10"
27-
- name: Install dependencies
28-
run: python -m pip install --require-hashes --no-deps -r .ci/requirements.txt
2927
- name: Freeze dependencies
30-
run: pip-compile --extra=docs,base,mmlab,anomaly,transformers -o requirements.txt pyproject.toml
28+
run: |
29+
pip install '.[docs,base]'
30+
pip freeze > requirements.txt
3131
- name: Run Trivy Scan (vuln)
3232
uses: aquasecurity/trivy-action@18f2510ee396bbf400402947b394f2dd8c87dbb0 # v0.29.0
3333
with:
@@ -111,10 +111,7 @@ jobs:
111111
python-version: "3.10"
112112
- name: Install tox
113113
run: |
114-
python -m pip install --require-hashes --no-deps -r .ci/requirements.txt
115-
pip-compile --generate-hashes --output-file=/tmp/requirements.txt --extra=ci_tox pyproject.toml
116-
python -m pip install --require-hashes --no-deps -r /tmp/requirements.txt
117-
rm /tmp/requirements.txt
114+
pip install '.[ci_tox]'
118115
- name: Bandit Scanning
119116
run: tox -e bandit-scan
120117

‎.github/workflows/daily.yaml‎

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,9 @@ jobs:
1616
fail-fast: false
1717
matrix:
1818
include:
19-
- task: "multi_cls_classification"
20-
- task: "multi_label_classification"
21-
- task: "hlabel_classification"
22-
- task: "visual_prompting"
19+
- task: "multi_class_cls"
20+
- task: "multi_label_cls"
21+
- task: "h_label_cls"
2322
- task: "anomaly"
2423
- task: "keypoint_detection"
2524
- task: "detection"
@@ -38,9 +37,6 @@ jobs:
3837
python-version: "3.10"
3938
- name: Install tox
4039
run: |
41-
python -m pip install --require-hashes --no-deps -r .ci/requirements.txt
42-
pip-compile --generate-hashes --output-file=/tmp/requirements.txt --extra=ci_tox pyproject.toml
43-
python -m pip install --require-hashes --no-deps -r /tmp/requirements.txt
44-
rm /tmp/requirements.txt
40+
pip install '.[ci_tox]'
4541
- name: Run Daily Integration Test
4642
run: tox -vv -e daily-integration-test-${{ matrix.task }}

‎.github/workflows/docs.yaml‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,7 @@ jobs:
2323
python-version: "3.10"
2424
- name: Install tox
2525
run: |
26-
python -m pip install --require-hashes --no-deps -r .ci/requirements.txt
27-
pip-compile --generate-hashes --output-file=/tmp/requirements.txt --extra=ci_tox pyproject.toml
28-
python -m pip install --require-hashes --no-deps -r /tmp/requirements.txt
29-
rm /tmp/requirements.txt
26+
pip install '.[ci_tox]'
3027
- name: Build-Docs
3128
run: tox -e build-doc
3229
- name: Create gh-pages branch

‎.github/workflows/docs_stable.yaml‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,7 @@ jobs:
2323
python-version: "3.10"
2424
- name: Install tox
2525
run: |
26-
python -m pip install --require-hashes --no-deps -r .ci/requirements.txt
27-
pip-compile --generate-hashes --output-file=/tmp/requirements.txt --extra=ci_tox pyproject.toml
28-
python -m pip install --require-hashes --no-deps -r /tmp/requirements.txt
29-
rm /tmp/requirements.txt
26+
pip install '.[ci_tox]'
3027
- name: Build-Docs
3128
run: tox -e build-doc
3229
- name: Create gh-pages branch

‎.github/workflows/perf_benchmark.yaml‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -126,10 +126,7 @@ jobs:
126126
python-version: "3.10"
127127
- name: Install tox
128128
run: |
129-
python -m pip install --require-hashes --no-deps -r .ci/requirements.txt
130-
pip-compile --generate-hashes --output-file=/tmp/requirements.txt --extra=ci_tox pyproject.toml
131-
python -m pip install --require-hashes --no-deps -r /tmp/requirements.txt
132-
rm /tmp/requirements.txt
129+
pip install '.[ci_tox]'
133130
- name: Run Performance Test
134131
env:
135132
BENCHMARK_RESULTS_CLEAR: ${{ vars.BENCHMARK_RESULTS_CLEAR }}
@@ -168,9 +165,7 @@ jobs:
168165
python-version: "3.10"
169166
- name: Install dependencies
170167
run: |
171-
pip-compile --generate-hashes --output-file=/tmp/requirements.txt --extra=ci_benchmark pyproject.toml
172-
python -m pip install --require-hashes --no-deps -r /tmp/requirements.txt
173-
rm /tmp/requirements.txt
168+
pip install '.[ci_benchmark]'
174169
- name: Download benchmark results
175170
uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4.1.8
176171
with:

‎.github/workflows/perf_benchmark_v2.yaml‎

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -51,11 +51,11 @@ jobs:
5151
fail-fast: false
5252
matrix:
5353
include:
54-
- task: ANOMALY
55-
- task: DETECTION
56-
- task: MULTI_CLASS_CLS
57-
- task: MULTI_LABEL_CLS
58-
- task: H_LABEL_CLS
54+
- task: anomaly
55+
- task: detection
56+
- task: multi_class_cls
57+
- task: multi_label_cls
58+
- task: h_label_cls
5959
# - task: INSTANCE_SEGMENTATION
6060
# - task: SEMANTIC_SEGMENTATION
6161
# - task: VISUAL_PROMPTING
@@ -72,10 +72,7 @@ jobs:
7272
python-version: "3.10"
7373
- name: Install tox
7474
run: |
75-
python -m pip install --require-hashes --no-deps -r .ci/requirements.txt
76-
pip-compile --generate-hashes --output-file=/tmp/requirements.txt --extra=ci_tox pyproject.toml
77-
python -m pip install --require-hashes --no-deps -r /tmp/requirements.txt
78-
rm /tmp/requirements.txt
75+
pip install '.[ci_tox]'
7976
- name: Run Performance Test
8077
env:
8178
BENCHMARK_RESULTS_CLEAR: ${{ vars.BENCHMARK_RESULTS_CLEAR }}

‎.github/workflows/pr_comment_trigger.yaml‎

Lines changed: 55 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,55 @@
1+
name: Pull Request Comment Triggered Integration Test
2+
3+
on:
4+
issue_comment:
5+
types: [created]
6+
7+
env:
8+
COMMENT_BODY: ${{ github.event.comment.body }}
9+
10+
# Declare default permissions as read only.
11+
permissions: read-all
12+
13+
jobs:
14+
pr-triggered-integration-test:
15+
if: |
16+
github.event.issue.pull_request &&
17+
startsWith(github.event.comment.body, '/run ')
18+
runs-on: [self-hosted, linux, x64, dev, dmount]
19+
name: PR-Comment-Integration-Tests
20+
steps:
21+
- name: Checkout repository
22+
uses: actions/checkout@v4
23+
24+
- name: Install Python
25+
uses: actions/setup-python@v5
26+
with:
27+
python-version: "3.10"
28+
29+
- name: Install tox
30+
run: |
31+
python -m pip install --require-hashes --no-deps -r .ci/requirements.txt
32+
pip-compile --generate-hashes --output-file=/tmp/requirements.txt --extra=ci_tox pyproject.toml
33+
python -m pip install --require-hashes --no-deps -r /tmp/requirements.txt
34+
rm /tmp/requirements.txt
35+
36+
- name: Extract, Validate, and Run Integration Test
37+
run: |
38+
ALLOWED_TASKS=("all detection" "instance_segmentation" "semantic_segmentation" "multi_class_cls" "multi_label_cls" "h_label_cls" "anomaly" "keypoint_detection")
39+
40+
# Ensure comment starts with "/run " and extract task name
41+
if [[ "$COMMENT_BODY" =~ ^/run\ ([a-zA-Z0-9_-]+)$ ]]; then
42+
TASK_NAME="${BASH_REMATCH[1]}"
43+
else
44+
echo "❌ Invalid format. Use '/run <task_name>'"
45+
exit 1
46+
fi
47+
48+
# Validate the extracted task name
49+
if [[ ! " ${ALLOWED_TASKS[@]} " =~ " ${TASK_NAME} " ]]; then
50+
echo "❌ Invalid task: $TASK_NAME. Allowed tasks: ${ALLOWED_TASKS[*]}"
51+
exit 1
52+
fi
53+
54+
echo "✅ Running integration test for: $TASK_NAME"
55+
tox -vv -e "integration-test-${TASK_NAME}"

‎.github/workflows/pre_merge.yaml‎

Lines changed: 9 additions & 80 deletions
Original file line numberDiff line numberDiff line change
@@ -27,15 +27,12 @@ jobs:
2727
- name: Checkout repository
2828
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
2929
- name: Set up Python
30-
uses: actions/setup-python@0b93645e9fea7318ecaed2b359559ac225c90a2b # v5.3.0
30+
uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5.6.0
3131
with:
3232
python-version: "3.10"
3333
- name: Install tox
3434
run: |
35-
python -m pip install --require-hashes --no-deps -r .ci/requirements.txt
36-
pip-compile --generate-hashes --output-file=/tmp/requirements.txt --extra=ci_tox pyproject.toml
37-
python -m pip install --require-hashes --no-deps -r /tmp/requirements.txt
38-
rm /tmp/requirements.txt
35+
pip install '.[ci_tox]'
3936
- name: Code quality checks
4037
run: tox -vv -e pre-commit
4138
Unit-Test:
@@ -60,10 +57,7 @@ jobs:
6057
python-version: ${{ matrix.python-version }}
6158
- name: Install tox
6259
run: |
63-
python -m pip install --require-hashes --no-deps -r .ci/requirements.txt
64-
pip-compile --generate-hashes --output-file=/tmp/requirements.txt --extra=ci_tox pyproject.toml
65-
python -m pip install --require-hashes --no-deps -r /tmp/requirements.txt
66-
rm /tmp/requirements.txt
60+
pip install '.[ci_tox]'
6761
- name: Run unit test
6862
run: tox -vv -e unit-test-${{ matrix.tox-env }}
6963
- name: Upload coverage reports to Codecov
@@ -84,87 +78,25 @@ jobs:
8478
curl -Os https://uploader.codecov.io/latest/linux/codecov
8579
chmod +x codecov
8680
./codecov -t ${{ secrets.CODECOV_TOKEN }} --sha $COMMIT_ID -U $HTTP_PROXY -f .tox/coverage_unit-test-${{ matrix.tox-env }}.xml -F ${{ matrix.tox-env }}
87-
Intense-Unit-Test:
88-
runs-on: [otx-gpu-a10g-1]
89-
container:
90-
image: "ubuntu:24.04"
91-
needs: Code-Quality-Checks
92-
timeout-minutes: 120
93-
strategy:
94-
fail-fast: false
95-
matrix:
96-
include:
97-
- python-version: "3.10"
98-
tox-env: "py310"
99-
- python-version: "3.11"
100-
tox-env: "py311"
101-
name: Intense-Unit-Test-with-Python${{ matrix.python-version }}
102-
steps:
103-
- name: Install dependencies
104-
run: apt-get update && apt-get install -y libsqlite3-0 libsqlite3-dev libgl1 libglib2.0-0
105-
- name: Checkout repository
106-
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
107-
- name: Install Python
108-
uses: actions/setup-python@0b93645e9fea7318ecaed2b359559ac225c90a2b # v5.3.0
109-
with:
110-
python-version: ${{ matrix.python-version }}
111-
- name: Install tox
112-
run: |
113-
python -m pip install --require-hashes --no-deps -r .ci/requirements.txt
114-
pip-compile --generate-hashes --output-file=/tmp/requirements.txt --extra=ci_tox pyproject.toml
115-
python -m pip install --require-hashes --no-deps -r /tmp/requirements.txt
116-
rm /tmp/requirements.txt
117-
- name: Run unit test
118-
run: tox -vv -e intense-unit-test-${{ matrix.tox-env }}
11981
Integration-Test:
12082
if: |
12183
github.event.pull_request.draft == false &&
12284
!(startsWith(github.event.pull_request.title, '[WIP]'))
123-
runs-on: [otx-gpu-a10g-1]
85+
runs-on: [self-hosted, linux, x64, dev, dmount]
12486
needs: Unit-Test
125-
container:
126-
image: 219678651685.dkr.ecr.eu-west-1.amazonaws.com/ote-ci:11.7.1.2-devel-ubuntu20.04
127-
options: "--runtime=nvidia --env-file=/home/runner/.nvidia.env --ipc=host"
12887
strategy:
12988
fail-fast: false
13089
matrix:
13190
include:
132-
- task: "multi_cls_classification"
133-
- task: "multi_label_classification"
134-
- task: "hlabel_classification"
135-
- task: "visual_prompting"
91+
- task: "multi_class_cls"
92+
- task: "multi_label_cls"
93+
- task: "h_label_cls"
13694
- task: "anomaly"
13795
- task: "keypoint_detection"
138-
name: Integration-Test-${{ matrix.task }}-py310
139-
steps:
140-
- name: Checkout repository
141-
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
142-
- name: Install Python
143-
uses: actions/setup-python@0b93645e9fea7318ecaed2b359559ac225c90a2b # v5.3.0
144-
with:
145-
python-version: "3.10"
146-
- name: Install tox
147-
run: |
148-
python -m pip install --require-hashes --no-deps -r .ci/requirements.txt
149-
pip-compile --generate-hashes --output-file=/tmp/requirements.txt --extra=ci_tox pyproject.toml
150-
python -m pip install --require-hashes --no-deps -r /tmp/requirements.txt
151-
rm /tmp/requirements.txt
152-
- name: Run Integration Test
153-
run: tox -vv -e integration-test-${{ matrix.task }}
154-
Integration-Test-Large:
155-
if: |
156-
github.event.pull_request.draft == false &&
157-
!(startsWith(github.event.pull_request.title, '[WIP]'))
158-
runs-on: [self-hosted, linux, x64, dev, dmount]
159-
needs: Unit-Test
160-
strategy:
161-
fail-fast: false
162-
matrix:
163-
include:
16496
- task: "detection"
16597
- task: "instance_segmentation"
16698
- task: "semantic_segmentation"
167-
name: Integration-Test-Large-${{ matrix.task }}-py310
99+
name: Integration-Test-${{ matrix.task }}-py310
168100
steps:
169101
- name: Checkout repository
170102
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
@@ -174,9 +106,6 @@ jobs:
174106
python-version: "3.10"
175107
- name: Install tox
176108
run: |
177-
python -m pip install --require-hashes --no-deps -r .ci/requirements.txt
178-
pip-compile --generate-hashes --output-file=/tmp/requirements.txt --extra=ci_tox pyproject.toml
179-
python -m pip install --require-hashes --no-deps -r /tmp/requirements.txt
180-
rm /tmp/requirements.txt
109+
pip install '.[ci_tox]'
181110
- name: Run Integration Test
182111
run: tox -vv -e integration-test-${{ matrix.task }}

0 commit comments

Comments
 (0)