refactor(caffe2): Break out Caffe2 from the LibTorch package to address

overlinking Signed-off-by: Naren Dasan <[email protected]> Signed-off-by: Naren Dasan <[email protected]>
pytorch · May 16, 2020 · a71bca9 · a71bca9
1 parent e8d458d
commit a71bca9
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 2 deletions.
diff --git a/cpp/benchmark/BUILD b/cpp/benchmark/BUILD
@@ -8,6 +8,7 @@ cc_binary(
     ],
     deps = [
         "@libtorch//:libtorch",
+        "@libtorch//:caffe2",
         "//cpp/api:trtorch"
     ],
 )
diff --git a/cpp/ptq/BUILD b/cpp/ptq/BUILD
@@ -9,6 +9,7 @@ cc_binary(
     deps = [
         "//cpp/ptq/datasets:cifar10",
         "@libtorch//:libtorch",
+        "@libtorch//:caffe2",
         "//cpp/api:trtorch",
         "@tensorrt//:nvinfer"
     ],

diff --git a/cpp/trtorchexec/BUILD b/cpp/trtorchexec/BUILD
@@ -7,6 +7,7 @@ cc_binary(
     ],
     deps = [
         "@libtorch//:libtorch",
+        "@libtorch//:caffe2",
         "//cpp/api:trtorch"
     ],
 )
diff --git a/tests/util/BUILD b/tests/util/BUILD
@@ -1,5 +1,12 @@
 package(default_visibility = ["//visibility:public"])
 
+config_setting(
+    name = "use_pre_cxx11_abi",
+    values = {
+        "define": "abi=pre_cxx11_abi",
+    }
+)
+
 cc_library(
     name = "util",
     hdrs = [
@@ -14,8 +21,18 @@ cc_library(
     deps = [
         "@tensorrt//:nvinfer",
         "@libtorch//:libtorch",
+        "@libtorch//:caffe2",
         "//core/conversion",
         "//core/util:prelude",
         "//cpp/api:trtorch",
-    ]
+    ] + select({
+        ":use_pre_cxx11_abi":  [
+            "@libtorch_pre_cxx11_abi//:libtorch",
+            "@libtorch_pre_cxx11_abi//:caffe2",
+        ],
+        "//conditions:default":  [
+            "@libtorch//:libtorch",
+            "@libtorch//:caffe2",
+        ],
+    })
 )
diff --git a/third_party/libtorch/BUILD b/third_party/libtorch/BUILD
@@ -27,7 +27,6 @@ cc_library(
     deps = [
         ":ATen",
         ":c10_cuda",
-        ":caffe2"
     ],
     includes = [
         "include",