Skip to content

Commit 52c80f6

Browse files
williamwen42pytorchmergebot
williamwen42
authored and
pytorchmergebot
committed
change name of dynamo CI chard to dynamo_wrapped (pytorch#138233)
Implements pytorch#118127 Pull Request resolved: pytorch#138233 Approved by: https://github.com/clee2000
1 parent 02339e6 commit 52c80f6

File tree

7 files changed

+25
-22
lines changed

7 files changed

+25
-22
lines changed

‎.ci/pytorch/test.sh

+4-4
Original file line numberDiff line numberDiff line change
@@ -296,7 +296,7 @@ test_python() {
296296
}
297297

298298

299-
test_dynamo_shard() {
299+
test_dynamo_wrapped_shard() {
300300
if [[ -z "$NUM_TEST_SHARDS" ]]; then
301301
echo "NUM_TEST_SHARDS must be defined to run a Python test shard"
302302
exit 1
@@ -806,7 +806,7 @@ test_without_numpy() {
806806
# Regression test for https://github.com/pytorch/pytorch/issues/66353
807807
python -c "import sys;sys.path.insert(0, 'fake_numpy');import torch;print(torch.tensor([torch.tensor(0.), torch.tensor(1.)]))"
808808
# Regression test for https://github.com/pytorch/pytorch/issues/109387
809-
if [[ "${TEST_CONFIG}" == *dynamo* ]]; then
809+
if [[ "${TEST_CONFIG}" == *dynamo_wrapped* ]]; then
810810
python -c "import sys;sys.path.insert(0, 'fake_numpy');import torch;torch.compile(lambda x:print(x))('Hello World')"
811811
fi
812812
popd
@@ -1479,9 +1479,9 @@ elif [[ "${TEST_CONFIG}" == *inductor* ]]; then
14791479
test_inductor_distributed
14801480
fi
14811481
fi
1482-
elif [[ "${TEST_CONFIG}" == *dynamo* ]]; then
1482+
elif [[ "${TEST_CONFIG}" == *dynamo_wrapped* ]]; then
14831483
install_torchvision
1484-
test_dynamo_shard "${SHARD_NUMBER}"
1484+
test_dynamo_wrapped_shard "${SHARD_NUMBER}"
14851485
if [[ "${SHARD_NUMBER}" == 1 ]]; then
14861486
test_aten
14871487
fi

‎.github/workflows/pull.yml

+12-12
Original file line numberDiff line numberDiff line change
@@ -195,9 +195,9 @@ jobs:
195195
{ config: "default", shard: 5, num_shards: 5, runner: "${{ needs.get-label-type.outputs.label-type }}linux.4xlarge" },
196196
{ config: "crossref", shard: 1, num_shards: 2, runner: "${{ needs.get-label-type.outputs.label-type }}linux.2xlarge" },
197197
{ config: "crossref", shard: 2, num_shards: 2, runner: "${{ needs.get-label-type.outputs.label-type }}linux.2xlarge" },
198-
{ config: "dynamo", shard: 1, num_shards: 3, runner: "${{ needs.get-label-type.outputs.label-type }}linux.2xlarge" },
199-
{ config: "dynamo", shard: 2, num_shards: 3, runner: "${{ needs.get-label-type.outputs.label-type }}linux.2xlarge" },
200-
{ config: "dynamo", shard: 3, num_shards: 3, runner: "${{ needs.get-label-type.outputs.label-type }}linux.2xlarge" },
198+
{ config: "dynamo_wrapped", shard: 1, num_shards: 3, runner: "${{ needs.get-label-type.outputs.label-type }}linux.2xlarge" },
199+
{ config: "dynamo_wrapped", shard: 2, num_shards: 3, runner: "${{ needs.get-label-type.outputs.label-type }}linux.2xlarge" },
200+
{ config: "dynamo_wrapped", shard: 3, num_shards: 3, runner: "${{ needs.get-label-type.outputs.label-type }}linux.2xlarge" },
201201
]}
202202
linux-focal-py3_9-clang10-test:
203203
name: linux-focal-py3.9-clang10
@@ -228,9 +228,9 @@ jobs:
228228
{ config: "default", shard: 5, num_shards: 5, runner: "${{ needs.get-label-type.outputs.label-type }}linux.4xlarge" },
229229
{ config: "crossref", shard: 1, num_shards: 2, runner: "${{ needs.get-label-type.outputs.label-type }}linux.2xlarge" },
230230
{ config: "crossref", shard: 2, num_shards: 2, runner: "${{ needs.get-label-type.outputs.label-type }}linux.2xlarge" },
231-
{ config: "dynamo", shard: 1, num_shards: 3, runner: "${{ needs.get-label-type.outputs.label-type }}linux.2xlarge" },
232-
{ config: "dynamo", shard: 2, num_shards: 3, runner: "${{ needs.get-label-type.outputs.label-type }}linux.2xlarge" },
233-
{ config: "dynamo", shard: 3, num_shards: 3, runner: "${{ needs.get-label-type.outputs.label-type }}linux.2xlarge" },
231+
{ config: "dynamo_wrapped", shard: 1, num_shards: 3, runner: "${{ needs.get-label-type.outputs.label-type }}linux.2xlarge" },
232+
{ config: "dynamo_wrapped", shard: 2, num_shards: 3, runner: "${{ needs.get-label-type.outputs.label-type }}linux.2xlarge" },
233+
{ config: "dynamo_wrapped", shard: 3, num_shards: 3, runner: "${{ needs.get-label-type.outputs.label-type }}linux.2xlarge" },
234234
]}
235235
secrets: inherit
236236

