From 13202ff7950219fe788fcf307d7ff5a3922ecd1d Mon Sep 17 00:00:00 2001
From: zmxdream <zhangminxu01@baidu.com>
Date: Tue, 19 Apr 2022 20:08:43 +0800
Subject: [PATCH] [XPUPS]add rename for heter_ps.cu (#41922) (#41968)

* add rename for heter_ps.cu

* update. test=develop

* update. test=develop

* fix. test=develop
---
 .../framework/fleet/heter_ps/CMakeLists.txt   |  4 ++
 .../framework/fleet/heter_ps/heter_ps.cc      | 61 -------------------
 2 files changed, 4 insertions(+), 61 deletions(-)
 delete mode 100644 paddle/fluid/framework/fleet/heter_ps/heter_ps.cc

diff --git a/paddle/fluid/framework/fleet/heter_ps/CMakeLists.txt b/paddle/fluid/framework/fleet/heter_ps/CMakeLists.txt
index 08bd3ce9ee6..f6aabe4c90a 100644
--- a/paddle/fluid/framework/fleet/heter_ps/CMakeLists.txt
+++ b/paddle/fluid/framework/fleet/heter_ps/CMakeLists.txt
@@ -26,6 +26,10 @@ IF(WITH_XPU_KP)
     xpu_library(heter_comm_kernel SRCS heter_comm_kernel.h heter_comm_kernel.kps feature_value.h)
     xpu_library(hashtable_kernel SRCS hashtable.h hashtable_kernel.kps)
     cc_library(heter_comm SRCS heter_comm.h heter_resource.cc DEPS ${HETERPS_DEPS} heter_comm_kernel hashtable_kernel)
+    # Change heter_ps.cu file suffix
+    # NOTE(zhangminxu): If we compile with XPU_KP, we directly copy heter_ps.cu to heter_ps.cc
+    file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/heter_ps.cu DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/)
+    file(RENAME ${CMAKE_CURRENT_BINARY_DIR}/heter_ps.cu ${CMAKE_CURRENT_BINARY_DIR}/heter_ps.cc)
     cc_library(heter_ps SRCS heter_ps.cc DEPS heter_comm)
     # xpu_library(heter_comm SRCS heter_comm.h heter_comm_kernel.kps feature_value.h heter_resource.cc heter_resource.h hashtable.h mem_pool.h DEPS ${HETERPS_DEPS})
 ENDIF()
diff --git a/paddle/fluid/framework/fleet/heter_ps/heter_ps.cc b/paddle/fluid/framework/fleet/heter_ps/heter_ps.cc
deleted file mode 100644
index 3d375209ed1..00000000000
--- a/paddle/fluid/framework/fleet/heter_ps/heter_ps.cc
+++ /dev/null
@@ -1,61 +0,0 @@
-/* Copyright (c) 2020 PaddlePaddle Authors. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License. */
-
-#include "paddle/fluid/framework/fleet/heter_ps/heter_ps.h"
-#include <vector>
-
-#ifdef PADDLE_WITH_HETERPS
-
-namespace paddle {
-namespace framework {
-
-HeterPsBase* HeterPsBase::get_instance(
-    size_t capacity, std::shared_ptr<HeterPsResource> resource) {
-  return new HeterPs(capacity, resource);
-}
-
-HeterPs::HeterPs(size_t capacity, std::shared_ptr<HeterPsResource> resource) {
-  comm_ =
-      std::make_shared<HeterComm<FeatureKey, FeatureValue, FeaturePushValue>>(
-          capacity, resource);
-}
-
-HeterPs::~HeterPs() {}
-
-void HeterPs::pull_sparse(int num, FeatureKey* d_keys, FeatureValue* d_vals,
-                          size_t len) {
-  comm_->pull_sparse(num, d_keys, d_vals, len);
-}
-
-void HeterPs::build_ps(int num, FeatureKey* h_keys, FeatureValue* h_vals,
-                       size_t len, size_t chunk_size, int stream_num) {
-  comm_->build_ps(num, h_keys, h_vals, len, chunk_size, stream_num);
-}
-
-int HeterPs::get_index_by_devid(int devid) {
-  return comm_->get_index_by_devid(devid);
-}
-
-void HeterPs::end_pass() { comm_->end_pass(); }
-
-void HeterPs::show_one_table(int gpu_num) { comm_->show_one_table(gpu_num); }
-
-void HeterPs::push_sparse(int num, FeatureKey* d_keys,
-                          FeaturePushValue* d_grads, size_t len) {
-  // comm_->push_sparse_multi_node(num, d_keys, d_grads, len, opt_);
-}
-
-}  // end namespace framework
-}  // end namespace paddle
-#endif
-- 
GitLab