m53297601
/
Paddle
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[CustomOp] Remove the dependence of the underlying data types on eigen (#31602)

Browse Source 
* init commit

* move eigen of bfloat16

* add complex header
pull/1/head
Chen Weihang 4 years ago committed by GitHub
parent 9066b74f58
commit 027b574a0e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 357 additions and 322 deletions
Show Stats Download Patch File Download Diff File

1
paddle/fluid/framework/data_type.h
Unescape View File

@ -20,6 +20,7 @@ limitations under the License. */
#include "paddle/fluid/platform/bfloat16.h" #include "paddle/fluid/platform/bfloat16.h"
#include "paddle/fluid/platform/complex128.h" #include "paddle/fluid/platform/complex128.h"
#include "paddle/fluid/platform/complex64.h" #include "paddle/fluid/platform/complex64.h"
#include "paddle/fluid/platform/eigen_ext.h"
#include "paddle/fluid/platform/enforce.h" #include "paddle/fluid/platform/enforce.h"
#include "paddle/fluid/platform/float16.h" #include "paddle/fluid/platform/float16.h"

124
paddle/fluid/platform/bfloat16.h
Unescape View File

@ -15,22 +15,26 @@
#pragma once #pragma once
#include <stdint.h> #include <stdint.h>
#include <cstring>
#include <iostream>
#include <limits> #include <limits>
#if !defined(_WIN32) #if !defined(_WIN32)
#define PADDLE_ALIGN(x) __attribute__((aligned(x))) #define PADDLE_ALIGN(x) __attribute__((aligned(x)))
#else #else
#define PADDLE_ALIGN(x) __declspec(align(x)) #define PADDLE_ALIGN(x) __declspec(align(x))
#endif #endif
#include <cstring> #if (defined(__CUDACC__) || defined(__HIPCC__))
#define HOSTDEVICE __host__ __device__
#include "paddle/fluid/platform/hostdevice.h" #define DEVICE __device__
#include "unsupported/Eigen/CXX11/Tensor" #define HOST __host__
#else
namespace Eigen { #define HOSTDEVICE
template <typename T> #define DEVICE
struct NumTraits; #define HOST
} // namespace Eigen #endif
namespace paddle { namespace paddle {
namespace platform { namespace platform {
@ -351,105 +355,3 @@ struct numeric_limits<paddle::platform::bfloat16> {
}; };
} // namespace std } // namespace std
namespace Eigen {
using bfloat16 = paddle::platform::bfloat16;
template <>
struct NumTraits<bfloat16> : GenericNumTraits<bfloat16> {
enum {
IsSigned = true,
IsInteger = false,
IsComplex = false,
RequireInitialization = false
};
HOSTDEVICE static inline bfloat16 epsilon() {
return paddle::platform::raw_uint16_to_bfloat16(0x3400);
}
HOSTDEVICE static inline bfloat16 dummy_precision() {
return bfloat16(1e-5f);
}
HOSTDEVICE static inline bfloat16 highest() {
return paddle::platform::raw_uint16_to_bfloat16(0x7f7f);
}
HOSTDEVICE static inline bfloat16 lowest() {
return paddle::platform::raw_uint16_to_bfloat16(0xff7f);
}
HOSTDEVICE static inline bfloat16 infinity() {
return paddle::platform::raw_uint16_to_bfloat16(0x7f80);
}
HOSTDEVICE static inline bfloat16 quiet_NaN() {
return paddle::platform::raw_uint16_to_bfloat16(0xffc1);
}
};
namespace numext {
template <>
HOSTDEVICE inline bool(isnan)(const bfloat16& a) {
return (paddle::platform::isnan)(a);
}
template <>
HOSTDEVICE inline bool(isinf)(const bfloat16& a) {
return (paddle::platform::isinf)(a);
}
template <>
HOSTDEVICE inline bool(isfinite)(const bfloat16& a) {
return (paddle::platform::isfinite)(a);
}
template <>
HOSTDEVICE inline bfloat16 exp(const bfloat16& a) {
return bfloat16(::expf(static_cast<float>(a)));
}
template <>
HOSTDEVICE inline bfloat16 erf(const bfloat16& a) {
return bfloat16(::erff(static_cast<float>(a)));
}
template <>
HOSTDEVICE inline bfloat16 log(const bfloat16& a) {
return bfloat16(::logf(static_cast<float>(a)));
}
template <>
HOSTDEVICE inline bfloat16 tanh(const bfloat16& a) {
return bfloat16(::tanhf(static_cast<float>(a)));
}
template <>
HOSTDEVICE inline bfloat16 sqrt(const bfloat16& a) {
return bfloat16(::sqrtf(static_cast<float>(a)));
}
template <>
HOSTDEVICE inline bfloat16 ceil(const bfloat16& a) {
return bfloat16(::ceilf(static_cast<float>(a)));
}
template <>
HOSTDEVICE inline bfloat16 floor(const bfloat16& a) {
return bfloat16(::floorf(static_cast<float>(a)));
}
template <>
HOSTDEVICE inline bfloat16 round(const bfloat16& a) {
return bfloat16(::roundf(static_cast<float>(a)));
}
template <>
HOSTDEVICE inline bfloat16 pow(const bfloat16& a, const bfloat16& b) {
return bfloat16(::powf(static_cast<float>(a), static_cast<float>(b)));
}
template <>
HOSTDEVICE inline bfloat16 abs(const bfloat16& a) {
return bfloat16(::fabs(static_cast<float>(a)));
}
} // namespace numext
} // namespace Eigen

1
paddle/fluid/platform/bfloat16_test.cc
Unescape View File

@ -10,6 +10,7 @@ See the License for the specific language governing permissions and
limitations under the License. */ limitations under the License. */
#include "paddle/fluid/platform/bfloat16.h" #include "paddle/fluid/platform/bfloat16.h"
#include "paddle/fluid/platform/eigen_ext.h"
#define GLOG_NO_ABBREVIATED_SEVERITIES // msvc conflict logging with windows.h #define GLOG_NO_ABBREVIATED_SEVERITIES // msvc conflict logging with windows.h
#include "gtest/gtest.h" #include "gtest/gtest.h"

122
paddle/fluid/platform/complex128.h
Unescape View File

@ -16,12 +16,10 @@
#include <stdint.h> #include <stdint.h>
#include <complex>
#include <cstring>
#include <iostream>
#include <limits> #include <limits>
#if !defined(_WIN32)
#define PADDLE_ALIGN(x) __attribute__((aligned(x)))
#else
#define PADDLE_ALIGN(x) __declspec(align(x))
#endif
#ifdef PADDLE_WITH_CUDA #ifdef PADDLE_WITH_CUDA
#include <cuComplex.h> #include <cuComplex.h>
@ -33,15 +31,21 @@
#include <thrust/complex.h> // NOLINT #include <thrust/complex.h> // NOLINT
#endif #endif
#include <cstring> #if !defined(_WIN32)
#define PADDLE_ALIGN(x) __attribute__((aligned(x)))
#include "paddle/fluid/platform/hostdevice.h" #else
#include "unsupported/Eigen/CXX11/Tensor" #define PADDLE_ALIGN(x) __declspec(align(x))
#endif
namespace Eigen { #if (defined(__CUDACC__) || defined(__HIPCC__))
template <typename T> #define HOSTDEVICE __host__ __device__
struct NumTraits; #define DEVICE __device__
} // namespace Eigen #define HOST __host__
#else
#define HOSTDEVICE
#define DEVICE
#define HOST
#endif
namespace paddle { namespace paddle {
namespace platform { namespace platform {
@ -509,97 +513,5 @@ struct numeric_limits<paddle::platform::complex128> {
}; };
} // namespace std } // namespace std
namespace Eigen {
using complex128 = paddle::platform::complex128;
template <>
struct NumTraits<complex128> : GenericNumTraits<std::complex<double>> {
typedef double Real;
typedef typename NumTraits<double>::Literal Literal;
enum {
IsComplex = 1,
RequireInitialization = NumTraits<double>::RequireInitialization,
ReadCost = 2 * NumTraits<double>::ReadCost,
AddCost = 2 * NumTraits<Real>::AddCost,
MulCost = 4 * NumTraits<Real>::MulCost + 2 * NumTraits<Real>::AddCost
};
EIGEN_DEVICE_FUNC
static inline Real epsilon() { return NumTraits<Real>::epsilon(); }
EIGEN_DEVICE_FUNC
static inline Real dummy_precision() {
return NumTraits<Real>::dummy_precision();
}
EIGEN_DEVICE_FUNC
static inline int digits10() { return NumTraits<Real>::digits10(); }
};
namespace numext {
template <>
HOSTDEVICE inline bool(isnan)(const complex128& a) {
return (paddle::platform::isnan)(a);
}
template <>
HOSTDEVICE inline bool(isinf)(const complex128& a) {
return (paddle::platform::isinf)(a);
}
template <>
HOSTDEVICE inline bool(isfinite)(const complex128& a) {
return (paddle::platform::isfinite)(a);
}
template <>
HOSTDEVICE inline complex128 exp(const complex128& a) {
double com = ::expf(a.real);
double res_real = com * ::cosf(a.imag);
double res_imag = com * ::sinf(a.imag);
return complex128(res_real, res_imag);
}
template <>
HOSTDEVICE inline complex128 log(const complex128& a) {
return paddle::platform::log(a);
}
template <>
HOSTDEVICE inline complex128 tanh(const complex128& a) {
return paddle::platform::tanh(a);
}
template <>
HOSTDEVICE inline complex128 sqrt(const complex128& a) {
return paddle::platform::sqrt(a);
}
template <>
HOSTDEVICE inline complex128 ceil(const complex128& a) {
return complex128(::ceilf(a.real), ::ceilf(a.imag));
}
template <>
HOSTDEVICE inline complex128 floor(const complex128& a) {
return complex128(::floorf(a.real), ::floor(a.imag));
}
template <>
HOSTDEVICE inline complex128 round(const complex128& a) {
return complex128(::roundf(a.real), ::roundf(a.imag));
}
template <>
HOSTDEVICE inline complex128 pow(const complex128& a, const complex128& b) {
return paddle::platform::pow(a, b);
}
template <>
HOSTDEVICE inline double abs(const complex128& a) {
return paddle::platform::abs(a);
}
} // namespace numext
} // namespace Eigen
#define MKL_Complex16 paddle::platform::complex128 #define MKL_Complex16 paddle::platform::complex128

125
paddle/fluid/platform/complex64.h
Unescape View File

@ -15,12 +15,11 @@
#pragma once #pragma once
#include <stdint.h> #include <stdint.h>
#include <complex>
#include <cstring>
#include <iostream>
#include <limits> #include <limits>
#if !defined(_WIN32)
#define PADDLE_ALIGN(x) __attribute__((aligned(x)))
#else
#define PADDLE_ALIGN(x) __declspec(align(x))
#endif
#ifdef PADDLE_WITH_CUDA #ifdef PADDLE_WITH_CUDA
#include <cuComplex.h> #include <cuComplex.h>
@ -32,16 +31,23 @@
#include <thrust/complex.h> // NOLINT #include <thrust/complex.h> // NOLINT
#endif #endif
#include <cstring> #if !defined(_WIN32)
#define PADDLE_ALIGN(x) __attribute__((aligned(x)))
#else
#define PADDLE_ALIGN(x) __declspec(align(x))
#endif
#include "paddle/fluid/platform/complex128.h" #if (defined(__CUDACC__) || defined(__HIPCC__))
#include "paddle/fluid/platform/hostdevice.h" #define HOSTDEVICE __host__ __device__
#include "unsupported/Eigen/CXX11/Tensor" #define DEVICE __device__
#define HOST __host__
#else
#define HOSTDEVICE
#define DEVICE
#define HOST
#endif
namespace Eigen { #include "complex128.h" // NOLINT
template <typename T>
struct NumTraits;
} // namespace Eigen
namespace paddle { namespace paddle {
namespace platform { namespace platform {
@ -510,98 +516,5 @@ struct numeric_limits<paddle::platform::complex64> {
}; };
} // namespace std } // namespace std
namespace Eigen {
using complex64 = paddle::platform::complex64;
template <>
struct NumTraits<complex64> : GenericNumTraits<std::complex<float>> {
typedef float Real;
typedef typename NumTraits<float>::Literal Literal;
enum {
IsComplex = 1,
RequireInitialization = NumTraits<float>::RequireInitialization,
ReadCost = 2 * NumTraits<float>::ReadCost,
AddCost = 2 * NumTraits<Real>::AddCost,
MulCost = 4 * NumTraits<Real>::MulCost + 2 * NumTraits<Real>::AddCost
};
EIGEN_DEVICE_FUNC
static inline Real epsilon() { return NumTraits<Real>::epsilon(); }
EIGEN_DEVICE_FUNC
static inline Real dummy_precision() {
return NumTraits<Real>::dummy_precision();
}
EIGEN_DEVICE_FUNC
static inline int digits10() { return NumTraits<Real>::digits10(); }
};
namespace numext {
template <>
HOSTDEVICE inline bool(isnan)(const complex64& a) {
return (paddle::platform::isnan)(a);
}
template <>
HOSTDEVICE inline bool(isinf)(const complex64& a) {
return (paddle::platform::isinf)(a);
}
template <>
HOSTDEVICE inline bool(isfinite)(const complex64& a) {
return (paddle::platform::isfinite)(a);
}
template <>
HOSTDEVICE inline complex64 exp(const complex64& a) {
float com = ::expf(a.real);
float res_real = com * ::cosf(a.imag);
float res_imag = com * ::sinf(a.imag);
return complex64(res_real, res_imag);
}
template <>
HOSTDEVICE inline complex64 log(const complex64& a) {
return paddle::platform::log(a);
}
template <>
HOSTDEVICE inline complex64 tanh(const complex64& a) {
return paddle::platform::tanh(a);
}
template <>
HOSTDEVICE inline complex64 sqrt(const complex64& a) {
return paddle::platform::sqrt(a);
}
template <>
HOSTDEVICE inline complex64 ceil(const complex64& a) {
return complex64(::ceilf(a.real), ::ceilf(a.imag));
}
template <>
HOSTDEVICE inline complex64 floor(const complex64& a) {
return complex64(::floorf(a.real), ::floor(a.imag));
}
template <>
HOSTDEVICE inline complex64 round(const complex64& a) {
return complex64(::roundf(a.real), ::roundf(a.imag));
}
template <>
HOSTDEVICE inline complex64 pow(const complex64& a, const complex64& b) {
return paddle::platform::pow(a, b);
}
template <>
HOSTDEVICE inline float abs(const complex64& a) {
return paddle::platform::abs(a);
}
} // namespace numext
} // namespace Eigen
#define MKL_Complex8 paddle::platform::complex64 #define MKL_Complex8 paddle::platform::complex64

306
paddle/fluid/platform/eigen_ext.h
View File

File diff suppressed because it is too large Load Diff
Write Preview
Loading…
Cancel
Save