From 3009d79a1f8d54ed66d1ba8abd0ab873931d77d3 Mon Sep 17 00:00:00 2001 From: Gael Guennebaud Date: Sat, 7 Feb 2009 11:16:15 +0000 Subject: [PATCH] * allow Matrix to be resized to 0 (solve a lot of troubles with some containers) * new workaround for std::vector which is supposed to work for any classes having EIGEN_MAKE_ALIGNED_OPERATOR_NEW as discussed on ML --- Eigen/StdVector | 116 ++++++++++++++++++++++++++++++-- Eigen/src/Core/Matrix.h | 2 - Eigen/src/Core/MatrixStorage.h | 15 ++++- Eigen/src/Core/util/Memory.h | 3 +- Eigen/src/Geometry/Quaternion.h | 4 -- Eigen/src/Geometry/Transform.h | 3 - test/stdvector.cpp | 2 +- 7 files changed, 125 insertions(+), 20 deletions(-) diff --git a/Eigen/StdVector b/Eigen/StdVector index e8b5354ac..a9b76ca86 100644 --- a/Eigen/StdVector +++ b/Eigen/StdVector @@ -1,15 +1,119 @@ #ifndef EIGEN_STDVECTOR_MODULE_H #define EIGEN_STDVECTOR_MODULE_H -#include "Core" -#include +#if defined(_GLIBCXX_VECTOR) || defined(_VECTOR_) +#error you must include Eigen/StdVector before std::vector +#endif + +#define vector std_vector +#include +#undef vector namespace Eigen { -#include "src/StdVector/UnalignedType.h" -} // namespace Eigen + +template class aligned_allocator; + +// meta programming to determine if a class has a given member +struct ei_does_not_have_aligned_operator_new_marker_sizeof {int a[1];}; +struct ei_has_aligned_operator_new_marker_sizeof {int a[2];}; + +template +struct ei_has_aligned_operator_new { + template + static ei_has_aligned_operator_new_marker_sizeof + test(T const *, typename T::ei_operator_new_marker_type const * = 0); + static ei_does_not_have_aligned_operator_new_marker_sizeof + test(...); + + // note that the following indirection is needed for gcc-3.3 + enum {ret = sizeof(test(static_cast(0))) + == sizeof(ei_has_aligned_operator_new_marker_sizeof) }; +}; + +#ifdef _MSVC_VER + + // sometimes, MSVC detects, at compile time, that the argument x + // in std::vector::resize(size_t s,T x) won't be aligned and generate an error + // even if this function is never called. Whence this little wrapper. + #define _EIGEN_WORKAROUND_MSVC_STD_VECTOR(T) Eigen::ei_workaround_msvc_std_vector + template struct ei_workaround_msvc_std_vector : public T + { + inline ei_workaround_msvc_std_vector() : T() {} + inline ei_workaround_msvc_std_vector(const T& other) : T(other) {} + inline operator T& () { return *static_cast(this); } + inline operator const T& () const { return *static_cast(this); } + template + inline T& operator=(const OtherT& other) + { T::operator=(other); return *this; } + inline ei_workaround_msvc_std_vector& operator=(const ei_workaround_msvc_std_vector& other) + { T::operator=(other); return *this; } + }; + +#else + + #define _EIGEN_WORKAROUND_MSVC_STD_VECTOR(T) T + +#endif + +} namespace std { -#include "src/StdVector/StdVector.h" -} // namespace std + +#define EIGEN_STD_VECTOR_SPECIALIZATION_BODY \ + public: \ + typedef T value_type; \ + typedef typename vector_base::allocator_type allocator_type; \ + typedef typename vector_base::size_type size_type; \ + typedef typename vector_base::iterator iterator; \ + explicit vector(const allocator_type& __a = allocator_type()) : vector_base(__a) {} \ + vector(const vector& c) : vector_base(c) {} \ + vector(size_type num, const value_type& val = value_type()) : vector_base(num, val) {} \ + vector(iterator start, iterator end) : vector_base(start, end) {} \ + vector& operator=(const vector& __x) { \ + vector_base::operator=(__x); \ + return *this; \ + } + +template, + bool HasAlignedNew = Eigen::ei_has_aligned_operator_new::ret> +class vector : public std::std_vector +{ + typedef std_vector vector_base; + EIGEN_STD_VECTOR_SPECIALIZATION_BODY +}; + +template +class vector,true> + : public std::std_vector<_EIGEN_WORKAROUND_MSVC_STD_VECTOR(T), + Eigen::aligned_allocator<_EIGEN_WORKAROUND_MSVC_STD_VECTOR(T)> > +{ + typedef std_vector<_EIGEN_WORKAROUND_MSVC_STD_VECTOR(T), + Eigen::aligned_allocator<_EIGEN_WORKAROUND_MSVC_STD_VECTOR(T)> > vector_base; + EIGEN_STD_VECTOR_SPECIALIZATION_BODY + + void resize(size_type __new_size) + { resize(__new_size, T()); } + + #if defined(_GLIBCXX_VECTOR) + void resize(size_type __new_size, const value_type& __x) + { + if (__new_size < vector_base::size()) + vector_base::_M_erase_at_end(this->_M_impl._M_start + __new_size); + else + vector_base::insert(vector_base::end(), __new_size - vector_base::size(), __x); + } + #elif defined(_VECTOR_) + void resize(size_type __new_size, const value_type& __x) + { + if (vector_base::size() < __new_size) + vector_base::_Insert_n(vector_base::end(), __new_size - vector_base::size(), __x); + else if (__new_size < vector_base::size()) + vector_base::erase(vector_base::begin() + __new_size, vector_base::end()); + } + #endif +}; + +} #endif // EIGEN_STDVECTOR_MODULE_H diff --git a/Eigen/src/Core/Matrix.h b/Eigen/src/Core/Matrix.h index 61c38fc59..0b172e97c 100644 --- a/Eigen/src/Core/Matrix.h +++ b/Eigen/src/Core/Matrix.h @@ -226,7 +226,6 @@ class Matrix */ inline void resize(int rows, int cols) { - ei_assert(rows > 0 && cols > 0 && "a matrix cannot be resized to 0 size"); ei_assert((MaxRowsAtCompileTime == Dynamic || MaxRowsAtCompileTime >= rows) && (RowsAtCompileTime == Dynamic || RowsAtCompileTime == rows) && (MaxColsAtCompileTime == Dynamic || MaxColsAtCompileTime >= cols) @@ -240,7 +239,6 @@ class Matrix */ inline void resize(int size) { - ei_assert(size>0 && "a vector cannot be resized to 0 length"); EIGEN_STATIC_ASSERT_VECTOR_ONLY(Matrix) if(RowsAtCompileTime == 1) m_storage.resize(size, 1, size); diff --git a/Eigen/src/Core/MatrixStorage.h b/Eigen/src/Core/MatrixStorage.h index ce656f13b..ba2355b8e 100644 --- a/Eigen/src/Core/MatrixStorage.h +++ b/Eigen/src/Core/MatrixStorage.h @@ -176,7 +176,10 @@ template class ei_matrix_storage(size); + if (size) + m_data = ei_aligned_new(size); + else + m_data = 0; } m_rows = rows; m_cols = cols; @@ -203,7 +206,10 @@ template class ei_matrix_storage(size); + if (size) + m_data = ei_aligned_new(size); + else + m_data = 0; } m_cols = cols; } @@ -229,7 +235,10 @@ template class ei_matrix_storage(size); + if (size) + m_data = ei_aligned_new(size); + else + m_data = 0; } m_rows = rows; } diff --git a/Eigen/src/Core/util/Memory.h b/Eigen/src/Core/util/Memory.h index 8c58debea..5ceeb0dbb 100644 --- a/Eigen/src/Core/util/Memory.h +++ b/Eigen/src/Core/util/Memory.h @@ -247,7 +247,8 @@ inline static int ei_alignmentOffset(const Scalar* ptr, int maxOffset) } \ void operator delete(void * ptr) { Eigen::ei_conditional_aligned_free(ptr); } \ void operator delete[](void * ptr) { Eigen::ei_conditional_aligned_free(ptr); } \ - void *operator new(size_t, void *ptr) throw() { return ptr; } + void *operator new(size_t, void *ptr) throw() { return ptr; } \ + typedef void ei_operator_new_marker_type; #else #define EIGEN_MAKE_ALIGNED_OPERATOR_NEW_IF(NeedsToAlign) #endif diff --git a/Eigen/src/Geometry/Quaternion.h b/Eigen/src/Geometry/Quaternion.h index 37f0d3033..e72ce814f 100644 --- a/Eigen/src/Geometry/Quaternion.h +++ b/Eigen/src/Geometry/Quaternion.h @@ -114,10 +114,6 @@ public: /** Default constructor leaving the quaternion uninitialized. */ inline Quaternion() {} - inline Quaternion(ei_constructor_without_unaligned_array_assert) - : m_coeffs(ei_constructor_without_unaligned_array_assert()) {} - - /** Constructs and initializes the quaternion \f$ w+xi+yj+zk \f$ from * its four coefficients \a w, \a x, \a y and \a z. * diff --git a/Eigen/src/Geometry/Transform.h b/Eigen/src/Geometry/Transform.h index cb5fc2e14..907dc769d 100644 --- a/Eigen/src/Geometry/Transform.h +++ b/Eigen/src/Geometry/Transform.h @@ -100,9 +100,6 @@ public: /** Default constructor without initialization of the coefficients. */ inline Transform() { } - inline Transform(ei_constructor_without_unaligned_array_assert) - : m_matrix(ei_constructor_without_unaligned_array_assert()) {} - inline Transform(const Transform& other) { m_matrix = other.m_matrix; diff --git a/test/stdvector.cpp b/test/stdvector.cpp index 78e65e927..998945a6e 100644 --- a/test/stdvector.cpp +++ b/test/stdvector.cpp @@ -22,8 +22,8 @@ // License and a copy of the GNU General Public License along with // Eigen. If not, see . -#include "main.h" #include +#include "main.h" #include template