Rebase to master

Signed-off-by: Dheeraj Peri <[email protected]>

Author: peri044

BUILD

@@ -19,25 +19,24 @@ pkg_tar(
         "//core/conversion/tensorcontainer:include",
         "//core/conversion/evaluators:include",
         "//core/plugins:include",
-        "//core/runtime: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": [
@@ -47,26 +46,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",

WORKSPACE

@@ -4,37 +4,38 @@ load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
 load("@bazel_tools//tools/build_defs/repo:git.bzl", "git_repository")
 
 http_archive(
-        name = "rules_python",
-        url = "https://github.com/bazelbuild/rules_python/releases/download/0.2.0/rules_python-0.2.0.tar.gz",
-        sha256 = "778197e26c5fbeb07ac2a2c5ae405b30f6cb7ad1f5510ea6fdac03bded96cc6f",
-    )
+    name = "rules_python",
+    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:pip.bzl", "pip_install")
 
 http_archive(
     name = "rules_pkg",
+    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",
+        "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",
     ],
-    sha256 = "038f1caa773a7e35b3663865ffb003169c6a71dc995e39bf4815792f385d837d",
 )
 
 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",
+    path = "/usr/local/cuda-11.1/",
 )
 
 #############################################################################################################
@@ -44,16 +45,16 @@ new_local_repository(
 http_archive(
     name = "libtorch",
     build_file = "@//third_party/libtorch:BUILD",
-    strip_prefix = "libtorch",
     sha256 = "1f8aec376f9343538bd7c2fd3abb81ed3af11f575efe3aa72777c4d62044b832",
+    strip_prefix = "libtorch",
     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",
-    strip_prefix = "libtorch",
     sha256 = "3a6e0dc11859111e75caa640c8ce9bf904fbb6e9992b4345e444ed5410e4d77e",
+    strip_prefix = "libtorch",
     urls = ["https://download.pytorch.org/libtorch/cu111/libtorch-shared-with-deps-1.8.1%2Bcu111.zip"],
 )
 
@@ -63,22 +64,22 @@ http_archive(
 
 http_archive(
     name = "cudnn",
+    build_file = "@//third_party/cudnn/archive:BUILD",
+    sha256 = "98a8784e92862f20018d20c281b30d4a0cd951f93694f6433ccf4ae9c502ba6a",
+    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",
     ],
-    build_file = "@//third_party/cudnn/archive:BUILD",
-    sha256 = "98a8784e92862f20018d20c281b30d4a0cd951f93694f6433ccf4ae9c502ba6a",
-    strip_prefix = "cuda"
 )
 
 http_archive(
     name = "tensorrt",
+    build_file = "@//third_party/tensorrt/archive:BUILD",
+    sha256 = "d3a1f478e304b48878604fac70ce7920fece71f9cac62f925c9c59c197f5d087",
+    strip_prefix = "TensorRT-7.2.3.4",
     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",
-    strip_prefix = "TensorRT-7.2.3.4",
-    sha256 = "d3a1f478e304b48878604fac70ce7920fece71f9cac62f925c9c59c197f5d087"
 )
 
 ####################################################################################

core/BUILD

@@ -4,43 +4,43 @@ 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/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/",
 )

core/conversion/BUILD

@@ -4,36 +4,36 @@ config_setting(
     name = "use_pre_cxx11_abi",
     values = {
         "define": "abi=pre_cxx11_abi",
-    }
+    },
 )
 
 cc_library(
     name = "conversion",
-    hdrs = [
-        "conversion.h",
-    ],
     srcs = [
+        "InterfaceTypes.cpp",
         "conversion.cpp",
         "conversion_ignorelist.cpp",
-        "InterfaceTypes.cpp"
+    ],
+    hdrs = [
+        "conversion.h",
     ],
     deps = [
         "@tensorrt//:nvinfer",
         "//core/conversion/var",
         "//core/conversion/conversionctx",
         "//core/conversion/converters",
         "//core/conversion/evaluators",
-        "//core/util:prelude"
+        "//core/util:prelude",
     ] + 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"],
     }),
 )
 
 load("@rules_pkg//:pkg.bzl", "pkg_tar")
 
 pkg_tar(
     name = "include",
-    package_dir = "core/conversion/",
     srcs = ["conversion.h"],
+    package_dir = "core/conversion/",
 )

