Merge pull request #19 from bddppq/whole-archive-registerers

narendasan · web-flow · commit e638ea31069c · 2020-03-20T13:02:20.000-06:00
Whole archive libs with registerers
diff --git a/core/conversion/converters/BUILD b/core/conversion/converters/BUILD
@@ -4,18 +4,29 @@ cc_library(
     name = "converters",
     hdrs = [
         "converters.h",
-    ] + glob(["impl/**/*.cpp"]),
+    ],
     srcs = [
         "NodeConverterRegistry.cpp",
         "Weights.cpp",
         "Arg.cpp",
+        "impl/activation.cpp",
+        "impl/batch_norm.cpp",
+        "impl/constant.cpp",
+        "impl/conv_deconv.cpp",
+        "impl/element_wise.cpp",
+        "impl/linear.cpp",
+        "impl/pooling.cpp",
+        "impl/scale.cpp",
+        "impl/softmax.cpp",
+        "impl/unary.cpp",
     ],
     deps = [
         "@libtorch//:libtorch",
         "@tensorrt//:nvinfer",
         "//core/util:prelude",
         "//core/conversion/conversionctx"
     ],
+    alwayslink = True,
 )
 
 load("@rules_pkg//:pkg.bzl", "pkg_tar")
diff --git a/core/conversion/converters/NodeConverterRegistry.cpp b/core/conversion/converters/NodeConverterRegistry.cpp
@@ -138,16 +138,3 @@ RegisterNodeConversionPatterns& RegisterNodeConversionPatterns::RegisterNodeConv
 } // namespace conversion
 } // namespace core
 } // namespace trtorch
-
-// Hack to keep the symbols live, need to get rid of this
-#include "core/conversion/converters/impl/activation.cpp"
-#include "core/conversion/converters/impl/batch_norm.cpp"
-#include "core/conversion/converters/impl/constant.cpp"
-#include "core/conversion/converters/impl/conv_deconv.cpp"
-#include "core/conversion/converters/impl/element_wise.cpp"
-#include "core/conversion/converters/impl/linear.cpp"
-#include "core/conversion/converters/impl/pooling.cpp"
-#include "core/conversion/converters/impl/scale.cpp"
-#include "core/conversion/converters/impl/softmax.cpp"
-#include "core/conversion/converters/impl/unary.cpp"
-
diff --git a/core/conversion/converters/impl/activation.cpp b/core/conversion/converters/impl/activation.cpp
@@ -1,4 +1,3 @@
-#pragma once
 #include "core/util/prelude.h"
 #include "core/conversion/converters/converters.h"
 
diff --git a/core/conversion/converters/impl/batch_norm.cpp b/core/conversion/converters/impl/batch_norm.cpp
@@ -1,4 +1,3 @@
-#pragma once
 #include "core/util/prelude.h"
 #include "core/conversion/converters/converters.h"
 
diff --git a/core/conversion/converters/impl/constant.cpp b/core/conversion/converters/impl/constant.cpp
@@ -1,4 +1,3 @@
-#pragma once
 #include "core/util/prelude.h"
 #include "core/conversion/converters/converters.h"
 
diff --git a/core/conversion/converters/impl/conv_deconv.cpp b/core/conversion/converters/impl/conv_deconv.cpp
@@ -1,4 +1,3 @@
-#pragma once
 #include "core/util/prelude.h"
 #include "core/conversion/converters/converters.h"
 
diff --git a/core/conversion/converters/impl/element_wise.cpp b/core/conversion/converters/impl/element_wise.cpp
@@ -1,4 +1,3 @@
-#pragma once
 #include "core/util/prelude.h"
 #include "core/conversion/converters/converters.h"
 
diff --git a/core/conversion/converters/impl/linear.cpp b/core/conversion/converters/impl/linear.cpp
@@ -1,4 +1,3 @@
-#pragma once
 #include "core/util/prelude.h"
 #include "core/conversion/converters/converters.h"
 
diff --git a/core/conversion/converters/impl/pooling.cpp b/core/conversion/converters/impl/pooling.cpp
@@ -1,4 +1,3 @@
-#pragma once
 #include "core/util/prelude.h"
 #include "core/conversion/converters/converters.h"
 
diff --git a/core/conversion/converters/impl/scale.cpp b/core/conversion/converters/impl/scale.cpp
@@ -1,4 +1,3 @@
-#pragma once
 #include "core/util/prelude.h"
 #include "core/conversion/converters/converters.h"
 
diff --git a/core/conversion/converters/impl/softmax.cpp b/core/conversion/converters/impl/softmax.cpp
@@ -1,4 +1,3 @@
-#pragma once
 #include "core/util/prelude.h"
 #include "core/conversion/converters/converters.h"
 
diff --git a/core/conversion/converters/impl/unary.cpp b/core/conversion/converters/impl/unary.cpp
@@ -1,4 +1,3 @@
-#pragma once
 #include "core/util/prelude.h"
 #include "core/conversion/converters/converters.h"
 
diff --git a/core/conversion/evaluators/BUILD b/core/conversion/evaluators/BUILD
@@ -4,15 +4,16 @@ cc_library(
     name = "evaluators",
     hdrs = [
         "evaluators.h",
-        "prim.cpp"
     ],
     srcs = [
         "NodeEvaluatorRegistry.cpp",
+        "prim.cpp",
     ],
     deps = [
         "@libtorch//:libtorch",
         "//core/util:prelude",
-    ]
+    ],
+    alwayslink = True,
 )
 
 load("@rules_pkg//:pkg.bzl", "pkg_tar")
diff --git a/core/conversion/evaluators/NodeEvaluatorRegistry.cpp b/core/conversion/evaluators/NodeEvaluatorRegistry.cpp
@@ -85,6 +85,3 @@ RegisterNodeEvaluators& RegisterNodeEvaluators::RegisterNodeEvaluators::operator
 } // namespace conversion
 } // namespace core
 } // namespace trtorch
-
-// Hack, remove when symbols don't get left out
-#include "core/conversion/evaluators/prim.cpp"
diff --git a/core/conversion/evaluators/prim.cpp b/core/conversion/evaluators/prim.cpp
@@ -1,4 +1,3 @@
-#pragma once
 #include "torch/csrc/jit/ir.h"
 #include "torch/csrc/jit/constants.h"
 #include "ATen/core/functional.h"

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-#pragma once`
`2`	`1`	`#include "core/util/prelude.h"`
`3`	`2`	`#include "core/conversion/converters/converters.h"`
`4`	`3`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-#pragma once`
`2`	`1`	`#include "torch/csrc/jit/ir.h"`
`3`	`2`	`#include "torch/csrc/jit/constants.h"`
`4`	`3`	`#include "ATen/core/functional.h"`