mirror of
https://gitlab.com/libeigen/eigen.git
synced 2025-08-05 19:46:07 +08:00
Add missing EIGEN_DEPRECATED annotations to deprecated functions and fix few other doxygen warnings
This commit is contained in:
parent
68a2a8c445
commit
a7b7f3ca8a
@ -235,7 +235,7 @@ DenseBase<Derived>::Constant(const Scalar& value)
|
|||||||
* \sa LinSpaced(Index,Scalar,Scalar), setLinSpaced(Index,const Scalar&,const Scalar&)
|
* \sa LinSpaced(Index,Scalar,Scalar), setLinSpaced(Index,const Scalar&,const Scalar&)
|
||||||
*/
|
*/
|
||||||
template<typename Derived>
|
template<typename Derived>
|
||||||
EIGEN_DEVICE_FUNC EIGEN_STRONG_INLINE const typename DenseBase<Derived>::RandomAccessLinSpacedReturnType
|
EIGEN_DEPRECATED EIGEN_DEVICE_FUNC EIGEN_STRONG_INLINE const typename DenseBase<Derived>::RandomAccessLinSpacedReturnType
|
||||||
DenseBase<Derived>::LinSpaced(Sequential_t, Index size, const Scalar& low, const Scalar& high)
|
DenseBase<Derived>::LinSpaced(Sequential_t, Index size, const Scalar& low, const Scalar& high)
|
||||||
{
|
{
|
||||||
EIGEN_STATIC_ASSERT_VECTOR_ONLY(Derived)
|
EIGEN_STATIC_ASSERT_VECTOR_ONLY(Derived)
|
||||||
@ -247,7 +247,7 @@ DenseBase<Derived>::LinSpaced(Sequential_t, Index size, const Scalar& low, const
|
|||||||
* \sa LinSpaced(Scalar,Scalar)
|
* \sa LinSpaced(Scalar,Scalar)
|
||||||
*/
|
*/
|
||||||
template<typename Derived>
|
template<typename Derived>
|
||||||
EIGEN_DEVICE_FUNC EIGEN_STRONG_INLINE const typename DenseBase<Derived>::RandomAccessLinSpacedReturnType
|
EIGEN_DEPRECATED EIGEN_DEVICE_FUNC EIGEN_STRONG_INLINE const typename DenseBase<Derived>::RandomAccessLinSpacedReturnType
|
||||||
DenseBase<Derived>::LinSpaced(Sequential_t, const Scalar& low, const Scalar& high)
|
DenseBase<Derived>::LinSpaced(Sequential_t, const Scalar& low, const Scalar& high)
|
||||||
{
|
{
|
||||||
EIGEN_STATIC_ASSERT_VECTOR_ONLY(Derived)
|
EIGEN_STATIC_ASSERT_VECTOR_ONLY(Derived)
|
||||||
|
@ -266,7 +266,7 @@ template<typename Derived> class DenseBase
|
|||||||
/** \internal Represents a matrix with all coefficients equal to one another*/
|
/** \internal Represents a matrix with all coefficients equal to one another*/
|
||||||
typedef CwiseNullaryOp<internal::scalar_constant_op<Scalar>,PlainObject> ConstantReturnType;
|
typedef CwiseNullaryOp<internal::scalar_constant_op<Scalar>,PlainObject> ConstantReturnType;
|
||||||
/** \internal \deprecated Represents a vector with linearly spaced coefficients that allows sequential access only. */
|
/** \internal \deprecated Represents a vector with linearly spaced coefficients that allows sequential access only. */
|
||||||
typedef CwiseNullaryOp<internal::linspaced_op<Scalar>,PlainObject> SequentialLinSpacedReturnType;
|
EIGEN_DEPRECATED typedef CwiseNullaryOp<internal::linspaced_op<Scalar>,PlainObject> SequentialLinSpacedReturnType;
|
||||||
/** \internal Represents a vector with linearly spaced coefficients that allows random access. */
|
/** \internal Represents a vector with linearly spaced coefficients that allows random access. */
|
||||||
typedef CwiseNullaryOp<internal::linspaced_op<Scalar>,PlainObject> RandomAccessLinSpacedReturnType;
|
typedef CwiseNullaryOp<internal::linspaced_op<Scalar>,PlainObject> RandomAccessLinSpacedReturnType;
|
||||||
/** \internal the return type of MatrixBase::eigenvalues() */
|
/** \internal the return type of MatrixBase::eigenvalues() */
|
||||||
@ -305,7 +305,7 @@ template<typename Derived> class DenseBase
|
|||||||
* Copies \a other into *this without evaluating other. \returns a reference to *this.
|
* Copies \a other into *this without evaluating other. \returns a reference to *this.
|
||||||
* \deprecated */
|
* \deprecated */
|
||||||
template<typename OtherDerived>
|
template<typename OtherDerived>
|
||||||
EIGEN_DEVICE_FUNC
|
EIGEN_DEPRECATED EIGEN_DEVICE_FUNC
|
||||||
Derived& lazyAssign(const DenseBase<OtherDerived>& other);
|
Derived& lazyAssign(const DenseBase<OtherDerived>& other);
|
||||||
|
|
||||||
EIGEN_DEVICE_FUNC
|
EIGEN_DEVICE_FUNC
|
||||||
|
@ -35,7 +35,7 @@ template<typename Derived> struct EigenBase
|
|||||||
* \deprecated Since Eigen 3.3, its usage is deprecated. Use Eigen::Index instead.
|
* \deprecated Since Eigen 3.3, its usage is deprecated. Use Eigen::Index instead.
|
||||||
* \sa StorageIndex, \ref TopicPreprocessorDirectives.
|
* \sa StorageIndex, \ref TopicPreprocessorDirectives.
|
||||||
*/
|
*/
|
||||||
typedef Eigen::Index Index;
|
EIGEN_DEPRECATED typedef Eigen::Index Index;
|
||||||
|
|
||||||
// FIXME is it needed?
|
// FIXME is it needed?
|
||||||
typedef typename internal::traits<Derived>::StorageKind StorageKind;
|
typedef typename internal::traits<Derived>::StorageKind StorageKind;
|
||||||
|
@ -12,6 +12,7 @@
|
|||||||
#define EIGEN_RESHAPED_H
|
#define EIGEN_RESHAPED_H
|
||||||
|
|
||||||
namespace Eigen {
|
namespace Eigen {
|
||||||
|
namespace internal {
|
||||||
|
|
||||||
/** \class Reshaped
|
/** \class Reshaped
|
||||||
* \ingroup Core_Module
|
* \ingroup Core_Module
|
||||||
@ -43,7 +44,6 @@ namespace Eigen {
|
|||||||
* \sa DenseBase::reshaped(NRowsType,NColsType)
|
* \sa DenseBase::reshaped(NRowsType,NColsType)
|
||||||
*/
|
*/
|
||||||
|
|
||||||
namespace internal {
|
|
||||||
template<typename XprType, int Rows, int Cols, int Order>
|
template<typename XprType, int Rows, int Cols, int Order>
|
||||||
struct traits<Reshaped<XprType, Rows, Cols, Order> > : traits<XprType>
|
struct traits<Reshaped<XprType, Rows, Cols, Order> > : traits<XprType>
|
||||||
{
|
{
|
||||||
|
@ -451,12 +451,12 @@ template<typename _MatrixType, unsigned int _Mode> class TriangularViewImpl<_Mat
|
|||||||
|
|
||||||
/** \deprecated */
|
/** \deprecated */
|
||||||
template<typename OtherDerived>
|
template<typename OtherDerived>
|
||||||
EIGEN_DEVICE_FUNC
|
EIGEN_DEPRECATED EIGEN_DEVICE_FUNC
|
||||||
void lazyAssign(const TriangularBase<OtherDerived>& other);
|
void lazyAssign(const TriangularBase<OtherDerived>& other);
|
||||||
|
|
||||||
/** \deprecated */
|
/** \deprecated */
|
||||||
template<typename OtherDerived>
|
template<typename OtherDerived>
|
||||||
EIGEN_DEVICE_FUNC
|
EIGEN_DEPRECATED EIGEN_DEVICE_FUNC
|
||||||
void lazyAssign(const MatrixBase<OtherDerived>& other);
|
void lazyAssign(const MatrixBase<OtherDerived>& other);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
@ -539,7 +539,7 @@ template<typename _MatrixType, unsigned int _Mode> class TriangularViewImpl<_Mat
|
|||||||
/** \deprecated
|
/** \deprecated
|
||||||
* Shortcut for \code (*this).swap(other.triangularView<(*this)::Mode>()) \endcode */
|
* Shortcut for \code (*this).swap(other.triangularView<(*this)::Mode>()) \endcode */
|
||||||
template<typename OtherDerived>
|
template<typename OtherDerived>
|
||||||
EIGEN_DEVICE_FUNC
|
EIGEN_DEPRECATED EIGEN_DEVICE_FUNC
|
||||||
void swap(MatrixBase<OtherDerived> const & other)
|
void swap(MatrixBase<OtherDerived> const & other)
|
||||||
{
|
{
|
||||||
EIGEN_STATIC_ASSERT_LVALUE(OtherDerived);
|
EIGEN_STATIC_ASSERT_LVALUE(OtherDerived);
|
||||||
|
@ -41,7 +41,7 @@ struct cond<RowMajor> {
|
|||||||
} // namespace
|
} // namespace
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* \class TensorBlockShapeType
|
* \enum TensorBlockShapeType
|
||||||
* \ingroup CXX11_Tensor_Module
|
* \ingroup CXX11_Tensor_Module
|
||||||
*
|
*
|
||||||
* \brief Tensor block shape type.
|
* \brief Tensor block shape type.
|
||||||
|
@ -367,9 +367,16 @@ struct NoOpOutputKernel {
|
|||||||
*/
|
*/
|
||||||
template <typename Index, typename Scalar>
|
template <typename Index, typename Scalar>
|
||||||
EIGEN_ALWAYS_INLINE void operator()(
|
EIGEN_ALWAYS_INLINE void operator()(
|
||||||
const internal::blas_data_mapper<Scalar, Index, ColMajor>& /*output_mapper*/,
|
const internal::blas_data_mapper<Scalar, Index, ColMajor>& output_mapper,
|
||||||
const TensorContractionParams& /*params*/, Index /*i*/,
|
const TensorContractionParams& params, Index i,
|
||||||
Index /*j*/, Index /*num_rows*/, Index /*num_cols*/) const {}
|
Index j, Index num_rows, Index num_cols) const {
|
||||||
|
EIGEN_UNUSED_VARIABLE(output_mapper);
|
||||||
|
EIGEN_UNUSED_VARIABLE(params);
|
||||||
|
EIGEN_UNUSED_VARIABLE(i);
|
||||||
|
EIGEN_UNUSED_VARIABLE(j);
|
||||||
|
EIGEN_UNUSED_VARIABLE(num_rows);
|
||||||
|
EIGEN_UNUSED_VARIABLE(num_cols);
|
||||||
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
template<typename Indices, typename LhsXprType, typename RhsXprType, typename OutputKernelType = const NoOpOutputKernel>
|
template<typename Indices, typename LhsXprType, typename RhsXprType, typename OutputKernelType = const NoOpOutputKernel>
|
||||||
|
@ -177,7 +177,8 @@ class TensorCostModel {
|
|||||||
double threads = (cost - kStartupCycles) / kPerThreadCycles + 0.9;
|
double threads = (cost - kStartupCycles) / kPerThreadCycles + 0.9;
|
||||||
// Make sure we don't invoke undefined behavior when we convert to an int.
|
// Make sure we don't invoke undefined behavior when we convert to an int.
|
||||||
threads = numext::mini<double>(threads, GenericNumTraits<int>::highest());
|
threads = numext::mini<double>(threads, GenericNumTraits<int>::highest());
|
||||||
return numext::mini(max_threads, numext::maxi<int>(1, threads));
|
return numext::mini(max_threads,
|
||||||
|
numext::maxi<int>(1, static_cast<int>(threads)));
|
||||||
}
|
}
|
||||||
|
|
||||||
// taskSize assesses parallel task size.
|
// taskSize assesses parallel task size.
|
||||||
|
Loading…
x
Reference in New Issue
Block a user