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

Fix warnings about repeated deinitions of macros.

Browse Source
This commit is contained in:
Rasmus Munk Larsen 2024-05-29 13:38:00 -07:00
parent f02f89bf2c
commit 38b9cc263b
3 changed files with 20 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
Eigen/src/ThreadPool/CoreThreadPoolDevice.h
View File

@ -15,24 +15,24 @@ namespace Eigen {
// CoreThreadPoolDevice provides an easy-to-understand Device for parallelizing Eigen Core expressions with // CoreThreadPoolDevice provides an easy-to-understand Device for parallelizing Eigen Core expressions with
// Threadpool. Expressions are recursively split evenly until the evaluation cost is less than the threshold for // Threadpool. Expressions are recursively split evenly until the evaluation cost is less than the threshold for
// delegating the task to a thread. // delegating the task to a thread.
/*
// a a
// / \ / \
// / \ / \
// / \ / \
// / \ / \
// / \ / \
// / \ / \
// / \ / \
// a e a e
// / \ / \ / \ / \
// / \ / \ / \ / \
// / \ / \ / \ / \
// a c e g a c e g
// / \ / \ / \ / \ / \ / \ / \ / \
// / \ / \ / \ / \ / \ / \ / \ / \
// a b c d e f g h a b c d e f g h
*/
// Each task descends the binary tree to the left, delegates the right task to a new thread, and continues to the // Each task descends the binary tree to the left, delegates the right task to a new thread, and continues to the
// left. This ensures that work is evenly distributed to the thread pool as quickly as possible and minimizes the number // left. This ensures that work is evenly distributed to the thread pool as quickly as possible and minimizes the number
// of tasks created during the evaluation. Consider an expression that is divided into 8 chunks. The // of tasks created during the evaluation. Consider an expression that is divided into 8 chunks. The

7
test/assignment_threaded.cpp
View File

@ -7,13 +7,10 @@
// Public License v. 2.0. If a copy of the MPL was not distributed // Public License v. 2.0. If a copy of the MPL was not distributed
// with this file, You can obtain one at http://mozilla.org/MPL/2.0/. // with this file, You can obtain one at http://mozilla.org/MPL/2.0/.
#if defined(EIGEN_USE_THREADS) #define EIGEN_USE_THREADS 1
#undef EIGEN_USE_THREADS
#endif
#define EIGEN_USE_THREADS
#include "main.h" #include "main.h"
#include <Eigen/ThreadPool>
namespace Eigen { namespace Eigen {
namespace internal { namespace internal {

7
test/main.h
View File

@ -52,9 +52,6 @@
#if __cplusplus >= 201103L || (defined(_MSVC_LANG) && _MSVC_LANG >= 201103L) #if __cplusplus >= 201103L || (defined(_MSVC_LANG) && _MSVC_LANG >= 201103L)
#include <random> #include <random>
#include <chrono> #include <chrono>
#ifdef EIGEN_USE_THREADS
#include <Eigen/ThreadPool>
#endif
#endif #endif
#if __cplusplus > 201703L #if __cplusplus > 201703L
// libstdc++ 9's <memory> indirectly uses max() via <bit>. // libstdc++ 9's <memory> indirectly uses max() via <bit>.
@ -219,11 +216,7 @@ class EigenTest {
} // namespace Eigen } // namespace Eigen
#define TRACK std::cerr << __FILE__ << " " << __LINE__ << std::endl #define TRACK std::cerr << __FILE__ << " " << __LINE__ << std::endl
// #define TRACK while()
#ifdef EIGEN_DEFAULT_IO_FORMAT
#undef EIGEN_DEFAULT_IO_FORMAT
#endif
#define EIGEN_DEFAULT_IO_FORMAT IOFormat(4, 0, " ", "\n", "", "", "", "") #define EIGEN_DEFAULT_IO_FORMAT IOFormat(4, 0, " ", "\n", "", "", "", "")
#if (defined(_CPPUNWIND) || defined(__EXCEPTIONS)) && !defined(__CUDA_ARCH__) && !defined(__HIP_DEVICE_COMPILE__) && \ #if (defined(_CPPUNWIND) || defined(__EXCEPTIONS)) && !defined(__CUDA_ARCH__) && !defined(__HIP_DEVICE_COMPILE__) && \