core/conversion/conversionctx/BUILD

@@ -4,30 +4,30 @@ config_setting(
     name = "use_pre_cxx11_abi",
     values = {
         "define": "abi=pre_cxx11_abi",
-    }
+    },
 )
 
 cc_library(
     name = "conversionctx",
-    hdrs = [
-        "ConversionCtx.h",
-    ],
     srcs = [
         "ConversionCtx.cpp",
     ],
+    hdrs = [
+        "ConversionCtx.h",
+    ],
     deps = [
         "@tensorrt//:nvinfer",
         "//core/util:prelude",
     ] + 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"],
     }),
 )
 
 load("@rules_pkg//:pkg.bzl", "pkg_tar")
 
 pkg_tar(
     name = "include",
-    package_dir = "core/conversion/conversionctx/",
     srcs = ["ConversionCtx.h"],
+    package_dir = "core/conversion/conversionctx/",
 )

core/conversion/converters/BUILD

@@ -4,60 +4,60 @@ config_setting(
     name = "use_pre_cxx11_abi",
     values = {
         "define": "abi=pre_cxx11_abi",
-    }
+    },
 )
 
 cc_library(
     name = "weights",
-    hdrs = [
-        "Weights.h"
-    ],
     srcs = [
-        "Weights.cpp"
+        "Weights.cpp",
+    ],
+    hdrs = [
+        "Weights.h",
     ],
     deps = [
         "@tensorrt//:nvinfer",
         "//core/util:prelude",
-        "//core/conversion/conversionctx"
+        "//core/conversion/conversionctx",
     ] + 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,
 )
 
 cc_library(
     name = "converters",
-    hdrs = [
-        "converters.h",
-        "converter_util.h",
-    ],
     srcs = [
         "NodeConverterRegistry.cpp",
-        "converter_util.cpp",   
+        "converter_util.cpp",
         "impl/activation.cpp",
         "impl/batch_norm.cpp",
         "impl/concat.cpp",
         "impl/constant.cpp",
         "impl/conv_deconv.cpp",
         "impl/element_wise.cpp",
         "impl/expand.cpp",
+        "impl/interpolate.cpp",
         "impl/linear.cpp",
+        "impl/lstm_cell.cpp",
         "impl/matrix_multiply.cpp",
         "impl/normalize.cpp",
         "impl/pooling.cpp",
         "impl/reduce.cpp",
         "impl/replication_pad.cpp",
+        "impl/select.cpp",
         "impl/shuffle.cpp",
         "impl/softmax.cpp",
-        "impl/unary.cpp",
-        "impl/interpolate.cpp",
-        "impl/select.cpp",
         "impl/squeeze.cpp",
         "impl/stack.cpp",
-        "impl/lstm_cell.cpp",
-        "impl/unsqueeze.cpp",
         "impl/topk.cpp",
+        "impl/unary.cpp",
+        "impl/unsqueeze.cpp",
+    ],
+    hdrs = [
+        "converter_util.h",
+        "converters.h",
     ],
     deps = [
         "@tensorrt//:nvinfer",
@@ -67,8 +67,8 @@ cc_library(
         "//core/conversion/conversionctx",
         "//core/plugins:trtorch_plugins",
     ] + 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,
 )
@@ -77,9 +77,9 @@ load("@rules_pkg//:pkg.bzl", "pkg_tar")
 
 pkg_tar(
     name = "include",
-    package_dir = "core/conversion/converters/",
     srcs = [
+        "Weights.h",
         "converters.h",
-        "Weights.h"
     ],
+    package_dir = "core/conversion/converters/",
 )