From b2c53a0676f046ecbd3080cdd5bc32493a91351e Mon Sep 17 00:00:00 2001 From: Michael Reneer Date: Thu, 2 May 2024 13:25:49 -0700 Subject: [PATCH] Fix import-related lint errors. PiperOrigin-RevId: 630160629 --- .../protocol/checkpoint_aggregator_test.cc | 3 ++- .../impl/aggregation/protocol/checkpoint_builder.h | 1 - .../impl/aggregation/protocol/config_converter.cc | 1 + .../impl/aggregation/protocol/config_converter.h | 1 + .../aggregation/protocol/config_converter_test.cc | 3 +-- .../protocol/federated_compute_checkpoint_builder.cc | 1 - .../federated_compute_checkpoint_builder_test.cc | 2 -- .../federated_compute_checkpoint_parser_test.cc | 2 -- .../protocol/python/aggregation_protocol.cc | 1 - .../impl/aggregation/protocol/resource_resolver.h | 2 +- .../simple_aggregation/cancelable_callback.cc | 4 ---- .../simple_aggregation/cancelable_callback.h | 3 --- .../protocol/simple_aggregation/latency_aggregator.h | 1 + .../simple_aggregation_protocol_test.cc | 12 +++++------- 14 files changed, 12 insertions(+), 25 deletions(-) diff --git a/tensorflow_federated/cc/core/impl/aggregation/protocol/checkpoint_aggregator_test.cc b/tensorflow_federated/cc/core/impl/aggregation/protocol/checkpoint_aggregator_test.cc index 024986a741..50bda1ae38 100644 --- a/tensorflow_federated/cc/core/impl/aggregation/protocol/checkpoint_aggregator_test.cc +++ b/tensorflow_federated/cc/core/impl/aggregation/protocol/checkpoint_aggregator_test.cc @@ -20,10 +20,10 @@ #include #include #include +#include #include #include -#include "tensorflow_federated/cc/core/impl/executors/status_matchers.h" // clang-format off #include "tensorflow_federated/cc/core/impl/aggregation/testing/parse_text_proto.h" // clang-format on @@ -49,6 +49,7 @@ #include "tensorflow_federated/cc/core/impl/aggregation/testing/mocks.h" #include "tensorflow_federated/cc/core/impl/aggregation/testing/test_data.h" #include "tensorflow_federated/cc/core/impl/aggregation/testing/testing.h" +#include "tensorflow_federated/cc/core/impl/executors/status_matchers.h" namespace tensorflow_federated { namespace aggregation { diff --git a/tensorflow_federated/cc/core/impl/aggregation/protocol/checkpoint_builder.h b/tensorflow_federated/cc/core/impl/aggregation/protocol/checkpoint_builder.h index 89aa54b9cd..283bfeb9d1 100644 --- a/tensorflow_federated/cc/core/impl/aggregation/protocol/checkpoint_builder.h +++ b/tensorflow_federated/cc/core/impl/aggregation/protocol/checkpoint_builder.h @@ -19,7 +19,6 @@ #include #include - #include "absl/status/status.h" #include "absl/status/statusor.h" #include "absl/strings/cord.h" diff --git a/tensorflow_federated/cc/core/impl/aggregation/protocol/config_converter.cc b/tensorflow_federated/cc/core/impl/aggregation/protocol/config_converter.cc index 147a37f81b..4e2410691f 100644 --- a/tensorflow_federated/cc/core/impl/aggregation/protocol/config_converter.cc +++ b/tensorflow_federated/cc/core/impl/aggregation/protocol/config_converter.cc @@ -13,6 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + #include "tensorflow_federated/cc/core/impl/aggregation/protocol/config_converter.h" #include diff --git a/tensorflow_federated/cc/core/impl/aggregation/protocol/config_converter.h b/tensorflow_federated/cc/core/impl/aggregation/protocol/config_converter.h index 7b68c2c91b..d170cfa0e2 100644 --- a/tensorflow_federated/cc/core/impl/aggregation/protocol/config_converter.h +++ b/tensorflow_federated/cc/core/impl/aggregation/protocol/config_converter.h @@ -13,6 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + #ifndef THIRD_PARTY_TENSORFLOW_FEDERATED_CC_CORE_IMPL_AGGREGATION_PROTOCOL_CONFIG_CONVERTER_H_ #define THIRD_PARTY_TENSORFLOW_FEDERATED_CC_CORE_IMPL_AGGREGATION_PROTOCOL_CONFIG_CONVERTER_H_ diff --git a/tensorflow_federated/cc/core/impl/aggregation/protocol/config_converter_test.cc b/tensorflow_federated/cc/core/impl/aggregation/protocol/config_converter_test.cc index 61a2a58dac..0faca61a6e 100644 --- a/tensorflow_federated/cc/core/impl/aggregation/protocol/config_converter_test.cc +++ b/tensorflow_federated/cc/core/impl/aggregation/protocol/config_converter_test.cc @@ -20,8 +20,6 @@ #include #include -#include "tensorflow_federated/cc/core/impl/executors/status_matchers.h" - // clang-format off #include "tensorflow_federated/cc/core/impl/aggregation/testing/parse_text_proto.h" // clang-format on @@ -37,6 +35,7 @@ #include "tensorflow_federated/cc/core/impl/aggregation/protocol/configuration.pb.h" #include "tensorflow_federated/cc/core/impl/aggregation/testing/test_data.h" #include "tensorflow_federated/cc/core/impl/aggregation/testing/testing.h" +#include "tensorflow_federated/cc/core/impl/executors/status_matchers.h" namespace tensorflow_federated { namespace aggregation { diff --git a/tensorflow_federated/cc/core/impl/aggregation/protocol/federated_compute_checkpoint_builder.cc b/tensorflow_federated/cc/core/impl/aggregation/protocol/federated_compute_checkpoint_builder.cc index 317656238e..3336ef28f5 100644 --- a/tensorflow_federated/cc/core/impl/aggregation/protocol/federated_compute_checkpoint_builder.cc +++ b/tensorflow_federated/cc/core/impl/aggregation/protocol/federated_compute_checkpoint_builder.cc @@ -17,7 +17,6 @@ #include #include #include -#include #include "absl/status/status.h" #include "absl/status/statusor.h" diff --git a/tensorflow_federated/cc/core/impl/aggregation/protocol/federated_compute_checkpoint_builder_test.cc b/tensorflow_federated/cc/core/impl/aggregation/protocol/federated_compute_checkpoint_builder_test.cc index c776053d1a..b520989764 100644 --- a/tensorflow_federated/cc/core/impl/aggregation/protocol/federated_compute_checkpoint_builder_test.cc +++ b/tensorflow_federated/cc/core/impl/aggregation/protocol/federated_compute_checkpoint_builder_test.cc @@ -31,8 +31,6 @@ #include "tensorflow_federated/cc/core/impl/aggregation/protocol/checkpoint_builder.h" #include "tensorflow_federated/cc/core/impl/aggregation/protocol/checkpoint_header.h" #include "tensorflow_federated/cc/core/impl/aggregation/testing/test_data.h" -#include "tensorflow_federated/cc/core/impl/aggregation/testing/testing.h" -#include "tensorflow_federated/cc/core/impl/executors/status_matchers.h" namespace tensorflow_federated::aggregation { namespace { diff --git a/tensorflow_federated/cc/core/impl/aggregation/protocol/federated_compute_checkpoint_parser_test.cc b/tensorflow_federated/cc/core/impl/aggregation/protocol/federated_compute_checkpoint_parser_test.cc index 48fcd4dcb6..3a8ea44b05 100644 --- a/tensorflow_federated/cc/core/impl/aggregation/protocol/federated_compute_checkpoint_parser_test.cc +++ b/tensorflow_federated/cc/core/impl/aggregation/protocol/federated_compute_checkpoint_parser_test.cc @@ -16,7 +16,6 @@ #include #include -#include #include "googlemock/include/gmock/gmock.h" #include "googletest/include/gtest/gtest.h" @@ -30,7 +29,6 @@ #include "tensorflow_federated/cc/core/impl/aggregation/protocol/federated_compute_checkpoint_builder.h" #include "tensorflow_federated/cc/core/impl/aggregation/testing/test_data.h" #include "tensorflow_federated/cc/core/impl/aggregation/testing/testing.h" -#include "tensorflow_federated/cc/core/impl/executors/status_matchers.h" namespace tensorflow_federated::aggregation { namespace { diff --git a/tensorflow_federated/cc/core/impl/aggregation/protocol/python/aggregation_protocol.cc b/tensorflow_federated/cc/core/impl/aggregation/protocol/python/aggregation_protocol.cc index 5a01dffda7..40cfcd25ab 100644 --- a/tensorflow_federated/cc/core/impl/aggregation/protocol/python/aggregation_protocol.cc +++ b/tensorflow_federated/cc/core/impl/aggregation/protocol/python/aggregation_protocol.cc @@ -17,7 +17,6 @@ #include "tensorflow_federated/cc/core/impl/aggregation/protocol/aggregation_protocol.h" #include - #include #include diff --git a/tensorflow_federated/cc/core/impl/aggregation/protocol/resource_resolver.h b/tensorflow_federated/cc/core/impl/aggregation/protocol/resource_resolver.h index 5e42ddc309..82f846ea79 100644 --- a/tensorflow_federated/cc/core/impl/aggregation/protocol/resource_resolver.h +++ b/tensorflow_federated/cc/core/impl/aggregation/protocol/resource_resolver.h @@ -17,7 +17,7 @@ #ifndef THIRD_PARTY_TENSORFLOW_FEDERATED_CC_CORE_IMPL_AGGREGATION_PROTOCOL_RESOURCE_RESOLVER_H_ #define THIRD_PARTY_TENSORFLOW_FEDERATED_CC_CORE_IMPL_AGGREGATION_PROTOCOL_RESOURCE_RESOLVER_H_ -#include +#include #include #include "absl/status/statusor.h" diff --git a/tensorflow_federated/cc/core/impl/aggregation/protocol/simple_aggregation/cancelable_callback.cc b/tensorflow_federated/cc/core/impl/aggregation/protocol/simple_aggregation/cancelable_callback.cc index b451ef4ff3..ee1df1d98a 100644 --- a/tensorflow_federated/cc/core/impl/aggregation/protocol/simple_aggregation/cancelable_callback.cc +++ b/tensorflow_federated/cc/core/impl/aggregation/protocol/simple_aggregation/cancelable_callback.cc @@ -14,10 +14,6 @@ #include "tensorflow_federated/cc/core/impl/aggregation/protocol/simple_aggregation/cancelable_callback.h" -#include -#include -#include - #include "absl/time/time.h" #include "tensorflow_federated/cc/core/impl/aggregation/base/clock.h" diff --git a/tensorflow_federated/cc/core/impl/aggregation/protocol/simple_aggregation/cancelable_callback.h b/tensorflow_federated/cc/core/impl/aggregation/protocol/simple_aggregation/cancelable_callback.h index cf8664a472..1430cb4fb2 100644 --- a/tensorflow_federated/cc/core/impl/aggregation/protocol/simple_aggregation/cancelable_callback.h +++ b/tensorflow_federated/cc/core/impl/aggregation/protocol/simple_aggregation/cancelable_callback.h @@ -17,9 +17,6 @@ #ifndef THIRD_PARTY_TENSORFLOW_FEDERATED_CC_CORE_IMPL_AGGREGATION_PROTOCOL_SIMPLE_AGGREGATION_CANCELABLE_CALLBACK_H_ #define THIRD_PARTY_TENSORFLOW_FEDERATED_CC_CORE_IMPL_AGGREGATION_PROTOCOL_SIMPLE_AGGREGATION_CANCELABLE_CALLBACK_H_ -#include -#include - #include "absl/time/time.h" #include "tensorflow_federated/cc/core/impl/aggregation/base/clock.h" diff --git a/tensorflow_federated/cc/core/impl/aggregation/protocol/simple_aggregation/latency_aggregator.h b/tensorflow_federated/cc/core/impl/aggregation/protocol/simple_aggregation/latency_aggregator.h index f4561a68c8..20dafb34fd 100644 --- a/tensorflow_federated/cc/core/impl/aggregation/protocol/simple_aggregation/latency_aggregator.h +++ b/tensorflow_federated/cc/core/impl/aggregation/protocol/simple_aggregation/latency_aggregator.h @@ -18,6 +18,7 @@ #define THIRD_PARTY_TENSORFLOW_FEDERATED_CC_CORE_IMPL_AGGREGATION_PROTOCOL_SIMPLE_AGGREGATION_LATENCY_AGGREGATOR_H_ #include +#include #include "absl/status/status.h" #include "absl/status/statusor.h" diff --git a/tensorflow_federated/cc/core/impl/aggregation/protocol/simple_aggregation/simple_aggregation_protocol_test.cc b/tensorflow_federated/cc/core/impl/aggregation/protocol/simple_aggregation/simple_aggregation_protocol_test.cc index b0c24641de..b675a5e147 100644 --- a/tensorflow_federated/cc/core/impl/aggregation/protocol/simple_aggregation/simple_aggregation_protocol_test.cc +++ b/tensorflow_federated/cc/core/impl/aggregation/protocol/simple_aggregation/simple_aggregation_protocol_test.cc @@ -19,19 +19,15 @@ #include #include #include -#include #include - -#include "tensorflow_federated/cc/core/impl/executors/protobuf_matchers.h" -#include "tensorflow_federated/cc/core/impl/executors/status_matchers.h" -// clang-format off -#include "tensorflow_federated/cc/core/impl/aggregation/testing/parse_text_proto.h" -// clang-format on #include #include #include #include +// clang-format off +#include "tensorflow_federated/cc/core/impl/aggregation/testing/parse_text_proto.h" +// clang-format on #include "googlemock/include/gmock/gmock.h" #include "googletest/include/gtest/gtest.h" #include "absl/status/status.h" @@ -58,6 +54,8 @@ #include "tensorflow_federated/cc/core/impl/aggregation/testing/mocks.h" #include "tensorflow_federated/cc/core/impl/aggregation/testing/test_data.h" #include "tensorflow_federated/cc/core/impl/aggregation/testing/testing.h" +#include "tensorflow_federated/cc/core/impl/executors/protobuf_matchers.h" +#include "tensorflow_federated/cc/core/impl/executors/status_matchers.h" namespace tensorflow_federated::aggregation { namespace {