Skip to content

Commit f68f444

Browse files
Merge branch 'develop' into ad/p312_as_default
2 parents b49cd3e + da58717 commit f68f444

File tree

69 files changed

+1765
-351
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

69 files changed

+1765
-351
lines changed

.github/actionlint.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
self-hosted-runner:
2+
labels:
3+
- windows-2025-8-core
4+
- windows-2025-16-core
5+
- aks-linux-4-cores-28gb-gpu-tesla-t4

.github/workflows/api_changes_check.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
issues: write
2727
steps:
2828
- name: Download built HTML doc as artifact from previous step
29-
uses: actions/download-artifact@018cc2cf5baa6db3ef3c5f8a56943fffe632ef53 # v6.0.0
29+
uses: actions/download-artifact@37930b1c2abaa49bbe596cd826c3c89aef350131 # v7.0.0
3030
with:
3131
name: html_doc_artifact
3232
- run: |
@@ -41,11 +41,11 @@ jobs:
4141
- name: Get changed file names in API doc path
4242
id: diff
4343
run: |
44-
cd html_build/html/$API_DOC_HTML_ROOT_RELATIVE_PATH
45-
CHANGED_FILES=$(find . -name "*.html" -exec diff -qrBZ {} $GITHUB_WORKSPACE/previous_doc_state/$API_DOC_HTML_ROOT_RELATIVE_PATH/{} \;)
46-
echo ${CHANGED_FILES}
47-
CHANGED_FILES=$(echo $CHANGED_FILES | tr '\n' ' ')
48-
echo "changed_files=${CHANGED_FILES}" >> $GITHUB_OUTPUT
44+
cd "html_build/html/$API_DOC_HTML_ROOT_RELATIVE_PATH"
45+
CHANGED_FILES=$(find . -name "*.html" -exec diff -qrBZ {} "$GITHUB_WORKSPACE/previous_doc_state/$API_DOC_HTML_ROOT_RELATIVE_PATH/{}" \;)
46+
echo "${CHANGED_FILES}"
47+
CHANGED_FILES=$(echo "$CHANGED_FILES" | tr '\n' ' ')
48+
echo "changed_files=${CHANGED_FILES}" >> "$GITHUB_OUTPUT"
4949
5050
- name: Add label
5151
if: ${{ contains(steps.diff.outputs.changed_files, 'differ') }}
@@ -63,7 +63,7 @@ jobs:
6363
echo '{"pr_number": "${{ github.event.pull_request.number }}", "action": "none"}' > api_status.json
6464
6565
- name: Upload artifact
66-
uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 #v5.0.0
66+
uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f #v6.0.0
6767
with:
6868
name: api_status
6969
path: api_status.json

.github/workflows/api_set_label.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@ jobs:
2929
- name: Set output value
3030
id: status
3131
run: |
32-
echo "action=$(cat api_status.json | jq -r .action)" >> $GITHUB_OUTPUT
33-
echo "pr_number=$(cat api_status.json | jq -r .pr_number)" >> $GITHUB_OUTPUT
32+
echo "action=$(jq -r .action api_status.json)" >> "$GITHUB_OUTPUT"
33+
echo "pr_number=$(jq -r .pr_number api_status.json)" >> "$GITHUB_OUTPUT"
3434
3535
- name: Print outputs
3636
run: echo ${{ steps.status.outputs.action }} ${{ steps.status.outputs.pr_number }}

.github/workflows/build_and_publish_doc.yml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,11 @@ jobs:
2727
steps:
2828
- name: Checkout main repo # the github-pages-deploy-action seems to require this step
2929
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
30+
with:
31+
persist-credentials: false
3032

