diff options
author | Eugene Zhulenev <ezhulenev@google.com> | 2019-04-23 17:23:19 -0700 |
---|---|---|
committer | Eugene Zhulenev <ezhulenev@google.com> | 2019-04-23 17:23:19 -0700 |
commit | a7b7f3ca8a25bfef4058d8a212cdc504bf5aa50e (patch) | |
tree | b72fcb0b8127f9fa456244d63d244f2eb0ccd6d6 /unsupported/Eigen/CXX11/src | |
parent | 68a2a8c4454cfa653d1ad0ec9de729c43e6a151d (diff) |
Add missing EIGEN_DEPRECATED annotations to deprecated functions and fix few other doxygen warnings
Diffstat (limited to 'unsupported/Eigen/CXX11/src')
-rw-r--r-- | unsupported/Eigen/CXX11/src/Tensor/TensorBlock.h | 2 | ||||
-rw-r--r-- | unsupported/Eigen/CXX11/src/Tensor/TensorContraction.h | 13 | ||||
-rw-r--r-- | unsupported/Eigen/CXX11/src/Tensor/TensorCostModel.h | 3 |
3 files changed, 13 insertions, 5 deletions
diff --git a/unsupported/Eigen/CXX11/src/Tensor/TensorBlock.h b/unsupported/Eigen/CXX11/src/Tensor/TensorBlock.h index 91c77b05a..0db637405 100644 --- a/unsupported/Eigen/CXX11/src/Tensor/TensorBlock.h +++ b/unsupported/Eigen/CXX11/src/Tensor/TensorBlock.h @@ -41,7 +41,7 @@ struct cond<RowMajor> { } // namespace /** - * \class TensorBlockShapeType + * \enum TensorBlockShapeType * \ingroup CXX11_Tensor_Module * * \brief Tensor block shape type. diff --git a/unsupported/Eigen/CXX11/src/Tensor/TensorContraction.h b/unsupported/Eigen/CXX11/src/Tensor/TensorContraction.h index d9400163c..614475fc0 100644 --- a/unsupported/Eigen/CXX11/src/Tensor/TensorContraction.h +++ b/unsupported/Eigen/CXX11/src/Tensor/TensorContraction.h @@ -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> diff --git a/unsupported/Eigen/CXX11/src/Tensor/TensorCostModel.h b/unsupported/Eigen/CXX11/src/Tensor/TensorCostModel.h index 7f79ac30d..195267ce8 100644 --- a/unsupported/Eigen/CXX11/src/Tensor/TensorCostModel.h +++ b/unsupported/Eigen/CXX11/src/Tensor/TensorCostModel.h @@ -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. |