-
Notifications
You must be signed in to change notification settings - Fork 6k
[Cpp API Compatibility] Fix empty() and from_blob() and Verify cuda() #78255
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
youge325
wants to merge
1
commit into
PaddlePaddle:develop
Choose a base branch
from
youge325:cAlign
base: develop
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+594
−43
Open
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or 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 hidden or 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 hidden or 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 |
|---|---|---|
|
|
@@ -18,21 +18,159 @@ | |
| #include "paddle/phi/api/include/tensor_utils.h" | ||
| namespace at { | ||
|
|
||
| namespace detail { | ||
|
|
||
| inline void noopDelete(void* /*unused*/) {} | ||
|
|
||
| } // namespace detail | ||
|
|
||
| class TensorMaker { | ||
| friend TensorMaker for_blob(void* data, IntArrayRef sizes) noexcept; | ||
|
|
||
| public: | ||
| using ContextDeleter = DeleterFnPtr; | ||
|
|
||
| TensorMaker& strides(OptionalIntArrayRef value) noexcept { | ||
| strides_ = value; | ||
|
|
||
| return *this; | ||
| } | ||
|
|
||
| TensorMaker& storage_offset(std::optional<int64_t> value) noexcept { | ||
| storage_offset_ = value; | ||
|
|
||
| return *this; | ||
| } | ||
|
|
||
| TensorMaker& deleter(std::function<void(void*)> value) noexcept { | ||
| deleter_ = std::move(value); | ||
|
|
||
| return *this; | ||
| } | ||
|
|
||
| TensorMaker& context(void* value, ContextDeleter deleter = nullptr) noexcept { | ||
| ctx_ = std::unique_ptr<void, ContextDeleter>{ | ||
| value, deleter != nullptr ? deleter : detail::noopDelete}; | ||
|
|
||
| return *this; | ||
| } | ||
|
|
||
| TensorMaker& target_device(std::optional<Device> value) noexcept { | ||
| device_ = value; | ||
|
|
||
| return *this; | ||
| } | ||
|
|
||
| TensorMaker& options(TensorOptions value) noexcept { | ||
| opts_ = value; | ||
|
|
||
| return *this; | ||
| } | ||
|
|
||
| TensorMaker& resizeable_storage() noexcept { | ||
| resizeable_ = true; | ||
|
|
||
| return *this; | ||
| } | ||
|
|
||
| Tensor make_tensor() { | ||
| PD_CHECK(!deleter_ || !ctx_, | ||
| "The deleter and context arguments are mutually exclusive."); | ||
|
|
||
| PD_CHECK(!storage_offset_.has_value() || storage_offset_.value() == 0, | ||
| "storage_offset` should be zero."); | ||
|
|
||
| if (device_.has_value() && opts_.has_device() && | ||
| opts_.device().has_index()) { | ||
| PD_CHECK(opts_.device() == *device_, | ||
| "Specified device ", | ||
| opts_.device(), | ||
| " does not match device of data ", | ||
| *device_); | ||
| } | ||
|
|
||
| phi::Place pd_place; | ||
| if (device_.has_value()) { | ||
| pd_place = device_->_PD_GetInner(); | ||
| } else if (opts_.has_device() && opts_.device().has_index()) { | ||
| pd_place = opts_.device()._PD_GetInner(); | ||
| } else { | ||
| pd_place = phi::Place(); // UNDEFINED → auto-detect inside from_blob | ||
| } | ||
|
|
||
| // Build paddle deleter: prefer explicit deleter_, then wrap ctx_ so its | ||
| // lifetime is tied to the tensor allocation. | ||
| paddle::Deleter pd_deleter = nullptr; | ||
| if (deleter_) { | ||
| pd_deleter = deleter_; | ||
| } else if (ctx_) { | ||
| // shared_ptr takes ownership of the context and calls its deleter when | ||
| // the last copy (held in the lambda) is destroyed. | ||
| auto shared_ctx = | ||
| std::shared_ptr<void>(ctx_.release(), ctx_.get_deleter()); | ||
| pd_deleter = [shared_ctx](void* /*data*/) {}; | ||
| } | ||
|
|
||
| if (strides_.has_value()) { | ||
| return paddle::from_blob( | ||
| data_, | ||
| sizes_._PD_ToPaddleIntArray(), | ||
| strides_.value()._PD_ToPaddleIntArray(), | ||
| compat::_PD_AtenScalarTypeToPhiDataType(opts_.dtype()), | ||
| phi::DataLayout::NCHW, | ||
| pd_place, | ||
| pd_deleter); | ||
| } else { | ||
| return paddle::from_blob( | ||
| data_, | ||
| sizes_._PD_ToPaddleIntArray(), | ||
| compat::_PD_AtenScalarTypeToPhiDataType(opts_.dtype()), | ||
| phi::DataLayout::NCHW, | ||
| pd_place, | ||
| pd_deleter); | ||
| } | ||
| } | ||
|
|
||
| private: | ||
| explicit TensorMaker(void* data, IntArrayRef sizes) noexcept | ||
| : data_{data}, sizes_{sizes} {} | ||
|
|
||
| std::size_t computeStorageSize() const noexcept; | ||
|
|
||
| DataPtr makeDataPtrFromDeleter() noexcept; | ||
|
|
||
| DataPtr makeDataPtrFromContext() noexcept; | ||
|
|
||
| IntArrayRef makeTempSizes() const noexcept; | ||
|
|
||
| void* data_; | ||
| IntArrayRef sizes_; | ||
| OptionalIntArrayRef strides_; | ||
| std::optional<int64_t> storage_offset_; | ||
| std::function<void(void*)> deleter_; | ||
| std::unique_ptr<void, ContextDeleter> ctx_{nullptr, detail::noopDelete}; | ||
| std::optional<Device> device_; | ||
| TensorOptions opts_; | ||
| bool resizeable_{}; | ||
|
Comment on lines
+138
to
+154
|
||
| }; | ||
|
|
||
| inline TensorMaker for_blob(void* data, IntArrayRef sizes) noexcept { | ||
| return TensorMaker{data, sizes}; | ||
| } | ||
|
|
||
| inline Tensor from_blob( | ||
| void* data, | ||
| IntArrayRef sizes, | ||
| IntArrayRef strides, | ||
| const std::function<void(void*)>& deleter, | ||
| const TensorOptions& options = {}, | ||
| const std::optional<Device> target_device = std::nullopt) { | ||
| return paddle::from_blob( | ||
| data, | ||
| sizes._PD_ToPaddleIntArray(), | ||
| strides._PD_ToPaddleIntArray(), | ||
| compat::_PD_AtenScalarTypeToPhiDataType(options.dtype()), | ||
| phi::DataLayout::NCHW, | ||
| device_or_default(target_device)._PD_GetInner(), | ||
| deleter); | ||
| return for_blob(data, sizes) | ||
| .strides(strides) | ||
| .deleter(deleter) | ||
| .options(options) | ||
| .target_device(target_device) | ||
| .make_tensor(); | ||
| } | ||
|
|
||
| inline Tensor from_blob( | ||
|
|
@@ -43,16 +181,13 @@ inline Tensor from_blob( | |
| const std::function<void(void*)>& deleter, | ||
| const TensorOptions& options = {}, | ||
| const std::optional<Device> target_device = std::nullopt) { | ||
| PD_CHECK(storage_offset == 0, "`storage_offset` should be zero."); | ||
|
|
||
| return paddle::from_blob( | ||
| data, | ||
| sizes._PD_ToPaddleIntArray(), | ||
| strides._PD_ToPaddleIntArray(), | ||
| compat::_PD_AtenScalarTypeToPhiDataType(options.dtype()), | ||
| phi::DataLayout::NCHW, | ||
| device_or_default(target_device)._PD_GetInner(), | ||
| deleter); | ||
| return for_blob(data, sizes) | ||
| .strides(strides) | ||
| .storage_offset(storage_offset) | ||
| .deleter(deleter) | ||
| .options(options) | ||
| .target_device(target_device) | ||
| .make_tensor(); | ||
| } | ||
|
|
||
| inline Tensor from_blob( | ||
|
|
@@ -61,38 +196,24 @@ inline Tensor from_blob( | |
| std::function<void(void*)> deleter, | ||
| const TensorOptions& options = {}, | ||
| const std::optional<Device> target_device = std::nullopt) { | ||
| return paddle::from_blob( | ||
| data, | ||
| sizes._PD_ToPaddleIntArray(), | ||
| compat::_PD_AtenScalarTypeToPhiDataType(options.dtype()), | ||
| phi::DataLayout::NCHW, | ||
| device_or_default(target_device)._PD_GetInner(), | ||
| deleter); | ||
| return for_blob(data, sizes) | ||
| .deleter(std::move(deleter)) | ||
| .options(options) | ||
| .target_device(target_device) | ||
| .make_tensor(); | ||
| } | ||
|
|
||
| inline Tensor from_blob(void* data, | ||
| IntArrayRef sizes, | ||
| IntArrayRef strides, | ||
| const TensorOptions& options = {}) { | ||
| return paddle::from_blob( | ||
| data, | ||
| sizes._PD_ToPaddleIntArray(), | ||
| strides._PD_ToPaddleIntArray(), | ||
| compat::_PD_AtenScalarTypeToPhiDataType(options.dtype()), | ||
| phi::DataLayout::NCHW, | ||
| options._PD_GetPlace()); | ||
| return for_blob(data, sizes).strides(strides).options(options).make_tensor(); | ||
| } | ||
|
|
||
| inline Tensor from_blob(void* data, | ||
| IntArrayRef sizes, | ||
| const TensorOptions& options = {}) { | ||
| return paddle::from_blob( | ||
| data, | ||
| sizes._PD_ToPaddleIntArray(), | ||
| compat::_PD_AtenScalarTypeToPhiDataType(options.dtype()), | ||
| phi::DataLayout::NCHW, | ||
| options._PD_GetPlace(), | ||
| nullptr); | ||
| return for_blob(data, sizes).options(options).make_tensor(); | ||
| } | ||
|
|
||
| } // namespace at | ||
This file contains hidden or 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.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The error message string on line 81 has a mismatched backtick:
"storage_offsetshould be zero.". The opening backtick beforestorage_offsetis missing. It should read: `` "storage_offset` should be zero." ``