Skip to content

P
Paddle

机器未来 / Paddle
与 Fork 源项目一致

Fork自 PaddlePaddle / Paddle

通知 1
Star 1
Fork 0
P
Paddle

体验新版 GitCode，发现更多精彩内容 >>

未验证 提交 c05cd7ed 编写于 作者: C Chen Weihang 提交者： GitHub
浏览文件
操作

[PTen] Clean useless header in pten core (#39560) 

* clean useless header in pten core

* fix compiled failed

* fix cmake target

* fix typo

* resolve conflict
上级 9f99b591
显示空白变更内容
内联 并排
Showing with 481 addition and 734 deletion
paddle/pten/api/lib/tensor.cc
浏览文件 @ c05cd7ed
......@@ -176,12 +176,12 @@ template PADDLE_API uint8_t *Tensor::mutable_data<uint8_t>();
template PADDLE_API int8_t *Tensor::mutable_data<int8_t>();
template PADDLE_API int16_t *Tensor::mutable_data<int16_t>();
template PADDLE_API bool *Tensor::mutable_data<bool>();
template PADDLE_API paddle::platform::complex<float>
*Tensor::mutable_data<paddle::platform::complex<float>>();
template PADDLE_API paddle::platform::complex<double>
*Tensor::mutable_data<paddle::platform::complex<double>>();
template PADDLE_API paddle::platform::float16 *
Tensor::mutable_data<paddle::platform::float16>();
template PADDLE_API pten::dtype::complex<float>
*Tensor::mutable_data<pten::dtype::complex<float>>();
template PADDLE_API pten::dtype::complex<double>
*Tensor::mutable_data<pten::dtype::complex<double>>();
template PADDLE_API pten::dtype::float16 *
Tensor::mutable_data<pten::dtype::float16>();
template <typename T>
T *Tensor::mutable_data(const PlaceType &place) {
......@@ -214,12 +214,12 @@ template PADDLE_API int8_t *Tensor::mutable_data<int8_t>(
template PADDLE_API int16_t *Tensor::mutable_data<int16_t>(
const PlaceType &place);
template PADDLE_API bool *Tensor::mutable_data<bool>(const PlaceType &place);
template PADDLE_API paddle::platform::complex<float> *
Tensor::mutable_data<paddle::platform::complex<float>>(const PlaceType &place);
template PADDLE_API paddle::platform::complex<double> *
Tensor::mutable_data<paddle::platform::complex<double>>(const PlaceType &place);
template PADDLE_API paddle::platform::float16 *
Tensor::mutable_data<paddle::platform::float16>(const PlaceType &place);
template PADDLE_API pten::dtype::complex<float>
*Tensor::mutable_data<pten::dtype::complex<float>>(const PlaceType &place);
template PADDLE_API pten::dtype::complex<double>
*Tensor::mutable_data<pten::dtype::complex<double>>(const PlaceType &place);
template PADDLE_API pten::dtype::float16 *
Tensor::mutable_data<pten::dtype::float16>(const PlaceType &place);
template <typename T>
const T *Tensor::data() const {
......@@ -241,14 +241,14 @@ template PADDLE_API const uint8_t *Tensor::data<uint8_t>() const;
template PADDLE_API const int8_t *Tensor::data<int8_t>() const;
template PADDLE_API const int16_t *Tensor::data<int16_t>() const;
template PADDLE_API const bool *Tensor::data<bool>() const;
template PADDLE_API const paddle::platform::complex<float>
*Tensor::data<paddle::platform::complex<float>>() const;
template PADDLE_API const paddle::platform::complex<double>
*Tensor::data<paddle::platform::complex<double>>() const;
template PADDLE_API const paddle::platform::float16 *
Tensor::data<paddle::platform::float16>() const;
template PADDLE_API const paddle::platform::bfloat16 *
Tensor::data<paddle::platform::bfloat16>() const;
template PADDLE_API const pten::dtype::complex<float>
*Tensor::data<pten::dtype::complex<float>>() const;
template PADDLE_API const pten::dtype::complex<double>
*Tensor::data<pten::dtype::complex<double>>() const;
template PADDLE_API const pten::dtype::float16 *
Tensor::data<pten::dtype::float16>() const;
template PADDLE_API const pten::dtype::bfloat16 *
Tensor::data<pten::dtype::bfloat16>() const;
template <typename T>
T *Tensor::data() {
......@@ -267,12 +267,11 @@ template PADDLE_API uint8_t *Tensor::data<uint8_t>();
template PADDLE_API int8_t *Tensor::data<int8_t>();
template PADDLE_API int16_t *Tensor::data<int16_t>();
template PADDLE_API bool *Tensor::data<bool>();
template PADDLE_API paddle::platform::complex<float>
*Tensor::data<paddle::platform::complex<float>>();
template PADDLE_API paddle::platform::complex<double>
*Tensor::data<paddle::platform::complex<double>>();
template PADDLE_API paddle::platform::float16 *
Tensor::data<paddle::platform::float16>();
template PADDLE_API pten::dtype::complex<float>
*Tensor::data<pten::dtype::complex<float>>();
template PADDLE_API pten::dtype::complex<double>
*Tensor::data<pten::dtype::complex<double>>();
template PADDLE_API pten::dtype::float16 *Tensor::data<pten::dtype::float16>();
// TODO(chenweihang): replace slice impl by API
Tensor Tensor::slice(int64_t begin_idx, int64_t end_idx) const {
......@@ -328,12 +327,12 @@ template PADDLE_API Tensor
Tensor::copy_to<int16_t>(const PlaceType &target_place) const;
template PADDLE_API Tensor
Tensor::copy_to<bool>(const PlaceType &target_place) const;
template PADDLE_API Tensor Tensor::copy_to<paddle::platform::complex<float>>(
template PADDLE_API Tensor Tensor::copy_to<pten::dtype::complex<float>>(
const PlaceType &target_place) const;
template PADDLE_API Tensor Tensor::copy_to<paddle::platform::complex<double>>(
template PADDLE_API Tensor Tensor::copy_to<pten::dtype::complex<double>>(
const PlaceType &target_place) const;
template PADDLE_API Tensor
Tensor::copy_to<paddle::platform::float16>(const PlaceType &target_place) const;
Tensor::copy_to<pten::dtype::float16>(const PlaceType &target_place) const;
Tensor Tensor::copy_to(Backend backend, bool blocking) const {
return experimental::copy_to(*this, backend, blocking);
......
paddle/pten/core/compat/convert_utils.h
浏览文件 @ c05cd7ed
......@@ -20,11 +20,6 @@ limitations under the License. */
#include "paddle/pten/common/place.h"
#include "paddle/pten/core/tensor_meta.h"
// See Note [ Why still include the fluid headers? ]
#include "paddle/fluid/framework/data_type.h"
// TODO(chenweihang): this file may need to be removed
namespace pten {
std::string TransToPtenKernelName(const std::string& fluid_op_name);
......
paddle/pten/core/dense_tensor.cc
浏览文件 @ c05cd7ed
......@@ -202,12 +202,12 @@ DATA_MEMBER_FUNC_INSTANTIATION(int32_t);
DATA_MEMBER_FUNC_INSTANTIATION(uint32_t);
DATA_MEMBER_FUNC_INSTANTIATION(int64_t);
DATA_MEMBER_FUNC_INSTANTIATION(uint64_t);
DATA_MEMBER_FUNC_INSTANTIATION(::paddle::platform::bfloat16);
DATA_MEMBER_FUNC_INSTANTIATION(::paddle::platform::float16);
DATA_MEMBER_FUNC_INSTANTIATION(::pten::dtype::bfloat16);
DATA_MEMBER_FUNC_INSTANTIATION(::pten::dtype::float16);
DATA_MEMBER_FUNC_INSTANTIATION(float);
DATA_MEMBER_FUNC_INSTANTIATION(double);
DATA_MEMBER_FUNC_INSTANTIATION(::paddle::experimental::complex64);
DATA_MEMBER_FUNC_INSTANTIATION(::paddle::experimental::complex128);
DATA_MEMBER_FUNC_INSTANTIATION(::pten::dtype::complex<float>);
DATA_MEMBER_FUNC_INSTANTIATION(::pten::dtype::complex<double>);
#undef DATA_MEMBER_FUNC_INSTANTIATION
......
paddle/pten/core/dense_tensor.h
浏览文件 @ c05cd7ed
......@@ -20,9 +20,6 @@ limitations under the License. */
#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/data_type.h"
/* @jim19930609: Move to MKLDNN_Tensor in the future
*/
#ifdef PADDLE_WITH_MKLDNN
......
paddle/pten/core/dense_tensor_impl.cc
浏览文件 @ c05cd7ed
......@@ -40,14 +40,14 @@ size_t DenseTensor::memory_size() const {
}
void DenseTensor::check_memory_size() const {
PADDLE_ENFORCE_NOT_NULL(holder_,
paddle::platform::errors::PreconditionNotMet(
"Tensor holds no memory. "
PADDLE_ENFORCE_NOT_NULL(
holder_,
pten::errors::PreconditionNotMet("Tensor holds no memory. "
"Call Tensor::mutable_data firstly."));
PADDLE_ENFORCE_LE(
numel() * SizeOf(dtype()),
memory_size(),
paddle::platform::errors::PreconditionNotMet(
pten::errors::PreconditionNotMet(
"Tensor's dimension is out of bound."
"Tensor's dimension must be equal or less than the size of its "
"memory."
......@@ -56,10 +56,10 @@ void DenseTensor::check_memory_size() const {
memory_size()));
}
const paddle::platform::Place& DenseTensor::place() const {
const Place& DenseTensor::place() const {
PADDLE_ENFORCE_NOT_NULL(
holder_,
paddle::platform::errors::PreconditionNotMet(
pten::errors::PreconditionNotMet(
"Tensor not initialized yet when DenseTensor::place() is called."));
return holder_->place();
}
......@@ -82,7 +82,7 @@ void DenseTensor::ResetHolder(const std::shared_ptr<pten::Allocation>& holder) {
numel() * static_cast<int64_t>(SizeOf(dtype())) +
static_cast<int64_t>(meta_.offset),
static_cast<int64_t>(holder->size()),
paddle::platform::errors::InvalidArgument(
pten::errors::InvalidArgument(
"The size of Holder is not enough to store the Tensor."));
}
holder_ = holder;
......@@ -99,14 +99,14 @@ void DenseTensor::set_type(paddle::experimental::DataType type) {
meta_.dtype = type;
}
void* DenseTensor::mutable_data(const paddle::platform::Place& place,
void* DenseTensor::mutable_data(const Place& place,
paddle::experimental::DataType type,
size_t requested_size) {
set_type(type);
PADDLE_ENFORCE_GE(
numel(),
0,
paddle::platform::errors::PreconditionNotMet(
pten::errors::PreconditionNotMet(
"The Tensor's element number must be equal or greater than zero. "
"The Tensor's shape is [",
dims(),
......@@ -127,19 +127,18 @@ void* DenseTensor::mutable_data(const paddle::platform::Place& place,
meta_.offset);
}
void* DenseTensor::mutable_data(const paddle::platform::Place& place,
size_t requested_size) {
void* DenseTensor::mutable_data(const Place& place, size_t requested_size) {
return mutable_data(place, type(), requested_size);
}
void* DenseTensor::mutable_data(const paddle::platform::Place& place,
void* DenseTensor::mutable_data(const Place& place,
paddle::experimental::DataType type,
const pten::Stream& stream) {
set_type(type);
PADDLE_ENFORCE_GE(
numel(),
0,
paddle::platform::errors::PreconditionNotMet(
pten::errors::PreconditionNotMet(
"The Tensor's element number must be equal or greater than zero. "
"The Tensor's shape is [",
dims(),
......@@ -149,7 +148,7 @@ void* DenseTensor::mutable_data(const paddle::platform::Place& place,
/* some versions of boost::variant don't have operator!= */
if (holder_ == nullptr || !(holder_->place() == place) ||
holder_->size() < size + meta_.offset ||
!(paddle::platform::is_gpu_place(place) &&
!(place.GetType() == pten::AllocationType::GPU &&
paddle::memory::InSameStream(holder_, stream))) {
holder_.reset();
holder_ = paddle::memory::AllocShared(place, size, stream);
......@@ -166,7 +165,7 @@ void* DenseTensor::mutable_data(const paddle::platform::Place& place,
*/
template <typename T>
inline T* DenseTensor::mutable_data(const DDim& dims,
const paddle::platform::Place& place,
const Place& place,
size_t requested_size) {
static_assert(std::is_pod<T>::value, "T must be POD");
meta_.dims = dims;
......@@ -174,8 +173,7 @@ inline T* DenseTensor::mutable_data(const DDim& dims,
}
template <typename T>
inline T* DenseTensor::mutable_data(const paddle::platform::Place& place,
size_t requested_size) {
inline T* DenseTensor::mutable_data(const Place& place, size_t requested_size) {
static_assert(std::is_pod<T>::value, "T must be POD");
return reinterpret_cast<T*>(
mutable_data(place,
......@@ -191,11 +189,9 @@ void DenseTensor::ShareBufferWith(const DenseTensor& tensor) {
#define LEGACY_DATA_MEMBER_FUNC_INSTANTIATION(dtype) \
template dtype* DenseTensor::mutable_data( \
const DDim& dims, \
const paddle::platform::Place& place, \
size_t requested_size); \
template dtype* DenseTensor::mutable_data( \
const paddle::platform::Place& place, size_t requested_size);
const DDim& dims, const Place& place, size_t requested_size); \
template dtype* DenseTensor::mutable_data(const Place& place, \
size_t requested_size);
LEGACY_DATA_MEMBER_FUNC_INSTANTIATION(bool)
LEGACY_DATA_MEMBER_FUNC_INSTANTIATION(int8_t)
......@@ -205,10 +201,10 @@ LEGACY_DATA_MEMBER_FUNC_INSTANTIATION(int32_t)
LEGACY_DATA_MEMBER_FUNC_INSTANTIATION(int64_t)
LEGACY_DATA_MEMBER_FUNC_INSTANTIATION(float)
LEGACY_DATA_MEMBER_FUNC_INSTANTIATION(double)
LEGACY_DATA_MEMBER_FUNC_INSTANTIATION(::paddle::platform::bfloat16)
LEGACY_DATA_MEMBER_FUNC_INSTANTIATION(::paddle::platform::float16)
LEGACY_DATA_MEMBER_FUNC_INSTANTIATION(::paddle::experimental::complex64)
LEGACY_DATA_MEMBER_FUNC_INSTANTIATION(::paddle::experimental::complex128)
LEGACY_DATA_MEMBER_FUNC_INSTANTIATION(::pten::dtype::bfloat16)
LEGACY_DATA_MEMBER_FUNC_INSTANTIATION(::pten::dtype::float16)
LEGACY_DATA_MEMBER_FUNC_INSTANTIATION(::pten::dtype::complex<float>)
LEGACY_DATA_MEMBER_FUNC_INSTANTIATION(::pten::dtype::complex<double>)
#undef LEGACY_DATA_MEMBER_FUNC_INSTANTIATION
......@@ -234,7 +230,7 @@ std::pair<size_t, size_t> DenseTensor::lod_element(size_t level,
PADDLE_ENFORCE_LT(
level,
NumLevels(),
paddle::platform::errors::InvalidArgument(
pten::errors::InvalidArgument(
"The input level of LoD is invalid, it should be less than LoD "
"size. The input level is %zu, the LoD size is %zu.",
level,
......@@ -242,7 +238,7 @@ std::pair<size_t, size_t> DenseTensor::lod_element(size_t level,
PADDLE_ENFORCE_LT(elem,
NumElements(level),
paddle::platform::errors::InvalidArgument(
pten::errors::InvalidArgument(
"The input element of LoD is invalid, it should be "
"less than the number of elements in its level."
"The input element is %zu, the number of elements in "
......@@ -259,7 +255,7 @@ size_t DenseTensor::NumElements(size_t level) const {
PADDLE_ENFORCE_LT(
level,
NumLevels(),
paddle::platform::errors::InvalidArgument(
pten::errors::InvalidArgument(
"The input level of LoD is invalid, it should be less than LoD "
"size. The input level is %zu, the LoD size is %zu.",
level,
......@@ -276,20 +272,20 @@ DenseTensor& DenseTensor::Resize(const DDim& dims) {
DenseTensor DenseTensor::Slice(int64_t begin_idx, int64_t end_idx) const {
check_memory_size();
PADDLE_ENFORCE_GE(begin_idx,
PADDLE_ENFORCE_GE(
begin_idx,
0,
paddle::platform::errors::OutOfRange(
"The start row index must be greater than 0."
pten::errors::OutOfRange("The start row index must be greater than 0."
"But received the start index is d%.",
begin_idx));
PADDLE_ENFORCE_LE(end_idx,
PADDLE_ENFORCE_LE(
end_idx,
meta_.dims[0],
paddle::platform::errors::OutOfRange(
"The end row index is out of bound."));
pten::errors::OutOfRange("The end row index is out of bound."));
PADDLE_ENFORCE_LT(
begin_idx,
end_idx,
paddle::platform::errors::InvalidArgument(
pten::errors::InvalidArgument(
"The start row index must be less than the end row index."
"But received the start index = %d, the end index = %d.",
begin_idx,
......@@ -317,13 +313,13 @@ std::vector<DenseTensor> DenseTensor::Split(int64_t split_size,
PADDLE_ENFORCE_GE(meta_.dims.size(),
0,
paddle::platform::errors::OutOfRange(
pten::errors::OutOfRange(
"split expects at least a 1-dimensional tensor"));
PADDLE_ENFORCE_GE(
split_size,
0,
paddle::platform::errors::OutOfRange(
pten::errors::OutOfRange(
"split expects split_size be non-negative, but got split_size is %d",
split_size));
......@@ -350,12 +346,12 @@ std::vector<DenseTensor> DenseTensor::Chunk(int64_t chunks,
check_memory_size();
PADDLE_ENFORCE_GE(meta_.dims.size(),
0,
paddle::platform::errors::OutOfRange(
pten::errors::OutOfRange(
"split expects at least a 1-dimensional tensor"));
PADDLE_ENFORCE_GE(
chunks,
0,
paddle::platform::errors::OutOfRange(
pten::errors::OutOfRange(
"chunks expects to be greater than 0, but got chunks is %d", chunks));
int64_t numel_size = meta_.dims[axis];
......@@ -376,7 +372,7 @@ DenseTensor& DenseTensor::ShareInplaceVersionCounterWith(
const DenseTensor& src) {
PADDLE_ENFORCE_NOT_NULL(
inplace_version_counter_,
paddle::platform::errors::PreconditionNotMet(
pten::errors::PreconditionNotMet(
"Tensor does not hold inplace_version_counter_."));
inplace_version_counter_ = src.inplace_version_counter_;
......
paddle/pten/core/kernel_utils.h
浏览文件 @ c05cd7ed
......@@ -233,7 +233,7 @@ struct KernelImpl<Return (*)(DevCtx, Args...), kernel_fn> {
PT_SPECIALIZE_KernelCallHelper_FOR_ATTRIBUTE(double);
PT_SPECIALIZE_KernelCallHelper_FOR_ATTRIBUTE(int);
PT_SPECIALIZE_KernelCallHelper_FOR_ATTRIBUTE(int64_t);
PT_SPECIALIZE_KernelCallHelper_FOR_ATTRIBUTE(paddle::platform::float16);
PT_SPECIALIZE_KernelCallHelper_FOR_ATTRIBUTE(pten::dtype::float16);
PT_SPECIALIZE_KernelCallHelper_FOR_ATTRIBUTE(const Scalar&);
PT_SPECIALIZE_KernelCallHelper_FOR_ATTRIBUTE(DataType);
PT_SPECIALIZE_KernelCallHelper_FOR_ATTRIBUTE(DataLayout);
......
paddle/pten/core/utils/data_type.h
浏览文件 @ c05cd7ed
......@@ -29,9 +29,9 @@ namespace pten {
#define _PtenForEachDataType_(callback) \
_PtenForEachDataTypeHelper_(callback, float, DataType::FLOAT32); \
_PtenForEachDataTypeHelper_( \
callback, ::paddle::platform::float16, DataType::FLOAT16); \
callback, ::pten::dtype::float16, DataType::FLOAT16); \
_PtenForEachDataTypeHelper_( \
callback, ::paddle::platform::bfloat16, DataType::BFLOAT16); \
callback, ::pten::dtype::bfloat16, DataType::BFLOAT16); \
_PtenForEachDataTypeHelper_(callback, double, DataType::FLOAT64); \
_PtenForEachDataTypeHelper_(callback, int, DataType::INT32); \
_PtenForEachDataTypeHelper_(callback, int64_t, DataType::INT64); \
......@@ -40,9 +40,9 @@ namespace pten {
_PtenForEachDataTypeHelper_(callback, int16_t, DataType::INT16); \
_PtenForEachDataTypeHelper_(callback, int8_t, DataType::INT8); \
_PtenForEachDataTypeHelper_( \
callback, ::paddle::platform::complex<float>, DataType::COMPLEX64); \
callback, ::pten::dtype::complex<float>, DataType::COMPLEX64); \
_PtenForEachDataTypeHelper_( \
callback, ::paddle::platform::complex<double>, DataType::COMPLEX128);
callback, ::pten::dtype::complex<double>, DataType::COMPLEX128);
template <typename Visitor>
inline void VisitDataType(pten::DataType type, Visitor visitor) {
......
paddle/pten/kernels/CMakeLists.txt
浏览文件 @ c05cd7ed
......@@ -15,14 +15,10 @@ set(COMMON_KERNEL_DEPS ${COMMON_KERNEL_DEPS} eigen_function blas math_function)
set(COMMON_KERNEL_DEPS ${COMMON_KERNEL_DEPS} pten_api_utils)
set(COMMON_KERNEL_DEPS ${COMMON_KERNEL_DEPS} infermeta)
set(MATH_KERNEL_DEPS ${COMMON_KERNEL_DEPS} cast_kernel copy_kernel pten_transpose_cpu)
if(WITH_GPU OR WITH_ROCM)
set(MATH_KERNEL_DEPS ${MATH_KERNEL_DEPS} pten_transpose_gpu)
endif()
# auto build kernel targets by cmake
register_kernels(EXCLUDES math_kernel DEPS ${COMMON_KERNEL_DEPS})
kernel_library(math_kernel DEPS ${MATH_KERNEL_DEPS})
register_kernels(DEPS ${COMMON_KERNEL_DEPS})
# pten sparse kernels
add_subdirectory(sparse)
copy_if_different(${kernel_declare_file} ${kernel_declare_file_final})
paddle/pten/kernels/complex_kernel.h
浏览文件 @ c05cd7ed
......@@ -25,11 +25,11 @@ template <typename T, typename Context>
void ConjKernel(const Context& dev_ctx, const DenseTensor& x, DenseTensor* out);
// If T is complex
template <typename T,
template <
typename T,
typename Context,
std::enable_if_t<
std::is_same<T, paddle::platform::complex<float>>::value ||
std::is_same<T, paddle::platform::complex<double>>::value,
std::enable_if_t<std::is_same<T, pten::dtype::complex<float>>::value ||
std::is_same<T, pten::dtype::complex<double>>::value,
bool> = true>
DenseTensor Conj(const Context& dev_ctx, const DenseTensor& x) {
auto dense_out = pten::Empty<T, Context>(dev_ctx);
......@@ -40,11 +40,11 @@ DenseTensor Conj(const Context& dev_ctx, const DenseTensor& x) {
}
// If T is not complex
template <typename T,
template <
typename T,
typename Context,
std::enable_if_t<
!std::is_same<T, paddle::platform::complex<float>>::value &&
!std::is_same<T, paddle::platform::complex<double>>::value,
std::enable_if_t<!std::is_same<T, pten::dtype::complex<float>>::value &&
!std::is_same<T, pten::dtype::complex<double>>::value,
bool> = true>
DenseTensor Conj(const Context& dev_ctx, const DenseTensor& x) {
return x;
......
paddle/pten/kernels/cpu/cast_kernel.cc
浏览文件 @ c05cd7ed
......@@ -69,9 +69,9 @@ PT_REGISTER_KERNEL(cast,
int16_t,
bool,
uint8_t,
paddle::platform::float16,
paddle::platform::bfloat16,
paddle::platform::complex<float>,
paddle::platform::complex<double>) {
pten::dtype::float16,
pten::dtype::bfloat16,
pten::dtype::complex<float>,
pten::dtype::complex<double>) {
kernel->OutputAt(0).SetDataType(paddle::experimental::DataType::UNDEFINED);
}
paddle/pten/kernels/cpu/complex_kernel.cc
浏览文件 @ c05cd7ed
......@@ -25,8 +25,8 @@ PT_REGISTER_KERNEL(conj,
CPU,
ALL_LAYOUT,
pten::ConjKernel,
paddle::platform::complex<float>,
paddle::platform::complex<double>,
pten::dtype::complex<float>,
pten::dtype::complex<double>,
float,
double,
int,
......
paddle/pten/kernels/cpu/concat_kernel.cc
浏览文件 @ c05cd7ed
......@@ -120,6 +120,6 @@ PT_REGISTER_KERNEL(concat,
int64_t,
int,
uint8_t,
paddle::platform::float16,
paddle::platform::complex<float>,
paddle::platform::complex<double>) {}
pten::dtype::float16,
pten::dtype::complex<float>,
pten::dtype::complex<double>) {}
paddle/pten/kernels/cpu/dot_grad_kernel.cc
浏览文件 @ c05cd7ed
......@@ -28,5 +28,5 @@ PT_REGISTER_KERNEL(dot_grad,
double,
int,
int64_t,
paddle::platform::complex<float>,
paddle::platform::complex<double>) {}
pten::dtype::complex<float>,
pten::dtype::complex<double>) {}
paddle/pten/kernels/cpu/dot_kernel.cc
浏览文件 @ c05cd7ed
......@@ -46,8 +46,8 @@ void DotKernel(const Context& dev_ctx,
} // namespace pten
using complex64 = ::paddle::platform::complex<float>;
using complex128 = ::paddle::platform::complex<double>;
using complex64 = ::pten::dtype::complex<float>;
using complex128 = ::pten::dtype::complex<double>;
PT_REGISTER_KERNEL(dot,
CPU,
......
paddle/pten/kernels/cpu/elementwise_grad_kernel.cc
浏览文件 @ c05cd7ed
......@@ -134,8 +134,8 @@ PT_REGISTER_KERNEL(add_grad,
double,
int,
int64_t,
paddle::platform::complex<float>,
paddle::platform::complex<double>) {}
pten::dtype::complex<float>,
pten::dtype::complex<double>) {}
PT_REGISTER_KERNEL(add_double_grad,
CPU,
......@@ -145,8 +145,8 @@ PT_REGISTER_KERNEL(add_double_grad,
double,
int,
int64_t,
paddle::platform::complex<float>,
paddle::platform::complex<double>) {}
pten::dtype::complex<float>,
pten::dtype::complex<double>) {}
PT_REGISTER_KERNEL(add_triple_grad,
CPU,
......@@ -156,8 +156,8 @@ PT_REGISTER_KERNEL(add_triple_grad,
double,
int,
int64_t,
paddle::platform::complex<float>,
paddle::platform::complex<double>) {}
pten::dtype::complex<float>,
pten::dtype::complex<double>) {}
PT_REGISTER_KERNEL(subtract_grad,
CPU,
......@@ -167,8 +167,8 @@ PT_REGISTER_KERNEL(subtract_grad,
double,
int,
int64_t,
paddle::platform::complex<float>,
paddle::platform::complex<double>) {}
pten::dtype::complex<float>,
pten::dtype::complex<double>) {}
PT_REGISTER_KERNEL(subtract_double_grad,
CPU,
......@@ -178,5 +178,5 @@ PT_REGISTER_KERNEL(subtract_double_grad,
double,
int,
int64_t,
paddle::platform::complex<float>,
paddle::platform::complex<double>) {}
pten::dtype::complex<float>,
pten::dtype::complex<double>) {}
paddle/pten/kernels/cpu/full_kernel.cc
浏览文件 @ c05cd7ed
......@@ -29,10 +29,10 @@ PT_REGISTER_KERNEL(full,
int,
int64_t,
bool,
paddle::platform::float16,
paddle::platform::bfloat16,
paddle::platform::complex<float>,
paddle::platform::complex<double>) {}
pten::dtype::float16,
pten::dtype::bfloat16,
pten::dtype::complex<float>,
pten::dtype::complex<double>) {}
PT_REGISTER_KERNEL(full_like,
CPU,
......@@ -43,4 +43,4 @@ PT_REGISTER_KERNEL(full_like,
int,
int64_t,
bool,
paddle::platform::float16) {}
pten::dtype::float16) {}
paddle/pten/kernels/cpu/math_kernel.cc
浏览文件 @ c05cd7ed
......@@ -113,11 +113,11 @@ DEFINE_CPU_ELEMENTWISE_OP(Multiply)
} // namespace pten
using complex64 = ::paddle::platform::complex<float>;
using complex128 = ::paddle::platform::complex<double>;
using complex64 = ::pten::dtype::complex<float>;
using complex128 = ::pten::dtype::complex<double>;
// NOTE(chenweihang): using bfloat16 will cause redefine with xpu bfloat16
// using bfloat16 = ::paddle::platform::bfloat16;
// using bfloat16 = ::pten::dtype::bfloat16;
PT_REGISTER_KERNEL(add_raw,
CPU,
ALL_LAYOUT,
......@@ -166,7 +166,7 @@ PT_REGISTER_KERNEL(sum_raw,
bool,
float,
double,
paddle::platform::float16,
pten::dtype::float16,
int,
int64_t,
complex64,
......
paddle/pten/kernels/cpu/matmul_grad_kernel.cc
浏览文件 @ c05cd7ed
......@@ -25,8 +25,8 @@ PT_REGISTER_KERNEL(matmul_grad,
pten::MatmulGradKernel,
float,
double,
paddle::platform::complex<float>,
paddle::platform::complex<double>) {}
pten::dtype::complex<float>,
pten::dtype::complex<double>) {}
PT_REGISTER_KERNEL(matmul_double_grad,
CPU,
......@@ -34,8 +34,8 @@ PT_REGISTER_KERNEL(matmul_double_grad,
pten::MatmulDoubleGradKernel,
float,
double,
paddle::platform::complex<float>,
paddle::platform::complex<double>) {}
pten::dtype::complex<float>,
pten::dtype::complex<double>) {}
PT_REGISTER_KERNEL(matmul_triple_grad,
CPU,
......@@ -43,5 +43,5 @@ PT_REGISTER_KERNEL(matmul_triple_grad,
pten::MatmulTripleGradKernel,
float,
double,
paddle::platform::complex<float>,
paddle::platform::complex<double>) {}
pten::dtype::complex<float>,
pten::dtype::complex<double>) {}
paddle/pten/kernels/cpu/matmul_kernel.cc
浏览文件 @ c05cd7ed
......@@ -26,5 +26,5 @@ PT_REGISTER_KERNEL(matmul,
pten::MatmulKernel,
float,
double,
paddle::platform::complex<float>,
paddle::platform::complex<double>) {}
pten::dtype::complex<float>,
pten::dtype::complex<double>) {}
paddle/pten/kernels/cpu/reduce.h
浏览文件 @ c05cd7ed
......@@ -23,7 +23,7 @@
#include "paddle/pten/api/lib/utils/storage.h"
#include "paddle/pten/core/dense_tensor.h"
#include "paddle/pten/kernels/funcs/eigen/common.h"
#include "paddle/pten/kernels/funcs/transpose.h"
#include "paddle/pten/kernels/funcs/math_function.h"
// See Note [ Why still include the fluid headers? ]
#include "paddle/fluid/operators/eigen/eigen_function.h"
namespace pten {
......@@ -80,7 +80,7 @@ void ReduceFunctor(const DeviceContext& context,
inline void GetShuffledDim(const DDim& src_dims,
DDim* dst_dims,
const std::vector<int64_t>& reduced_dims,
std::vector<int64_t>* perm_axis) {
std::vector<int>* perm_axis) {
// check if it's a reduced dim
std::vector<bool> src_dims_check(src_dims.size(), false);
size_t src_size = src_dims.size();
......@@ -115,13 +115,13 @@ void GetShuffledInput(const DeviceContext& dev_ctx,
pten::DenseTensor* shuffled_input,
const std::vector<int64_t>& dims) {
DDim shuffled_dims(input.dims());
std::vector<int64_t> perm_axis(input.dims().size());
std::vector<int> perm_axis(input.dims().size());
GetShuffledDim(input.dims(), &shuffled_dims, dims, &perm_axis);
shuffled_input->ResizeAndAllocate(shuffled_dims);
dev_ctx.template Alloc<OutT>(shuffled_input);
pten::math::TransposeNormal<DeviceContext, OutT> trans;
pten::funcs::TransposeNormal<DeviceContext, OutT> trans;
trans(dev_ctx, input, shuffled_input, perm_axis);
}
......
paddle/pten/kernels/empty_kernel.cc
浏览文件 @ c05cd7ed
......@@ -45,10 +45,10 @@ PT_REGISTER_KERNEL(empty,
int,
int64_t,
bool,
paddle::platform::float16,
paddle::platform::bfloat16,
paddle::platform::complex<float>,
paddle::platform::complex<double>) {}
pten::dtype::float16,
pten::dtype::bfloat16,
pten::dtype::complex<float>,
pten::dtype::complex<double>) {}
PT_REGISTER_KERNEL(empty_like,
CPU,
......@@ -61,10 +61,10 @@ PT_REGISTER_KERNEL(empty_like,
int,
int64_t,
bool,
paddle::platform::float16,
paddle::platform::bfloat16,
paddle::platform::complex<float>,
paddle::platform::complex<double>) {}
pten::dtype::float16,
pten::dtype::bfloat16,
pten::dtype::complex<float>,
pten::dtype::complex<double>) {}
#if defined(PADDLE_WITH_CUDA) || defined(PADDLE_WITH_HIP)
PT_REGISTER_KERNEL(empty,
......@@ -78,9 +78,9 @@ PT_REGISTER_KERNEL(empty,
int,
int64_t,
bool,
paddle::platform::float16,
paddle::platform::complex<float>,
paddle::platform::complex<double>) {}
pten::dtype::float16,
pten::dtype::complex<float>,
pten::dtype::complex<double>) {}
PT_REGISTER_KERNEL(empty_like,
GPU,
......@@ -93,8 +93,8 @@ PT_REGISTER_KERNEL(empty_like,
int,
int64_t,
bool,
paddle::platform::float16,
paddle::platform::bfloat16,
paddle::platform::complex<float>,
paddle::platform::complex<double>) {}
pten::dtype::float16,
pten::dtype::bfloat16,
pten::dtype::complex<float>,
pten::dtype::complex<double>) {}
#endif
paddle/pten/kernels/flatten_grad_kernel.cc
浏览文件 @ c05cd7ed
......@@ -49,7 +49,7 @@ PT_REGISTER_KERNEL(flatten_grad,
ALL_LAYOUT,
pten::FlattenGradKernel,
float,
paddle::platform::float16,
pten::dtype::float16,
double,
uint8_t,
int8_t,
......@@ -64,7 +64,7 @@ PT_REGISTER_KERNEL(flatten_grad,
ALL_LAYOUT,
pten::FlattenGradKernel,
float,
paddle::platform::float16,
pten::dtype::float16,
int8_t,
int,
int64_t) {}
......
paddle/pten/kernels/flatten_kernel.cc
浏览文件 @ c05cd7ed
......@@ -76,7 +76,7 @@ PT_REGISTER_KERNEL(flatten,
ALL_LAYOUT,
pten::FlattenKernel,
float,
paddle::platform::float16,
pten::dtype::float16,
double,
uint8_t,
int8_t,
......@@ -88,7 +88,7 @@ PT_REGISTER_KERNEL(flatten_with_xshape,
ALL_LAYOUT,
pten::FlattenWithXShape,
float,
paddle::platform::float16,
pten::dtype::float16,
double,
uint8_t,
int8_t,
......@@ -102,7 +102,7 @@ PT_REGISTER_KERNEL(flatten,
ALL_LAYOUT,
pten::FlattenKernel,
float,
paddle::platform::float16,
pten::dtype::float16,
int8_t,
int,
int64_t) {}
......@@ -112,7 +112,7 @@ PT_REGISTER_KERNEL(flatten_with_xshape,
ALL_LAYOUT,
pten::FlattenWithXShape,
float,
paddle::platform::float16,
pten::dtype::float16,
int8_t,
int,
int64_t) {}
......
paddle/pten/kernels/funcs/CMakeLists.txt
浏览文件 @ c05cd7ed
add_subdirectory(eigen)
cc_library(pten_transpose_cpu SRCS transpose.cc DEPS dense_tensor pten_context)
if(WITH_GPU)
nv_library(pten_transpose_gpu SRCS transpose.cu DEPS dense_tensor malloc pten_context)
elseif(WITH_ROCM)
hip_library(pten_transpose_gpu SRCS transpose.cu DEPS dense_tensor malloc pten_context)
endif()
function(math_library TARGET)
# math_library is a function to create math library.
# The interface is the same as cc_library.
......@@ -47,10 +40,3 @@ function(math_library TARGET)
endfunction()
math_library(math_function DEPS blas dense_tensor tensor)
cc_test(math_function_test SRCS math_function_test.cc DEPS math_function)
if(WITH_GPU)
nv_test(math_function_gpu_test SRCS math_function_test.cu DEPS math_function)
endif()
if(WITH_ROCM)
hip_test(math_function_gpu_test SRCS math_function_test.cu DEPS math_function tensor)
endif()
paddle/pten/kernels/funcs/common_shape.h
浏览文件 @ c05cd7ed
......@@ -15,6 +15,8 @@ limitations under the License. */
#pragma once
#include "paddle/pten/core/dense_tensor.h"
#include "paddle/pten/kernels/funcs/eigen/common.h"
#include "paddle/pten/kernels/funcs/eigen/eigen_function.h"
namespace pten {
namespace funcs {
......
paddle/pten/kernels/funcs/math_function.cc
浏览文件 @ c05cd7ed
......@@ -36,12 +36,12 @@ limitations under the License. */
namespace pten {
namespace funcs {
using float16 = paddle::platform::float16;
using float16 = pten::dtype::float16;
template struct SetConstant<paddle::platform::CPUDeviceContext,
paddle::platform::float16>;
pten::dtype::float16>;
template struct SetConstant<paddle::platform::CPUDeviceContext,
paddle::platform::bfloat16>;
pten::dtype::bfloat16>;
template struct SetConstant<paddle::platform::CPUDeviceContext, float>;
template struct SetConstant<paddle::platform::CPUDeviceContext, double>;
template struct SetConstant<paddle::platform::CPUDeviceContext, int16_t>;
......@@ -50,12 +50,12 @@ template struct SetConstant<paddle::platform::CPUDeviceContext, int64_t>;
template struct SetConstant<paddle::platform::CPUDeviceContext, bool>;
template struct SetConstant<paddle::platform::CPUDeviceContext, uint8_t>;
template struct SetConstant<paddle::platform::CPUDeviceContext,
paddle::platform::complex<float>>;
pten::dtype::complex<float>>;
template struct SetConstant<paddle::platform::CPUDeviceContext,
paddle::platform::complex<double>>;
pten::dtype::complex<double>>;
template struct SetConstant<pten::CPUContext, paddle::platform::float16>;
template struct SetConstant<pten::CPUContext, paddle::platform::bfloat16>;
template struct SetConstant<pten::CPUContext, pten::dtype::float16>;
template struct SetConstant<pten::CPUContext, pten::dtype::bfloat16>;
template struct SetConstant<pten::CPUContext, float>;
template struct SetConstant<pten::CPUContext, double>;
template struct SetConstant<pten::CPUContext, int16_t>;
......@@ -63,15 +63,14 @@ template struct SetConstant<pten::CPUContext, int>;
template struct SetConstant<pten::CPUContext, int64_t>;
template struct SetConstant<pten::CPUContext, bool>;
template struct SetConstant<pten::CPUContext, uint8_t>;
template struct SetConstant<pten::CPUContext, paddle::platform::complex<float>>;
template struct SetConstant<pten::CPUContext,
paddle::platform::complex<double>>;
template struct SetConstant<pten::CPUContext, pten::dtype::complex<float>>;
template struct SetConstant<pten::CPUContext, pten::dtype::complex<double>>;
#ifdef PADDLE_WITH_XPU
template struct SetConstant<paddle::platform::XPUDeviceContext,
paddle::platform::float16>;
pten::dtype::float16>;
template struct SetConstant<paddle::platform::XPUDeviceContext,
paddle::platform::bfloat16>;
pten::dtype::bfloat16>;
template struct SetConstant<paddle::platform::XPUDeviceContext, float>;
template struct SetConstant<paddle::platform::XPUDeviceContext, double>;
template struct SetConstant<paddle::platform::XPUDeviceContext, uint8_t>;
......@@ -80,17 +79,17 @@ template struct SetConstant<paddle::platform::XPUDeviceContext, int>;
template struct SetConstant<paddle::platform::XPUDeviceContext, int64_t>;
template struct SetConstant<paddle::platform::XPUDeviceContext, bool>;
template struct SetConstant<paddle::platform::XPUDeviceContext,
paddle::platform::complex<float>>;
pten::dtype::complex<float>>;
template struct SetConstant<paddle::platform::XPUDeviceContext,
paddle::platform::complex<double>>;
pten::dtype::complex<double>>;
#endif
#define DEFINE_CPU_TRANS(RANK) \
template struct Transpose<paddle::platform::CPUDeviceContext, \
paddle::platform::float16, \
pten::dtype::float16, \
RANK>; \
template struct Transpose<paddle::platform::CPUDeviceContext, \
paddle::platform::bfloat16, \
pten::dtype::bfloat16, \
RANK>; \
template struct Transpose<paddle::platform::CPUDeviceContext, float, RANK>; \
template struct Transpose<paddle::platform::CPUDeviceContext, double, RANK>; \
......@@ -107,10 +106,26 @@ template struct SetConstant<paddle::platform::XPUDeviceContext,
RANK>; \
template struct Transpose<paddle::platform::CPUDeviceContext, int8_t, RANK>; \
template struct Transpose<paddle::platform::CPUDeviceContext, \
paddle::platform::complex<float>, \
pten::dtype::complex<float>, \
RANK>; \
template struct Transpose<paddle::platform::CPUDeviceContext, \
paddle::platform::complex<double>, \
pten::dtype::complex<double>, \
RANK>; \
template struct Transpose<pten::CPUContext, pten::dtype::float16, RANK>; \
template struct Transpose<pten::CPUContext, pten::dtype::bfloat16, RANK>; \
template struct Transpose<pten::CPUContext, float, RANK>; \
template struct Transpose<pten::CPUContext, double, RANK>; \
template struct Transpose<pten::CPUContext, int, RANK>; \
template struct Transpose<pten::CPUContext, int64_t, RANK>; \
template struct Transpose<pten::CPUContext, bool, RANK>; \
template struct Transpose<pten::CPUContext, int16_t, RANK>; \
template struct Transpose<pten::CPUContext, uint8_t, RANK>; \
template struct Transpose<pten::CPUContext, int8_t, RANK>; \
template struct Transpose<pten::CPUContext, \
pten::dtype::complex<float>, \
RANK>; \
template struct Transpose<pten::CPUContext, \
pten::dtype::complex<double>, \
RANK>;
DEFINE_CPU_TRANS(1);
......@@ -120,9 +135,9 @@ DEFINE_CPU_TRANS(4);
DEFINE_CPU_TRANS(5);
DEFINE_CPU_TRANS(6);
template <typename T>
struct TransposeNormal<paddle::platform::CPUDeviceContext, T> {
void operator()(const paddle::platform::CPUDeviceContext& context,
template <typename DeviceContext, typename T>
void TransposeNormal<DeviceContext, T>::operator()(
const DeviceContext& context,
const paddle::framework::Tensor& in,
paddle::framework::Tensor* out,
const std::vector<int>& axis) {
......@@ -146,15 +161,15 @@ struct TransposeNormal<paddle::platform::CPUDeviceContext, T> {
}
};
transpose_helper(0, out->numel());
}
};
}
// define transpose normal
#define DEFINE_CPU_TRANS_NORMAL(TYPE) \
template struct TransposeNormal<paddle::platform::CPUDeviceContext, TYPE>
template struct TransposeNormal<paddle::platform::CPUDeviceContext, TYPE>; \
template struct TransposeNormal<pten::CPUContext, TYPE>
DEFINE_CPU_TRANS_NORMAL(paddle::platform::float16);
DEFINE_CPU_TRANS_NORMAL(paddle::platform::bfloat16);
DEFINE_CPU_TRANS_NORMAL(pten::dtype::float16);
DEFINE_CPU_TRANS_NORMAL(pten::dtype::bfloat16);
DEFINE_CPU_TRANS_NORMAL(float);
DEFINE_CPU_TRANS_NORMAL(double);
DEFINE_CPU_TRANS_NORMAL(int);
......@@ -163,8 +178,8 @@ DEFINE_CPU_TRANS_NORMAL(bool);
DEFINE_CPU_TRANS_NORMAL(int16_t);
DEFINE_CPU_TRANS_NORMAL(uint8_t);
DEFINE_CPU_TRANS_NORMAL(int8_t);
DEFINE_CPU_TRANS_NORMAL(paddle::platform::complex<float>);
DEFINE_CPU_TRANS_NORMAL(paddle::platform::complex<double>);
DEFINE_CPU_TRANS_NORMAL(pten::dtype::complex<float>);
DEFINE_CPU_TRANS_NORMAL(pten::dtype::complex<double>);
struct TensorSetConstantCPU {
TensorSetConstantCPU(paddle::framework::Tensor* tensor, float value)
......@@ -343,7 +358,7 @@ struct ElementwiseAddTo<paddle::platform::CPUDeviceContext, T> {
};
template struct ElementwiseAddTo<paddle::platform::CPUDeviceContext,
paddle::platform::float16>;
pten::dtype::float16>;
} // namespace funcs
} // namespace pten
paddle/pten/kernels/funcs/math_function.cu
浏览文件 @ c05cd7ed
......@@ -27,13 +27,13 @@ limitations under the License. */
namespace pten {
namespace funcs {
using float16 = paddle::platform::float16;
using bfloat16 = paddle::platform::bfloat16;
using float16 = pten::dtype::float16;
using bfloat16 = pten::dtype::bfloat16;
template struct SetConstant<paddle::platform::CUDADeviceContext,
paddle::platform::float16>;
pten::dtype::float16>;
template struct SetConstant<paddle::platform::CUDADeviceContext,
paddle::platform::bfloat16>;
pten::dtype::bfloat16>;
template struct SetConstant<paddle::platform::CUDADeviceContext, float>;
template struct SetConstant<paddle::platform::CUDADeviceContext, double>;
template struct SetConstant<paddle::platform::CUDADeviceContext, uint8_t>;
......@@ -42,12 +42,12 @@ template struct SetConstant<paddle::platform::CUDADeviceContext, int16_t>;
template struct SetConstant<paddle::platform::CUDADeviceContext, int64_t>;
template struct SetConstant<paddle::platform::CUDADeviceContext, bool>;
template struct SetConstant<paddle::platform::CUDADeviceContext,
paddle::platform::complex<float>>;
pten::dtype::complex<float>>;
template struct SetConstant<paddle::platform::CUDADeviceContext,
paddle::platform::complex<double>>;
pten::dtype::complex<double>>;
template struct SetConstant<pten::GPUContext, paddle::platform::float16>;
template struct SetConstant<pten::GPUContext, paddle::platform::bfloat16>;
template struct SetConstant<pten::GPUContext, pten::dtype::float16>;
template struct SetConstant<pten::GPUContext, pten::dtype::bfloat16>;
template struct SetConstant<pten::GPUContext, float>;
template struct SetConstant<pten::GPUContext, double>;
template struct SetConstant<pten::GPUContext, uint8_t>;
......@@ -55,14 +55,13 @@ template struct SetConstant<pten::GPUContext, int>;
template struct SetConstant<pten::GPUContext, int16_t>;
template struct SetConstant<pten::GPUContext, int64_t>;
template struct SetConstant<pten::GPUContext, bool>;
template struct SetConstant<pten::GPUContext, paddle::platform::complex<float>>;
template struct SetConstant<pten::GPUContext,
paddle::platform::complex<double>>;
template struct SetConstant<pten::GPUContext, pten::dtype::complex<float>>;
template struct SetConstant<pten::GPUContext, pten::dtype::complex<double>>;
template struct SetConstant<paddle::platform::CUDAPinnedDeviceContext,
paddle::platform::float16>;
pten::dtype::float16>;
template struct SetConstant<paddle::platform::CUDAPinnedDeviceContext,
paddle::platform::bfloat16>;
pten::dtype::bfloat16>;
template struct SetConstant<paddle::platform::CUDAPinnedDeviceContext, float>;
template struct SetConstant<paddle::platform::CUDAPinnedDeviceContext, double>;
template struct SetConstant<paddle::platform::CUDAPinnedDeviceContext, uint8_t>;
......@@ -71,9 +70,9 @@ template struct SetConstant<paddle::platform::CUDAPinnedDeviceContext, int16_t>;
template struct SetConstant<paddle::platform::CUDAPinnedDeviceContext, int64_t>;
template struct SetConstant<paddle::platform::CUDAPinnedDeviceContext, bool>;
template struct SetConstant<paddle::platform::CUDAPinnedDeviceContext,
paddle::platform::complex<float>>;
pten::dtype::complex<float>>;
template struct SetConstant<paddle::platform::CUDAPinnedDeviceContext,
paddle::platform::complex<double>>;
pten::dtype::complex<double>>;
#define DEFINE_GPU_TRANS(RANK) \
template struct Transpose<paddle::platform::CUDADeviceContext, bool, RANK>; \
......@@ -97,10 +96,24 @@ template struct SetConstant<paddle::platform::CUDAPinnedDeviceContext,
int64_t, \
RANK>; \
template struct Transpose<paddle::platform::CUDADeviceContext, \
paddle::platform::complex<float>, \
pten::dtype::complex<float>, \
RANK>; \
template struct Transpose<paddle::platform::CUDADeviceContext, \
paddle::platform::complex<double>, \
pten::dtype::complex<double>, \
RANK>; \
template struct Transpose<pten::GPUContext, bool, RANK>; \
template struct Transpose<pten::GPUContext, float, RANK>; \
template struct Transpose<pten::GPUContext, double, RANK>; \
template struct Transpose<pten::GPUContext, float16, RANK>; \
template struct Transpose<pten::GPUContext, bfloat16, RANK>; \
template struct Transpose<pten::GPUContext, int8_t, RANK>; \
template struct Transpose<pten::GPUContext, int32_t, RANK>; \
template struct Transpose<pten::GPUContext, int64_t, RANK>; \
template struct Transpose<pten::GPUContext, \
pten::dtype::complex<float>, \
RANK>; \
template struct Transpose<pten::GPUContext, \
pten::dtype::complex<double>, \
RANK>;
DEFINE_GPU_TRANS(1);
......@@ -133,9 +146,9 @@ __global__ void TransposeNormalKernel(const T* in_ptr,
}
}
template <typename T>
struct TransposeNormal<paddle::platform::CUDADeviceContext, T> {
void operator()(const paddle::platform::CUDADeviceContext& context,
template <typename DeviceContext, typename T>
void TransposeNormal<DeviceContext, T>::operator()(
const DeviceContext& context,
const paddle::framework::Tensor& in,
paddle::framework::Tensor* out,
const std::vector<int>& axis) {
......@@ -165,8 +178,7 @@ struct TransposeNormal<paddle::platform::CUDADeviceContext, T> {
REINTERPRET(const int64_t, axis_ptr, cuda_buf + 2 * rank);
const int MAX_BLOCK_DIM = context.GetMaxThreadsPerBlock();
const int MAX_GRID_DIM =
context.GetMaxPhysicalThreadCount() / MAX_BLOCK_DIM;
const int MAX_GRID_DIM = context.GetMaxPhysicalThreadCount() / MAX_BLOCK_DIM;
int64_t elements = in.numel();
int block_size = (elements >= MAX_BLOCK_DIM)
? MAX_BLOCK_DIM
......@@ -174,19 +186,13 @@ struct TransposeNormal<paddle::platform::CUDADeviceContext, T> {
int grid_size = elements / block_size;
grid_size = (grid_size >= MAX_GRID_DIM) ? MAX_GRID_DIM : grid_size;
TransposeNormalKernel<T><<<grid_size, block_size, 0, context.stream()>>>(
in_ptr,
out_ptr,
elements,
in_stride_ptr,
out_stride_ptr,
axis_ptr,
rank);
}
};
in_ptr, out_ptr, elements, in_stride_ptr, out_stride_ptr, axis_ptr, rank);
}
// define transpose normal
#define DEFINE_GPU_TRANS_NORMAL(TYPE) \
template struct TransposeNormal<paddle::platform::CUDADeviceContext, TYPE>
template struct TransposeNormal<paddle::platform::CUDADeviceContext, TYPE>; \
template struct TransposeNormal<pten::GPUContext, TYPE>
DEFINE_GPU_TRANS_NORMAL(float16);
DEFINE_GPU_TRANS_NORMAL(bfloat16);
......@@ -198,8 +204,8 @@ DEFINE_GPU_TRANS_NORMAL(bool);
DEFINE_GPU_TRANS_NORMAL(int16_t);
DEFINE_GPU_TRANS_NORMAL(uint8_t);
DEFINE_GPU_TRANS_NORMAL(int8_t);
DEFINE_GPU_TRANS_NORMAL(paddle::platform::complex<float>);
DEFINE_GPU_TRANS_NORMAL(paddle::platform::complex<double>);
DEFINE_GPU_TRANS_NORMAL(pten::dtype::complex<float>);
DEFINE_GPU_TRANS_NORMAL(pten::dtype::complex<double>);
struct TensorSetConstantGPU {
TensorSetConstantGPU(const paddle::platform::DeviceContext& context,
......@@ -374,7 +380,7 @@ struct ElementwiseAddTo<paddle::platform::CUDADeviceContext, T> {
};
template struct ElementwiseAddTo<paddle::platform::CUDADeviceContext,
paddle::platform::float16>;
pten::dtype::float16>;
} // namespace funcs
} // namespace pten
paddle/pten/kernels/funcs/transpose.cc 已删除 100644 → 0
浏览文件 @ 9f99b591
// 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/kernels/funcs/transpose.h"
#include "paddle/pten/backends/cpu/cpu_context.h"
#include "paddle/pten/core/ddim.h"
#include "paddle/pten/core/dense_tensor.h"
// See Note [ Why still include the fluid headers? ]
#include "paddle/pten/common/bfloat16.h"
#include "paddle/pten/common/complex.h"
#include "paddle/pten/common/float16.h"
namespace pten {
namespace math {
template <typename T>
struct TransposeNormal<CPUContext, T> {
// for dims >= 7 situation
void operator()(const CPUContext& dev_ctx,
const pten::DenseTensor& in,
pten::DenseTensor* out,
const std::vector<int64_t>& axis) {
const int rank = axis.size();
auto in_stride = pten::framework::stride(in.dims());
auto out_stride = pten::framework::stride(out->dims());
const T* in_ptr = in.data<T>();
T* out_ptr = dev_ctx.template Alloc<T>(out);
auto transpose_helper = [&](int64_t beg, int64_t end) {
for (int64_t out_idx = beg; out_idx < end; ++out_idx) {
int64_t in_idx = 0;
int64_t tmp_idx = out_idx;
// calculate the input index
for (int i = 0; i < rank; ++i) {
const int64_t coordinate = tmp_idx / out_stride[i];
tmp_idx -= coordinate * out_stride[i];
in_idx += coordinate * in_stride[axis[i]];
}
out_ptr[out_idx] = in_ptr[in_idx];
}
};
transpose_helper(0, out->numel());
}
};
// define transpose normal
#define DEFINE_CPU_TRANS_NORMAL(TYPE) \
template struct TransposeNormal<CPUContext, TYPE>
DEFINE_CPU_TRANS_NORMAL(bool);
DEFINE_CPU_TRANS_NORMAL(int8_t);
DEFINE_CPU_TRANS_NORMAL(uint8_t);
DEFINE_CPU_TRANS_NORMAL(int16_t);
DEFINE_CPU_TRANS_NORMAL(int32_t);
DEFINE_CPU_TRANS_NORMAL(int64_t);
DEFINE_CPU_TRANS_NORMAL(float);
DEFINE_CPU_TRANS_NORMAL(double);
DEFINE_CPU_TRANS_NORMAL(paddle::platform::float16);
DEFINE_CPU_TRANS_NORMAL(paddle::platform::bfloat16);
DEFINE_CPU_TRANS_NORMAL(paddle::platform::complex<float>);
DEFINE_CPU_TRANS_NORMAL(paddle::platform::complex<double>);
} // namespace math
} // namespace pten
paddle/pten/kernels/funcs/transpose.cu 已删除 100644 → 0
浏览文件 @ 9f99b591
// 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/memory/malloc.h"
#include "paddle/fluid/memory/memcpy.h"
#include "paddle/pten/backends/gpu/gpu_context.h"
#include "paddle/pten/core/ddim.h"
#include "paddle/pten/core/dense_tensor.h"
#include "paddle/pten/kernels/funcs/transpose.h"
// See Note [ Why still include the fluid headers? ]
#include "paddle/pten/common/bfloat16.h"
#include "paddle/pten/common/complex.h"
#include "paddle/pten/common/float16.h"
namespace pten {
namespace math {
#define REINTERPRET(T, DST_PTR, SRC_PTR) \
T* DST_PTR = reinterpret_cast<T*>(SRC_PTR)
template <typename T>
__global__ void TransposeNormalKernel(const T* in_ptr,
T* out_ptr,
int64_t element,
const int64_t* in_stride_ptr,
const int64_t* out_stride_ptr,
const int64_t* axis_ptr,
int rank) {
CUDA_KERNEL_LOOP(out_idx, element) {
int64_t in_idx = 0;
int64_t tmp_idx = out_idx;
for (int i = 0; i < rank; ++i) {
const int64_t coordinate = tmp_idx / out_stride_ptr[i];
tmp_idx -= coordinate * out_stride_ptr[i];
in_idx += coordinate * in_stride_ptr[axis_ptr[i]];
}
out_ptr[out_idx] = in_ptr[in_idx];
}
}
template <typename T>
struct TransposeNormal<GPUContext, T> {
// for dims >= 7 situation
void operator()(const GPUContext& dev_ctx,
const pten::DenseTensor& in,
pten::DenseTensor* out,
const std::vector<int64_t>& axis) {
const int rank = axis.size();
auto in_stride = pten::framework::stride(in.dims());
auto out_stride = pten::framework::stride(out->dims());
auto* in_ptr = in.data<T>();
T* out_ptr = dev_ctx.template Alloc<T>(out);
// copy in_stride, out_stride, axis to gpu device
const paddle::platform::CUDAPlace& cuda_place = dev_ctx.GetPlace();
paddle::platform::CPUPlace cpu_place = paddle::platform::CPUPlace();
size_t size = 3 * rank * sizeof(int64_t);
auto cpu_buf_holder = paddle::memory::Alloc(cpu_place, size);
auto cuda_buf_holder = paddle::memory::Alloc(cuda_place, size);
REINTERPRET(int64_t, cpu_buf, cpu_buf_holder->ptr());
REINTERPRET(int64_t, cuda_buf, cuda_buf_holder->ptr());
for (int i = 0; i < rank; ++i) {
cpu_buf[i] = in_stride[i];
cpu_buf[rank + i] = out_stride[i];
cpu_buf[2 * rank + i] = axis[i];
}
paddle::memory::Copy(
cuda_place, cuda_buf, cpu_place, cpu_buf, size, dev_ctx.stream());
REINTERPRET(const int64_t, in_stride_ptr, cuda_buf);
REINTERPRET(const int64_t, out_stride_ptr, cuda_buf + rank);
REINTERPRET(const int64_t, axis_ptr, cuda_buf + 2 * rank);
const int MAX_BLOCK_DIM = dev_ctx.GetMaxThreadsPerBlock();
const int MAX_GRID_DIM =
dev_ctx.GetMaxPhysicalThreadCount() / MAX_BLOCK_DIM;
int64_t elements = in.numel();
int block_size = (elements >= MAX_BLOCK_DIM)
? MAX_BLOCK_DIM
: (1 << static_cast<int>(std::log2(elements)));
int grid_size = elements / block_size;
grid_size = (grid_size >= MAX_GRID_DIM) ? MAX_GRID_DIM : grid_size;
TransposeNormalKernel<T><<<grid_size, block_size, 0, dev_ctx.stream()>>>(
in_ptr,
out_ptr,
elements,
in_stride_ptr,
out_stride_ptr,
axis_ptr,
rank);
}
};
// define transpose normal
#define DEFINE_GPU_TRANS_NORMAL(TYPE) \
template struct TransposeNormal<GPUContext, TYPE>
DEFINE_GPU_TRANS_NORMAL(bool);
DEFINE_GPU_TRANS_NORMAL(int8_t);
DEFINE_GPU_TRANS_NORMAL(uint8_t);
DEFINE_GPU_TRANS_NORMAL(int16_t);
DEFINE_GPU_TRANS_NORMAL(int32_t);
DEFINE_GPU_TRANS_NORMAL(int64_t);
DEFINE_GPU_TRANS_NORMAL(float);
DEFINE_GPU_TRANS_NORMAL(double);
DEFINE_GPU_TRANS_NORMAL(paddle::platform::float16);
DEFINE_GPU_TRANS_NORMAL(paddle::platform::bfloat16);
DEFINE_GPU_TRANS_NORMAL(paddle::platform::complex<float>);
DEFINE_GPU_TRANS_NORMAL(paddle::platform::complex<double>);
} // namespace math
} // namespace pten
paddle/pten/kernels/funcs/transpose.h 已删除 100644 → 0
浏览文件 @ 9f99b591
// 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/core/ddim.h"
#include "paddle/pten/core/dense_tensor.h"
#include "paddle/fluid/operators/eigen/eigen_function.h"
#include "paddle/pten/kernels/funcs/eigen/common.h"
namespace pten {
namespace math {
template <typename DeviceContext, typename T>
struct TransposeNormal {
// for dims >= 7 situation
void operator()(const DeviceContext& dev_ctx,
const pten::DenseTensor& in,
pten::DenseTensor* out,
const std::vector<int64_t>& axis);
};
template <typename DeviceContext, typename T, int Rank>
struct Transpose {
void operator()(const DeviceContext& dev_ctx,
const DenseTensor& in,
DenseTensor* out,
const std::vector<int>& axis) {
Eigen::array<int, Rank> permute;
for (int i = 0; i < Rank; i++) {
permute[i] = axis[i];
}
auto eigen_in = pten::EigenTensor<T, Rank>::From(in);
auto eigen_out = pten::EigenTensor<T, Rank>::From(*out);
auto* dev = dev_ctx.eigen_device();
// use 32bit index to speed up computation
bool use_32bit_index = eigen_out.size() < Eigen::NumTraits<int>::highest();
bool is_gpu_place = paddle::platform::is_gpu_place(dev_ctx.GetPlace());
if (use_32bit_index && is_gpu_place) {
To32BitIndex(eigen_out).device(*dev) =
To32BitIndex(eigen_in).shuffle(permute);
} else {
eigen_out.device(*dev) = eigen_in.shuffle(permute);
}
}
};
} // namespace math
} // namespace pten
paddle/pten/kernels/gpu/cast_kernel.cu
浏览文件 @ c05cd7ed
......@@ -72,16 +72,16 @@ void CastKernel(const Context& dev_ctx,
int16_t, \
bool, \
uint8_t, \
paddle::platform::float16, \
paddle::platform::complex<float>, \
paddle::platform::complex<double>, \
pten::dtype::float16, \
pten::dtype::complex<float>, \
pten::dtype::complex<double>, \
##__VA_ARGS__) { \
kernel->OutputAt(0).SetDataType( \
paddle::experimental::DataType::UNDEFINED); \
}
#if !defined(PADDLE_WITH_HIP)
PTEN_REGISTER_CAST_CUDA_BASE_TYPE(cast, paddle::platform::bfloat16)
PTEN_REGISTER_CAST_CUDA_BASE_TYPE(cast, pten::dtype::bfloat16)
#else
PTEN_REGISTER_CAST_CUDA_BASE_TYPE(cast)
#endif
paddle/pten/kernels/gpu/complex_kernel.cu
浏览文件 @ c05cd7ed
......@@ -25,9 +25,9 @@ PT_REGISTER_KERNEL(conj,
GPU,
ALL_LAYOUT,
pten::ConjKernel,
paddle::platform::float16,
paddle::platform::complex<float>,
paddle::platform::complex<double>,
pten::dtype::float16,
pten::dtype::complex<float>,
pten::dtype::complex<double>,
float,
double,
int,
......
paddle/pten/kernels/gpu/concat_kernel.cu
浏览文件 @ c05cd7ed
......@@ -120,7 +120,7 @@ PT_REGISTER_KERNEL(concat,
int64_t,
int,
uint8_t,
paddle::platform::float16,
paddle::platform::bfloat16,
paddle::platform::complex<float>,
paddle::platform::complex<double>) {}
pten::dtype::float16,
pten::dtype::bfloat16,
pten::dtype::complex<float>,
pten::dtype::complex<double>) {}
paddle/pten/kernels/gpu/dot_grad_kernel.cu
浏览文件 @ c05cd7ed
......@@ -28,5 +28,5 @@ PT_REGISTER_KERNEL(dot_grad,
double,
int,
int64_t,
paddle::platform::complex<float>,
paddle::platform::complex<double>) {}
pten::dtype::complex<float>,
pten::dtype::complex<double>) {}
paddle/pten/kernels/gpu/dot_kernel.cu
浏览文件 @ c05cd7ed
......@@ -49,8 +49,8 @@ void DotKernel(const Context& dev_ctx,
} // namespace pten
using complex64 = ::paddle::platform::complex<float>;
using complex128 = ::paddle::platform::complex<double>;
using complex64 = ::pten::dtype::complex<float>;
using complex128 = ::pten::dtype::complex<double>;
PT_REGISTER_KERNEL(dot,
GPU,
......
paddle/pten/kernels/gpu/elementwise_grad_kernel.cu
浏览文件 @ c05cd7ed
......@@ -128,9 +128,9 @@ PT_REGISTER_KERNEL(add_grad,
double,
int,
int64_t,
paddle::platform::float16,
paddle::platform::complex<float>,
paddle::platform::complex<double>) {}
pten::dtype::float16,
pten::dtype::complex<float>,
pten::dtype::complex<double>) {}
PT_REGISTER_KERNEL(add_double_grad,
GPU,
......@@ -140,9 +140,9 @@ PT_REGISTER_KERNEL(add_double_grad,
double,
int,
int64_t,
paddle::platform::float16,
paddle::platform::complex<float>,
paddle::platform::complex<double>) {}
pten::dtype::float16,
pten::dtype::complex<float>,
pten::dtype::complex<double>) {}
PT_REGISTER_KERNEL(add_triple_grad,
GPU,
......@@ -152,9 +152,9 @@ PT_REGISTER_KERNEL(add_triple_grad,
double,
int,
int64_t,
paddle::platform::float16,
paddle::platform::complex<float>,
paddle::platform::complex<double>) {}
pten::dtype::float16,
pten::dtype::complex<float>,
pten::dtype::complex<double>) {}
PT_REGISTER_KERNEL(subtract_grad,
GPU,
......@@ -164,9 +164,9 @@ PT_REGISTER_KERNEL(subtract_grad,
double,
int,
int64_t,
paddle::platform::float16,
paddle::platform::complex<float>,
paddle::platform::complex<double>) {}
pten::dtype::float16,
pten::dtype::complex<float>,
pten::dtype::complex<double>) {}
PT_REGISTER_KERNEL(subtract_double_grad,
GPU,
......@@ -176,6 +176,6 @@ PT_REGISTER_KERNEL(subtract_double_grad,
double,
int,
int64_t,
paddle::platform::float16,
paddle::platform::complex<float>,
paddle::platform::complex<double>) {}
pten::dtype::float16,
pten::dtype::complex<float>,
pten::dtype::complex<double>) {}
paddle/pten/kernels/gpu/expand_grad_kernel.cu
浏览文件 @ c05cd7ed
......@@ -24,6 +24,6 @@ PT_REGISTER_KERNEL(expand_grad,
pten::ExpandGradKernel,
float,
double,
paddle::platform::float16,
pten::dtype::float16,
int,
int64_t) {}
paddle/pten/kernels/gpu/expand_kernel.cu
浏览文件 @ c05cd7ed
......@@ -25,7 +25,7 @@ PT_REGISTER_KERNEL(expand,
pten::ExpandKernel,
float,
double,
paddle::platform::float16,
pten::dtype::float16,
int,
int64_t,
bool) {}
paddle/pten/kernels/gpu/full_kernel.cu
浏览文件 @ c05cd7ed
......@@ -106,9 +106,9 @@ PT_REGISTER_KERNEL(full,
int,
int64_t,
bool,
paddle::platform::float16,
paddle::platform::complex<float>,
paddle::platform::complex<double>) {}
pten::dtype::float16,
pten::dtype::complex<float>,
pten::dtype::complex<double>) {}
PT_REGISTER_KERNEL(full_like,
GPU,
......@@ -119,4 +119,4 @@ PT_REGISTER_KERNEL(full_like,
int,
int64_t,
bool,
paddle::platform::float16) {}
pten::dtype::float16) {}
paddle/pten/kernels/gpu/math_kernel.cu
浏览文件 @ c05cd7ed
......@@ -91,9 +91,9 @@ DEFINE_CUDA_ELEMENTWISE_OP(Divide)
} // namespace pten
using float16 = paddle::platform::float16;
using complex64 = ::paddle::platform::complex<float>;
using complex128 = ::paddle::platform::complex<double>;
using float16 = pten::dtype::float16;
using complex64 = ::pten::dtype::complex<float>;
using complex128 = ::pten::dtype::complex<double>;
PT_REGISTER_KERNEL(add_raw,
GPU,
......
paddle/pten/kernels/gpu/matmul_grad_kernel.cu
浏览文件 @ c05cd7ed
......@@ -25,10 +25,10 @@ PT_REGISTER_KERNEL(matmul_grad,
pten::MatmulGradKernel,
float,
double,
paddle::platform::float16,
paddle::platform::bfloat16,
paddle::platform::complex<float>,
paddle::platform::complex<double>) {}
pten::dtype::float16,
pten::dtype::bfloat16,
pten::dtype::complex<float>,
pten::dtype::complex<double>) {}
PT_REGISTER_KERNEL(matmul_double_grad,
GPU,
......@@ -36,9 +36,9 @@ PT_REGISTER_KERNEL(matmul_double_grad,
pten::MatmulDoubleGradKernel,
float,
double,
paddle::platform::float16,
paddle::platform::complex<float>,
paddle::platform::complex<double>) {}
pten::dtype::float16,
pten::dtype::complex<float>,
pten::dtype::complex<double>) {}
PT_REGISTER_KERNEL(matmul_triple_grad,
GPU,
......@@ -46,6 +46,6 @@ PT_REGISTER_KERNEL(matmul_triple_grad,
pten::MatmulTripleGradKernel,
float,
double,
paddle::platform::float16,
paddle::platform::complex<float>,
paddle::platform::complex<double>) {}
pten::dtype::float16,
pten::dtype::complex<float>,
pten::dtype::complex<double>) {}
paddle/pten/kernels/gpu/matmul_kernel.cu
浏览文件 @ c05cd7ed
......@@ -26,7 +26,7 @@ PT_REGISTER_KERNEL(matmul,
pten::MatmulKernel,
float,
double,
paddle::platform::float16,
paddle::platform::bfloat16,
paddle::platform::complex<float>,
paddle::platform::complex<double>) {}
pten::dtype::float16,
pten::dtype::bfloat16,
pten::dtype::complex<float>,
pten::dtype::complex<double>) {}
paddle/pten/kernels/gpu/norm_grad_kernel.cu
浏览文件 @ c05cd7ed
......@@ -117,4 +117,4 @@ PT_REGISTER_KERNEL(norm_grad,
pten::NormGradKernel,
float,
double,
paddle::platform::float16) {}
pten::dtype::float16) {}
paddle/pten/kernels/gpu/norm_kernel.cu
浏览文件 @ c05cd7ed
......@@ -130,4 +130,4 @@ PT_REGISTER_KERNEL(norm,
pten::NormKernel,
float,
double,
paddle::platform::float16) {}
pten::dtype::float16) {}
paddle/pten/kernels/gpu/reduce.h
浏览文件 @ c05cd7ed
......@@ -1004,10 +1004,9 @@ template <typename Tx,
typename Ty,
template <typename> class ReduceOp,
typename TransformOp>
static
typename std::enable_if<!std::is_same<Tx, paddle::platform::float16>::value,
static typename std::enable_if<!std::is_same<Tx, pten::dtype::float16>::value,
void>::type
CubTensorReduceImpl(const Tx* x_data,
CubTensorReduceImpl(const Tx* x_data,
Ty* y_data,
const TransformOp& transform,
int reduce_num,
......@@ -1048,10 +1047,9 @@ template <typename Tx,
typename Ty,
template <typename> class ReduceOp,
typename TransformOp>
static
typename std::enable_if<std::is_same<Tx, paddle::platform::float16>::value,
static typename std::enable_if<std::is_same<Tx, pten::dtype::float16>::value,
void>::type
CubTensorReduceImpl(const Tx* x_data,
CubTensorReduceImpl(const Tx* x_data,
Ty* y_data,
const TransformOp& transform,
int reduce_num,
......@@ -1099,7 +1097,7 @@ void TensorReduceImpl(const pten::GPUContext& dev_ctx,
}
config.SetOutputData(y_data, x.place(), &tmp);
constexpr bool kIsTxFP16 = std::is_same<Tx, paddle::platform::float16>::value;
constexpr bool kIsTxFP16 = std::is_same<Tx, pten::dtype::float16>::value;
bool use_cub_reduce = config.reduce_num == numel && !kIsTxFP16;
if (use_cub_reduce) {
CubTensorReduceImpl<Tx, Ty, ReduceOp, TransformOp>(
......
paddle/pten/kernels/gpu/sign_kernel.cu
浏览文件 @ c05cd7ed
......@@ -21,7 +21,7 @@ limitations under the License. */
// See Note [ Why still include the fluid headers? ]
#include "paddle/pten/common/float16.h"
using float16 = paddle::platform::float16;
using float16 = pten::dtype::float16;
PT_REGISTER_KERNEL(
sign, GPU, ALL_LAYOUT, pten::SignKernel, float, double, float16) {}
paddle/pten/kernels/impl/full_kernel_impl.h
浏览文件 @ c05cd7ed
......@@ -47,8 +47,7 @@ void FullLikeKernel(const Context& dev_ctx,
auto value = val.to<float>();
using CommonType = typename std::common_type<
float,
typename std::conditional<
std::is_same<T, paddle::platform::float16>::value,
typename std::conditional<std::is_same<T, pten::dtype::float16>::value,
float,
T>::type>::type;
......
paddle/pten/kernels/impl/matmul_grad_kernel_impl.h
浏览文件 @ c05cd7ed
......@@ -90,7 +90,7 @@ static DenseTensor FoldHeadAndLastDims(const Context& dev_ctx,
DenseTensor output = EmptyLike<T, Context>(dev_ctx, input);
output.Resize({in_dims[1], in_dims[0], in_dims[2]});
std::vector<int> axis = {1, 0, 2};
math::Transpose<Context, T, 3> trans;
funcs::Transpose<Context, T, 3> trans;
trans(dev_ctx, input, &output, axis);
output.Resize({in_dims[1], in_dims[0] * in_dims[2]});
return output;
......
paddle/pten/kernels/math_kernel.cc
浏览文件 @ c05cd7ed
......@@ -78,8 +78,8 @@ void MultiplyKernel(const Context& dev_ctx,
} // namespace pten
using complex64 = ::paddle::platform::complex<float>;
using complex128 = ::paddle::platform::complex<double>;
using complex64 = ::pten::dtype::complex<float>;
using complex128 = ::pten::dtype::complex<double>;
PT_REGISTER_KERNEL(
mean, CPU, ALL_LAYOUT, pten::MeanKernel, float, double, bool) {}
......@@ -91,7 +91,7 @@ PT_REGISTER_KERNEL(sum,
bool,
float,
double,
paddle::platform::float16,
pten::dtype::float16,
int,
int64_t,
complex64,
......@@ -149,7 +149,7 @@ PT_REGISTER_KERNEL(mean,
float,
double,
bool,
paddle::platform::float16) {}
pten::dtype::float16) {}
PT_REGISTER_KERNEL(sum,
GPU,
ALL_LAYOUT,
......@@ -157,7 +157,7 @@ PT_REGISTER_KERNEL(sum,
bool,
float,
double,
paddle::platform::float16,
pten::dtype::float16,
int,
int64_t,
complex64,
......@@ -172,7 +172,7 @@ PT_REGISTER_KERNEL(add,
double,
int,
int64_t,
paddle::platform::float16,
pten::dtype::float16,
complex64,
complex128) {}
PT_REGISTER_KERNEL(subtract,
......@@ -183,7 +183,7 @@ PT_REGISTER_KERNEL(subtract,
double,
int,
int64_t,
paddle::platform::float16,
pten::dtype::float16,
complex64,
complex128) {}
PT_REGISTER_KERNEL(divide,
......@@ -194,7 +194,7 @@ PT_REGISTER_KERNEL(divide,
double,
int,
int64_t,
paddle::platform::float16,
pten::dtype::float16,
complex64,
complex128) {}
PT_REGISTER_KERNEL(multiply,
......@@ -206,7 +206,7 @@ PT_REGISTER_KERNEL(multiply,
int,
int64_t,
bool,
paddle::platform::float16,
pten::dtype::float16,
complex64,
complex128) {}
#endif
paddle/pten/kernels/transfer_layout_kernel.cc
浏览文件 @ c05cd7ed
......@@ -17,7 +17,7 @@ limitations under the License. */
#include "paddle/pten/api/ext/dispatch.h"
#include "paddle/pten/backends/all_context.h"
#include "paddle/pten/core/kernel_registry.h"
#include "paddle/pten/kernels/funcs/transpose.h"
#include "paddle/pten/kernels/funcs/math_function.h"
namespace pten {
......@@ -42,7 +42,7 @@ void CastDataLayout(const Context& dev_ctx,
const DenseTensor& x,
const std::vector<int>& axis,
DenseTensor* out) {
math::Transpose<Context, T, 4> trans4;
funcs::Transpose<Context, T, 4> trans4;
trans4(dev_ctx, x, out, axis);
}
......
paddle/pten/tests/api/scale_api.h
浏览文件 @ c05cd7ed
......@@ -162,7 +162,7 @@ static void ScaleGPU(DataType kernel_dtype,
break;
}
case pten::DataType::FLOAT16: {
pten::ScaleKernel<paddle::platform::float16>(
pten::ScaleKernel<pten::dtype::float16>(
dev_ctx, x, pten::Scalar(scale), bias, bias_after_scale, dense_out);
break;
}
......
paddle/pten/tests/kernels/CMakeLists.txt
浏览文件 @ c05cd7ed
......@@ -13,3 +13,11 @@ cc_test(test_conj_dev_api SRCS test_conj_dev_api.cc DEPS pten pten_api_utils)
cc_test(test_concat_dev_api SRCS test_concat_dev_api.cc DEPS pten pten_api_utils)
cc_test(test_split_dev_api SRCS test_split_dev_api.cc DEPS pten pten_api_utils)
cc_test(test_sparse_utils_dev_api SRCS test_sparse_utils_dev_api.cc DEPS pten pten_api_utils)
cc_test(test_math_function SRCS test_math_function.cc DEPS math_function)
if(WITH_GPU)
nv_test(test_math_function_gpu SRCS test_math_function.cu DEPS math_function)
endif()
if(WITH_ROCM)
hip_test(test_math_function_gpu SRCS test_math_function.cu DEPS math_function)
endif()
paddle/pten/kernels/funcs/math_function_test.cc → paddle/pten/tests/kernels/test_math_function.cc
浏览文件 @ c05cd7ed
......@@ -11,9 +11,13 @@
// 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/kernels/funcs/math_function.h"
#include "gtest/gtest.h"
#include "paddle/fluid/operators/math/blas.h"
#include "paddle/pten/kernels/funcs/math_function.h"
namespace pten {
namespace tests {
template <typename T>
inline paddle::operators::math::BlasT<paddle::platform::CPUDeviceContext, T>
......@@ -348,3 +352,6 @@ TEST(math_function, gemm_warp) {
GemmWarpTest<double>(8, 5, 6, 1.0, 0.0);
GemmWarpTest<double>(8, 5, 6, 2.0, 1.0);
}
} // namespace tests
} // namespace pten
paddle/pten/kernels/funcs/math_function_test.cu → paddle/pten/tests/kernels/test_math_function.cu
浏览文件 @ c05cd7ed
......@@ -11,12 +11,16 @@
// 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 "gtest/gtest.h"
#include "paddle/fluid/operators/math/blas.h"
#include "paddle/fluid/platform/device_context.h"
#include "paddle/pten/kernels/funcs/math_function.h"
void fill_fp16_data(paddle::platform::float16* in_ptr,
namespace pten {
namespace tests {
void fill_fp16_data(pten::dtype::float16* in_ptr,
size_t size,
const std::vector<float>& data) {
PADDLE_ENFORCE_EQ(
......@@ -28,7 +32,7 @@ void fill_fp16_data(paddle::platform::float16* in_ptr,
size,
data.size()));
for (size_t i = 0; i < data.size(); ++i) {
in_ptr[i] = paddle::platform::float16(data[i]);
in_ptr[i] = pten::dtype::float16(data[i]);
}
}
......@@ -95,27 +99,26 @@ TEST(math_function, notrans_mul_trans_fp16) {
return;
}
paddle::platform::float16* input1_ptr =
input1.mutable_data<paddle::platform::float16>({2, 3}, cpu_place);
pten::dtype::float16* input1_ptr =
input1.mutable_data<pten::dtype::float16>({2, 3}, cpu_place);
fill_fp16_data(input1_ptr, input1.numel(), {0, 1, 2, 3, 4, 5});
paddle::framework::TensorCopySync(input1, gpu_place, &input1_gpu);
paddle::framework::TensorCopySync(input1, gpu_place, &input2_gpu);
out_gpu.mutable_data<paddle::platform::float16>({2, 2}, gpu_place);
out_gpu.mutable_data<pten::dtype::float16>({2, 2}, gpu_place);
GetBlas<paddle::platform::float16>(context).MatMul(
input1_gpu,
GetBlas<pten::dtype::float16>(context).MatMul(input1_gpu,
false,
input2_gpu,
true,
paddle::platform::float16(1),
pten::dtype::float16(1),
&out_gpu,
paddle::platform::float16(0));
pten::dtype::float16(0));
paddle::framework::TensorCopySync(out_gpu, cpu_place, &out);
paddle::platform::float16* out_ptr = out.data<paddle::platform::float16>();
pten::dtype::float16* out_ptr = out.data<pten::dtype::float16>();
context.Wait();
EXPECT_EQ(static_cast<float>(out_ptr[0]), 5);
EXPECT_EQ(static_cast<float>(out_ptr[1]), 14);
......@@ -185,27 +188,26 @@ TEST(math_function, trans_mul_notrans_fp16) {
return;
}
paddle::platform::float16* input1_ptr =
input1.mutable_data<paddle::platform::float16>({2, 3}, cpu_place);
pten::dtype::float16* input1_ptr =
input1.mutable_data<pten::dtype::float16>({2, 3}, cpu_place);
fill_fp16_data(input1_ptr, input1.numel(), {0, 1, 2, 3, 4, 5});
paddle::framework::TensorCopySync(input1, gpu_place, &input1_gpu);
paddle::framework::TensorCopySync(input1, gpu_place, &input2_gpu);
out_gpu.mutable_data<paddle::platform::float16>({3, 3}, gpu_place);
out_gpu.mutable_data<pten::dtype::float16>({3, 3}, gpu_place);
GetBlas<paddle::platform::float16>(context).MatMul(
input1_gpu,
GetBlas<pten::dtype::float16>(context).MatMul(input1_gpu,
true,
input2_gpu,
false,
paddle::platform::float16(1),
pten::dtype::float16(1),
&out_gpu,
paddle::platform::float16(0));
pten::dtype::float16(0));
paddle::framework::TensorCopySync(out_gpu, cpu_place, &out);
paddle::platform::float16* out_ptr = out.data<paddle::platform::float16>();
pten::dtype::float16* out_ptr = out.data<pten::dtype::float16>();
context.Wait();
EXPECT_EQ(static_cast<float>(out_ptr[0]), 9);
EXPECT_EQ(static_cast<float>(out_ptr[1]), 12);
......@@ -300,37 +302,37 @@ TEST(math_function, gemm_notrans_cublas_fp16) {
int m = 2;
int n = 3;
int k = 3;
paddle::platform::float16* input1_ptr =
input1.mutable_data<paddle::platform::float16>({2, 3}, cpu_place);
pten::dtype::float16* input1_ptr =
input1.mutable_data<pten::dtype::float16>({2, 3}, cpu_place);
fill_fp16_data(input1_ptr, input1.numel(), {0, 1, 2, 3, 4, 5});
paddle::platform::float16* input2_ptr =
input2.mutable_data<paddle::platform::float16>({3, 4}, cpu_place);
pten::dtype::float16* input2_ptr =
input2.mutable_data<pten::dtype::float16>({3, 4}, cpu_place);
fill_fp16_data(
input2_ptr, input2.numel(), {0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11});
paddle::platform::float16* input3_ptr =
input3.mutable_data<paddle::platform::float16>({2, 4}, cpu_place);
pten::dtype::float16* input3_ptr =
input3.mutable_data<pten::dtype::float16>({2, 4}, cpu_place);
fill_fp16_data(input3_ptr, input3.numel(), {0, 1, 2, 3, 4, 5, 6, 7});
paddle::framework::TensorCopySync(input1, gpu_place, &input1_gpu);
paddle::framework::TensorCopySync(input2, gpu_place, &input2_gpu);
paddle::framework::TensorCopySync(input3, gpu_place, &input3_gpu);
paddle::platform::float16* a = input1_gpu.data<paddle::platform::float16>();
paddle::platform::float16* b = input2_gpu.data<paddle::platform::float16>();
paddle::platform::float16* c =
input3_gpu.mutable_data<paddle::platform::float16>(gpu_place);
pten::dtype::float16* a = input1_gpu.data<pten::dtype::float16>();
pten::dtype::float16* b = input2_gpu.data<pten::dtype::float16>();
pten::dtype::float16* c =
input3_gpu.mutable_data<pten::dtype::float16>(gpu_place);
GetBlas<paddle::platform::float16>(context).GEMM(
GetBlas<pten::dtype::float16>(context).GEMM(
false,
false,
m,
n,
k,
static_cast<paddle::platform::float16>(1),
static_cast<pten::dtype::float16>(1),
a,
3,
b + 1,
4,
static_cast<paddle::platform::float16>(1),
static_cast<pten::dtype::float16>(1),
c + 1,
4);
......@@ -429,37 +431,37 @@ TEST(math_function, gemm_trans_cublas_fp16) {
int m = 2;
int n = 3;
int k = 3;
paddle::platform::float16* input1_ptr =
input1.mutable_data<paddle::platform::float16>({2, 3}, cpu_place);
pten::dtype::float16* input1_ptr =
input1.mutable_data<pten::dtype::float16>({2, 3}, cpu_place);
fill_fp16_data(input1_ptr, input1.numel(), {0, 1, 2, 3, 4, 5});
paddle::platform::float16* input2_ptr =
input2.mutable_data<paddle::platform::float16>({4, 3}, cpu_place);
pten::dtype::float16* input2_ptr =
input2.mutable_data<pten::dtype::float16>({4, 3}, cpu_place);
fill_fp16_data(
input2_ptr, input2.numel(), {0, 4, 8, 1, 5, 9, 2, 6, 10, 3, 7, 11});
paddle::platform::float16* input3_ptr =
input3.mutable_data<paddle::platform::float16>({2, 4}, cpu_place);
pten::dtype::float16* input3_ptr =
input3.mutable_data<pten::dtype::float16>({2, 4}, cpu_place);
fill_fp16_data(input3_ptr, input3.numel(), {0, 1, 2, 3, 4, 5, 6, 7});
paddle::framework::TensorCopySync(input1, gpu_place, &input1_gpu);
paddle::framework::TensorCopySync(input2, gpu_place, &input2_gpu);
paddle::framework::TensorCopySync(input3, gpu_place, &input3_gpu);
paddle::platform::float16* a = input1_gpu.data<paddle::platform::float16>();
paddle::platform::float16* b = input2_gpu.data<paddle::platform::float16>();
paddle::platform::float16* c =
input3_gpu.mutable_data<paddle::platform::float16>(gpu_place);
pten::dtype::float16* a = input1_gpu.data<pten::dtype::float16>();
pten::dtype::float16* b = input2_gpu.data<pten::dtype::float16>();
pten::dtype::float16* c =
input3_gpu.mutable_data<pten::dtype::float16>(gpu_place);
GetBlas<paddle::platform::float16>(context).GEMM(
GetBlas<pten::dtype::float16>(context).GEMM(
false,
true,
m,
n,
k,
static_cast<paddle::platform::float16>(1),
static_cast<pten::dtype::float16>(1),
a,
3,
b + 3,
3,
static_cast<paddle::platform::float16>(1),
static_cast<pten::dtype::float16>(1),
c + 1,
4);
......@@ -547,3 +549,6 @@ TEST(math_function, gemv) {
GemvTest<float>(3, 13, true);
GemvTest<double>(3, 13, true);
}
} // namespace tests
} // namespace pten
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或