forked from PaddlePaddle/Paddle
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'develop' of https://github.com/PaddlePaddle/Paddle into…
… fluid_move_selected_rows_to_pten_1
- Loading branch information
Showing
288 changed files
with
8,803 additions
and
4,399 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
100 changes: 100 additions & 0 deletions
100
paddle/fluid/distributed/fleet_executor/dist_model_tensor_wrapper.cc
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,100 @@ | ||
| // Copyright (c) 2021 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/distributed/fleet_executor/dist_model_tensor_wrapper.h" | ||
| #include "paddle/fluid/platform/enforce.h" | ||
|
|
||
| namespace paddle { | ||
| namespace distributed { | ||
|
|
||
| void DistModelDataBuf::Reset(void* data, size_t length) { | ||
| Free(); | ||
| memory_owned_ = false; | ||
| data_ = data; | ||
| length_ = length; | ||
| } | ||
|
|
||
| void DistModelDataBuf::Free() { | ||
| if (memory_owned_ && data_) { | ||
| PADDLE_ENFORCE_GT(length_, 0UL, | ||
| platform::errors::PreconditionNotMet( | ||
| "Error occurred when deconstruct DistModelDataBuf: " | ||
| "it contains no data!")); | ||
| // NOTE: if own the memory, it must be char* type | ||
| delete[] static_cast<char*>(data_); | ||
| data_ = nullptr; | ||
| length_ = 0; | ||
| } | ||
| } | ||
|
|
||
| void DistModelDataBuf::Resize(size_t length) { | ||
| if (length_ >= length) { | ||
| return; | ||
| } | ||
| if (memory_owned_) { | ||
| Free(); | ||
| data_ = new char[length]; | ||
| length_ = length; | ||
| memory_owned_ = true; | ||
| } else { | ||
| PADDLE_THROW(platform::errors::PreconditionNotMet( | ||
| "The memory is allocated externally, can not Resized")); | ||
| } | ||
| } | ||
|
|
||
| DistModelDataBuf& DistModelDataBuf::operator=(const DistModelDataBuf& other) { | ||
| if (!other.memory_owned_) { | ||
| data_ = other.data_; | ||
| length_ = other.length_; | ||
| memory_owned_ = other.memory_owned_; | ||
| } else { | ||
| Resize(other.length_); | ||
| if (other.length() && other.data()) { | ||
| std::memcpy(data_, other.data(), other.length()); | ||
| } else if (other.length()) { | ||
| PADDLE_THROW(platform::errors::InvalidArgument( | ||
| "Invalid argument, null pointer data with length %u is passed", | ||
| other.length())); | ||
| } | ||
| length_ = other.length_; | ||
| memory_owned_ = true; | ||
| } | ||
| return *this; | ||
| } | ||
|
|
||
| DistModelDataBuf& DistModelDataBuf::operator=(DistModelDataBuf&& other) { | ||
| data_ = other.data_; | ||
| memory_owned_ = other.memory_owned_; | ||
| length_ = other.length_; | ||
| other.data_ = nullptr; | ||
| other.length_ = 0; | ||
| other.memory_owned_ = false; | ||
| return *this; | ||
| } | ||
|
|
||
| DistModelDataBuf::DistModelDataBuf(DistModelDataBuf&& other) | ||
| : data_(other.data_), | ||
| length_(other.length_), | ||
| memory_owned_(other.memory_owned_) { | ||
| other.memory_owned_ = false; | ||
| other.data_ = nullptr; | ||
| other.length_ = 0; | ||
| } | ||
|
|
||
| DistModelDataBuf::DistModelDataBuf(const DistModelDataBuf& other) { | ||
| *this = other; | ||
| } | ||
|
|
||
| } // namespace distributed | ||
| } // namespace paddle |
77 changes: 77 additions & 0 deletions
77
paddle/fluid/distributed/fleet_executor/dist_model_tensor_wrapper.h
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,77 @@ | ||
| // Copyright (c) 2021 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 <string> | ||
| #include <vector> | ||
| #include "paddle/fluid/platform/macros.h" | ||
|
|
||
| namespace paddle { | ||
| namespace distributed { | ||
|
|
||
| enum DistModelDataType { FLOAT16, FLOAT32, INT64, INT32, INT8 }; | ||
|
|
||
| template <typename T> | ||
| constexpr DistModelDataType DistModelGetDtype(); | ||
|
|
||
| template <> | ||
| constexpr DistModelDataType DistModelGetDtype<int32_t>() { | ||
| return DistModelDataType::INT32; | ||
| } | ||
|
|
||
| template <> | ||
| constexpr DistModelDataType DistModelGetDtype<int64_t>() { | ||
| return DistModelDataType::INT64; | ||
| } | ||
|
|
||
| template <> | ||
| constexpr DistModelDataType DistModelGetDtype<float>() { | ||
| return DistModelDataType::FLOAT32; | ||
| } | ||
|
|
||
| class DistModelDataBuf { | ||
| public: | ||
| explicit DistModelDataBuf(size_t length) | ||
| : data_(new char[length]), length_(length), memory_owned_(true) {} | ||
| DistModelDataBuf(void* data, size_t length) | ||
| : data_(data), length_(length), memory_owned_(false) {} | ||
| void Reset(void* data, size_t length); | ||
| size_t length() const { return length_; } | ||
| void* data() const { return data_; } | ||
| ~DistModelDataBuf() { Free(); } | ||
| DistModelDataBuf() = default; | ||
| void Resize(size_t length); | ||
|
|
||
| DistModelDataBuf& operator=(const DistModelDataBuf& other); | ||
| DistModelDataBuf& operator=(DistModelDataBuf&& other); | ||
| DistModelDataBuf(DistModelDataBuf&& other); | ||
| DistModelDataBuf(const DistModelDataBuf& other); | ||
|
|
||
| private: | ||
| void Free(); | ||
| void* data_{nullptr}; | ||
| size_t length_{0}; | ||
| bool memory_owned_{false}; | ||
| }; | ||
|
|
||
| struct DistModelTensor { | ||
| std::string name; | ||
| std::vector<int> shape; | ||
| DistModelDataBuf data; | ||
| DistModelDataType dtype; | ||
| std::vector<std::vector<size_t>> lod; | ||
| }; | ||
|
|
||
| } // namespace distributed | ||
| } // namespace paddle |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.