GitHub-Proxy/eigen
1
0
Fork 0
mirror of https://gitlab.com/libeigen/eigen.git synced 2025-09-23 14:53:13 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix a bug in commit 76e8c0455396446f8166c798da5efe879e010bdc:

Browse Source
This commit is contained in:
Rasmus Munk Larsen 2023-11-15 21:45:37 +00:00
parent 32165c6f0c
commit 3cf6bb6f1c
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Eigen/src/Core/products/Parallelizer.h
View File

@ -99,7 +99,16 @@ namespace internal {
#if defined(EIGEN_USE_BLAS) || (!defined(EIGEN_HAS_OPENMP) && !defined(EIGEN_GEMM_THREADPOOL)) #if defined(EIGEN_USE_BLAS) || (!defined(EIGEN_HAS_OPENMP) && !defined(EIGEN_GEMM_THREADPOOL))
inline void manage_multi_threading(Action /*unused*/, int* /*unused*/) {} inline void manage_multi_threading(Action action, int* v) {
if (action == SetAction) {
eigen_internal_assert(v != nullptr);
} else if (action == GetAction) {
eigen_internal_assert(v != nullptr);
*v = 1;
} else {
eigen_internal_assert(false);
}
}
template<typename Index> struct GemmParallelInfo {}; template<typename Index> struct GemmParallelInfo {};
template <bool Condition, typename Functor, typename Index> template <bool Condition, typename Functor, typename Index>
EIGEN_STRONG_INLINE void parallelize_gemm(const Functor& func, Index rows, Index cols, EIGEN_STRONG_INLINE void parallelize_gemm(const Functor& func, Index rows, Index cols,
@ -212,7 +221,7 @@ EIGEN_STRONG_INLINE void parallelize_gemm(const Functor& func, Index rows, Index
// Note that the actual number of threads might be lower than the number of // Note that the actual number of threads might be lower than the number of
// requested ones // requested ones
Index actual_threads = omp_get_num_threads(); Index actual_threads = omp_get_num_threads();
GemmParallelInfo<Index> info(i, int(actual_threads), task_info); GemmParallelInfo<Index> info(i, static_cast<int>(actual_threads), task_info);
Index blockCols = (cols / actual_threads) & ~Index(0x3); Index blockCols = (cols / actual_threads) & ~Index(0x3);
Index blockRows = (rows / actual_threads); Index blockRows = (rows / actual_threads);
@ -237,7 +246,7 @@ EIGEN_STRONG_INLINE void parallelize_gemm(const Functor& func, Index rows, Index
auto task = [=, &func, &barrier, &task_info](int i) auto task = [=, &func, &barrier, &task_info](int i)
{ {
Index actual_threads = threads; Index actual_threads = threads;
GemmParallelInfo<Index> info(i, int(actual_threads), task_info); GemmParallelInfo<Index> info(i, static_cast<int>(actual_threads), task_info);
Index blockCols = (cols / actual_threads) & ~Index(0x3); Index blockCols = (cols / actual_threads) & ~Index(0x3);
Index blockRows = (rows / actual_threads); Index blockRows = (rows / actual_threads);
blockRows = (blockRows/Functor::Traits::mr)*Functor::Traits::mr; blockRows = (blockRows/Functor::Traits::mr)*Functor::Traits::mr;