Skip to content

Migrate re2 usages #155

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

Migrate re2 usages #155

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 5 additions & 11 deletions targets.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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/...",
],
Expand Down Expand Up @@ -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/...",
Expand All @@ -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",
Expand All @@ -151,7 +146,6 @@ def define_common_targets():
"//pytorch/tokenizers/...",
],
exported_external_deps = [
"re2",
"nlohmann_json",
],
platforms = PLATFORMS,
Expand Down Expand Up @@ -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 = [
Expand Down
8 changes: 2 additions & 6 deletions test/targets.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand All @@ -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(
Expand Down