From 69267b06f46200abe0f03d731717695a4d88f189 Mon Sep 17 00:00:00 2001 From: Dheeraj Date: Thu, 21 Nov 2019 18:40:21 +0530 Subject: [PATCH 1/3] Don't build parse_time till TF r2.1 --- tensorflow_addons/custom_ops/text/BUILD | 15 +++---- tensorflow_addons/text/BUILD | 56 +++++++++++++------------ tensorflow_addons/text/__init__.py | 3 +- 3 files changed, 39 insertions(+), 35 deletions(-) diff --git a/tensorflow_addons/custom_ops/text/BUILD b/tensorflow_addons/custom_ops/text/BUILD index a52e139228..22d4ae4b65 100644 --- a/tensorflow_addons/custom_ops/text/BUILD +++ b/tensorflow_addons/custom_ops/text/BUILD @@ -12,10 +12,11 @@ custom_op_library( ], ) -custom_op_library( - name = "_parse_time_op.so", - srcs = [ - "cc/kernels/parse_time_kernel.cc", - "cc/ops/parse_time_op.cc", - ], -) +# TODO: https://github.com/tensorflow/addons/pull/658 +# custom_op_library( +# name = "_parse_time_op.so", +# srcs = [ +# "cc/kernels/parse_time_kernel.cc", +# "cc/ops/parse_time_op.cc", +# ], +# ) diff --git a/tensorflow_addons/text/BUILD b/tensorflow_addons/text/BUILD index fbeafe16f7..053da691f0 100644 --- a/tensorflow_addons/text/BUILD +++ b/tensorflow_addons/text/BUILD @@ -2,21 +2,22 @@ licenses(["notice"]) # Apache 2.0 package(default_visibility = ["//visibility:public"]) -py_library( - name = "text", - srcs = ([ - "__init__.py", - "crf.py", - "parse_time_op.py", - "skip_gram_ops.py", - ]), - data = [ - "//tensorflow_addons/custom_ops/text:_parse_time_op.so", - "//tensorflow_addons/custom_ops/text:_skip_gram_ops.so", - "//tensorflow_addons/utils", - ], - srcs_version = "PY2AND3", -) +# TODO: https://github.com/tensorflow/addons/pull/658 +# py_library( +# name = "text", +# srcs = ([ +# "__init__.py", +# "crf.py", +# "parse_time_op.py", +# "skip_gram_ops.py", +# ]), +# data = [ +# "//tensorflow_addons/custom_ops/text:_parse_time_op.so", +# "//tensorflow_addons/custom_ops/text:_skip_gram_ops.so", +# "//tensorflow_addons/utils", +# ], +# srcs_version = "PY2AND3", +# ) py_test( name = "crf_test", @@ -44,15 +45,16 @@ py_test( ], ) -py_test( - name = "parse_time_op_test", - size = "small", - srcs = [ - "parse_time_op_test.py", - ], - main = "parse_time_op_test.py", - srcs_version = "PY2AND3", - deps = [ - ":text", - ], -) +# TODO: https://github.com/tensorflow/addons/pull/658 +# py_test( +# name = "parse_time_op_test", +# size = "small", +# srcs = [ +# "parse_time_op_test.py", +# ], +# main = "parse_time_op_test.py", +# srcs_version = "PY2AND3", +# deps = [ +# ":text", +# ], +# ) diff --git a/tensorflow_addons/text/__init__.py b/tensorflow_addons/text/__init__.py index d334b3db81..1d694fd0b8 100644 --- a/tensorflow_addons/text/__init__.py +++ b/tensorflow_addons/text/__init__.py @@ -34,5 +34,6 @@ from tensorflow_addons.text.skip_gram_ops import skip_gram_sample from tensorflow_addons.text.skip_gram_ops import skip_gram_sample_with_text_vocab +# TODO: https://github.com/tensorflow/addons/pull/658 # Parse Time -from tensorflow_addons.text.parse_time_op import parse_time +# from tensorflow_addons.text.parse_time_op import parse_time From 2131faa026fa64a53dbea78da2c910b4d316aac6 Mon Sep 17 00:00:00 2001 From: Dheeraj Date: Thu, 21 Nov 2019 18:52:21 +0530 Subject: [PATCH 2/3] Fix TODO, and BUILD --- tensorflow_addons/custom_ops/text/BUILD | 2 +- tensorflow_addons/text/BUILD | 34 ++++++++++++------------- tensorflow_addons/text/__init__.py | 2 +- 3 files changed, 19 insertions(+), 19 deletions(-) diff --git a/tensorflow_addons/custom_ops/text/BUILD b/tensorflow_addons/custom_ops/text/BUILD index 22d4ae4b65..3e5c888c01 100644 --- a/tensorflow_addons/custom_ops/text/BUILD +++ b/tensorflow_addons/custom_ops/text/BUILD @@ -12,7 +12,7 @@ custom_op_library( ], ) -# TODO: https://github.com/tensorflow/addons/pull/658 +# TODO: https://github.com/tensorflow/addons/issues/663 # custom_op_library( # name = "_parse_time_op.so", # srcs = [ diff --git a/tensorflow_addons/text/BUILD b/tensorflow_addons/text/BUILD index 053da691f0..ae91a7edc7 100644 --- a/tensorflow_addons/text/BUILD +++ b/tensorflow_addons/text/BUILD @@ -2,22 +2,22 @@ licenses(["notice"]) # Apache 2.0 package(default_visibility = ["//visibility:public"]) -# TODO: https://github.com/tensorflow/addons/pull/658 -# py_library( -# name = "text", -# srcs = ([ -# "__init__.py", -# "crf.py", -# "parse_time_op.py", -# "skip_gram_ops.py", -# ]), -# data = [ -# "//tensorflow_addons/custom_ops/text:_parse_time_op.so", -# "//tensorflow_addons/custom_ops/text:_skip_gram_ops.so", -# "//tensorflow_addons/utils", -# ], -# srcs_version = "PY2AND3", -# ) +py_library( + name = "text", + srcs = ([ + "__init__.py", + "crf.py", + "parse_time_op.py", + "skip_gram_ops.py", + ]), + data = [ + # TODO: https://github.com/tensorflow/addons/issues/663 + # "//tensorflow_addons/custom_ops/text:_parse_time_op.so", + "//tensorflow_addons/custom_ops/text:_skip_gram_ops.so", + "//tensorflow_addons/utils", + ], + srcs_version = "PY2AND3", +) py_test( name = "crf_test", @@ -45,7 +45,7 @@ py_test( ], ) -# TODO: https://github.com/tensorflow/addons/pull/658 +# TODO: https://github.com/tensorflow/addons/issues/663 # py_test( # name = "parse_time_op_test", # size = "small", diff --git a/tensorflow_addons/text/__init__.py b/tensorflow_addons/text/__init__.py index 1d694fd0b8..d13db57b13 100644 --- a/tensorflow_addons/text/__init__.py +++ b/tensorflow_addons/text/__init__.py @@ -34,6 +34,6 @@ from tensorflow_addons.text.skip_gram_ops import skip_gram_sample from tensorflow_addons.text.skip_gram_ops import skip_gram_sample_with_text_vocab -# TODO: https://github.com/tensorflow/addons/pull/658 +# TODO: https://github.com/tensorflow/addons/issues/663 # Parse Time # from tensorflow_addons.text.parse_time_op import parse_time From dfe6e818bf5da8c703c52c4c144b32851913be28 Mon Sep 17 00:00:00 2001 From: Dheeraj Date: Thu, 21 Nov 2019 18:53:19 +0530 Subject: [PATCH 3/3] Remove .py file from build target --- tensorflow_addons/text/BUILD | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tensorflow_addons/text/BUILD b/tensorflow_addons/text/BUILD index ae91a7edc7..30b5e010bc 100644 --- a/tensorflow_addons/text/BUILD +++ b/tensorflow_addons/text/BUILD @@ -2,16 +2,16 @@ licenses(["notice"]) # Apache 2.0 package(default_visibility = ["//visibility:public"]) +# TODO: https://github.com/tensorflow/addons/issues/663 py_library( name = "text", srcs = ([ "__init__.py", "crf.py", - "parse_time_op.py", + # "parse_time_op.py", "skip_gram_ops.py", ]), data = [ - # TODO: https://github.com/tensorflow/addons/issues/663 # "//tensorflow_addons/custom_ops/text:_parse_time_op.so", "//tensorflow_addons/custom_ops/text:_skip_gram_ops.so", "//tensorflow_addons/utils",