refactor(//core): Break out the pre_cxx11_abi and python compilation

paths

Signed-off-by: Naren Dasan <[email protected]>
Signed-off-by: Naren Dasan <[email protected]>

Author: narendasan

.bazelrc

@@ -28,4 +28,8 @@ build --cxxopt='-std=c++14'
 
 build:python --cxxopt="-D_GLIBCXX_USE_CXX11_ABI=0"
 build:python --linkopt="-D_GLIBCXX_USE_CXX11_ABI=0"
-build:python --define=api=python
+build:python --define=abi=pre_cxx11_abi
+
+build:pre_cxx11_abi --cxxopt="-D_GLIBCXX_USE_CXX11_ABI=0"
+build:pre_cxx11_abi --linkopt="-D_GLIBCXX_USE_CXX11_ABI=0"
+build:pre_cxx11_abi --define=abi=pre_cxx11_abi

.gitignore

@@ -30,4 +30,6 @@ docsrc/_api
 docsrc/_tmp
 *.so
 __pycache__
-*.egg-info
+*.egg-info
+dist
+bdist

core/BUILD

@@ -1,9 +1,9 @@
 package(default_visibility = ["//visibility:public"])
 
 config_setting(
-    name = "dont_use_cxx11_abi",
+    name = "use_pre_cxx11_abi",
     values = {
-        "define": "api=python",
+        "define": "abi=pre_cxx11_abi",
     }
 )
 
@@ -22,7 +22,7 @@ cc_library(
         "//core/util/logging",
         "@tensorrt//:nvinfer"
     ] + select({
-        ":dont_use_cxx11_abi":  ["@libtorch_non_cxx11_abi//:libtorch"],
+        ":use_pre_cxx11_abi":  ["@libtorch_pre_cxx11_abi//:libtorch"],
         "//conditions:default":  ["@libtorch//:libtorch"],
     }),
     alwayslink=True,

core/conversion/BUILD

@@ -1,9 +1,9 @@
 package(default_visibility = ["//visibility:public"])
 
 config_setting(
-    name = "dont_use_cxx11_abi",
+    name = "use_pre_cxx11_abi",
     values = {
-        "define": "api=python",
+        "define": "abi=pre_cxx11_abi",
     }
 )
 
@@ -15,7 +15,6 @@ cc_library(
     srcs = [
         "conversion.cpp",
         "conversion_blacklist.cpp",
-        "string_to_type_lut.cpp",
         "InterfaceTypes.cpp"
     ],
     deps = [
@@ -25,9 +24,9 @@ cc_library(
         "//core/conversion/evaluators",
         "//core/util:prelude"
     ] + select({
-        ":dont_use_cxx11_abi":  ["@libtorch_non_cxx11_abi//:libtorch"],
+        ":use_pre_cxx11_abi":  ["@libtorch_pre_cxx11_abi//:libtorch"],
         "//conditions:default":  ["@libtorch//:libtorch"],
-    })
+    }),
 )
 
 load("@rules_pkg//:pkg.bzl", "pkg_tar")

core/conversion/conversionctx/BUILD

@@ -1,9 +1,9 @@
 package(default_visibility = ["//visibility:public"])
 
 config_setting(
-    name = "dont_use_cxx11_abi",
+    name = "use_pre_cxx11_abi",
     values = {
-        "define": "api=python",
+        "define": "abi=pre_cxx11_abi",
     }
 )
 
@@ -19,9 +19,9 @@ cc_library(
         "@tensorrt//:nvinfer",
         "//core/util:prelude",
     ] + select({
-        ":dont_use_cxx11_abi":  ["@libtorch_non_cxx11_abi//:libtorch"],
+        ":use_pre_cxx11_abi":  ["@libtorch_pre_cxx11_abi//:libtorch"],
         "//conditions:default":  ["@libtorch//:libtorch"],
-    })
+    }),
 )
 
 load("@rules_pkg//:pkg.bzl", "pkg_tar")

core/conversion/converters/BUILD

