Merge branch 'master' into aten_size_fix_bug

Author: narendasan

.github/ISSUE_TEMPLATE/bug-report.md

@@ -29,7 +29,8 @@ Steps to reproduce the behavior:
 
 > Build information about the TRTorch compiler can be found by turning on debug messages
 
- - PyTorch Version (e.g., 1.0):
+ - TRTorch Version (e.g. 0.2.0): 
+ - PyTorch Version (e.g. 1.0):
  - CPU Architecture:
  - OS (e.g., Linux):
  - How you installed PyTorch (`conda`, `pip`, `libtorch`, source):

.github/scripts/run_cpp_linter.py

@@ -24,6 +24,12 @@
     comment = '''There are some changes that do not conform to C++ style guidelines:\n ```diff\n{}```'''.format(output.stdout.decode("utf-8"))
     approval = 'REQUEST_CHANGES'
 
-pr.create_review(commit, comment, approval)
-
-
+try:
+    pr.create_review(commit, comment, approval)
+except:
+    print("Unable to submit in depth review, please review logs for linting issues")
+    
+if output.returncode != 0:
+    exit(1)
+else:
+    exit(0)

.github/scripts/run_py_linter.py

@@ -24,4 +24,12 @@
     comment = '''There are some changes that do not conform to Python style guidelines:\n ```diff\n{}```'''.format(output.stdout.decode("utf-8"))
     approval = 'REQUEST_CHANGES'
 
-pr.create_review(commit, comment, approval)
+try:
+    pr.create_review(commit, comment, approval)
+except:
+    print("Unable to submit in depth review, please review logs for linting issues")
+
+if output.returncode != 0:
+    exit(1)
+else:
+    exit(0)

BUILD

