Migrate re2 usages for pytorch

Differential Revision: D87078834

Pull Request resolved: #156

Author: skrueger

targets.bzl

@@ -30,11 +30,9 @@ def define_common_targets():
             "src/regex.cpp",
         ],
         exported_deps = [
+            "fbsource//third-party/re2:re2",
             ":headers",
         ],
-        exported_external_deps = [
-            "re2",
-        ],
         visibility = ["//pytorch/tokenizers/..."],
         header_namespace = "",
         platforms = PLATFORMS,
@@ -75,11 +73,9 @@ def define_common_targets():
             "src/bpe_tokenizer_base.cpp",
         ],
         exported_deps = [
+            "fbsource//third-party/re2:re2",
             ":headers",
         ],
-        exported_external_deps = [
-            "re2",
-        ],
         visibility = [
             "//pytorch/tokenizers/...",
         ],
@@ -117,12 +113,10 @@ def define_common_targets():
             ":regex",
         ],
         exported_deps = [
+            "fbsource//third-party/re2:re2",
             ":bpe_tokenizer_base",
             ":headers",
         ],
-        exported_external_deps = [
-            "re2",
-        ],
         visibility = [
             "@EXECUTORCH_CLIENTS",
             "//pytorch/tokenizers/...",
@@ -142,6 +136,7 @@ def define_common_targets():
             ":regex",
         ],
         exported_deps = [
+            "fbsource//third-party/re2:re2",
             ":bpe_tokenizer_base",
             ":headers",
             "//pytorch/tokenizers/third-party:unicode",
@@ -151,7 +146,6 @@ def define_common_targets():
             "//pytorch/tokenizers/...",
         ],
         exported_external_deps = [
-            "re2",
             "nlohmann_json",
         ],
         platforms = PLATFORMS,
@@ -181,11 +175,11 @@ def define_common_targets():
             ":regex",
         ],
         exported_deps = [
+            "fbsource//third-party/re2:re2",
             ":bpe_tokenizer_base",
             ":headers",
         ],
         exported_external_deps = [
-            "re2",
             "nlohmann_json",
         ],
         visibility = [

test/targets.bzl

@@ -68,15 +68,13 @@ def define_common_targets():
             "test_string_integer_map.cpp",
         ],
         deps = [
+            "fbsource//third-party/re2:re2",
             "//pytorch/tokenizers:headers",
         ],
         env = {
             "RESOURCES_PATH": "$(location :resources)/resources",
         },
         platforms = [CXX, ANDROID],  # Cannot bundle resources on Apple platform.
-        external_deps = [
-            "re2",
-        ],
     )
 
     runtime.cxx_test(
@@ -85,15 +83,13 @@ def define_common_targets():
             "test_tiktoken.cpp",
         ],
         deps = [
+            "fbsource//third-party/re2:re2",
             "//pytorch/tokenizers:tiktoken",
         ],
         env = {
             "RESOURCES_PATH": "$(location :resources)/resources",
         },
         platforms = [CXX, ANDROID],  # Cannot bundle resources on Apple platform.
-        external_deps = [
-            "re2",
-        ],
     )
 
     runtime.cxx_test(