Commit 3f50e07f authored by Michael Tesch's avatar Michael Tesch
Browse files

fix for new eigen location; fix compile on non-x86

parent f96eea60

duals/dual

+2 −2
Original line number Diff line number Diff line
@@ -1216,7 +1216,7 @@ typedef std::complex<dualld> cdualld; 
/// Formats a dual number (r,d) as (r+d_e), offering the same

/// formatting options as the underlying type - with the addition of

/// three optional format options, only one of which may appear

/// directly after the ':' in the format spec: '$', '*', and ',".  The

/// directly after the ':' in the format spec: '$', '*', and ','.  The

/// '*' flag changes the separating _ to a *, producing (r+d*e), where

/// r and d are the formatted value_type values.  The ',' flag simply

/// prints the real and dual parts separated by a comma.  As a
@@ -1289,7 +1289,7 @@ struct fmt::formatter<duals::dual<T>,Char> : public fmt::formatter<T,Char> 
/// options as the underlying type - with the addition of three

/// optional format options, only one of which may appear directly

/// after the ':' in the format spec (before any fill or align): '$'

/// (the default if no flag is specified), '*', and ',".  The '*' flag

/// (the default if no flag is specified), '*', and ','.  The '*' flag

/// adds a * before the 'i', producing (a+b*i), where a and b are the

/// formatted value_type values.  The ',' flag simply prints the real

/// and complex parts separated by a comma (same as iostreams' format).

tests/CMakeLists.txt

+22 −9
Original line number Diff line number Diff line
@@ -32,6 +32,14 @@ add_definitions (-DEIGEN_DEFAULT_IO_FORMAT=${IOFORMAT}) 
#

# Correctness & Coverage

#

message ("OSX_ARCHITECTURES: ${CMAKE_SYSTEM_PROCESSOR}")

if (CMAKE_SYSTEM_PROCESSOR MATCHES "(x86)|(X86)|(amd64)|(AMD64)")

  set (X86 TRUE)

else ()

  set (X86 FALSE)

endif ()



if (X86)

  if (NOT MSVC)

    set (OPT_FLAGS "-O2")

    set (OPT_FLAGS "-O3;-msse3")
@@ -44,6 +52,11 @@ else () 
    set (OPT_FLAGS "/arch:AVX2")

  endif ()



else ()

  set (OPT_FLAGS "-O2")

  set (OPT_FLAGS "-O3")

endif ()



#set (OPT_FLAGS "${OPT_FLAGS};-fsanitize=address;-fno-omit-frame-pointer")

set (OPT_FLAGS "${OPT_FLAGS};-DCPPDUALS_VECTORIZE_CDUAL")

#set (OPT_FLAGS "${OPT_FLAGS};-DCPPDUALS_DONT_VECTORIZE")

thirdparty/CMakeLists.txt

+1 −0
Original line number Diff line number Diff line
@@ -71,6 +71,7 @@ if (CPPDUALS_EIGEN_LATEST) 
  #set (EIGEN_MD5 ffc83130dcd37b694c6cf7e905099af9)

else ()

  set (EIGEN_URL http://bitbucket.org/eigen/eigen/get/3.3.7.tar.bz2)

  set (EIGEN_URL https://gitlab.com/libeigen/eigen/-/archive/3.3.7/eigen-3.3.7.tar.bz2)

  set (EIGEN_MD5 05b1f7511c93980c385ebe11bd3c93fa)

endif ()