Change the namespace for core boosted trees quantiles.

PiperOrigin-RevId: 324282593
Change-Id: I047b5e2ea221a5d9eaf920b5b46317959c6b4207
This commit is contained in:
A. Unique TensorFlower 2020-07-31 14:15:03 -07:00 committed by TensorFlower Gardener
parent 4e11812725
commit 781ff0196c
8 changed files with 26 additions and 29 deletions

View File

@ -51,12 +51,12 @@ const char* const kResourceHandleName = "quantile_stream_resource_handle";
using QuantileStreamResource = BoostedTreesQuantileStreamResource; using QuantileStreamResource = BoostedTreesQuantileStreamResource;
using QuantileStream = using QuantileStream =
core_boosted_trees::quantiles::WeightedQuantilesStream<float, float>; boosted_trees::quantiles::WeightedQuantilesStream<float, float>;
using QuantileSummary = using QuantileSummary =
core_boosted_trees::quantiles::WeightedQuantilesSummary<float, float>; boosted_trees::quantiles::WeightedQuantilesSummary<float, float>;
using QuantileSummaryEntry = using QuantileSummaryEntry =
core_boosted_trees::quantiles::WeightedQuantilesSummary< boosted_trees::quantiles::WeightedQuantilesSummary<float,
float, float>::SummaryEntry; float>::SummaryEntry;
// Generates quantiles on a finalized QuantileStream. // Generates quantiles on a finalized QuantileStream.
std::vector<float> GenerateBoundaries(const QuantileStream& stream, std::vector<float> GenerateBoundaries(const QuantileStream& stream,
@ -421,10 +421,6 @@ class BoostedTreesQuantileStreamResourceFlushOp : public OpKernel {
generate_quantiles_ ? GenerateQuantiles(*stream, num_buckets) generate_quantiles_ ? GenerateQuantiles(*stream, num_buckets)
: GenerateBoundaries(*stream, num_buckets), : GenerateBoundaries(*stream, num_buckets),
stream_idx); stream_idx);
VLOG(1) << "Generated "
<< stream_resource->boundaries(stream_idx).size()
<< " boundaries. Num buckets: " << num_buckets
<< " Generate quantiles: " << generate_quantiles_;
} }
}; };

View File