3133
- name: Download HTML doc build artifact
32-
uses: actions/download-artifact@018cc2cf5baa6db3ef3c5f8a56943fffe632ef53 # v6.0.0
34+
uses: actions/download-artifact@37930b1c2abaa49bbe596cd826c3c89aef350131 # v7.0.0
3335
with:
3436
name: html_doc_artifact
3537
- name: Extract artifact
@@ -39,7 +41,7 @@ jobs:
3941
rm artifact.tar
4042
4143
- name: Download schema doc build artifact
42-
uses: actions/download-artifact@018cc2cf5baa6db3ef3c5f8a56943fffe632ef53 # v6.0.0
44+
uses: actions/download-artifact@37930b1c2abaa49bbe596cd826c3c89aef350131 # v7.0.0
4345
with:
4446
name: schema_doc_artifact
4547
path: html_build/html
@@ -51,7 +53,7 @@ jobs:
5153
rm artifact.tar
5254
5355
- name: Publish built docs on Github Pages branch ${{ env.GH_PAGES_BRANCH }}
54-
uses: JamesIves/github-pages-deploy-action@4a3abc783e1a24aeb44c16e869ad83caf6b4cc23 # v4.7.4
56+
uses: JamesIves/github-pages-deploy-action@9d877eea73427180ae43cf98e8914934fe157a1a # v4.7.6
5557
with:
5658
folder: html_build/html
5759
token: ${{ secrets.PUSH_TO_GH_PAGES_BRANCH }}

.github/workflows/build_html_doc.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
- name: Archive built HTMLs
3030
shell: bash
3131
run: tar -czf artifact.tar html_build/html
32-
- uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 #v5.0.0
32+
- uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f #v6.0.0
3333
with:
3434
name: html_doc_artifact
3535
path: artifact.tar

.github/workflows/build_schema_page.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
run: tar -czf artifact.tar schema
3333

3434
- name: Upload result as artifact
35-
uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 #v5.0.0
35+
uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f #v6.0.0
3636
with:
3737
name: schema_doc_artifact
3838
path: artifact.tar

.github/workflows/call_precommit.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ on:
1212
description: 'Enable gpu tests'
1313
type: boolean
1414
default: false
15-
required: true
1615
override_requirements:
1716
description: 'Override requirements'
1817
default: ''
@@ -227,7 +226,7 @@ jobs:
227226
- name: Print installed modules
228227
run: pip list
229228
- name: Run torch2 precommit test scope
230-
run: pytest -ra tests/torch2 -m "not cuda"
229+
run: pytest -ra -n2 --durations=30 tests/torch2 -m "not cuda"
231230

232231
pytorch2-cuda:
233232
timeout-minutes: 40

.github/workflows/call_precommit_windows.yml

Lines changed: 16 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -120,9 +120,14 @@ jobs:
120120
- name: Run PyTorch precommit test scope
121121
run: |
122122
set +e
123-
export LIB="${LIB};$(python -c "import sysconfig; print(sysconfig.get_config_var('LIBDIR'))")"
124-
export LIB="${LIB};$(python -c "import sys; print(sys.prefix + '/libs')")"
125-
export INCLUDE="${INCLUDE};$(python -c "import sysconfig; print(sysconfig.get_path('include'))")"
123+
124+
sys_lib="$(python -c "import sysconfig; print(sysconfig.get_config_var('LIBDIR'))")"
125+
prefix_lib="$(python -c "import sys; print(sys.prefix + '/libs')")"
126+
include_dir="$(python -c "import sysconfig; print(sysconfig.get_path('include'))")"
127+
128+
export LIB="${LIB};${sys_lib};${prefix_lib}"
129+
export INCLUDE="${INCLUDE};${include_dir}"
130+
126131
make test-torch-cpu
127132
env:
128133
NUM_WORKERS: 1 # Parallel tests are falls on build extenstion.
@@ -153,7 +158,12 @@ jobs:
153158
- name: Run torch2 precommit test scope
154159
run: |
155160
set +e
156-
export LIB="${LIB};$(python -c "import sysconfig; print(sysconfig.get_config_var('LIBDIR'))")"
157-
export LIB="${LIB};$(python -c "import sys; print(sys.prefix + '/libs')")"
158-
export INCLUDE="${INCLUDE};$(python -c "import sysconfig; print(sysconfig.get_path('include'))")"
161+
162+
sys_lib="$(python -c "import sysconfig; print(sysconfig.get_config_var('LIBDIR'))")"
163+
prefix_lib="$(python -c "import sys; print(sys.prefix + '/libs')")"
164+
include_dir="$(python -c "import sysconfig; print(sysconfig.get_path('include'))")"
165+
166+
export LIB="${LIB};${sys_lib};${prefix_lib}"
167+
export INCLUDE="${INCLUDE};${include_dir}"
168+
159169
pytest -ra tests/torch2 -m "not cuda"