@@ -261,9 +261,9 @@ jobs:
261261
{ config: "default", shard: 3, num_shards: 5, runner: "${{ needs.get-label-type.outputs.label-type }}linux.4xlarge" },
262262
{ config: "default", shard: 4, num_shards: 5, runner: "${{ needs.get-label-type.outputs.label-type }}linux.4xlarge" },
263263
{ config: "default", shard: 5, num_shards: 5, runner: "${{ needs.get-label-type.outputs.label-type }}linux.4xlarge" },
264-
{ config: "dynamo", shard: 1, num_shards: 3, runner: "${{ needs.get-label-type.outputs.label-type }}linux.2xlarge" },
265-
{ config: "dynamo", shard: 2, num_shards: 3, runner: "${{ needs.get-label-type.outputs.label-type }}linux.2xlarge" },
266-
{ config: "dynamo", shard: 3, num_shards: 3, runner: "${{ needs.get-label-type.outputs.label-type }}linux.2xlarge" },
264+
{ config: "dynamo_wrapped", shard: 1, num_shards: 3, runner: "${{ needs.get-label-type.outputs.label-type }}linux.2xlarge" },
265+
{ config: "dynamo_wrapped", shard: 2, num_shards: 3, runner: "${{ needs.get-label-type.outputs.label-type }}linux.2xlarge" },
266+
{ config: "dynamo_wrapped", shard: 3, num_shards: 3, runner: "${{ needs.get-label-type.outputs.label-type }}linux.2xlarge" },
267267
]}
268268
secrets: inherit
269269

@@ -601,9 +601,9 @@ jobs:
601601
{ config: "default", shard: 1, num_shards: 3, runner: "linux.4xlarge" },
602602
{ config: "default", shard: 2, num_shards: 3, runner: "linux.4xlarge" },
603603
{ config: "default", shard: 3, num_shards: 3, runner: "linux.4xlarge" },
604-
{ config: "dynamo", shard: 1, num_shards: 3, runner: "linux.2xlarge" },
605-
{ config: "dynamo", shard: 2, num_shards: 3, runner: "linux.2xlarge" },
606-
{ config: "dynamo", shard: 3, num_shards: 3, runner: "linux.2xlarge" },
604+
{ config: "dynamo_wrapped", shard: 1, num_shards: 3, runner: "linux.2xlarge" },
605+
{ config: "dynamo_wrapped", shard: 2, num_shards: 3, runner: "linux.2xlarge" },
606+
{ config: "dynamo_wrapped", shard: 3, num_shards: 3, runner: "linux.2xlarge" },
607607
]}
608608
secrets: inherit
609609

