Skip to content

Issue #12: Fix skip_gram input_tensor check #15

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

Merged
merged 2 commits into from
Jan 16, 2019
+13 −11
Merged

Issue #12: Fix skip_gram input_tensor check #15

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4e2c8ed
Issue #12: Fix skip_gram input_tensor check
seanpmorgan Jan 15, 2019
8075a39
Update skip_gram_kernels.cc
seanpmorgan Jan 15, 2019
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
10 changes: 8 additions & 2 deletions tensorflow_addons/text/cc/kernels/skip_gram_kernels.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,11 +47,17 @@ class SkipGramGenerateCandidatesOp : public OpKernel {
OP_REQUIRES_OK(context, context->input("max_skips", &max_skips_tensor));
const int max_skips = *(max_skips_tensor->scalar<int>().data());

const Tensor& input_check = context->input(0);
OP_REQUIRES(
context, TensorShapeUtils::IsVector(input_check.shape()),
errors::InvalidArgument("input_tensor must be of rank 1"));

OP_REQUIRES(
context, min_skips >= 0 && max_skips >= 0,
errors::InvalidArgument("Both min_skips and max_skips must be >= 0."));
OP_REQUIRES(context, min_skips <= max_skips,
errors::InvalidArgument("min_skips must be <= max_skips."));
OP_REQUIRES(
context, min_skips <= max_skips,
errors::InvalidArgument("min_skips must be <= max_skips."));

const Tensor* start_tensor;
OP_REQUIRES_OK(context, context->input("start", &start_tensor));
Expand Down
14 changes: 5 additions & 9 deletions tensorflow_addons/text/python/skip_gram_ops_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -265,15 +265,11 @@ def test_skip_gram_sample_errors(self):
text.skip_gram_sample(input_tensor, min_skips=min_skips,
max_skips=max_skips)

#########################################

# FIXME: Why is this not failing?
# with self.assertRaises(ValueError):
# invalid_tensor = constant_op.constant([[b"the"], [b"quick"],
# [b"brown"]])
# text.skip_gram_sample(invalid_tensor)

#########################################
# Eager tensor must be rank 1
with self.assertRaises(errors.InvalidArgumentError):
invalid_tensor = constant_op.constant([[b"the"], [b"quick"],
[b"brown"]])
text.skip_gram_sample(invalid_tensor)

# vocab_freq_table must be provided if vocab_min_count,
# vocab_subsampling, or corpus_size is specified.
Expand Down