Skip to content

Commit 6ab5f3c

Browse files
committed
chore: Real testing workflow
Signed-off-by: Naren Dasan <[email protected]>
1 parent 8703f7d commit 6ab5f3c

File tree

3 files changed

+71
-23
lines changed

3 files changed

+71
-23
lines changed

.circleci/config.yml

+67-19
Original file line numberDiff line numberDiff line change
@@ -482,7 +482,7 @@ jobs:
482482
path: /tmp/dist/nightly
483483
destination: x86_64-pyt-nightly
484484

485-
test-core-cpp-x86_64-pyt-release:
485+
test-core-cpp-x86_64:
486486
parameters:
487487
torch-build:
488488
type: string
@@ -514,7 +514,7 @@ jobs:
514514
- dump-test-env
515515
- test-ts-core
516516

517-
test-ts-py-x86_64-pyt-release:
517+
test-py-ts-x86_64:
518518
parameters:
519519
torch-build:
520520
type: string
@@ -527,18 +527,19 @@ jobs:
527527
- checkout
528528
- create-py-env:
529529
trt-version-long: << pipeline.parameters.trt-release-version-long >>
530-
- install-torch-from-index:
531-
torch-build: << parameters.torch-build >>
532-
torch-build-index: << parameters.torch-build-index >>
533530
- attach_workspace:
534531
at: /tmp/dist
535532
- run:
536533
name: "Install torch-tensorrt"
537534
command: pip3 install /tmp/dist/release/*
535+
# We install torch after torch-trt because pip automatically enforces the version constraint otherwise
536+
- install-torch-from-index:
537+
torch-build: << parameters.torch-build >>
538+
torch-build-index: << parameters.torch-build-index >>
538539
- dump-test-env
539540
- test-ts-py-api
540541

541-
test-x86_64-pyt-nightly:
542+
test-py-fx-x86_64:
542543
parameters:
543544
torch-build:
544545
type: string
@@ -556,7 +557,7 @@ jobs:
556557
- run:
557558
name: "Install torch-tensorrt"
558559
command: pip3 install /tmp/dist/nightly/*
559-
# We install torch after torch-trt because pip automatically enforces the version constraint otherwise, swap back after versions are synced
560+
# We install torch after torch-trt because pip automatically enforces the version constraint otherwise
560561
- install-torch-from-index:
561562
torch-build: << parameters.torch-build >>
562563
torch-build-index: << parameters.torch-build-index >>
@@ -573,30 +574,30 @@ parameters:
573574
default: "https://download.pytorch.org/whl/nightly/cu113"
574575
cudnn-nightly-version:
575576
type: string
576-
default: "8.2.1"
577+
default: "8.4.1"
577578
trt-nightly-version-short:
578579
type: string
579-
default: "8.2.4"
580+
default: "8.4.1"
580581
trt-nightly-version-long:
581582
type: string
582-
default: "8.2.4.2"
583+
default: "8.4.1.5"
583584

584585
# Release platform config
585586
torch-release-build:
586587
type: string
587-
default: "1.11.0+cu113"
588+
default: "1.12.0+cu113"
588589
torch-release-build-index:
589590
type: string
590591
default: "https://download.pytorch.org/whl/cu113"
591592
cudnn-release-version:
592593
type: string
593-
default: "8.2.1"
594+
default: "8.4.1"
594595
trt-release-version-short:
595596
type: string
596-
default: "8.2.4"
597+
default: "8.4.1"
597598
trt-release-version-long:
598599
type: string
599-
default: "8.2.4.2"
600+
default: "8.4.1.5"
600601

601602
# Jetson platform config
602603
torch-jetson-build:
@@ -635,16 +636,42 @@ workflows:
635636
- build-x86_64-pyt-release:
636637
torch-build: << pipeline.parameters.torch-release-build >>
637638
torch-build-index: << pipeline.parameters.torch-release-build-index >>
638-
- test-core-cpp-x86_64-pyt-release:
639+
- test-core-cpp-x86_64:
640+
name: test-core-cpp-x86_64-pyt-release
641+
torch-build: << pipeline.parameters.torch-release-build >>
642+
torch-build-index: << pipeline.parameters.torch-release-build-index >>
643+
requires:
644+
- build-x86_64-pyt-release
645+
- test-py-ts-x86_64:
646+
name: test-py-ts-x86_64-pyt-release
639647
torch-build: << pipeline.parameters.torch-release-build >>
640648
torch-build-index: << pipeline.parameters.torch-release-build-index >>
641649
requires:
642650
- build-x86_64-pyt-release
651+
- test-py-ts-x86_64:
652+
name: test-py-fx-x86_64-pyt-release
653+
torch-build: << pipeline.parameters.torch-nightly-build >>
654+
torch-build-index: << pipeline.parameters.torch-nightly-build-index >>
655+
requires:
656+
- build-x86_64-pyt-release
643657

644658
- build-x86_64-pyt-nightly:
645659
torch-build: << pipeline.parameters.torch-nightly-build >>
646660
torch-build-index: << pipeline.parameters.torch-nightly-build-index >>
647-
- test-x86_64-pyt-nightly:
661+
- test-core-cpp-x86_64:
662+
name: test-core-cpp-x86_64-pyt-nightly
663+
torch-build: << pipeline.parameters.torch-release-build >>
664+
torch-build-index: << pipeline.parameters.torch-release-build-index >>
665+
requires:
666+
- build-x86_64-pyt-nightly
667+
- test-py-ts-x86_64:
668+
name: test-py-ts-x86_64-pyt-nightly
669+
torch-build: << pipeline.parameters.torch-release-build >>
670+
torch-build-index: << pipeline.parameters.torch-release-build-index >>
671+
requires:
672+
- build-x86_64-pyt-nightly
673+
- test-py-fx-x86_64:
674+
name: test-py-fx-x86_64-pyt-nightly
648675
torch-build: << pipeline.parameters.torch-nightly-build >>
649676
torch-build-index: << pipeline.parameters.torch-nightly-build-index >>
650677
requires:
@@ -660,21 +687,42 @@ workflows:
660687
- build-x86_64-pyt-release:
661688
torch-build: << pipeline.parameters.torch-release-build >>
662689
torch-build-index: << pipeline.parameters.torch-release-build-index >>
663-
- test-core-cpp-x86_64-pyt-release:
690+
- test-core-cpp-x86_64:
691+
name: test-core-cpp-x86_64-pyt-release
664692
torch-build: << pipeline.parameters.torch-release-build >>
665693
torch-build-index: << pipeline.parameters.torch-release-build-index >>
666694
requires:
667695
- build-x86_64-pyt-release
668-
- test-ts-py-x86_64-pyt-release:
696+
- test-py-ts-x86_64:
697+
name: test-py-ts-x86_64-pyt-release
669698
torch-build: << pipeline.parameters.torch-release-build >>
670699
torch-build-index: << pipeline.parameters.torch-release-build-index >>
671700
requires:
672701
- build-x86_64-pyt-release
702+
- test-py-ts-x86_64:
703+
name: test-py-fx-x86_64-pyt-release
704+
torch-build: << pipeline.parameters.torch-nightly-build >>
705+
torch-build-index: << pipeline.parameters.torch-nightly-build-index >>
706+
requires:
707+
- build-x86_64-pyt-release
673708

674709
- build-x86_64-pyt-nightly:
675710
torch-build: << pipeline.parameters.torch-nightly-build >>
676711
torch-build-index: << pipeline.parameters.torch-nightly-build-index >>
677-
- test-x86_64-pyt-nightly:
712+
- test-core-cpp-x86_64:
713+
name: test-core-cpp-x86_64-pyt-nightly
714+
torch-build: << pipeline.parameters.torch-release-build >>
715+
torch-build-index: << pipeline.parameters.torch-release-build-index >>
716+
requires:
717+
- build-x86_64-pyt-nightly
718+
- test-py-ts-x86_64:
719+
name: test-py-ts-x86_64-pyt-nightly
720+
torch-build: << pipeline.parameters.torch-release-build >>
721+
torch-build-index: << pipeline.parameters.torch-release-build-index >>
722+
requires:
723+
- build-x86_64-pyt-nightly
724+
- test-py-fx-x86_64:
725+
name: test-py-fx-x86_64-pyt-nightly
678726
torch-build: << pipeline.parameters.torch-nightly-build >>
679727
torch-build-index: << pipeline.parameters.torch-nightly-build-index >>
680728
requires:

py/setup.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -308,7 +308,7 @@ def run(self):
308308
long_description=long_description,
309309
ext_modules=ext_modules,
310310
install_requires=[
311-
'torch>=1.11.0+cu113,<1.12.0',
311+
'torch>=1.12.0+cu113,<1.13.0',
312312
],
313313
setup_requires=[],
314314
cmdclass={

py/torch_tensorrt/_compile.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55
import torch
66
import torch.fx
77
from enum import Enum
8-
import torch_tensorrt.fx
9-
from torch_tensorrt.fx.lower import lower_to_trt
10-
from torch_tensorrt.fx.utils import LowerPrecision
8+
#import torch_tensorrt.fx
9+
#from torch_tensorrt.fx.lower import lower_to_trt
10+
#from torch_tensorrt.fx.utils import LowerPrecision
1111

1212
class _IRType(Enum):
1313
"""Enum to set the minimum required logging level to print a message to stdout

0 commit comments

Comments
 (0)