Pulled latest updates from trunk

This commit is contained in:
Benoit Steiner 2015-03-16 13:25:45 -07:00
commit 25664afacd
2 changed files with 2 additions and 1 deletions

View File

@ -61,6 +61,7 @@
#pragma GCC optimize ("-fno-ipa-cp-clone") #pragma GCC optimize ("-fno-ipa-cp-clone")
#endif #endif
#include <stdint.h>
#include <complex> #include <complex>
// this include file manages BLAS and MKL related macros // this include file manages BLAS and MKL related macros

View File

@ -59,7 +59,7 @@ struct LookupBlockingSizesFromTableImpl<LhsScalar, RhsScalar, true>
using std::max; using std::max;
typedef BlockingSizesLookupTable<LhsScalar, RhsScalar> Table; typedef BlockingSizesLookupTable<LhsScalar, RhsScalar> Table;
const uint16_t minsize = Table::BaseSize; const uint16_t minsize = Table::BaseSize;
const uint16_t maxsize = minsize << (Table::NumSizes + 1); const uint16_t maxsize = minsize << (Table::NumSizes - 1);
const uint16_t k_clamped = max<uint16_t>(minsize, min<Index>(k, maxsize)); const uint16_t k_clamped = max<uint16_t>(minsize, min<Index>(k, maxsize));
const uint16_t m_clamped = max<uint16_t>(minsize, min<Index>(m, maxsize)); const uint16_t m_clamped = max<uint16_t>(minsize, min<Index>(m, maxsize));
const uint16_t n_clamped = max<uint16_t>(minsize, min<Index>(n, maxsize)); const uint16_t n_clamped = max<uint16_t>(minsize, min<Index>(n, maxsize));