merge my Dynamic -> -1 change

Eigen/src/Core/util/BlasUtil.h

@@ -139,7 +139,7 @@ struct ei_product_blocking_traits
     mr = 2 * PacketSize,
 
     // max cache block size along the K direction
-    Max_kc = 8 * ei_meta_sqrt<EIGEN_TUNE_FOR_CPU_CACHE_SIZE/(64*sizeof(Scalar))>::ret,
+    Max_kc = 4 * ei_meta_sqrt<EIGEN_TUNE_FOR_CPU_CACHE_SIZE/(64*sizeof(Scalar))>::ret,
 
     // max cache block size along the M direction
     Max_mc = 2*Max_kc
@@ -162,7 +162,7 @@ template<typename XprType> struct ei_blas_traits
                      && (  /* Uncomment this when the low-level matrix-vector product functions support strided vectors
                            bool(XprType::IsVectorAtCompileTime)
                          ||  */
-                           int(ei_inner_stride_at_compile_time<XprType>::ret) == 1)
+                           int(ei_inner_stride_at_compile_time<XprType>::ret) <= 1)
                    ) ?  1 : 0
   };
   typedef typename ei_meta_if<bool(HasUsableDirectAccess),

Eigen/src/Core/util/Constants.h

@@ -259,6 +259,8 @@ namespace Architecture
 
 enum { CoeffBasedProductMode, LazyCoeffBasedProductMode, OuterProduct, InnerProduct, GemvProduct, GemmProduct };
 
+enum Action {GetAction, SetAction};
+
 /** The type used to identify a dense storage. */
 struct Dense {};
 

Eigen/src/Core/util/DisableMSVCWarnings.h

@@ -3,7 +3,8 @@
   // 4273 - QtAlignedMalloc, inconsistent DLL linkage
   // 4100 - unreferenced formal parameter (occurred e.g. in aligned_allocator::destroy(pointer p))
   // 4101 - unreferenced local variable
+  // 4324 - structure was padded due to declspec(align())
   // 4512 - assignment operator could not be generated
   #pragma warning( push )
-  #pragma warning( disable : 4100 4101 4181 4244 4127 4211 4273 4512 4522 4717 )
+  #pragma warning( disable : 4100 4101 4181 4244 4127 4211 4273 4324 4512 4522 4717 )
 #endif

Eigen/src/Core/util/ForwardDeclarations.h

@@ -77,6 +77,8 @@ template<typename _DiagonalVectorType> class DiagonalWrapper;
 template<typename _Scalar, int SizeAtCompileTime, int MaxSizeAtCompileTime=SizeAtCompileTime> class DiagonalMatrix;
 template<typename MatrixType, typename DiagonalType, int ProductOrder> class DiagonalProduct;
 template<typename MatrixType, int Index> class Diagonal;
+template<int SizeAtCompileTime, int MaxSizeAtCompileTime = SizeAtCompileTime> class PermutationMatrix;
+template<int SizeAtCompileTime, int MaxSizeAtCompileTime = SizeAtCompileTime> class Transpositions;
 
 template<int InnerStrideAtCompileTime, int OuterStrideAtCompileTime> class Stride;
 template<typename MatrixType, int MapOptions=Unaligned, typename StrideType = Stride<0,0> > class Map;
@@ -158,7 +160,7 @@ template<typename MatrixType> class FullPivHouseholderQR;
 template<typename MatrixType> class SVD;
 template<typename MatrixType, unsigned int Options = 0> class JacobiSVD;
 template<typename MatrixType, int UpLo = Lower> class LLT;
-template<typename MatrixType> class LDLT;
+template<typename MatrixType, int UpLo = Lower> class LDLT;
 template<typename VectorsType, typename CoeffsType, int Side=OnTheLeft> class HouseholderSequence;
 template<typename Scalar>     class PlanarRotation;
 

Eigen/src/Core/util/Macros.h

@@ -98,10 +98,6 @@
 #define EIGEN_DEFAULT_DENSE_INDEX_TYPE std::ptrdiff_t
 #endif
 
