[go: nahoru, domu]
Skip to content

Commit

Permalink
Minor style change to approximate_vocabulary, making _VocabularyCombi…
Browse files Browse the repository at this point in the history 
…ner private.

PiperOrigin-RevId: 417425287
  • Loading branch information
@zoyahav @tfx-copybara
zoyahav authored and tfx-copybara committed Dec 20, 2021
1 parent e93e9b0 commit f4dd039
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 7 deletions.
8 changes: 4 additions & 4 deletions tensorflow_transform/beam/combiner_packing_util_test.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -108,9 +108,9 @@ def _preprocessing_fn_with_packable_analyzer_single_phase(inputs):
"VocabularyOrderAndWrite[z]" -> "CreateTensorBinding[z#Placeholder]";
"TensorSource[z_approx]" [label="{ExtractFromDict|keys: ('z_approx/UniqueWithCounts', 'z_approx/UniqueWithCounts:2')|label: TensorSource[z_approx]|partitionable: True}"];
"ApplySavedModel[Phase0]" -> "TensorSource[z_approx]";
"CacheableCombineAccumulate[z_approx]" [label="{CacheableCombineAccumulate|combiner: \<VocabularyCombiner\>|label: CacheableCombineAccumulate[z_approx]|partitionable: True}"];
"CacheableCombineAccumulate[z_approx]" [label="{CacheableCombineAccumulate|combiner: \<_VocabularyCombiner\>|label: CacheableCombineAccumulate[z_approx]|partitionable: True}"];
"TensorSource[z_approx]" -> "CacheableCombineAccumulate[z_approx]";
"CacheableCombineMerge[z_approx]" [label="{CacheableCombineMerge|combiner: \<VocabularyCombiner\>|label: CacheableCombineMerge[z_approx]}"];
"CacheableCombineMerge[z_approx]" [label="{CacheableCombineMerge|combiner: \<_VocabularyCombiner\>|label: CacheableCombineMerge[z_approx]}"];
"CacheableCombineAccumulate[z_approx]" -> "CacheableCombineMerge[z_approx]";
"ExtractCombineMergeOutputs[z_approx]" [label="{ExtractCombineMergeOutputs|output_tensor_info_list: [TensorInfo(dtype=tf.string, shape=[None, 2], temporary_asset_value=None)]|label: ExtractCombineMergeOutputs[z_approx]}"];
"CacheableCombineMerge[z_approx]" -> "ExtractCombineMergeOutputs[z_approx]";
Expand Down Expand Up @@ -139,7 +139,7 @@ def _preprocessing_fn_with_packable_analyzer_single_phase(inputs):
"ApplySavedModel[Phase0]" [label="{ApplySavedModel|phase: 0|label: ApplySavedModel[Phase0]|partitionable: True}"];
"CreateSavedModelForAnalyzerInputs[Phase0]" -> "ApplySavedModel[Phase0]";
"ExtractInputForSavedModel[FlattenedDataset]" -> "ApplySavedModel[Phase0]";
"PackedCombineAccumulate[ApplySavedModel[Phase0]]" [label="{PackedCombineAccumulate|combiners: [_CombinerOpWrapper(combiner=\<WeightedMeanAndVarCombiner\>, keys=('x/mean_and_var/Cast_1', 'x/mean_and_var/div_no_nan', 'x/mean_and_var/div_no_nan_1', 'x/mean_and_var/zeros'), label='CacheableCombineAccumulate[x#mean_and_var]'), _CombinerOpWrapper(combiner=\<WeightedMeanAndVarCombiner\>, keys=('y/mean_and_var/Cast_1', 'y/mean_and_var/div_no_nan', 'y/mean_and_var/div_no_nan_1', 'y/mean_and_var/zeros'), label='CacheableCombineAccumulate[y#mean_and_var]'), _CombinerOpWrapper(combiner=\<VocabularyCombiner\>, keys=('z_approx/UniqueWithCounts', 'z_approx/UniqueWithCounts:2'), label='CacheableCombineAccumulate[z_approx]')]|label: PackedCombineAccumulate[ApplySavedModel[Phase0]]|partitionable: True}"];
"PackedCombineAccumulate[ApplySavedModel[Phase0]]" [label="{PackedCombineAccumulate|combiners: [_CombinerOpWrapper(combiner=\<WeightedMeanAndVarCombiner\>, keys=('x/mean_and_var/Cast_1', 'x/mean_and_var/div_no_nan', 'x/mean_and_var/div_no_nan_1', 'x/mean_and_var/zeros'), label='CacheableCombineAccumulate[x#mean_and_var]'), _CombinerOpWrapper(combiner=\<WeightedMeanAndVarCombiner\>, keys=('y/mean_and_var/Cast_1', 'y/mean_and_var/div_no_nan', 'y/mean_and_var/div_no_nan_1', 'y/mean_and_var/zeros'), label='CacheableCombineAccumulate[y#mean_and_var]'), _CombinerOpWrapper(combiner=\<_VocabularyCombiner\>, keys=('z_approx/UniqueWithCounts', 'z_approx/UniqueWithCounts:2'), label='CacheableCombineAccumulate[z_approx]')]|label: PackedCombineAccumulate[ApplySavedModel[Phase0]]|partitionable: True}"];
"ApplySavedModel[Phase0]" -> "PackedCombineAccumulate[ApplySavedModel[Phase0]]";
"CacheableCombineAccumulate[x#mean_and_var]" [label="{ExtractFromDict|keys: CacheableCombineAccumulate[x#mean_and_var]|label: CacheableCombineAccumulate[x#mean_and_var]|partitionable: True}"];
"PackedCombineAccumulate[ApplySavedModel[Phase0]]" -> "CacheableCombineAccumulate[x#mean_and_var]";
Expand All @@ -157,7 +157,7 @@ def _preprocessing_fn_with_packable_analyzer_single_phase(inputs):
"AddKey[CacheableCombineMerge[x#mean_and_var]]" -> "FlattenInputForPackedCombineMerge[3]";
"AddKey[CacheableCombineMerge[y#mean_and_var]]" -> "FlattenInputForPackedCombineMerge[3]";
"AddKey[CacheableCombineMerge[z_approx]]" -> "FlattenInputForPackedCombineMerge[3]";
"PackedCombineMerge[3]" [label="{PackedCombineMerge|combiners: [_CombinerOpWrapper(combiner=\<WeightedMeanAndVarCombiner\>, keys=('CacheableCombineMerge[x#mean_and_var]',), label='CacheableCombineMerge[x#mean_and_var]'), _CombinerOpWrapper(combiner=\<WeightedMeanAndVarCombiner\>, keys=('CacheableCombineMerge[y#mean_and_var]',), label='CacheableCombineMerge[y#mean_and_var]'), _CombinerOpWrapper(combiner=\<VocabularyCombiner\>, keys=('CacheableCombineMerge[z_approx]',), label='CacheableCombineMerge[z_approx]')]|label: PackedCombineMerge[3]}"];
"PackedCombineMerge[3]" [label="{PackedCombineMerge|combiners: [_CombinerOpWrapper(combiner=\<WeightedMeanAndVarCombiner\>, keys=('CacheableCombineMerge[x#mean_and_var]',), label='CacheableCombineMerge[x#mean_and_var]'), _CombinerOpWrapper(combiner=\<WeightedMeanAndVarCombiner\>, keys=('CacheableCombineMerge[y#mean_and_var]',), label='CacheableCombineMerge[y#mean_and_var]'), _CombinerOpWrapper(combiner=\<_VocabularyCombiner\>, keys=('CacheableCombineMerge[z_approx]',), label='CacheableCombineMerge[z_approx]')]|label: PackedCombineMerge[3]}"];
"FlattenInputForPackedCombineMerge[3]" -> "PackedCombineMerge[3]";
"ExtractFromDict[CacheableCombineMerge[z_approx]]" [label="{ExtractFromDict|keys: CacheableCombineMerge[z_approx]|label: ExtractFromDict[CacheableCombineMerge[z_approx]]|partitionable: True}"];
"PackedCombineMerge[3]" -> "ExtractFromDict[CacheableCombineMerge[z_approx]]";
Expand Down
5 changes: 2 additions & 3 deletions tensorflow_transform/experimental/analyzers.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -335,10 +335,9 @@ def _approximate_vocabulary_analyzer_nodes(
# TODO(b/208879020): Add vocabulary size annotation for this analyzer.
analyzers.register_vocab(
vocab_filename, vocabulary_key=vocabulary_key, file_format=file_format)
combiner = VocabularyCombiner(top_k)

outputs_value_nodes = analyzers.apply_cacheable_combine_operation(
combiner, *analyzer_inputs)
_VocabularyCombiner(top_k), *analyzer_inputs)

flattened_outputs_value_node = nodes.apply_operation(
analyzer_nodes.FlattenLists, *outputs_value_nodes)
Expand Down Expand Up @@ -367,7 +366,7 @@ def decode_cache(self,
return sketches.MisraGriesSketch.Deserialize(encoded_accumulator)


class VocabularyCombiner(analyzer_nodes.Combiner):
class _VocabularyCombiner(analyzer_nodes.Combiner):
"""Approximately computes unique values on the PCollection."""

def __init__(self, top_k: int):
Expand Down

0 comments on commit f4dd039

Please sign in to comment.