69 lines
2.7 KiB
Diff
69 lines
2.7 KiB
Diff
diff --git a/tensorflow/core/lib/monitoring/percentile_sampler.cc b/tensorflow/core/lib/monitoring/percentile_sampler.cc
|
|
index b7c22ae77b..d0ba7b48b4 100644
|
|
--- a/tensorflow/core/lib/monitoring/percentile_sampler.cc
|
|
+++ b/tensorflow/core/lib/monitoring/percentile_sampler.cc
|
|
@@ -29,7 +29,8 @@ namespace monitoring {
|
|
void PercentileSamplerCell::Add(double sample) {
|
|
uint64 nstime = EnvTime::NowNanos();
|
|
mutex_lock l(mu_);
|
|
- samples_[next_position_] = {nstime, sample};
|
|
+ samples_[next_position_].nstime = nstime;
|
|
+ samples_[next_position_].value = sample;
|
|
++next_position_;
|
|
if (TF_PREDICT_FALSE(next_position_ >= samples_.size())) {
|
|
next_position_ = 0;
|
|
@@ -73,7 +74,9 @@ Percentiles PercentileSamplerCell::value() const {
|
|
size_t index = std::min<size_t>(
|
|
static_cast<size_t>(percentile * pct_samples.num_samples / 100.0),
|
|
pct_samples.num_samples - 1);
|
|
- PercentilePoint pct = {percentile, samples[index].value};
|
|
+ PercentilePoint pct;
|
|
+ pct.percentile = percentile;
|
|
+ pct.value = samples[index].value;
|
|
pct_samples.points.push_back(pct);
|
|
}
|
|
}
|
|
diff --git a/tensorflow/core/platform/test.h b/tensorflow/core/platform/test.h
|
|
index ba50783765..5de5ea01f0 100644
|
|
--- a/tensorflow/core/platform/test.h
|
|
+++ b/tensorflow/core/platform/test.h
|
|
@@ -42,7 +42,6 @@ limitations under the License.
|
|
#if defined(PLATFORM_GOOGLE) || defined(PLATFORM_GOOGLE_ANDROID)
|
|
#include "testing/base/public/gmock.h" // IWYU pragma: export
|
|
#else
|
|
-#include <gmock/gmock-generated-matchers.h>
|
|
#include <gmock/gmock-matchers.h>
|
|
#include <gmock/gmock-more-matchers.h>
|
|
#include <gmock/gmock.h>
|
|
diff --git a/tensorflow/lite/delegates/gpu/cl/serialization.fbs b/tensorflow/lite/delegates/gpu/cl/serialization.fbs
|
|
index 67bd587162e..2a3c6bd30dc 100644
|
|
--- a/tensorflow/lite/delegates/gpu/cl/serialization.fbs
|
|
+++ b/tensorflow/lite/delegates/gpu/cl/serialization.fbs
|
|
@@ -12,7 +12,7 @@
|
|
// See the License for the specific language governing permissions and
|
|
// limitations under the License.
|
|
|
|
-include "tensorflow/lite/delegates/gpu/common/task/serialization_base.fbs";
|
|
+include "../common/task/serialization_base.fbs";
|
|
|
|
namespace tflite.gpu.cl.data;
|
|
|
|
diff --git a/third_party/eigen3/eigen_archive.BUILD b/third_party/eigen3/eigen_archive.BUILD
|
|
index dad592bec48..670017c2c0f 100644
|
|
--- a/third_party/eigen3/eigen_archive.BUILD
|
|
+++ b/third_party/eigen3/eigen_archive.BUILD
|
|
@@ -49,6 +49,13 @@ cc_library(
|
|
visibility = ["//visibility:public"],
|
|
)
|
|
|
|
+# For backward compatibility.
|
|
+alias(
|
|
+ name = "eigen",
|
|
+ actual=":eigen3",
|
|
+ visibility = ["//visibility:public"],
|
|
+)
|
|
+
|
|
filegroup(
|
|
name = "eigen_header_files",
|
|
srcs = EIGEN_MPL2_HEADER_FILES,
|