.github/workflows/conformance_weight_compression.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ jobs:
6363
run: column -s, -t < tmp/results.csv || echo "no file"
6464
- name: Upload artifact
6565
if: ${{ !cancelled() }}
66-
uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 #v5.0.0
66+
uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f #v6.0.0
6767
with:
6868
name: wc_results_${{ matrix.group }}
6969
path: tmp/results.csv
@@ -72,4 +72,4 @@ jobs:
7272
if: ${{ !cancelled() }}
7373
run: |
7474
pip install defusedxml==0.7.1
75-
python .github/scripts/pytest_md_summary.py pytest-results.xml >> $GITHUB_STEP_SUMMARY
75+
python .github/scripts/pytest_md_summary.py pytest-results.xml >> "$GITHUB_STEP_SUMMARY"

.github/workflows/examples.yml

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ jobs:
7575
if: ${{ !cancelled() }}
7676
run: |
7777
pip install defusedxml==0.7.1
78-
python .github/scripts/pytest_md_summary.py pytest-results.xml >> $GITHUB_STEP_SUMMARY
78+
python .github/scripts/pytest_md_summary.py pytest-results.xml >> "$GITHUB_STEP_SUMMARY"
7979
8080
examples-cuda:
8181
name: Test examples CUDA [${{ matrix.group }}/1]
@@ -145,7 +145,7 @@ jobs:
145145
if: ${{ !cancelled() }}
146146
run: |
147147
pip install defusedxml==0.7.1
148-
python .github/scripts/pytest_md_summary.py pytest-results.xml >> $GITHUB_STEP_SUMMARY
148+
python .github/scripts/pytest_md_summary.py pytest-results.xml >> "$GITHUB_STEP_SUMMARY"
149149
150150
examples-win-cpu:
151151
timeout-minutes: 80
@@ -183,9 +183,14 @@ jobs:
183183
- name: Run examples test scope
184184
run: |
185185
set +e
186-
export LIB="${LIB};$(python -c "import sysconfig; print(sysconfig.get_config_var('LIBDIR'))")"
187-
export LIB="${LIB};$(python -c "import sys; print(sys.prefix + '/libs')")"
188-
export INCLUDE="${INCLUDE};$(python -c "import sysconfig; print(sysconfig.get_path('include'))")"
186+
187+
sys_lib="$(python -c "import sysconfig; print(sysconfig.get_config_var('LIBDIR'))")"
188+
prefix_lib="$(python -c "import sys; print(sys.prefix + '/libs')")"
189+
include_dir="$(python -c "import sysconfig; print(sysconfig.get_path('include'))")"
190+
191+
export LIB="${LIB};${sys_lib};${prefix_lib}"
192+
export INCLUDE="${INCLUDE};${include_dir}"
193+
189194
python -m pytest -s -ra tests/cross_fw/examples \
190195
-m 'not cuda' \
191196
--junit-xml=pytest-results.xml \
@@ -194,7 +199,7 @@ jobs:
194199
--splits 6 \
195200
--group ${{ matrix.group }} \
196201
${{ github.event.inputs.pytest_args || '' }}
197-
ret=$?
202+
ret="$?"
198203
[ $ret -eq 5 ] && [ -n "${{ github.event.inputs.pytest_args || '' }}" ] && exit 0 || exit $ret
199204
env:
200205
TQDM_DISABLE: 1
@@ -203,4 +208,4 @@ jobs:
203208
if: ${{ !cancelled() }}
204209
run: |
205210
pip install defusedxml==0.7.1
206-
python .github/scripts/pytest_md_summary.py pytest-results.xml >> $GITHUB_STEP_SUMMARY
211+
python .github/scripts/pytest_md_summary.py pytest-results.xml >> "$GITHUB_STEP_SUMMARY"

0 commit comments

Comments
 (0)