‎scripts/compile_tests/download_reports.py

+6-6
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,14 @@
99

1010
CONFIGS = {
1111
"dynamo39": {
12-
"linux-focal-py3.9-clang10 / test (dynamo, 1, 3, linux.2xlarge)",
13-
"linux-focal-py3.9-clang10 / test (dynamo, 2, 3, linux.2xlarge)",
14-
"linux-focal-py3.9-clang10 / test (dynamo, 3, 3, linux.2xlarge)",
12+
"linux-focal-py3.9-clang10 / test (dynamo_wrapped, 1, 3, linux.2xlarge)",
13+
"linux-focal-py3.9-clang10 / test (dynamo_wrapped, 2, 3, linux.2xlarge)",
14+
"linux-focal-py3.9-clang10 / test (dynamo_wrapped, 3, 3, linux.2xlarge)",
1515
},
1616
"dynamo311": {
17-
"linux-focal-py3.11-clang10 / test (dynamo, 1, 3, linux.2xlarge)",
18-
"linux-focal-py3.11-clang10 / test (dynamo, 2, 3, linux.2xlarge)",
19-
"linux-focal-py3.11-clang10 / test (dynamo, 3, 3, linux.2xlarge)",
17+
"linux-focal-py3.11-clang10 / test (dynamo_wrapped, 1, 3, linux.2xlarge)",
18+
"linux-focal-py3.11-clang10 / test (dynamo_wrapped, 2, 3, linux.2xlarge)",
19+
"linux-focal-py3.11-clang10 / test (dynamo_wrapped, 3, 3, linux.2xlarge)",
2020
},
2121
"eager311": {
2222
"linux-focal-py3.11-clang10 / test (default, 1, 3, linux.2xlarge)",

‎test/dynamo_expected_failures/TestTEFuserStatic.test_skip_grad_in_check ‎test/dynamo_skips/TestOperatorsCPU.test_extremal_numerics_nll_loss_cpu

File renamed without changes.

‎test/dynamo_skips/TestTEFuserStatic.test_skip_grad_in_check

Whitespace-only changes.

‎test/functorch/test_ops.py

+2
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@
5252
run_tests,
5353
runOnRocm,
5454
skipIfRocm,
55+
skipIfTorchDynamo,
5556
TEST_WITH_ASAN,
5657
TEST_WITH_ROCM,
5758
TestCase,
@@ -2182,6 +2183,7 @@ def test_extremal_numerics_nll_loss(self, device):
21822183
cotangents = torch.randn_like(result, device=device)
21832184
self._compare_jacobians_of_vjp(fn, (cotangents, input))
21842185

2186+
@skipIfTorchDynamo("segfaults")
21852187
def test_extremal_numerics_l1_loss(self, device):
21862188
N, C, H, W = 3, 4, 5, 6
21872189
shapes = ((N, C), (N, C, H), (N, C, H, W))

‎torch/testing/_internal/common_utils.py

+1
Original file line numberDiff line numberDiff line change
@@ -2516,6 +2516,7 @@ def matches_test(target: str):
25162516
"xpu": TEST_XPU,
25172517
"asan": TEST_WITH_ASAN,
25182518
"dynamo": TEST_WITH_TORCHDYNAMO,
2519+
"dynamo_wrapped": TEST_WITH_TORCHDYNAMO,
25192520
"inductor": TEST_WITH_TORCHINDUCTOR,
25202521
"slow": TEST_WITH_SLOW,
25212522
}

0 commit comments

Comments
 (0)