-
Notifications
You must be signed in to change notification settings - Fork 5.6k
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' into fluid_move_selected_rows_to_pten_2
- Loading branch information
Showing
9 changed files
with
259 additions
and
29 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
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,56 @@ | ||
| /* 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 | ||
|
|
||
| namespace pten { | ||
|
|
||
| // Disable the copy and assignment operator for a class. | ||
| #ifndef DISABLE_COPY_AND_ASSIGN | ||
| #define DISABLE_COPY_AND_ASSIGN(classname) \ | ||
| private: \ | ||
| classname(const classname&) = delete; \ | ||
| classname(classname&&) = delete; \ | ||
| classname& operator=(const classname&) = delete; \ | ||
| classname& operator=(classname&&) = delete | ||
| #endif | ||
|
|
||
| #define PT_STATIC_ASSERT_GLOBAL_NAMESPACE(uniq_name, msg) \ | ||
| _PT_STATIC_ASSERT_GLOBAL_NAMESPACE(uniq_name, msg) | ||
|
|
||
| #define _PT_STATIC_ASSERT_GLOBAL_NAMESPACE(uniq_name, msg) \ | ||
| struct __test_global_namespace_##uniq_name##__ {}; \ | ||
| static_assert(std::is_same<::__test_global_namespace_##uniq_name##__, \ | ||
| __test_global_namespace_##uniq_name##__>::value, \ | ||
| msg) | ||
|
|
||
| #ifdef __COUNTER__ | ||
| #define PT_ID __COUNTER__ | ||
| #else | ||
| #define PT_ID __LINE__ | ||
| #endif | ||
|
|
||
| #if defined(_WIN32) | ||
| #define UNUSED | ||
| #define __builtin_expect(EXP, C) (EXP) | ||
| #else | ||
| #define UNUSED __attribute__((unused)) | ||
| #endif | ||
|
|
||
| #define PT_CONCATENATE(arg1, arg2) PT_CONCATENATE1(arg1, arg2) | ||
| #define PT_CONCATENATE1(arg1, arg2) PT_CONCATENATE2(arg1, arg2) | ||
| #define PT_CONCATENATE2(arg1, arg2) arg1##arg2 | ||
| #define PT_EXPAND(x) x | ||
|
|
||
| } // namespace pten |
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,86 @@ | ||
| /* 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/pten/core/meta_tensor.h" | ||
|
|
||
| #include "paddle/pten/core/compat_utils.h" | ||
| #include "paddle/pten/core/dense_tensor.h" | ||
|
|
||
| #include "paddle/fluid/platform/enforce.h" | ||
|
|
||
| namespace pten { | ||
|
|
||
| int64_t MetaTensor::numel() const { return tensor_->numel(); } | ||
|
|
||
| DDim MetaTensor::dims() const { return tensor_->dims(); } | ||
|
|
||
| DataType MetaTensor::dtype() const { return tensor_->dtype(); } | ||
|
|
||
| DataLayout MetaTensor::layout() const { return tensor_->layout(); } | ||
|
|
||
| void MetaTensor::set_dims(const DDim& dims) { | ||
| if (pten::DenseTensor::classof(tensor_)) { | ||
| CompatibleDenseTensorUtils::GetMutableMeta( | ||
| static_cast<DenseTensor*>(tensor_)) | ||
| ->dims = dims; | ||
| } else { | ||
| PADDLE_THROW(paddle::platform::errors::Unimplemented( | ||
| "Unsupported setting dims for `%s`.", tensor_->type_info().name())); | ||
| } | ||
| } | ||
|
|
||
| void MetaTensor::set_dtype(DataType dtype) { | ||
| if (pten::DenseTensor::classof(tensor_)) { | ||
| CompatibleDenseTensorUtils::GetMutableMeta( | ||
| static_cast<DenseTensor*>(tensor_)) | ||
| ->dtype = dtype; | ||
| } else { | ||
| PADDLE_THROW(paddle::platform::errors::Unimplemented( | ||
| "Unsupported settting dtype for `%s`.", tensor_->type_info().name())); | ||
| } | ||
| } | ||
|
|
||
| void MetaTensor::set_layout(DataLayout layout) { | ||
| if (pten::DenseTensor::classof(tensor_)) { | ||
| CompatibleDenseTensorUtils::GetMutableMeta( | ||
| static_cast<DenseTensor*>(tensor_)) | ||
| ->layout = layout; | ||
| } else { | ||
| PADDLE_THROW(paddle::platform::errors::Unimplemented( | ||
| "Unsupported settting layout for `%s`.", tensor_->type_info().name())); | ||
| } | ||
| } | ||
|
|
||
| void MetaTensor::share_lod(const MetaTensor& meta_tensor) { | ||
| if (pten::DenseTensor::classof(tensor_)) { | ||
| CompatibleDenseTensorUtils::GetMutableMeta( | ||
| static_cast<DenseTensor*>(tensor_)) | ||
| ->lod = meta_tensor.lod(); | ||
| } else { | ||
| PADDLE_THROW(paddle::platform::errors::Unimplemented( | ||
| "Unsupported share lod inplace for `%s`.", | ||
| tensor_->type_info().name())); | ||
| } | ||
| } | ||
|
|
||
| const LoD& MetaTensor::lod() const { | ||
| if (pten::DenseTensor::classof(tensor_)) { | ||
| return static_cast<DenseTensor*>(tensor_)->lod(); | ||
| } else { | ||
| PADDLE_THROW(paddle::platform::errors::Unimplemented( | ||
| "Unsupported setting dims for `%s`.", tensor_->type_info().name())); | ||
| } | ||
| } | ||
|
|
||
| } // namespace pten |
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,54 @@ | ||
| /* 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 "paddle/pten/common/data_type.h" | ||
| #include "paddle/pten/common/layout.h" | ||
| #include "paddle/pten/core/macros.h" | ||
| #include "paddle/pten/core/tensor_base.h" | ||
| #include "paddle/pten/core/tensor_meta.h" | ||
|
|
||
| // See Note [ Why still include the fluid headers? ] | ||
| #include "paddle/fluid/framework/ddim.h" | ||
|
|
||
| namespace pten { | ||
|
|
||
| class MetaTensor { | ||
| public: | ||
| explicit MetaTensor(TensorBase* tensor) : tensor_(tensor) {} | ||
|
|
||
| MetaTensor() = default; | ||
| MetaTensor(const MetaTensor&) = default; | ||
| MetaTensor(MetaTensor&&) = default; | ||
| MetaTensor& operator=(const MetaTensor&) = delete; | ||
| MetaTensor& operator=(MetaTensor&&) = delete; | ||
|
|
||
| virtual ~MetaTensor() = default; | ||
|
|
||
| virtual int64_t numel() const; | ||
| virtual DDim dims() const; | ||
| virtual DataType dtype() const; | ||
| virtual DataLayout layout() const; | ||
| virtual void set_dims(const DDim& dims); | ||
| virtual void set_dtype(DataType dtype); | ||
| virtual void set_layout(DataLayout layout); | ||
| virtual void share_lod(const MetaTensor& meta_tensor); | ||
|
|
||
| private: | ||
| const LoD& lod() const; | ||
| TensorBase* tensor_; | ||
| }; | ||
|
|
||
| } // namespace pten |
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