@@ -15,29 +15,28 @@ pkg_tar(
         "//core/conversion:include",
         "//core/conversion/conversionctx:include",
         "//core/conversion/converters:include",
-        "//core/conversion/var:include",
-        "//core/conversion/tensorcontainer:include",
-        "//core/conversion/evaluators:include",
         "//core/conversion/converters/impl/plugins:include",
-        "//core/runtime:include",
+        "//core/conversion/evaluators:include",
+        "//core/conversion/tensorcontainer:include",
+        "//core/conversion/var:include",
         "//core/lowering:include",
         "//core/lowering/passes:include",
+        "//core/runtime:include",
         "//core/util:include",
-        "//core/util/logging:include"
+        "//core/util/logging:include",
     ],
 )
 
 pkg_tar(
     name = "include",
-    package_dir = "include/trtorch/",
     srcs = [
         "//cpp/api:api_headers",
     ],
+    package_dir = "include/trtorch/",
 )
 
 pkg_tar(
     name = "lib",
-    package_dir = "lib/",
     srcs = select({
         ":windows": ["//cpp/api/lib:trtorch.dll"],
         "//conditions:default": [
@@ -46,26 +45,25 @@ pkg_tar(
         ],
     }),
     mode = "0755",
+    package_dir = "lib/",
 )
 
-
 pkg_tar(
     name = "bin",
-    package_dir = "bin/",
     srcs = [
-        "//cpp/trtorchc:trtorchc",
+        "//cpp/trtorchc",
     ],
     mode = "0755",
+    package_dir = "bin/",
 )
 
-
 pkg_tar(
     name = "libtrtorch",
-    extension = "tar.gz",
-    package_dir = "trtorch",
     srcs = [
-        "//:LICENSE"
+        "//:LICENSE",
     ],
+    extension = "tar.gz",
+    package_dir = "trtorch",
     deps = [
         ":lib",
         ":include",

README.md

@@ -74,7 +74,7 @@ torch.jit.save(trt_ts_module, "trt_torchscript_module.ts")
 These are the following dependencies used to verify the testcases. TRTorch can work with other versions, but the tests are not guaranteed to pass.
 
 - Bazel 4.0.0
-- Libtorch 1.8.0 (built with CUDA 11.1)
+- Libtorch 1.8.1 (built with CUDA 11.1)
 - CUDA 11.1 (10.2 on Jetson)
 - cuDNN 8.1
 - TensorRT 7.2.3

WORKSPACE

@@ -3,46 +3,39 @@ workspace(name = "TRTorch")
 load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
 load("@bazel_tools//tools/build_defs/repo:git.bzl", "git_repository")
 
-git_repository(
+http_archive(
     name = "rules_python",
-    remote = "https://github.com/bazelbuild/rules_python.git",
-    commit = "4fcc24fd8a850bdab2ef2e078b1de337eea751a6",
-    shallow_since = "1589292086 -0400"
+    sha256 = "778197e26c5fbeb07ac2a2c5ae405b30f6cb7ad1f5510ea6fdac03bded96cc6f",
+    url = "https://github.com/bazelbuild/rules_python/releases/download/0.2.0/rules_python-0.2.0.tar.gz",
 )
 
-load("@rules_python//python:repositories.bzl", "py_repositories")
-py_repositories()
-
-load("@rules_python//python:pip.bzl", "pip_repositories", "pip3_import")
-pip_repositories()
+load("@rules_python//python:pip.bzl", "pip_install")
 
 http_archive(
     name = "rules_pkg",
-    url = "https://github.com/bazelbuild/rules_pkg/releases/download/0.2.4/rules_pkg-0.2.4.tar.gz",
-    sha256 = "4ba8f4ab0ff85f2484287ab06c0d871dcb31cc54d439457d28fd4ae14b18450a",
+    sha256 = "038f1caa773a7e35b3663865ffb003169c6a71dc995e39bf4815792f385d837d",
+    urls = [
+        "https://mirror.bazel.build/github.com/bazelbuild/rules_pkg/releases/download/0.4.0/rules_pkg-0.4.0.tar.gz",
+        "https://github.com/bazelbuild/rules_pkg/releases/download/0.4.0/rules_pkg-0.4.0.tar.gz",
+    ],
 )
 
 load("@rules_pkg//:deps.bzl", "rules_pkg_dependencies")
+
 rules_pkg_dependencies()
 
 git_repository(
     name = "googletest",
-    remote = "https://github.com/google/googletest",
     commit = "703bd9caab50b139428cea1aaff9974ebee5742e",
-    shallow_since = "1570114335 -0400"
+    remote = "https://github.com/google/googletest",
+    shallow_since = "1570114335 -0400",
 )
 
 # CUDA should be installed on the system locally
 new_local_repository(
     name = "cuda",
-    path = "/usr/local/cuda-11.1/",
     build_file = "@//third_party/cuda:BUILD",
-)
-
-new_local_repository(
-    name = "cublas",
-    path = "/usr",
-    build_file = "@//third_party/cublas:BUILD",
+    path = "/usr/local/cuda-11.1/",
 )
 
 #############################################################################################################
@@ -52,17 +45,17 @@ new_local_repository(
 http_archive(
     name = "libtorch",
     build_file = "@//third_party/libtorch:BUILD",
+    sha256 = "1f8aec376f9343538bd7c2fd3abb81ed3af11f575efe3aa72777c4d62044b832",
     strip_prefix = "libtorch",
-    sha256 = "62a2c06761c32576b30f5884240cf675b937945d929e4b13cc776de8d9c2236c",
-    urls = ["https://download.pytorch.org/libtorch/cu111/libtorch-cxx11-abi-shared-with-deps-1.8.0%2Bcu111.zip"],
+    urls = ["https://download.pytorch.org/libtorch/cu111/libtorch-cxx11-abi-shared-with-deps-1.8.1%2Bcu111.zip"],
 )
 
 http_archive(
     name = "libtorch_pre_cxx11_abi",
     build_file = "@//third_party/libtorch:BUILD",
+    sha256 = "3a6e0dc11859111e75caa640c8ce9bf904fbb6e9992b4345e444ed5410e4d77e",
     strip_prefix = "libtorch",
-    sha256 = "1c8b0c0883dd17f5ce952d42ec5f7f0cc7ceb370307535cee26a66c10419f1f6",
-    urls = ["https://download.pytorch.org/libtorch/cu111/libtorch-shared-with-deps-1.8.0%2Bcu111.zip"],
+    urls = ["https://download.pytorch.org/libtorch/cu111/libtorch-shared-with-deps-1.8.1%2Bcu111.zip"],
 )
 
 # Download these tarballs manually from the NVIDIA website
@@ -71,18 +64,22 @@ http_archive(
 
 http_archive(
     name = "cudnn",
-    urls = ["https://developer.nvidia.com/compute/machine-learning/cudnn/secure/8.1.1.33/11.2_20210301/cudnn-11.2-linux-x64-v8.1.1.33.tgz",],
     build_file = "@//third_party/cudnn/archive:BUILD",
     sha256 = "98a8784e92862f20018d20c281b30d4a0cd951f93694f6433ccf4ae9c502ba6a",
-    strip_prefix = "cuda"
+    strip_prefix = "cuda",
+    urls = [
+        "https://developer.nvidia.com/compute/machine-learning/cudnn/secure/8.1.1.33/11.2_20210301/cudnn-11.2-linux-x64-v8.1.1.33.tgz",
+    ],
 )
 
 http_archive(
     name = "tensorrt",
-    urls = ["https://developer.nvidia.com/compute/machine-learning/tensorrt/secure/7.2.3/tars/TensorRT-7.2.3.4.Ubuntu-18.04.x86_64-gnu.cuda-11.1.cudnn8.1.tar.gz",],
     build_file = "@//third_party/tensorrt/archive:BUILD",
+    sha256 = "d3a1f478e304b48878604fac70ce7920fece71f9cac62f925c9c59c197f5d087",
     strip_prefix = "TensorRT-7.2.3.4",
-    sha256 = "d3a1f478e304b48878604fac70ce7920fece71f9cac62f925c9c59c197f5d087"
+    urls = [
+        "https://developer.nvidia.com/compute/machine-learning/tensorrt/secure/7.2.3/tars/TensorRT-7.2.3.4.Ubuntu-18.04.x86_64-gnu.cuda-11.1.cudnn8.1.tar.gz",
+    ],
 )
 
 ####################################################################################
@@ -123,26 +120,17 @@ http_archive(
 #########################################################################
 # Testing Dependencies (optional - comment out on aarch64)
 #########################################################################
-pip3_import(
+pip_install(
     name = "trtorch_py_deps",
-    requirements = "//py:requirements.txt"
+    requirements = "//py:requirements.txt",
 )
 
-load("@trtorch_py_deps//:requirements.bzl", "pip_install")
-pip_install()
-
-pip3_import(
+pip_install(
     name = "py_test_deps",
-    requirements = "//tests/py:requirements.txt"
+    requirements = "//tests/py:requirements.txt",
 )
 
-load("@py_test_deps//:requirements.bzl", "pip_install")
-pip_install()
-
-pip3_import(
-   name = "pylinter_deps",
-   requirements = "//tools/linter:requirements.txt",
+pip_install(
+    name = "pylinter_deps",
+    requirements = "//tools/linter:requirements.txt",
 )
-
-load("@pylinter_deps//:requirements.bzl", "pip_install")
-pip_install()

core/BUILD

@@ -4,43 +4,44 @@ config_setting(
     name = "use_pre_cxx11_abi",
     values = {
         "define": "abi=pre_cxx11_abi",
-    }
+    },
 )
 
 config_setting(
     name = "python_core",
     values = {
-        "define": "target_lang=python"
-    }
+        "define": "target_lang=python",
+    },
 )
 
 cc_library(
     name = "core",
-    hdrs = [
-        "compiler.h",
-    ],
     srcs = [
         "compiler.cpp",
     ],
+    hdrs = [
+        "compiler.h",
+    ],
     deps = [
         "//core/conversion",
         "//core/runtime",
         "//core/lowering",
+        "//core/partitioning",
         "//core/util/logging",
-        "@tensorrt//:nvinfer"
+        "@tensorrt//:nvinfer",
     ] + select({
-        ":use_pre_cxx11_abi":  ["@libtorch_pre_cxx11_abi//:libtorch"],
-        "//conditions:default":  ["@libtorch//:libtorch"],
+        ":use_pre_cxx11_abi": ["@libtorch_pre_cxx11_abi//:libtorch"],
+        "//conditions:default": ["@libtorch//:libtorch"],
     }),
-    alwayslink=True,
+    alwayslink = True,
 )
 
 load("@rules_pkg//:pkg.bzl", "pkg_tar")
 
 pkg_tar(
     name = "include",
-    package_dir = "core/",
     srcs = [
         "compiler.h",
     ],
+    package_dir = "core/",
 )