Merge branch 'master' into version

Author: egpbos

.travis.yml

@@ -51,6 +51,15 @@ matrix:
             - g++-7
             - libfftw3-dev
       env: COMPILER=gcc GCC=7
+    - os: linux
+      addons:
+        apt:
+          sources:
+            - ubuntu-toolchain-r-test
+          packages:
+            - g++-7
+            - libfftw3-dev
+      env: COMPILER=gcc GCC=7 DISABLE_EXCEPTION=1
     - os: linux
       addons:
         apt:

CMakeLists.txt

@@ -45,6 +45,7 @@ OPTION(BENCHMARK_ENABLE_TESTING "Build tests for Google Benchmark" OFF)
 OPTION(FIX_RPATH "Correctly set rpath for the linker" OFF)
 OPTION(DEFAULT_COLUMN_MAJOR "Set xtensor default layout to column major. This is currently not supported, since FFTW demands row major layout." OFF)
 OPTION(COVERAGE "Enable coverage compile flags (gcc only!)" OFF)
+OPTION(DISABLE_EXCEPTIONS "Disable C++ exceptions" OFF)
 
 if (COVERAGE)
     if(NOT CMAKE_CXX_COMPILER_ID MATCHES "Clang" AND NOT CMAKE_CXX_COMPILER_ID MATCHES "GNU")

include/xtensor-fftw/basic.hpp

@@ -32,6 +32,8 @@
 
 #include <fftw3.h>
 
+#include "xtensor-fftw_config.hpp"
+
 #ifdef __CLING__
   #pragma cling load("fftw3")
 #endif
@@ -386,7 +388,8 @@ namespace xt {
 
       auto plan = fftw_plan_dft_caller<dim, fftw_direction, fftw_123dim, input_t, output_t, fftw_plan_dft, half_plus_one_out, half_plus_one_in>(input, output, FFTW_ESTIMATE, odd_last_dim);
       if (plan == nullptr) {
-        throw std::runtime_error("Plan creation returned nullptr. This usually means FFTW cannot create a plan for the given arguments (e.g. a non-destructive multi-dimensional real FFT is impossible in FFTW).");
+        XTENSOR_FFTW_THROW(std::runtime_error,
+                           "Plan creation returned nullptr. This usually means FFTW cannot create a plan for the given arguments (e.g. a non-destructive multi-dimensional real FFT is impossible in FFTW).");
       }
 
       fftw_execute(plan);
@@ -414,7 +417,8 @@ namespace xt {
 
       auto plan = fftw_plan_dft_caller<dim, fftw_direction, fftw_123dim, input_t, output_t, fftw_plan_dft, half_plus_one_out, half_plus_one_in>(input, output, FFTW_ESTIMATE, odd_last_dim);
       if (plan == nullptr) {
-        throw std::runtime_error("Plan creation returned nullptr. This usually means FFTW cannot create a plan for the given arguments (e.g. a non-destructive multi-dimensional real FFT is impossible in FFTW).");
+        XTENSOR_FFTW_THROW(std::runtime_error,
+                           "Plan creation returned nullptr. This usually means FFTW cannot create a plan for the given arguments (e.g. a non-destructive multi-dimensional real FFT is impossible in FFTW).");
       }
 
       fftw_execute(plan);
@@ -446,7 +450,8 @@ namespace xt {
 
       auto plan = fftw_plan_dft_caller<dim, fftw_direction, fftw_123dim, input_t, output_t, fftw_plan_dft, half_plus_one_out, half_plus_one_in>(input_conj, output, FFTW_ESTIMATE);
       if (plan == nullptr) {
-        throw std::runtime_error("Plan creation returned nullptr. This usually means FFTW cannot create a plan for the given arguments (e.g. a non-destructive multi-dimensional real FFT is impossible in FFTW).");
+        XTENSOR_FFTW_THROW(std::runtime_error,
+                           "Plan creation returned nullptr. This usually means FFTW cannot create a plan for the given arguments (e.g. a non-destructive multi-dimensional real FFT is impossible in FFTW).");
       }
 
       fftw_execute(plan);
@@ -474,7 +479,8 @@ namespace xt {
 
       auto plan = fftw_plan_dft_caller<dim, fftw_direction, fftw_123dim, input_t, output_t, fftw_plan_dft, half_plus_one_out, half_plus_one_in>(input, output, FFTW_ESTIMATE);
       if (plan == nullptr) {
-        throw std::runtime_error("Plan creation returned nullptr. This usually means FFTW cannot create a plan for the given arguments (e.g. a non-destructive multi-dimensional real FFT is impossible in FFTW).");
+        XTENSOR_FFTW_THROW(std::runtime_error,
+                           "Plan creation returned nullptr. This usually means FFTW cannot create a plan for the given arguments (e.g. a non-destructive multi-dimensional real FFT is impossible in FFTW).");
       }
 
       fftw_execute(plan);

include/xtensor-fftw/xtensor-fftw_config.hpp

@@ -13,4 +13,22 @@
 #define XTENSOR_FFTW_VERSION_MINOR 2
 #define XTENSOR_FFTW_VERSION_PATCH 5
 
+// Define if the library is going to be using exceptions.
+#if (!defined(__cpp_exceptions) && !defined(__EXCEPTIONS) && !defined(_CPPUNWIND))
+#undef XTENSOR_FFTW_DISABLE_EXCEPTIONS
+#define XTENSOR_FFTW_DISABLE_EXCEPTIONS
+#endif
+
+// Exception support.
+#if defined(XTENSOR_FFTW_DISABLE_EXCEPTIONS)
+#include <iostream>
+#define XTENSOR_FFTW_THROW(_, msg)       \
+    {                                    \
+      std::cerr << msg << std::endl;     \
+      std::abort();                      \
+    }
+#else
+#define XTENSOR_FFTW_THROW(exception, msg) throw exception(msg)
+#endif
+
 #endif //XTENSOR_FFTW_CONFIG_HPP

test/CMakeLists.txt

@@ -33,12 +33,25 @@ string(TOUPPER "${CMAKE_BUILD_TYPE}" U_CMAKE_BUILD_TYPE)
 
 set(CMAKE_CXX_STANDARD 14)
 
+if(CMAKE_CXX_COMPILER_ID MATCHES "GNU" OR (CMAKE_CXX_COMPILER_ID MATCHES "Intel" AND NOT WIN32))
+    if (DISABLE_EXCEPTIONS)
+        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-exceptions")
+    endif()
+endif()
+
 if (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
     add_compile_options(-ftemplate-backtrace-limit=0)
+    if (DISABLE_EXCEPTIONS)
+        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-exceptions")
+    endif()
 endif()
 
 if(MSVC)
-    add_compile_options(/EHsc /MP /bigobj)
+    if (DISABLE_EXCEPTIONS)
+        add_compile_options(/EHs-c- /MP /bigobj)
+    else()
+        add_compile_options(/EHsc /MP /bigobj)
+    endif()
     set(CMAKE_EXE_LINKER_FLAGS /MANIFEST:NO)
     foreach(flag_var
             CMAKE_CXX_FLAGS CMAKE_CXX_FLAGS_DEBUG CMAKE_CXX_FLAGS_RELEASE

test/basic_interface_fft.cpp

@@ -106,4 +106,4 @@ TYPED_TEST(TransformAndInvert_FFT, FFT_4D_xtensor) {
   assert_results_complex(a, a_fourier, should_be_a);
 }
 
-*/
+*/