From 2a05b3d5a3e8f8e58d01eebc2c0826e61c15c5dd Mon Sep 17 00:00:00 2001 From: tangwei12 Date: Fri, 11 May 2018 16:23:30 +0800 Subject: [PATCH] delete checkpoint function --- paddle/fluid/operators/detail/checkpoint.cc | 54 ------------------- paddle/fluid/operators/detail/checkpoint.h | 33 ------------ paddle/fluid/operators/listen_and_serv_op.cc | 12 ----- .../fluid/transpiler/distribute_transpiler.py | 3 +- 4 files changed, 1 insertion(+), 101 deletions(-) delete mode 100644 paddle/fluid/operators/detail/checkpoint.cc delete mode 100644 paddle/fluid/operators/detail/checkpoint.h diff --git a/paddle/fluid/operators/detail/checkpoint.cc b/paddle/fluid/operators/detail/checkpoint.cc deleted file mode 100644 index 38e46532e6e..00000000000 --- a/paddle/fluid/operators/detail/checkpoint.cc +++ /dev/null @@ -1,54 +0,0 @@ -/* Copyright (c) 2016 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. */ - -#pragma once -#include "paddle/fluid/operators/detail/checkpoint.h" - -#include - -namespace paddle { -namespace framework { -namespace details { -Checkpoint::Save(const framework::Scope& scope, const platform::Place& place, - const std::string& save_dir, const std::string& var_name, - const bool& overwrite) { - auto* var = scope.FindVar(var_name); - PADDLE_ENFORCE(var != nullptr, "Cannot find variable %s for save_op", - var_name); - PADDLE_ENFORCE(var->IsType(), - "Checkpoint only supports LoDTensor, %s has wrong type", - var_name); - - bool is_present = FileExists(save_dir); - if (is_present && !overwrite) { - PADDLE_THROW("%s exists!, checkpoint cannot write it when overwrite=false", - save_dir, overwrite); - } - - MkDirRecursively(DirName(save_dir).c_str()); - std::ofstream fout(save_dir); - PADDLE_ENFORCE(static_cast(fout), "Cannot open %s to write", save_dir); - - // get device context from pool - platform::DeviceContextPool& pool = platform::DeviceContextPool::Instance(); - auto& dev_ctx = *pool.Get(place); - - auto& tensor = var->Get(); - // Serialize tensor - framework::SerializeToStream(fout, tensor, dev_ctx); - fout.close(); -} -} // namespace details -} // namespace framework -} // namespace paddle diff --git a/paddle/fluid/operators/detail/checkpoint.h b/paddle/fluid/operators/detail/checkpoint.h deleted file mode 100644 index dfa41979734..00000000000 --- a/paddle/fluid/operators/detail/checkpoint.h +++ /dev/null @@ -1,33 +0,0 @@ -/* Copyright (c) 2016 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. */ - -#pragma once -#include - -#include "paddle/fluid/framework/scope.h" - -namespace paddle { -namespace framework { -namespace details { -class Checkpoint { - public: - static void Save(const framework::Scope& scope, const platform::Place& place, - const std::string& save_dir, const std::string& var_name, - const bool& overwrite); - - static void Load(); -} -} // namespace details -} // namespace framework -} // namespace paddle diff --git a/paddle/fluid/operators/listen_and_serv_op.cc b/paddle/fluid/operators/listen_and_serv_op.cc index 7fb7f07a610..8a3d747f86c 100644 --- a/paddle/fluid/operators/listen_and_serv_op.cc +++ b/paddle/fluid/operators/listen_and_serv_op.cc @@ -101,7 +101,6 @@ void ListenAndServOp::RunSyncLoop(framework::Executor *executor, framework::Scope *recv_scope, framework::BlockDesc *prefetch_block) const { auto fan_in = Attr("Fanin"); - auto checkpoint = Attr("Checkpoint"); size_t num_blocks = program->Size(); PADDLE_ENFORCE_GE(num_blocks, 2, @@ -190,17 +189,6 @@ void ListenAndServOp::RunSyncLoop(framework::Executor *executor, var->GetMutable()->mutable_rows()->clear(); } - /******************** CHECK POINT ***********************/ - std::vector all_vars = recv_scope.LocalVarNames(); - - std::vector::iterator it; - for (it = all_vars.begin(); it != all_vars.end(); it++) { - VLOG(2) << "Checkpoint Var: " << *it; - break; - } - - /******************** CHECK POINT ***********************/ - rpc_service_->SetCond(1); // FIXME(typhoonzero): use another condition to sync wait clients get. rpc_service_->WaitClientGet(fan_in); diff --git a/python/paddle/fluid/transpiler/distribute_transpiler.py b/python/paddle/fluid/transpiler/distribute_transpiler.py index 635763ed352..b45cb987d89 100644 --- a/python/paddle/fluid/transpiler/distribute_transpiler.py +++ b/python/paddle/fluid/transpiler/distribute_transpiler.py @@ -483,8 +483,7 @@ class DistributeTranspiler: "Fanin": self.trainer_num, "PrefetchBlock": prefetch_block, "sync_mode": self.sync_mode, - "grad_to_block_id": grad_to_block_id, - "Checkpoint": "/tmp/tangwei_ckpt/" + "grad_to_block_id": grad_to_block_id }) pserver_program.sync_with_cpp() -- GitLab