Skip to content

Commit 553dee5

Browse files
lanluo-nvidialanluo-nvidia
authored
Lluo/cherrypick dlfw changes to main (#3844)
This is the cherry pick PR, directly merge in.
1 parent 45e56e9 commit 553dee5

24 files changed

+203
-131
lines changed

‎.github/workflows/build-test-linux-x86_64.yml‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ jobs:
103103
set -euo pipefail
104104
pushd .
105105
cd tests/py/dynamo
106-
python -m pytest -ra --junitxml=${RUNNER_TEST_RESULTS_DIR}/l0_dynamo_converter_tests_results.xml -n auto --dist=loadscope --maxfail=20 conversion/
106+
python -m pytest -ra -n 8 --junitxml=${RUNNER_TEST_RESULTS_DIR}/l0_dynamo_converter_tests_results.xml --dist=loadscope --maxfail=20 conversion/
107107
popd
108108
109109
L0-dynamo-core-tests:
@@ -132,9 +132,9 @@ jobs:
132132
pushd .
133133
cd tests/py
134134
cd dynamo
135-
python -m pytest -ra -n auto --junitxml=${RUNNER_TEST_RESULTS_DIR}/l0_dynamo_core_runtime_tests_results.xml runtime/test_000_*
136-
python -m pytest -ra -n auto --junitxml=${RUNNER_TEST_RESULTS_DIR}/l0_dynamo_core_partitioning_tests_results.xml partitioning/
137-
python -m pytest -ra -n auto --junitxml=${RUNNER_TEST_RESULTS_DIR}/l0_dynamo_core_lowering_tests_results.xml lowering/
135+
python -m pytest -ra -n 8 --junitxml=${RUNNER_TEST_RESULTS_DIR}/l0_dynamo_core_runtime_tests_results.xml runtime/test_000_*
136+
python -m pytest -ra -n 8 --junitxml=${RUNNER_TEST_RESULTS_DIR}/l0_dynamo_core_partitioning_tests_results.xml partitioning/
137+
python -m pytest -ra -n 8 --junitxml=${RUNNER_TEST_RESULTS_DIR}/l0_dynamo_core_lowering_tests_results.xml lowering/
138138
popd
139139
140140
L0-py-core-tests:
@@ -162,7 +162,7 @@ jobs:
162162
set -euo pipefail
163163
pushd .
164164
cd tests/py/core
165-
python -m pytest -ra --junitxml=${RUNNER_TEST_RESULTS_DIR}/l0_py_core_tests_results.xml -n auto .
165+
python -m pytest -ra -n 8 --junitxml=${RUNNER_TEST_RESULTS_DIR}/l0_py_core_tests_results.xml .
166166
popd
167167
168168
L0-torchscript-tests:
@@ -194,7 +194,7 @@ jobs:
194194
popd
195195
pushd .
196196
cd tests/py/ts
197-
python -m pytest -ra --junitxml=${RUNNER_TEST_RESULTS_DIR}/l0_ts_api_tests_results.xml -n auto api/
197+
python -m pytest -ra --junitxml=${RUNNER_TEST_RESULTS_DIR}/l0_ts_api_tests_results.xml api/
198198
popd
199199
200200
L1-dynamo-core-tests:
@@ -222,7 +222,7 @@ jobs:
222222
set -euo pipefail
223223
pushd .
224224
cd tests/py/dynamo
225-
python -m pytest -ra --junitxml=${RUNNER_TEST_RESULTS_DIR}/l1_dynamo_core_tests_results.xml -n auto runtime/test_001_*
225+
python -m pytest -ra -n 8 --junitxml=${RUNNER_TEST_RESULTS_DIR}/l1_dynamo_core_tests_results.xml runtime/test_001_*
226226
popd
227227
228228
L1-dynamo-compile-tests:
@@ -250,7 +250,7 @@ jobs:
250250
set -euo pipefail
251251
pushd .
252252
cd tests/py/dynamo/
253-
python -m pytest -m critical -ra -n auto --junitxml=${RUNNER_TEST_RESULTS_DIR}/l1_dynamo_compile_tests_results.xml models/
253+
python -m pytest -m critical -ra --junitxml=${RUNNER_TEST_RESULTS_DIR}/l1_dynamo_compile_tests_results.xml models/
254254
popd
255255
256256
L1-torch-compile-tests:
@@ -278,9 +278,9 @@ jobs:
278278
set -euo pipefail
279279
pushd .
280280
cd tests/py/dynamo/
281-
python -m pytest -ra --junitxml=${RUNNER_TEST_RESULTS_DIR}/l1_torch_compile_be_tests_results.xml -n auto backend/
282-
python -m pytest -m critical -ra -n auto --junitxml=${RUNNER_TEST_RESULTS_DIR}/l1_torch_compile_models_tests_results.xml --ir torch_compile models/test_models.py
283-
python -m pytest -m critical -ra -n auto --junitxml=${RUNNER_TEST_RESULTS_DIR}/l1_torch_compile_dyn_models_tests_results.xml --ir torch_compile models/test_dyn_models.py
281+
python -m pytest -ra --junitxml=${RUNNER_TEST_RESULTS_DIR}/l1_torch_compile_be_tests_results.xml backend/
282+
python -m pytest -m critical -ra --junitxml=${RUNNER_TEST_RESULTS_DIR}/l1_torch_compile_models_tests_results.xml --ir torch_compile models/test_models.py
283+
python -m pytest -m critical -ra --junitxml=${RUNNER_TEST_RESULTS_DIR}/l1_torch_compile_dyn_models_tests_results.xml --ir torch_compile models/test_dyn_models.py
284284
popd
285285
286286
L1-torchscript-tests:
@@ -312,7 +312,7 @@ jobs:
312312
popd
313313
pushd .
314314
cd tests/py/ts
315-
python -m pytest -ra --junitxml=${RUNNER_TEST_RESULTS_DIR}/l1_ts_models_tests_results.xml -n auto models/
315+
python -m pytest -ra --junitxml=${RUNNER_TEST_RESULTS_DIR}/l1_ts_models_tests_results.xml models/
316316
popd
317317
318318
L2-torch-compile-tests:
@@ -340,8 +340,8 @@ jobs:
340340
set -euo pipefail
341341
pushd .
342342
cd tests/py/dynamo/
343-
python -m pytest -m "not critical" -ra -n auto --junitxml=${RUNNER_TEST_RESULTS_DIR}/l2_torch_compile_models_tests_results.xml --ir torch_compile models/test_models.py
344-
python -m pytest -m "not critical" -ra -n auto --junitxml=${RUNNER_TEST_RESULTS_DIR}/l2_torch_compile_dyn_models_tests_results.xml --ir torch_compile models/test_dyn_models.py
343+
python -m pytest -m "not critical" -ra --junitxml=${RUNNER_TEST_RESULTS_DIR}/l2_torch_compile_models_tests_results.xml --ir torch_compile models/test_models.py
344+
python -m pytest -m "not critical" -ra --junitxml=${RUNNER_TEST_RESULTS_DIR}/l2_torch_compile_dyn_models_tests_results.xml --ir torch_compile models/test_dyn_models.py
345345
popd
346346
347347
L2-dynamo-compile-tests:
@@ -369,7 +369,7 @@ jobs:
369369
set -euo pipefail
370370
pushd .
371371
cd tests/py/dynamo/
372-
python -m pytest -m "not critical" -ra -n auto --junitxml=${RUNNER_TEST_RESULTS_DIR}/l2_dynamo_compile_tests_results.xml models/
372+
python -m pytest -m "not critical" -ra --junitxml=${RUNNER_TEST_RESULTS_DIR}/l2_dynamo_compile_tests_results.xml models/
373373
python -m pytest -ra --junitxml=${RUNNER_TEST_RESULTS_DIR}/l2_dynamo_compile_llm_tests_results.xml llm/
374374
popd
375375
@@ -398,7 +398,7 @@ jobs:
398398
set -euo pipefail
399399
pushd .
400400
cd tests/py/dynamo
401-
python -m pytest -ra --junitxml=${RUNNER_TEST_RESULTS_DIR}/l2_dynamo_core_tests_results.xml -n auto --ignore runtime/test_001_* --ignore runtime/test_000_* runtime/*
401+
python -m pytest -ra --junitxml=${RUNNER_TEST_RESULTS_DIR}/l2_dynamo_core_tests_results.xml --ignore runtime/test_000_* --ignore runtime/test_001_* --ignore runtime/gen_hw_compat* runtime/*
402402
popd
403403
404404
L2-dynamo-plugin-tests:
@@ -426,7 +426,7 @@ jobs:
426426
set -euo pipefail
427427
pushd .
428428
cd tests/py/dynamo
429-
python -m pytest -ra --junitxml=${RUNNER_TEST_RESULTS_DIR}/l2_dynamo_plugins_tests_results.xml -n auto --ignore automatic_plugin/
429+
python -m pytest -ra --junitxml=${RUNNER_TEST_RESULTS_DIR}/l2_dynamo_plugins_tests_results.xml automatic_plugin/
430430
popd
431431
432432
L2-torchscript-tests:
@@ -458,7 +458,7 @@ jobs:
458458
popd
459459
pushd .
460460
cd tests/py/ts
461-
python -m pytest -ra --junitxml=${RUNNER_TEST_RESULTS_DIR}/l2_ts_integrations_tests_results.xml -n auto integrations/
461+
python -m pytest -ra --junitxml=${RUNNER_TEST_RESULTS_DIR}/l2_ts_integrations_tests_results.xml integrations/
462462
popd
463463
464464
concurrency:

‎.github/workflows/build-test-linux-x86_64_rtx.yml‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ jobs:
103103
set -euo pipefail
104104
pushd .
105105
cd tests/py/dynamo
106-
python -m pytest -ra --junitxml=${RUNNER_TEST_RESULTS_DIR}/l0_dynamo_converter_tests_results.xml -n auto --dist=loadscope --maxfail=20 conversion/
106+
python -m pytest -ra -n 8 --junitxml=${RUNNER_TEST_RESULTS_DIR}/l0_dynamo_converter_tests_results.xml --dist=loadscope --maxfail=20 conversion/
107107
popd
108108
109109
L0-dynamo-core-tests:
@@ -133,9 +133,9 @@ jobs:
133133
pushd .
134134
cd tests/py
135135
cd dynamo
136-
python -m pytest -ra -n auto --junitxml=${RUNNER_TEST_RESULTS_DIR}/l0_dynamo_core_runtime_tests_results.xml runtime/test_000_*
137-
python -m pytest -ra -n auto --junitxml=${RUNNER_TEST_RESULTS_DIR}/l0_dynamo_core_partitioning_tests_results.xml partitioning/
138-
python -m pytest -ra -n auto --junitxml=${RUNNER_TEST_RESULTS_DIR}/l0_dynamo_core_lowering_tests_results.xml lowering/
136+
python -m pytest -ra -n 8 --junitxml=${RUNNER_TEST_RESULTS_DIR}/l0_dynamo_core_runtime_tests_results.xml runtime/test_000_*
137+
python -m pytest -ra -n 8 --junitxml=${RUNNER_TEST_RESULTS_DIR}/l0_dynamo_core_partitioning_tests_results.xml partitioning/
138+
python -m pytest -ra -n 8 --junitxml=${RUNNER_TEST_RESULTS_DIR}/l0_dynamo_core_lowering_tests_results.xml lowering/
139139
popd
140140
141141
L0-py-core-tests:
@@ -164,7 +164,7 @@ jobs:
164164
set -euo pipefail
165165
pushd .
166166
cd tests/py/core
167-
python -m pytest -ra --junitxml=${RUNNER_TEST_RESULTS_DIR}/l0_py_core_tests_results.xml -n auto .
167+
python -m pytest -ra -n 8 --junitxml=${RUNNER_TEST_RESULTS_DIR}/l0_py_core_tests_results.xml .
168168
popd
169169
170170
L1-dynamo-core-tests:
@@ -193,7 +193,7 @@ jobs:
193193
set -euo pipefail
194194
pushd .
195195
cd tests/py/dynamo
196-
python -m pytest -ra --junitxml=${RUNNER_TEST_RESULTS_DIR}/l1_dynamo_core_tests_results.xml -n auto runtime/test_001_*
196+
python -m pytest -ra -n 8 --junitxml=${RUNNER_TEST_RESULTS_DIR}/l1_dynamo_core_tests_results.xml runtime/test_001_*
197197
popd
198198
199199
L1-dynamo-compile-tests:
@@ -222,7 +222,7 @@ jobs:
222222
set -euo pipefail
223223
pushd .
224224
cd tests/py/dynamo/
225-
python -m pytest -m critical -ra -n auto --junitxml=${RUNNER_TEST_RESULTS_DIR}/l1_dynamo_compile_tests_results.xml models/
225+
python -m pytest -m critical -ra --junitxml=${RUNNER_TEST_RESULTS_DIR}/l1_dynamo_compile_tests_results.xml models/
226226
popd
227227
228228
L1-torch-compile-tests:
@@ -250,9 +250,9 @@ jobs:
250250
set -euo pipefail
251251
pushd .
252252
cd tests/py/dynamo/
253-
python -m pytest -ra --junitxml=${RUNNER_TEST_RESULTS_DIR}/l1_torch_compile_be_tests_results.xml -n auto backend/
254-
python -m pytest -m critical -ra -n auto --junitxml=${RUNNER_TEST_RESULTS_DIR}/l1_torch_compile_models_tests_results.xml --ir torch_compile models/test_models.py
255-
python -m pytest -m critical -ra -n auto --junitxml=${RUNNER_TEST_RESULTS_DIR}/l1_torch_compile_dyn_models_tests_results.xml --ir torch_compile models/test_dyn_models.py
253+
python -m pytest -ra --junitxml=${RUNNER_TEST_RESULTS_DIR}/l1_torch_compile_be_tests_results.xml backend/
254+
python -m pytest -m critical -ra --junitxml=${RUNNER_TEST_RESULTS_DIR}/l1_torch_compile_models_tests_results.xml --ir torch_compile models/test_models.py
255+
python -m pytest -m critical -ra --junitxml=${RUNNER_TEST_RESULTS_DIR}/l1_torch_compile_dyn_models_tests_results.xml --ir torch_compile models/test_dyn_models.py
256256
popd
257257
258258
@@ -282,8 +282,8 @@ jobs:
282282
set -euo pipefail
283283
pushd .
284284
cd tests/py/dynamo/
285-
python -m pytest -m "not critical" -ra -n auto --junitxml=${RUNNER_TEST_RESULTS_DIR}/l2_torch_compile_models_tests_results.xml --ir torch_compile models/test_models.py
286-
python -m pytest -m "not critical" -ra -n auto --junitxml=${RUNNER_TEST_RESULTS_DIR}/l2_torch_compile_dyn_models_tests_results.xml --ir torch_compile models/test_dyn_models.py
285+
python -m pytest -m "not critical" -ra --junitxml=${RUNNER_TEST_RESULTS_DIR}/l2_torch_compile_models_tests_results.xml --ir torch_compile models/test_models.py
286+
python -m pytest -m "not critical" -ra --junitxml=${RUNNER_TEST_RESULTS_DIR}/l2_torch_compile_dyn_models_tests_results.xml --ir torch_compile models/test_dyn_models.py
287287
popd
288288
289289
L2-dynamo-compile-tests:
@@ -312,7 +312,7 @@ jobs:
312312
set -euo pipefail
313313
pushd .
314314
cd tests/py/dynamo/
315-
python -m pytest -m "not critical" -ra -n auto --junitxml=${RUNNER_TEST_RESULTS_DIR}/l2_dynamo_compile_tests_results.xml models/
315+
python -m pytest -m "not critical" -ra --junitxml=${RUNNER_TEST_RESULTS_DIR}/l2_dynamo_compile_tests_results.xml models/
316316
python -m pytest -ra --junitxml=${RUNNER_TEST_RESULTS_DIR}/l2_dynamo_compile_llm_tests_results.xml llm/
317317
popd
318318
@@ -342,7 +342,7 @@ jobs:
342342
set -euo pipefail
343343
pushd .
344344
cd tests/py/dynamo
345-
python -m pytest -ra --junitxml=${RUNNER_TEST_RESULTS_DIR}/l2_dynamo_core_tests_results.xml -n auto --ignore runtime/test_001_* --ignore runtime/test_000_* runtime/*
345+
python -m pytest -ra --junitxml=${RUNNER_TEST_RESULTS_DIR}/l2_dynamo_core_tests_results.xml --ignore runtime/test_001_* --ignore runtime/test_000_* --ignore runtime/gen_hw_compat* runtime/*
346346
popd
347347
348348
L2-dynamo-plugin-tests:
@@ -371,7 +371,7 @@ jobs:
371371
set -euo pipefail
372372
pushd .
373373
cd tests/py/dynamo
374-
python -m pytest -ra --junitxml=${RUNNER_TEST_RESULTS_DIR}/l2_dynamo_plugins_tests_results.xml -n auto --ignore automatic_plugin/
374+
python -m pytest -ra --junitxml=${RUNNER_TEST_RESULTS_DIR}/l2_dynamo_plugins_tests_results.xml automatic_plugin/
375375
popd
376376
377377

0 commit comments

Comments
 (0)