@ -24,7 +24,7 @@
namespace tensorflow { namespace tensorflow {
using QuantileStream = using QuantileStream =
core_boosted_trees::quantiles::WeightedQuantilesStream<float, float>; boosted_trees::quantiles::WeightedQuantilesStream<float, float>;
// Quantile Stream Resource for a list of streams sharing the same number of // Quantile Stream Resource for a list of streams sharing the same number of
// quantiles, maximum elements, and epsilon. // quantiles, maximum elements, and epsilon.

View File

@ -23,7 +23,7 @@
#include "tensorflow/core/platform/types.h" #include "tensorflow/core/platform/types.h"
namespace tensorflow { namespace tensorflow {
namespace core_boosted_trees { namespace boosted_trees {
namespace quantiles { namespace quantiles {
// Buffering container ideally suited for scenarios where we need // Buffering container ideally suited for scenarios where we need
@ -126,7 +126,7 @@ constexpr decltype(CompareFn())
WeightedQuantilesBuffer<ValueType, WeightType, CompareFn>::kCompFn; WeightedQuantilesBuffer<ValueType, WeightType, CompareFn>::kCompFn;
} // namespace quantiles } // namespace quantiles
} // namespace core_boosted_trees } // namespace boosted_trees
} // namespace tensorflow } // namespace tensorflow
#endif // TENSORFLOW_CORE_KERNELS_BOOSTED_TREES_QUANTILES_WEIGHTED_QUANTILES_BUFFER_H_ #endif // TENSORFLOW_CORE_KERNELS_BOOSTED_TREES_QUANTILES_WEIGHTED_QUANTILES_BUFFER_H_

View File

@ -22,10 +22,10 @@ namespace tensorflow {
namespace { namespace {
using Buffer = using Buffer =
core_boosted_trees::quantiles::WeightedQuantilesBuffer<double, double>; boosted_trees::quantiles::WeightedQuantilesBuffer<double, double>;
using BufferEntry = using BufferEntry =
core_boosted_trees::quantiles::WeightedQuantilesBuffer<double, boosted_trees::quantiles::WeightedQuantilesBuffer<double,
double>::BufferEntry; double>::BufferEntry;
class WeightedQuantilesBufferTest : public ::testing::Test {}; class WeightedQuantilesBufferTest : public ::testing::Test {};

View File

@ -24,7 +24,7 @@
#include "tensorflow/core/platform/types.h" #include "tensorflow/core/platform/types.h"
namespace tensorflow { namespace tensorflow {
namespace core_boosted_trees { namespace boosted_trees {
namespace quantiles { namespace quantiles {
// Class to compute approximate quantiles with error bound guarantees for // Class to compute approximate quantiles with error bound guarantees for
@ -326,7 +326,7 @@ WeightedQuantilesStream<ValueType, WeightType, CompareFn>::GetQuantileSpecs(
} }
} // namespace quantiles } // namespace quantiles
} // namespace core_boosted_trees } // namespace boosted_trees
} // namespace tensorflow } // namespace tensorflow
#endif // TENSORFLOW_CORE_KERNELS_BOOSTED_TREES_QUANTILES_WEIGHTED_QUANTILES_STREAM_H_ #endif // TENSORFLOW_CORE_KERNELS_BOOSTED_TREES_QUANTILES_WEIGHTED_QUANTILES_STREAM_H_

View File

@ -23,11 +23,12 @@ namespace {
using Tuple = std::tuple<int64, int64>; using Tuple = std::tuple<int64, int64>;
using Summary = using Summary =
core_boosted_trees::quantiles::WeightedQuantilesSummary<double, double>; boosted_trees::quantiles::WeightedQuantilesSummary<double, double>;
using SummaryEntry = core_boosted_trees::quantiles::WeightedQuantilesSummary< using SummaryEntry =
double, double>::SummaryEntry; boosted_trees::quantiles::WeightedQuantilesSummary<double,
double>::SummaryEntry;
using Stream = using Stream =
core_boosted_trees::quantiles::WeightedQuantilesStream<double, double>; boosted_trees::quantiles::WeightedQuantilesStream<double, double>;
TEST(GetQuantileSpecs, InvalidEps) { TEST(GetQuantileSpecs, InvalidEps) {
EXPECT_DEATH({ Stream::GetQuantileSpecs(-0.01, 0L); }, "eps >= 0"); EXPECT_DEATH({ Stream::GetQuantileSpecs(-0.01, 0L); }, "eps >= 0");

View File

@ -22,7 +22,7 @@
#include "tensorflow/core/kernels/boosted_trees/quantiles/weighted_quantiles_buffer.h" #include "tensorflow/core/kernels/boosted_trees/quantiles/weighted_quantiles_buffer.h"
namespace tensorflow { namespace tensorflow {
namespace core_boosted_trees { namespace boosted_trees {
namespace quantiles { namespace quantiles {
// Summary holding a sorted block of entries with upper bound guarantees // Summary holding a sorted block of entries with upper bound guarantees
@ -366,7 +366,7 @@ constexpr decltype(CompareFn())
WeightedQuantilesSummary<ValueType, WeightType, CompareFn>::kCompFn; WeightedQuantilesSummary<ValueType, WeightType, CompareFn>::kCompFn;
} // namespace quantiles } // namespace quantiles
} // namespace core_boosted_trees } // namespace boosted_trees
} // namespace tensorflow } // namespace tensorflow
#endif // TENSORFLOW_CORE_KERNELS_BOOSTED_TREES_QUANTILES_WEIGHTED_QUANTILES_SUMMARY_H_ #endif // TENSORFLOW_CORE_KERNELS_BOOSTED_TREES_QUANTILES_WEIGHTED_QUANTILES_SUMMARY_H_

View File

@ -21,15 +21,15 @@
namespace tensorflow { namespace tensorflow {
namespace { namespace {
using Buffer = using Buffer = boosted_trees::quantiles::WeightedQuantilesBuffer<float, float>;
core_boosted_trees::quantiles::WeightedQuantilesBuffer<float, float>;
using BufferEntry = using BufferEntry =
core_boosted_trees::quantiles::WeightedQuantilesBuffer<float, boosted_trees::quantiles::WeightedQuantilesBuffer<float,
float>::BufferEntry; float>::BufferEntry;
using Summary = using Summary =
core_boosted_trees::quantiles::WeightedQuantilesSummary<float, float>; boosted_trees::quantiles::WeightedQuantilesSummary<float, float>;
using SummaryEntry = core_boosted_trees::quantiles::WeightedQuantilesSummary< using SummaryEntry =
float, float>::SummaryEntry; boosted_trees::quantiles::WeightedQuantilesSummary<float,
float>::SummaryEntry;
class WeightedQuantilesSummaryTest : public ::testing::Test { class WeightedQuantilesSummaryTest : public ::testing::Test {
protected: protected: