Skip to content

Commit 7840db0

Browse files
Fix a few CI issues (#3987)
1 parent ff123f2 commit 7840db0

File tree

7 files changed

+84
-30
lines changed

7 files changed

+84
-30
lines changed

.github/pr-labels.yml

Lines changed: 58 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,57 +1,89 @@
11
"component: torchtrtc":
2-
- cpp/torchtrtc/**/*
2+
- changed-files:
3+
- any-glob-to-any-file:
4+
- cpp/torchtrtc/**/*
35

46
"component: api [C++]":
5-
- cpp/**/*
7+
- changed-files:
8+
- any-glob-to-any-file:
9+
- cpp/**/*
610

711
"component: api [Python]":
8-
- py/**/*
12+
- changed-files:
13+
- any-glob-to-any-file:
14+
- py/**/*
915

1016
"component: core":
11-
- core/**/*
12-
- py/torch_tensorrt/dynamo/**/*
17+
- changed-files:
18+
- any-glob-to-any-file:
19+
- core/**/*
20+
- py/torch_tensorrt/dynamo/**/*
1321

1422
"component: conversion":
15-
- core/conversion/**/*
16-
- py/torch_tensorrt/dynamo/conversion/**/*
23+
- changed-files:
24+
- any-glob-to-any-file:
25+
- core/conversion/**/*
26+
- py/torch_tensorrt/dynamo/conversion/**/*
1727

1828
"component: converters":
19-
- core/conversion/converters/**/*
20-
- py/torch_tensorrt/dynamo/conversion/impl/**/*
29+
- changed-files:
30+
- any-glob-to-any-file:
31+
- core/conversion/converters/**/*
32+
- py/torch_tensorrt/dynamo/conversion/impl/**/*
2133

2234
"component: evaluators":
23-
- core/conversion/evaluators/**/*
35+
- changed-files:
36+
- any-glob-to-any-file:
37+
- core/conversion/evaluators/**/*
2438

2539
"component: fx":
26-
- py/torch_tensorrt/fx/**/*
40+
- changed-files:
41+
- any-glob-to-any-file:
42+
- py/torch_tensorrt/fx/**/*
2743

2844
"component: dynamo":
29-
- py/torch_tensorrt/dynamo/**/*
45+
- changed-files:
46+
- any-glob-to-any-file:
47+
- py/torch_tensorrt/dynamo/**/*
3048

3149
"component: torch_compile":
32-
- py/torch_tensorrt/dynamo/backend/*
50+
- changed-files:
51+
- any-glob-to-any-file:
52+
- py/torch_tensorrt/dynamo/backend/*
3353

3454
"component: partitioning":
35-
- core/partitioning/**/*
55+
- changed-files:
56+
- any-glob-to-any-file:
57+
- core/partitioning/**/*
3658

3759
"component: runtime":
38-
- core/runtime/**/*
39-
- py/torch_tensorrt/dynamo/runtime/**/*
60+
- changed-files:
61+
- any-glob-to-any-file:
62+
- core/runtime/**/*
63+
- py/torch_tensorrt/dynamo/runtime/**/*
4064

4165
"component: lowering":
42-
- core/lowering/**/*
43-
- py/torch_tensorrt/dynamo/lowering/**/*
66+
- changed-files:
67+
- any-glob-to-any-file:
68+
- core/lowering/**/*
69+
- py/torch_tensorrt/dynamo/lowering/**/*
4470

4571
"component: tests":
46-
- tests/**/*
72+
- changed-files:
73+
- any-glob-to-any-file:
74+
- tests/**/*
4775

4876
"component: build system":
49-
- MODULE.bazel
50-
- BUILD
51-
- pyproject.toml
52-
- setup.py
53-
- toolchain/**/*
77+
- changed-files:
78+
- any-glob-to-any-file:
79+
- MODULE.bazel
80+
- BUILD
81+
- pyproject.toml
82+
- setup.py
83+
- toolchain/**/*
5484

5585
"documentation":
56-
- docs/**/*
57-
- docsrc/**/*
86+
- changed-files:
87+
- any-glob-to-any-file:
88+
- docs/**/*
89+
- docsrc/**/*

.github/scripts/filter-matrix.py

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@
1313
# jetpack 6.2 only officially supports python 3.10 and cu126
1414
jetpack_python_versions: List[str] = ["3.10"]
1515
jetpack_cuda_versions: List[str] = ["cu126"]
16+
# rtx 1.2 currently only supports cu129 and cu130
17+
rtx_cuda_versions: List[str] = ["cu129", "cu130"]
1618

1719
jetpack_container_image: str = "nvcr.io/nvidia/l4t-jetpack:r36.4.0"
1820
sbsa_container_image: str = "quay.io/pypa/manylinux_2_39_aarch64"
@@ -32,6 +34,7 @@ def filter_matrix_item(
3234
item: Dict[str, Any],
3335
is_jetpack: bool,
3436
limit_pr_builds: bool,
37+
use_rtx: bool,
3538
) -> bool:
3639
"""Filter a single matrix item based on the build type and requirements."""
3740
if item["python_version"] in disabled_python_versions:
@@ -51,6 +54,10 @@ def filter_matrix_item(
5154
return True
5255
return False
5356
else:
57+
if use_rtx:
58+
if item["desired_cuda"] in rtx_cuda_versions:
59+
return True
60+
return False
5461
if item["gpu_arch_type"] == "cuda-aarch64":
5562
# pytorch image:pytorch/manylinuxaarch64-builder:cuda12.8 comes with glibc2.28
5663
# however, TensorRT requires glibc2.31 on aarch64 platform
@@ -85,6 +92,14 @@ def main(args: list[str]) -> None:
8592
default=os.getenv("LIMIT_PR_BUILDS", "false"),
8693
)
8794

95+
parser.add_argument(
96+
"--use-rtx",
97+
help="use rtx",
98+
type=str,
99+
choices=["true", "false"],
100+
default="false",
101+
)
102+
88103
options = parser.parse_args(args)
89104
if options.matrix == "":
90105
raise ValueError("--matrix needs to be provided")
@@ -105,6 +120,7 @@ def main(args: list[str]) -> None:
105120
item,
106121
options.jetpack == "true",
107122
options.limit_pr_builds == "true",
123+
options.use_rtx == "true",
108124
):
109125
filtered_includes.append(item)
110126

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ jobs:
4141
run: |
4242
set -eou pipefail
4343
MATRIX_BLOB=${{ toJSON(needs.generate-matrix.outputs.matrix) }}
44-
MATRIX_BLOB="$(python3 .github/scripts/filter-matrix.py --matrix "${MATRIX_BLOB}")"
44+
MATRIX_BLOB="$(python3 .github/scripts/filter-matrix.py --use-rtx true --matrix "${MATRIX_BLOB}")"
4545
echo "${MATRIX_BLOB}"
4646
echo "matrix=${MATRIX_BLOB}" >> "${GITHUB_OUTPUT}"
4747

