mirror of
https://gitlab.com/libeigen/eigen.git
synced 2026-04-10 11:34:33 +08:00
Add missing EIGEN_DEPRECATED annotations to deprecated functions and fix few other doxygen warnings
This commit is contained in:
@@ -41,7 +41,7 @@ struct cond<RowMajor> {
|
||||
} // namespace
|
||||
|
||||
/**
|
||||
* \class TensorBlockShapeType
|
||||
* \enum TensorBlockShapeType
|
||||
* \ingroup CXX11_Tensor_Module
|
||||
*
|
||||
* \brief Tensor block shape type.
|
||||
|
||||
@@ -367,9 +367,16 @@ struct NoOpOutputKernel {
|
||||
*/
|
||||
template <typename Index, typename Scalar>
|
||||
EIGEN_ALWAYS_INLINE void operator()(
|
||||
const internal::blas_data_mapper<Scalar, Index, ColMajor>& /*output_mapper*/,
|
||||
const TensorContractionParams& /*params*/, Index /*i*/,
|
||||
Index /*j*/, Index /*num_rows*/, Index /*num_cols*/) const {}
|
||||
const internal::blas_data_mapper<Scalar, Index, ColMajor>& output_mapper,
|
||||
const TensorContractionParams& params, Index i,
|
||||
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>
|
||||
|
||||
@@ -177,7 +177,8 @@ class TensorCostModel {
|
||||
double threads = (cost - kStartupCycles) / kPerThreadCycles + 0.9;
|
||||
// Make sure we don't invoke undefined behavior when we convert to an int.
|
||||
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.
|
||||
|
||||
Reference in New Issue
Block a user