mirror/eigen
2
0
Fork 0
mirror of https://gitlab.com/libeigen/eigen.git synced 2025-01-30 17:40:05 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fixed a few compilation warnings triggered by clang

Browse Source
This commit is contained in:
Benoit Steiner 2015-07-29 11:48:38 -07:00
parent 099597406f
commit 0570594f2c
2 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
unsupported/Eigen/CXX11/src/Tensor/TensorIntDiv.h
View File

@ -54,10 +54,15 @@ namespace {
#endif
}
template <typename T>
struct UnsignedTraits {
typedef typename conditional<sizeof(T) == 8, uint64_t, uint32_t>::type type;
};
template <typename T>
struct DividerTraits {
#if defined(__SIZEOF_INT128__) && !defined(__CUDACC__)
typedef typename conditional<sizeof(T) == 8, uint64_t, uint32_t>::type type;
typedef typename UnsignedTraits<T>::type type;
static const int N = sizeof(T) * 8;
#else
typedef uint32_t type;
@ -125,14 +130,14 @@ struct TensorIntDivisor {
// the __uint128_t type.
EIGEN_DEVICE_FUNC EIGEN_STRONG_INLINE TensorIntDivisor(const T divider) {
const int N = DividerTraits<T>::N;
eigen_assert(divider < NumTraits<UnsignedType>::highest()/2);
eigen_assert(static_cast<typename UnsignedTraits<T>::type>(divider) < NumTraits<UnsignedType>::highest()/2);
eigen_assert(divider > 0);
// fast ln2
const int leading_zeros = count_leading_zeros(static_cast<UnsignedType>(divider));
int log_div = N - leading_zeros;
// if divider is a power of two then log_div is 1 more than it should be.
if ((1ull << (log_div-1)) == divider)
if ((static_cast<typename UnsignedTraits<T>::type>(1) << (log_div-1)) == static_cast<typename UnsignedTraits<T>::type>(divider))
log_div--;
multiplier = DividerHelper<N, T>::computeMultiplier(log_div, divider);
@ -143,7 +148,7 @@ struct TensorIntDivisor {
// Must have 0 <= numerator. On platforms that dont support the __uint128_t
// type numerator should also be less than 2^32-1.
EIGEN_DEVICE_FUNC EIGEN_STRONG_INLINE T divide(const T numerator) const {
eigen_assert(numerator < NumTraits<UnsignedType>::highest()/2);
eigen_assert(static_cast<typename UnsignedTraits<T>::type>(numerator) < NumTraits<UnsignedType>::highest()/2);
eigen_assert(numerator >= 0);
UnsignedType t1 = muluh(multiplier, numerator);

8
unsupported/test/cxx11_tensor_intdiv.cpp
View File

@ -69,13 +69,13 @@ void test_unsigned_64bit()
void test_powers_32bit() {
for (int expon = 1; expon < 31; expon++) {
int32_t div = (1ull << expon);
int32_t div = (1 << expon);
for (int num_expon = 0; num_expon < 32; num_expon++) {
int32_t start_num = (1ull << num_expon) - 100;
int32_t end_num = (1ull << num_expon) + 100;
int32_t start_num = (1 << num_expon) - 100;
int32_t end_num = (1 << num_expon) + 100;
if (start_num < 0)
start_num = 0;
for (int64_t num = start_num; num < end_num; num++) {
for (int32_t num = start_num; num < end_num; num++) {
Eigen::internal::TensorIntDivisor<int32_t> divider =
Eigen::internal::TensorIntDivisor<int32_t>(div);
int32_t result = num/div;