@@ -1,9 +1,9 @@
 package(default_visibility = ["//visibility:public"])
 
 config_setting(
-    name = "dont_use_cxx11_abi",
+    name = "use_pre_cxx11_abi",
     values = {
-        "define": "api=python",
+        "define": "abi=pre_cxx11_abi",
     }
 )
 
@@ -35,7 +35,7 @@ cc_library(
         "//core/util:prelude",
         "//core/conversion/conversionctx",
     ] + select({
-        ":dont_use_cxx11_abi":  ["@libtorch_non_cxx11_abi//:libtorch"],
+        ":use_pre_cxx11_abi":  ["@libtorch_pre_cxx11_abi//:libtorch"],
         "//conditions:default":  ["@libtorch//:libtorch"],
     }),
     alwayslink = True,

core/conversion/evaluators/BUILD

@@ -1,9 +1,9 @@
 package(default_visibility = ["//visibility:public"])
 
 config_setting(
-    name = "dont_use_cxx11_abi",
+    name = "use_pre_cxx11_abi",
     values = {
-        "define": "api=python",
+        "define": "abi=pre_cxx11_abi",
     }
 )
 
@@ -19,7 +19,7 @@ cc_library(
     deps = [
         "//core/util:prelude",
     ] + select({
-        ":dont_use_cxx11_abi":  ["@libtorch_non_cxx11_abi//:libtorch"],
+        ":use_pre_cxx11_abi":  ["@libtorch_pre_cxx11_abi//:libtorch"],
         "//conditions:default":  ["@libtorch//:libtorch"],
     }),
     alwayslink = True,

core/execution/BUILD

@@ -1,9 +1,9 @@
 package(default_visibility = ["//visibility:public"])
 
 config_setting(
-    name = "dont_use_cxx11_abi",
+    name = "use_pre_cxx11_abi",
     values = {
-        "define": "api=python",
+        "define": "abi=pre_cxx11_abi",
     }
 )
 
@@ -21,7 +21,7 @@ cc_library(
         "@tensorrt//:nvinfer",
         "//core/util:prelude"
     ] + select({
-        ":dont_use_cxx11_abi":  ["@libtorch_non_cxx11_abi//:libtorch"],
+        ":use_pre_cxx11_abi":  ["@libtorch_pre_cxx11_abi//:libtorch"],
         "//conditions:default":  ["@libtorch//:libtorch"],
     }),
     alwayslink = True,

core/lowering/BUILD

@@ -1,9 +1,9 @@
 package(default_visibility = ["//visibility:public"])
 
 config_setting(
-    name = "dont_use_cxx11_abi",
+    name = "use_pre_cxx11_abi",
     values = {
-        "define": "api=python",
+        "define": "abi=pre_cxx11_abi",
     }
 )
 
@@ -21,7 +21,7 @@ cc_library(
         "//core/lowering/passes",
         "//core/util:prelude"
     ] + select({
-        ":dont_use_cxx11_abi":  ["@libtorch_non_cxx11_abi//:libtorch"],
+        ":use_pre_cxx11_abi":  ["@libtorch_pre_cxx11_abi//:libtorch"],
         "//conditions:default":  ["@libtorch//:libtorch"],
     }),
     alwayslink = True

core/lowering/passes/BUILD

@@ -1,9 +1,9 @@
 package(default_visibility = ["//visibility:public"])
 
 config_setting(
-    name = "dont_use_cxx11_abi",
+    name = "use_pre_cxx11_abi",
     values = {
-        "define": "api=python",
+        "define": "abi=pre_cxx11_abi",
     }
 )
 
@@ -24,9 +24,9 @@ cc_library(
     deps = [
         "//core/util:prelude",
     ] + select({
-        ":dont_use_cxx11_abi":  ["@libtorch_non_cxx11_abi//:libtorch"],
+        ":use_pre_cxx11_abi":  ["@libtorch_pre_cxx11_abi//:libtorch"],
         "//conditions:default":  ["@libtorch//:libtorch"],
-    })
+    }),
 )
 
 load("@rules_pkg//:pkg.bzl", "pkg_tar")