From 781ff0196ce5a877ec17655157fa681c3cb1e027 Mon Sep 17 00:00:00 2001 From: "A. Unique TensorFlower" Date: Fri, 31 Jul 2020 14:15:03 -0700 Subject: [PATCH] Change the namespace for core boosted trees quantiles. PiperOrigin-RevId: 324282593 Change-Id: I047b5e2ea221a5d9eaf920b5b46317959c6b4207 --- .../core/kernels/boosted_trees/quantile_ops.cc | 12 ++++-------- .../quantiles/quantile_stream_resource.h | 2 +- .../quantiles/weighted_quantiles_buffer.h | 4 ++-- .../quantiles/weighted_quantiles_buffer_test.cc | 6 +++--- .../quantiles/weighted_quantiles_stream.h | 4 ++-- .../quantiles/weighted_quantiles_stream_test.cc | 9 +++++---- .../quantiles/weighted_quantiles_summary.h | 4 ++-- .../quantiles/weighted_quantiles_summary_test.cc | 14 +++++++------- 8 files changed, 26 insertions(+), 29 deletions(-) diff --git a/tensorflow/core/kernels/boosted_trees/quantile_ops.cc b/tensorflow/core/kernels/boosted_trees/quantile_ops.cc index ad1e5a47f00..0065bdd66aa 100644 --- a/tensorflow/core/kernels/boosted_trees/quantile_ops.cc +++ b/tensorflow/core/kernels/boosted_trees/quantile_ops.cc @@ -51,12 +51,12 @@ const char* const kResourceHandleName = "quantile_stream_resource_handle"; using QuantileStreamResource = BoostedTreesQuantileStreamResource; using QuantileStream = - core_boosted_trees::quantiles::WeightedQuantilesStream; + boosted_trees::quantiles::WeightedQuantilesStream; using QuantileSummary = - core_boosted_trees::quantiles::WeightedQuantilesSummary; + boosted_trees::quantiles::WeightedQuantilesSummary; using QuantileSummaryEntry = - core_boosted_trees::quantiles::WeightedQuantilesSummary< - float, float>::SummaryEntry; + boosted_trees::quantiles::WeightedQuantilesSummary::SummaryEntry; // Generates quantiles on a finalized QuantileStream. std::vector GenerateBoundaries(const QuantileStream& stream, @@ -421,10 +421,6 @@ class BoostedTreesQuantileStreamResourceFlushOp : public OpKernel { generate_quantiles_ ? GenerateQuantiles(*stream, num_buckets) : GenerateBoundaries(*stream, num_buckets), stream_idx); - VLOG(1) << "Generated " - << stream_resource->boundaries(stream_idx).size() - << " boundaries. Num buckets: " << num_buckets - << " Generate quantiles: " << generate_quantiles_; } }; diff --git a/tensorflow/core/kernels/boosted_trees/quantiles/quantile_stream_resource.h b/tensorflow/core/kernels/boosted_trees/quantiles/quantile_stream_resource.h index d2e3720aff5..10afc9ee618 100644 --- a/tensorflow/core/kernels/boosted_trees/quantiles/quantile_stream_resource.h +++ b/tensorflow/core/kernels/boosted_trees/quantiles/quantile_stream_resource.h @@ -24,7 +24,7 @@ namespace tensorflow { using QuantileStream = - core_boosted_trees::quantiles::WeightedQuantilesStream; + boosted_trees::quantiles::WeightedQuantilesStream; // Quantile Stream Resource for a list of streams sharing the same number of // quantiles, maximum elements, and epsilon. diff --git a/tensorflow/core/kernels/boosted_trees/quantiles/weighted_quantiles_buffer.h b/tensorflow/core/kernels/boosted_trees/quantiles/weighted_quantiles_buffer.h index 5f7f74ec7bb..07aa9831c44 100644 --- a/tensorflow/core/kernels/boosted_trees/quantiles/weighted_quantiles_buffer.h +++ b/tensorflow/core/kernels/boosted_trees/quantiles/weighted_quantiles_buffer.h @@ -23,7 +23,7 @@ #include "tensorflow/core/platform/types.h" namespace tensorflow { -namespace core_boosted_trees { +namespace boosted_trees { namespace quantiles { // Buffering container ideally suited for scenarios where we need @@ -126,7 +126,7 @@ constexpr decltype(CompareFn()) WeightedQuantilesBuffer::kCompFn; } // namespace quantiles -} // namespace core_boosted_trees +} // namespace boosted_trees } // namespace tensorflow #endif // TENSORFLOW_CORE_KERNELS_BOOSTED_TREES_QUANTILES_WEIGHTED_QUANTILES_BUFFER_H_ diff --git a/tensorflow/core/kernels/boosted_trees/quantiles/weighted_quantiles_buffer_test.cc b/tensorflow/core/kernels/boosted_trees/quantiles/weighted_quantiles_buffer_test.cc index d99a6816f9b..29e28811225 100644 --- a/tensorflow/core/kernels/boosted_trees/quantiles/weighted_quantiles_buffer_test.cc +++ b/tensorflow/core/kernels/boosted_trees/quantiles/weighted_quantiles_buffer_test.cc @@ -22,10 +22,10 @@ namespace tensorflow { namespace { using Buffer = - core_boosted_trees::quantiles::WeightedQuantilesBuffer; + boosted_trees::quantiles::WeightedQuantilesBuffer; using BufferEntry = - core_boosted_trees::quantiles::WeightedQuantilesBuffer::BufferEntry; + boosted_trees::quantiles::WeightedQuantilesBuffer::BufferEntry; class WeightedQuantilesBufferTest : public ::testing::Test {}; diff --git a/tensorflow/core/kernels/boosted_trees/quantiles/weighted_quantiles_stream.h b/tensorflow/core/kernels/boosted_trees/quantiles/weighted_quantiles_stream.h index 6f195bc4dd2..1e8d8d5e22d 100644 --- a/tensorflow/core/kernels/boosted_trees/quantiles/weighted_quantiles_stream.h +++ b/tensorflow/core/kernels/boosted_trees/quantiles/weighted_quantiles_stream.h @@ -24,7 +24,7 @@ #include "tensorflow/core/platform/types.h" namespace tensorflow { -namespace core_boosted_trees { +namespace boosted_trees { namespace quantiles { // Class to compute approximate quantiles with error bound guarantees for @@ -326,7 +326,7 @@ WeightedQuantilesStream::GetQuantileSpecs( } } // namespace quantiles -} // namespace core_boosted_trees +} // namespace boosted_trees } // namespace tensorflow #endif // TENSORFLOW_CORE_KERNELS_BOOSTED_TREES_QUANTILES_WEIGHTED_QUANTILES_STREAM_H_ diff --git a/tensorflow/core/kernels/boosted_trees/quantiles/weighted_quantiles_stream_test.cc b/tensorflow/core/kernels/boosted_trees/quantiles/weighted_quantiles_stream_test.cc index 59173bfc2c5..6c5b9fd23bf 100644 --- a/tensorflow/core/kernels/boosted_trees/quantiles/weighted_quantiles_stream_test.cc +++ b/tensorflow/core/kernels/boosted_trees/quantiles/weighted_quantiles_stream_test.cc @@ -23,11 +23,12 @@ namespace { using Tuple = std::tuple; using Summary = - core_boosted_trees::quantiles::WeightedQuantilesSummary; -using SummaryEntry = core_boosted_trees::quantiles::WeightedQuantilesSummary< - double, double>::SummaryEntry; + boosted_trees::quantiles::WeightedQuantilesSummary; +using SummaryEntry = + boosted_trees::quantiles::WeightedQuantilesSummary::SummaryEntry; using Stream = - core_boosted_trees::quantiles::WeightedQuantilesStream; + boosted_trees::quantiles::WeightedQuantilesStream; TEST(GetQuantileSpecs, InvalidEps) { EXPECT_DEATH({ Stream::GetQuantileSpecs(-0.01, 0L); }, "eps >= 0"); diff --git a/tensorflow/core/kernels/boosted_trees/quantiles/weighted_quantiles_summary.h b/tensorflow/core/kernels/boosted_trees/quantiles/weighted_quantiles_summary.h index ca8eb5fd266..a22af7ab71e 100644 --- a/tensorflow/core/kernels/boosted_trees/quantiles/weighted_quantiles_summary.h +++ b/tensorflow/core/kernels/boosted_trees/quantiles/weighted_quantiles_summary.h @@ -22,7 +22,7 @@ #include "tensorflow/core/kernels/boosted_trees/quantiles/weighted_quantiles_buffer.h" namespace tensorflow { -namespace core_boosted_trees { +namespace boosted_trees { namespace quantiles { // Summary holding a sorted block of entries with upper bound guarantees @@ -366,7 +366,7 @@ constexpr decltype(CompareFn()) WeightedQuantilesSummary::kCompFn; } // namespace quantiles -} // namespace core_boosted_trees +} // namespace boosted_trees } // namespace tensorflow #endif // TENSORFLOW_CORE_KERNELS_BOOSTED_TREES_QUANTILES_WEIGHTED_QUANTILES_SUMMARY_H_ diff --git a/tensorflow/core/kernels/boosted_trees/quantiles/weighted_quantiles_summary_test.cc b/tensorflow/core/kernels/boosted_trees/quantiles/weighted_quantiles_summary_test.cc index 0f8d1a3cbfd..ccd1215cf49 100644 --- a/tensorflow/core/kernels/boosted_trees/quantiles/weighted_quantiles_summary_test.cc +++ b/tensorflow/core/kernels/boosted_trees/quantiles/weighted_quantiles_summary_test.cc @@ -21,15 +21,15 @@ namespace tensorflow { namespace { -using Buffer = - core_boosted_trees::quantiles::WeightedQuantilesBuffer; +using Buffer = boosted_trees::quantiles::WeightedQuantilesBuffer; using BufferEntry = - core_boosted_trees::quantiles::WeightedQuantilesBuffer::BufferEntry; + boosted_trees::quantiles::WeightedQuantilesBuffer::BufferEntry; using Summary = - core_boosted_trees::quantiles::WeightedQuantilesSummary; -using SummaryEntry = core_boosted_trees::quantiles::WeightedQuantilesSummary< - float, float>::SummaryEntry; + boosted_trees::quantiles::WeightedQuantilesSummary; +using SummaryEntry = + boosted_trees::quantiles::WeightedQuantilesSummary::SummaryEntry; class WeightedQuantilesSummaryTest : public ::testing::Test { protected: