use iwyu clean include second time, test=develop (#30829)

* use iwyu clean include second time, test=develop

paddle/fluid/distributed/fleet.cc

@@ -13,15 +13,8 @@ See the License for the specific language governing permissions and
 limitations under the License. */
 
 #include "paddle/fluid/distributed/fleet.h"
-#include <algorithm>
-#include <utility>
 #include "paddle/fluid/distributed/service/communicator.h"
 #include "paddle/fluid/distributed/table/table.h"
-#include "paddle/fluid/framework/channel.h"
-#include "paddle/fluid/framework/data_feed.h"
-#include "paddle/fluid/framework/io/fs.h"
-#include "paddle/fluid/framework/op_registry.h"
-#include "paddle/fluid/framework/scope.h"
 
 namespace paddle {
 namespace distributed {

paddle/fluid/distributed/fleet.h

@@ -23,7 +23,6 @@ limitations under the License. */
 #include <unordered_map>
 #include <vector>
 
-#include <ThreadPool.h>
 #include "paddle/fluid/distributed/communicator_common.h"
 #include "paddle/fluid/distributed/service/service.h"
 #include "paddle/fluid/framework/archive.h"
@@ -35,9 +34,20 @@ limitations under the License. */
 #include "paddle/fluid/framework/variable_helper.h"
 #include "paddle/fluid/platform/macros.h"  // for DISABLE_COPY_AND_ASSIGN
 
+namespace paddle {
+namespace framework {
+class LoDTensor;
+class Scope;
+class SelectedRows;
+class Variable;
+}  // namespace framework
+}  // namespace paddle
+
 namespace paddle {
 namespace distributed {
 
+class PSCore;
+
 using framework::LoDTensor;
 using framework::Scope;
 using framework::SelectedRows;

paddle/fluid/distributed/service/brpc_ps_client.cc

@@ -12,17 +12,12 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include <algorithm>
 #include <memory>
 #include <sstream>
 #include <string>
-#include <vector>
-#include "Eigen/Dense"
 
 #include "paddle/fluid/distributed/service/brpc_ps_client.h"
-#include "paddle/fluid/distributed/table/table.h"
 #include "paddle/fluid/framework/archive.h"
-#include "paddle/fluid/string/string_helper.h"
 
 const static int max_port = 65535;
 
@@ -62,9 +57,6 @@ namespace framework {
 class Scope;
 class Variable;
 }  // namespace framework
-namespace platform {
-class DeviceContext;
-}  // namespace platform
 }  // namespace paddle
 
 namespace paddle {

paddle/fluid/distributed/service/brpc_ps_client.h

@@ -27,9 +27,22 @@
 #include "paddle/fluid/framework/scope.h"
 #include "paddle/fluid/framework/tensor_util.h"
 
+namespace brpc {
+class Channel;
+class Controller;
+}  // namespace brpc
+namespace google {
+namespace protobuf {
+class Closure;
+class RpcController;
+}  // namespace protobuf
+}  // namespace google
+
 namespace paddle {
 namespace distributed {
 
+struct Region;
+
 class DownpourPsClientService : public PsService {
  public:
   DownpourPsClientService() {}

paddle/fluid/distributed/service/brpc_ps_server.cc

@@ -13,15 +13,18 @@
 // limitations under the License.
 
 #include "paddle/fluid/distributed/service/brpc_ps_server.h"
-#include <netdb.h>
 #include <thread>  // NOLINT
-#include "Eigen/Dense"
-#include "butil/endpoint.h"
-#include "iomanip"
 #include "paddle/fluid/distributed/table/table.h"
 #include "paddle/fluid/framework/archive.h"
 #include "paddle/fluid/platform/profiler.h"
 
+namespace google {
+namespace protobuf {
+class Closure;
+class RpcController;
+}  // namespace protobuf
+}  // namespace google
+
 namespace paddle {
 namespace distributed {
 

paddle/fluid/distributed/service/brpc_ps_server.h

@@ -17,15 +17,26 @@
 #include "brpc/channel.h"
 #include "brpc/controller.h"
 #include "brpc/server.h"
-
-#include <memory>
-#include <vector>
 #include "paddle/fluid/distributed/service/brpc_utils.h"
 #include "paddle/fluid/distributed/service/server.h"
 
+namespace brpc {
+class Controller;
+}  // namespace brpc
+namespace google {
+namespace protobuf {
+class Closure;
+class RpcController;
+}  // namespace protobuf
+}  // namespace google
+
 namespace paddle {
 namespace distributed {
 
+class PsRequestMessage;
+class PsResponseMessage;
+class Table;
+
 class BrpcPsServer : public PSServer {
  public:
   BrpcPsServer() {}

paddle/fluid/distributed/service/brpc_utils.cc

@@ -15,20 +15,13 @@ limitations under the License. */
 #include "paddle/fluid/distributed/service/brpc_utils.h"
 #include <arpa/inet.h>
 #include <netdb.h>
-#include <netinet/in.h>
-#include <limits>
-#include <memory>
 #include "paddle/fluid/platform/enforce.h"
-#include "paddle/fluid/platform/profiler.h"
 
 namespace paddle {
 namespace framework {
-class Scope;
 class Variable;
+class LoDTensor;
 }  // namespace framework
-namespace platform {
-class DeviceContext;
-}  // namespace platform
 }  // namespace paddle
 
 namespace paddle {

paddle/fluid/distributed/service/brpc_utils.h

@@ -18,6 +18,7 @@ limitations under the License. */
 #include <iostream>
 #include <string>
 #include <vector>
+
 #include "brpc/channel.h"
 #include "paddle/fluid/distributed/service/sendrecv.pb.h"
 #include "paddle/fluid/framework/data_type.h"
@@ -28,6 +29,11 @@ limitations under the License. */
 #include "paddle/fluid/framework/var_type.h"
 #include "paddle/fluid/platform/port.h"
 
+namespace butil {
+class IOBuf;
+class IOBufBytesIterator;
+}  // namespace butil
+
 namespace grpc {
 class ByteBuffer;
 }  // namespace grpc

paddle/fluid/distributed/service/communicator.cc

@@ -15,24 +15,11 @@ limitations under the License. */
 #include "paddle/fluid/distributed/service/communicator.h"
 
 #include <google/protobuf/text_format.h>
-#include <paddle/fluid/framework/program_desc.h>
-
-#include <algorithm>
-#include <chrono>  // NOLINT
-#include <map>
-#include <thread>  // NOLINT
-#include <unordered_set>
 
 #include "gflags/gflags.h"
-#include "paddle/fluid/distributed/table/table.h"
-#include "paddle/fluid/framework/eigen.h"
-#include "paddle/fluid/framework/selected_rows.h"
-#include "paddle/fluid/framework/tensor_util.h"
-#include "paddle/fluid/framework/threadpool.h"
-#include "paddle/fluid/framework/variable_helper.h"
+#include "paddle/fluid/distributed/service/brpc_ps_client.h"
 #include "paddle/fluid/platform/profiler.h"
-#include "paddle/fluid/string/printf.h"
-#include "paddle/fluid/string/split.h"
+#include "paddle/fluid/string/string_helper.h"
 
 #define LEARNING_RATE_DECAY_COUNTER "@LR_DECAY_COUNTER@"
 #define STEP_COUNTER "@PS_STEP_COUNTER@"

paddle/fluid/distributed/service/communicator.h

@@ -41,10 +41,15 @@ limitations under the License. */
 #include "paddle/fluid/platform/place.h"
 #include "paddle/fluid/string/split.h"
 
-#include "paddle/fluid/distributed/ps.pb.h"
-#include "paddle/fluid/distributed/service/brpc_ps_client.h"
 #include "paddle/fluid/distributed/service/ps_client.h"
 
+namespace paddle {
+namespace distributed {
+class PSClient;
+struct CommContext;
+}  // namespace distributed
+}  // namespace paddle
+
 DECLARE_bool(communicator_is_sgd_optimizer);
 
 namespace paddle {

paddle/fluid/distributed/service/heter_client.cc

@@ -13,15 +13,7 @@
 // limitations under the License.
 
 #include "paddle/fluid/distributed/service/heter_client.h"
-#include <algorithm>
-#include <utility>
-#include "paddle/fluid/framework/channel.h"
-#include "paddle/fluid/framework/data_feed.h"
-#include "paddle/fluid/framework/device_worker.h"
-#include "paddle/fluid/framework/io/fs.h"
-#include "paddle/fluid/framework/scope.h"
 #include "paddle/fluid/platform/profiler.h"
-#include "paddle/fluid/platform/timer.h"
 #include "paddle/fluid/string/split.h"
 
 DECLARE_int32(rpc_deadline);

paddle/fluid/distributed/service/heter_client.h

@@ -21,6 +21,7 @@ limitations under the License. */
 #include <string>
 #include <unordered_map>
 #include <vector>
+
 #include "brpc/channel.h"
 #include "brpc/controller.h"
 #include "brpc/server.h"
@@ -32,6 +33,15 @@ limitations under the License. */
 #include "paddle/fluid/framework/variable_helper.h"
 #include "paddle/fluid/platform/macros.h"  // for DISABLE_COPY_AND_ASSIGN
 
+namespace paddle {
+namespace framework {
+class Scope;
+}  // namespace framework
+namespace platform {
+class DeviceContext;
+}  // namespace platform
+}  // namespace paddle
+
 namespace paddle {
 namespace distributed {
 

paddle/fluid/distributed/service/heter_server.cc

@@ -13,12 +13,6 @@
 // limitations under the License.
 
 #include "paddle/fluid/distributed/service/heter_server.h"
-#include <algorithm>
-#include <utility>
-#include "paddle/fluid/framework/fleet/heter_wrapper.h"
-#include "paddle/fluid/framework/op_registry.h"
-#include "paddle/fluid/framework/scope.h"
-#include "paddle/fluid/platform/timer.h"
 #include "paddle/fluid/string/split.h"
 
 namespace paddle {

paddle/fluid/distributed/service/heter_server.h

@@ -35,6 +35,22 @@ limitations under the License. */
 #include "paddle/fluid/platform/macros.h"  // for DISABLE_COPY_AND_ASSIGN
 #include "paddle/fluid/platform/profiler.h"
 
+namespace google {
+namespace protobuf {
+class Closure;
+class RpcController;
+}  // namespace protobuf
+}  // namespace google
+namespace paddle {
+namespace framework {
+class Executor;
+class ProgramDesc;
+}  // namespace framework
+namespace platform {
+class DeviceContext;
+}  // namespace platform
+}  // namespace paddle
+
 DECLARE_double(eager_delete_tensor_gb);
 namespace paddle {
 namespace distributed {
@@ -43,6 +59,7 @@ using MultiVarMsg = ::paddle::distributed::MultiVariableMessage;
 using VarMsg = ::paddle::distributed::VariableMessage;
 
 class HeterService;
+
 typedef int32_t (HeterService::*serviceHandlerFunc)(
     const PsRequestMessage& request, PsResponseMessage& response,
     brpc::Controller* cntl);

paddle/fluid/distributed/service/ps_client.cc

@@ -13,8 +13,6 @@
 // limitations under the License.
 
 #include "paddle/fluid/distributed/service/ps_client.h"
-#include <map>
-#include "brpc/server.h"
 #include "glog/logging.h"
 #include "paddle/fluid/distributed/service/brpc_ps_client.h"
 #include "paddle/fluid/distributed/table/table.h"

paddle/fluid/distributed/service/ps_client.h

@@ -28,6 +28,12 @@
 namespace paddle {
 namespace distributed {
 
+class PSEnvironment;
+class PsRequestMessage;
+class PsResponseMessage;
+class ValueAccessor;
+struct Region;
+
 using paddle::distributed::PsRequestMessage;
 using paddle::distributed::PsResponseMessage;
 

paddle/fluid/distributed/service/server.h

@@ -31,6 +31,17 @@
 #include "paddle/fluid/platform/device_context.h"
 #include "paddle/fluid/platform/place.h"
 
+namespace google {
+namespace protobuf {
+class RpcController;
+}  // namespace protobuf
+}  // namespace google
+namespace paddle {
+namespace distributed {
+class PSEnvironment;
+}  // namespace distributed
+}  // namespace paddle
+
 namespace paddle {
 namespace framework {
 class Executor;
@@ -46,6 +57,7 @@ namespace paddle {
 namespace distributed {
 
 class Table;
+
 using paddle::distributed::PsRequestMessage;
 using paddle::distributed::PsResponseMessage;
 

paddle/fluid/distributed/service/service.h

@@ -19,7 +19,6 @@ limitations under the License. */
 #include <string>
 #include <vector>
 
-#include <glog/logging.h>
 #include "paddle/fluid/distributed/ps.pb.h"
 #include "paddle/fluid/distributed/service/ps_client.h"
 #include "paddle/fluid/distributed/service/sendrecv.pb.h"
@@ -28,6 +27,12 @@ limitations under the License. */
 namespace paddle {
 namespace distributed {
 
+class PSClient;
+class PSServer;
+class PsRequestMessage;
+class PsResponseMessage;
+class PsService;
+
 using paddle::distributed::PsRequestMessage;
 using paddle::distributed::PsResponseMessage;
 using paddle::distributed::PsService;

paddle/fluid/distributed/table/barrier_table.cc

@@ -12,8 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include <chrono>  // NOLINT
-#include "paddle/fluid/distributed/common/utils.h"
 #include "paddle/fluid/distributed/table/common_table.h"
 
 namespace paddle {

paddle/fluid/distributed/table/common_dense_table.cc

@@ -13,7 +13,8 @@
 // limitations under the License.
 
 #include "paddle/fluid/distributed/table/common_dense_table.h"
-#include "paddle/fluid/distributed/common/utils.h"
+
+#include "paddle/fluid/platform/enforce.h"
 
 namespace paddle {
 namespace distributed {

paddle/fluid/distributed/table/common_dense_table.h

@@ -28,6 +28,8 @@
 namespace paddle {
 namespace distributed {
 
+class DenseOptimizer;
+
 class CommonDenseTable : public DenseTable {
  public:
   explicit CommonDenseTable() {}

paddle/fluid/distributed/table/common_sparse_table.cc

@@ -13,13 +13,17 @@
 // limitations under the License.
 
 #include "paddle/fluid/distributed/table/common_sparse_table.h"
-#include <algorithm>
+
 #include <sstream>
-#include "paddle/fluid/distributed/common/utils.h"
-#include "paddle/fluid/distributed/table/depends/large_scale_kv.h"
-#include "paddle/fluid/framework/generator.h"
-#include "paddle/fluid/string/printf.h"
-#include "paddle/fluid/string/string_helper.h"
+
+#include "glog/logging.h"
+#include "paddle/fluid/platform/enforce.h"
+
+namespace paddle {
+namespace distributed {
+class ValueBlock;
+}  // namespace distributed
+}  // namespace paddle
 
 #define PSERVER_SAVE_SUFFIX "_txt"
 namespace paddle {

paddle/fluid/distributed/table/common_sparse_table.h

@@ -35,6 +35,8 @@
 namespace paddle {
 namespace distributed {
 
+class SparseOptimizer;
+
 class CommonSparseTable : public SparseTable {
  public:
   CommonSparseTable() { rwlock_.reset(new framework::RWLock); }

paddle/fluid/distributed/table/sparse_geo_table.h

@@ -16,11 +16,13 @@
 
 #include <assert.h>
 #include <pthread.h>
+#include <stdint.h>
 #include <memory>
 #include <mutex>  // NOLINT
 #include <string>
 #include <utility>
 #include <vector>
+
 #include "Eigen/Dense"
 #include "paddle/fluid/distributed/table/accessor.h"
 #include "paddle/fluid/distributed/table/common_sparse_table.h"
@@ -35,6 +37,8 @@
 namespace paddle {
 namespace distributed {
 
+class GeoRecorder;
+
 class SparseGeoTable : public CommonSparseTable {
  public:
   explicit SparseGeoTable() : CommonSparseTable() { geo_recorder = nullptr; }

paddle/fluid/distributed/table/table.cc

@@ -14,8 +14,6 @@
 
 #include "paddle/fluid/distributed/table/table.h"
 
-#include <boost/preprocessor/repetition/repeat_from_to.hpp>
-#include <boost/preprocessor/seq/elem.hpp>
 #include "glog/logging.h"
 #include "paddle/fluid/distributed/common/registerer.h"