From 27e7fd18f1c337c409f2a567697b27bcd0c09f8b Mon Sep 17 00:00:00 2001
From: Benjamin Barenblat <bbaren@google.com>
Date: Wed, 7 Jul 2021 17:12:12 -0400
Subject: Support manually disabling exceptions

Rename EIGEN_EXCEPTIONS to EIGEN_USE_EXCEPTIONS, and allow disabling
exceptions with -DEIGEN_USE_EXCEPTIONS=0.
---
 unsupported/Eigen/CXX11/src/Tensor/TensorDeviceSycl.h |  6 +++---
 unsupported/test/cxx11_maxsizevector.cpp              | 10 +++++-----
 2 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'unsupported')

diff --git a/unsupported/Eigen/CXX11/src/Tensor/TensorDeviceSycl.h b/unsupported/Eigen/CXX11/src/Tensor/TensorDeviceSycl.h
index df591c21d..3ccac604f 100644
--- a/unsupported/Eigen/CXX11/src/Tensor/TensorDeviceSycl.h
+++ b/unsupported/Eigen/CXX11/src/Tensor/TensorDeviceSycl.h
@@ -506,7 +506,7 @@ class QueueInterface {
 
 
   EIGEN_STRONG_INLINE void synchronize() const {
-#ifdef EIGEN_EXCEPTIONS
+#if EIGEN_USE_EXCEPTIONS
     m_queue.wait_and_throw();
 #else
     m_queue.wait();
@@ -749,7 +749,7 @@ class QueueInterface {
     set_latest_event(e);
     if (callback) {
       auto callback_ = [=]() {
-#ifdef EIGEN_EXCEPTIONS
+#if EIGEN_USE_EXCEPTIONS
         cl::sycl::event(e).wait_and_throw();
 #else
         cl::sycl::event(e).wait();
@@ -758,7 +758,7 @@ class QueueInterface {
       };
       m_thread_pool.Schedule(std::move(callback_));
     } else {
-#ifdef EIGEN_EXCEPTIONS
+#if EIGEN_USE_EXCEPTIONS
       m_queue.wait_and_throw();
 #else
       m_queue.wait();
diff --git a/unsupported/test/cxx11_maxsizevector.cpp b/unsupported/test/cxx11_maxsizevector.cpp
index 46b689a8e..24064c4ee 100644
--- a/unsupported/test/cxx11_maxsizevector.cpp
+++ b/unsupported/test/cxx11_maxsizevector.cpp
@@ -12,7 +12,7 @@ struct Foo
 
   Foo(int x=0) : dummy(x)
   {
-#ifdef EIGEN_EXCEPTIONS
+#if EIGEN_USE_EXCEPTIONS
     // TODO: Is this the correct way to handle this?
     if (Foo::object_count > Foo::object_limit) { std::cout << "\nThrow!\n"; throw Foo::Fail(); }
 #endif
@@ -50,17 +50,17 @@ EIGEN_DECLARE_TEST(cxx11_maxsizevector)
     Foo::object_limit = internal::random<Index>(0, rows - 2);
     std::cout << "object_limit = " << Foo::object_limit << std::endl;
     bool exception_raised = false;
-#ifdef EIGEN_EXCEPTIONS
-    try
+    EIGEN_TRY
     {
-#endif
       std::cout <<       "\nVectorX m(" << rows << ");\n";
       VectorX vect(rows);
       for(int i=0; i<rows; ++i)
           vect.push_back(Foo());
-#ifdef EIGEN_EXCEPTIONS
+#if EIGEN_USE_EXCEPTIONS
       VERIFY(false);  // not reached if exceptions are enabled
+#endif
     }
+#if EIGEN_USE_EXCEPTIONS
     catch (const Foo::Fail&) { exception_raised = true; }
     VERIFY(exception_raised);
 #endif
-- 
cgit v1.2.3