-#ifndef EIGEN_DEFAULT_SPARSE_INDEX_TYPE
-#define EIGEN_DEFAULT_SPARSE_INDEX_TYPE int
-#endif
-
 /** Allows to disable some optimizations which might affect the accuracy of the result.
   * Such optimization are enabled by default, and set EIGEN_FAST_MATH to 0 to disable them.
   * They currently include:
@@ -180,6 +176,9 @@
 #define EIGEN_UNUSED
 #endif
 
+// Suppresses 'unused variable' warnings.
+#define EIGEN_UNUSED_VARIABLE(var) (void)var;
+
 #if (defined __GNUC__)
 #define EIGEN_ASM_COMMENT(X)  asm("#"X)
 #else
@@ -269,13 +268,13 @@
 * documentation in a single line.
 **/
 
-#define EIGEN_GENERIC_PUBLIC_INTERFACE_NEW(Derived) \
+#define EIGEN_GENERIC_PUBLIC_INTERFACE(Derived) \
   typedef typename Eigen::ei_traits<Derived>::Scalar Scalar; /*!< \brief Numeric type, e.g. float, double, int or std::complex<float>. */ \
   typedef typename Eigen::NumTraits<Scalar>::Real RealScalar; /*!< \brief The underlying numeric type for composed scalar types. \details In cases where Scalar is e.g. std::complex<T>, T were corresponding to RealScalar. */ \
   typedef typename Base::CoeffReturnType CoeffReturnType; /*!< \brief The return type for coefficient access. \details Depending on whether the object allows direct coefficient access (e.g. for a MatrixXd), this type is either 'const Scalar&' or simply 'Scalar' for objects that do not allow direct coefficient access. */ \
   typedef typename Eigen::ei_nested<Derived>::type Nested; \
   typedef typename Eigen::ei_traits<Derived>::StorageKind StorageKind; \
-  typedef typename Eigen::ei_index<StorageKind>::type Index; \
+  typedef typename Eigen::ei_traits<Derived>::Index Index; \
   enum { RowsAtCompileTime = Eigen::ei_traits<Derived>::RowsAtCompileTime, \
         ColsAtCompileTime = Eigen::ei_traits<Derived>::ColsAtCompileTime, \
         Flags = Eigen::ei_traits<Derived>::Flags, \
@@ -292,7 +291,7 @@
   typedef typename Base::CoeffReturnType CoeffReturnType; /*!< \brief The return type for coefficient access. \details Depending on whether the object allows direct coefficient access (e.g. for a MatrixXd), this type is either 'const Scalar&' or simply 'Scalar' for objects that do not allow direct coefficient access. */ \
   typedef typename Eigen::ei_nested<Derived>::type Nested; \
   typedef typename Eigen::ei_traits<Derived>::StorageKind StorageKind; \
-  typedef typename Eigen::ei_index<StorageKind>::type Index; \
+  typedef typename Eigen::ei_traits<Derived>::Index Index; \
   enum { RowsAtCompileTime = Eigen::ei_traits<Derived>::RowsAtCompileTime, \
         ColsAtCompileTime = Eigen::ei_traits<Derived>::ColsAtCompileTime, \
         MaxRowsAtCompileTime = Eigen::ei_traits<Derived>::MaxRowsAtCompileTime, \

Eigen/src/Core/util/Memory.h

@@ -218,7 +218,7 @@ inline void ei_aligned_free(void *ptr)
 **/
 inline void* ei_aligned_realloc(void *ptr, size_t new_size, size_t old_size)
 {
-  (void)old_size; // Suppress 'unused variable' warning. Seen in boost tee.
+  EIGEN_UNUSED_VARIABLE(old_size);
 
   void *result;
 #if !EIGEN_ALIGN

Eigen/src/Core/util/XprHelper.h

@@ -42,13 +42,14 @@ class ei_no_assignment_operator
     ei_no_assignment_operator& operator=(const ei_no_assignment_operator&);
 };
 
-template<typename StorageKind> struct ei_index {};
+typedef EIGEN_DEFAULT_DENSE_INDEX_TYPE DenseIndex;
 
-template<>
-struct ei_index<Dense>
-{ typedef EIGEN_DEFAULT_DENSE_INDEX_TYPE type; };
-
-typedef ei_index<Dense>::type DenseIndex;
+/** \internal return the index type with the largest number of bits */
+template<typename I1, typename I2>
+struct ei_promote_index_type
+{
+  typedef typename ei_meta_if<(sizeof(I1)<sizeof(I2)), I2, I1>::ret type;
+};
 
 /** \internal If the template parameter Value is Dynamic, this class is just a wrapper around a T variable that
   * can be accessed using value() and setValue().