.github/workflows/build-test-windows_rtx.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ jobs:
4141
run: |
4242
set -eou pipefail
4343
MATRIX_BLOB=${{ toJSON(needs.generate-matrix.outputs.matrix) }}
44-
MATRIX_BLOB="$(python3 .github/scripts/filter-matrix.py --matrix "${MATRIX_BLOB}")"
44+
MATRIX_BLOB="$(python3 .github/scripts/filter-matrix.py --use-rtx true --matrix "${MATRIX_BLOB}")"
4545
echo "${MATRIX_BLOB}"
4646
echo "matrix=${MATRIX_BLOB}" >> "${GITHUB_OUTPUT}"
4747

.github/workflows/label.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,10 @@ jobs:
1515
pull-requests: write
1616
runs-on: ubuntu-latest
1717
steps:
18+
- name: Checkout base branch
19+
uses: actions/checkout@v4
20+
with:
21+
ref: ${{ github.event.pull_request.base.sha }}
1822
- uses: actions/labeler@v6
1923
with:
2024
repo-token: "${{ secrets.GITHUB_TOKEN }}"

.github/workflows/uv-update.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,6 @@ on:
55
# Every Monday at 03:00 UTC; adjust as needed
66
- cron: "0 3 * * 1"
77
push:
8-
# to remvoe: test only
9-
tags: [uv-update-v1]
108
branches: [main]
119
paths:
1210
- 'pyproject.toml'

tests/py/dynamo/models/test_models.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -425,6 +425,10 @@ def test_resnet18_half(ir):
425425

426426

427427
@pytest.mark.unit
428+
@unittest.skipIf(
429+
torch_trt.ENABLED_FEATURES.tensorrt_rtx,
430+
"tensorrt_rtx does not support bfloat16",
431+
)
428432
def test_cosmos_true_div(ir):
429433
class CosmosLearnablePositionalEmbed(torch.nn.Module):
430434
def __init__(

0 commit comments

Comments
 (0)