Add missing EIGEN_DEPRECATED annotations to deprecated functions and fix few other doxygen warnings

This commit is contained in:
Eugene Zhulenev
2019-04-23 17:23:19 -07:00
parent 68a2a8c445
commit a7b7f3ca8a
8 changed files with 22 additions and 14 deletions

View File

@@ -41,7 +41,7 @@ struct cond<RowMajor> {
} // namespace
/**
* \class TensorBlockShapeType
* \enum TensorBlockShapeType
* \ingroup CXX11_Tensor_Module
*
* \brief Tensor block shape type.

View File

@@ -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>

View File

@@ -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.