commit 3cf6bb6f1ce9cd3cd6bdc43cdcfae7f4822ff2c3
author Rasmus Munk Larsen <rmlarsen@google.com> Wed Nov 15 21:45:37 2023 +0000
committer Rasmus Munk Larsen <rmlarsen@google.com> Wed Nov 15 21:45:37 2023 +0000
tree 47ebeb744de39b8affb41a89b87084c8b48c9c87
parent 32165c6f0c72fb393c7d3344f15172d33963a877

Fix a bug in commit 76e8c0455396446f8166c798da5efe879e010bdc:

Eigen/src/Core/products/Parallelizer.h

diff --git a/Eigen/src/Core/products/Parallelizer.h b/Eigen/src/Core/products/Parallelizer.h
index 59335af..3e76827 100644
--- a/Eigen/src/Core/products/Parallelizer.h
+++ b/Eigen/src/Core/products/Parallelizer.h
@@ -99,7 +99,16 @@
 
 #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 <bool Condition, typename Functor, typename Index>
 EIGEN_STRONG_INLINE void parallelize_gemm(const Functor& func, Index rows, Index cols,
@@ -212,7 +221,7 @@
     // Note that the actual number of threads might be lower than the number of
     // requested ones
     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 blockRows = (rows / actual_threads);
@@ -237,7 +246,7 @@
   auto task = [=, &func, &barrier, &task_info](int i)
   {
     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 blockRows = (rows / actual_threads);
     blockRows = (blockRows/Functor::Traits::mr)*Functor::Traits::mr;