|
| 1 | +diff -ru eigen-3.3.5/Eigen/CholmodSupport inst/include/Eigen/CholmodSupport |
| 2 | +--- eigen-3.3.5/Eigen/CholmodSupport 2018-07-23 04:33:42.000000000 -0500 |
| 3 | ++++ inst/include/Eigen/CholmodSupport 2018-11-22 20:56:05.407463176 -0600 |
| 4 | +@@ -13,7 +13,7 @@ |
| 5 | + #include "src/Core/util/DisableStupidWarnings.h" |
| 6 | + |
| 7 | + extern "C" { |
| 8 | +- #include <cholmod.h> |
| 9 | ++ #include <RcppEigenCholmod.h> |
| 10 | + } |
| 11 | + |
| 12 | + /** \ingroup Support_modules |
| 13 | +Only in eigen-3.3.5/Eigen: CMakeLists.txt |
| 14 | +diff -ru eigen-3.3.5/Eigen/src/Core/arch/CUDA/Half.h inst/include/Eigen/src/Core/arch/CUDA/Half.h |
| 15 | +--- eigen-3.3.5/Eigen/src/Core/arch/CUDA/Half.h 2018-07-23 04:33:42.000000000 -0500 |
| 16 | ++++ inst/include/Eigen/src/Core/arch/CUDA/Half.h 2018-11-22 20:57:25.834187584 -0600 |
| 17 | +@@ -119,12 +119,14 @@ |
| 18 | + EIGEN_DEVICE_FUNC EIGEN_EXPLICIT_CAST(unsigned long) const { |
| 19 | + return static_cast<unsigned long>(half_impl::half_to_float(*this)); |
| 20 | + } |
| 21 | ++ #if EIGEN_HAS_CXX11 |
| 22 | + EIGEN_DEVICE_FUNC EIGEN_EXPLICIT_CAST(long long) const { |
| 23 | + return static_cast<long long>(half_impl::half_to_float(*this)); |
| 24 | + } |
| 25 | + EIGEN_DEVICE_FUNC EIGEN_EXPLICIT_CAST(unsigned long long) const { |
| 26 | + return static_cast<unsigned long long>(half_to_float(*this)); |
| 27 | + } |
| 28 | ++ #endif |
| 29 | + EIGEN_DEVICE_FUNC EIGEN_EXPLICIT_CAST(float) const { |
| 30 | + return half_impl::half_to_float(*this); |
| 31 | + } |
| 32 | +diff -ru eigen-3.3.5/Eigen/src/Core/arch/SSE/Complex.h inst/include/Eigen/src/Core/arch/SSE/Complex.h |
| 33 | +--- eigen-3.3.5/Eigen/src/Core/arch/SSE/Complex.h 2018-07-23 04:33:42.000000000 -0500 |
| 34 | ++++ inst/include/Eigen/src/Core/arch/SSE/Complex.h 2018-11-22 20:59:03.388691931 -0600 |
| 35 | +@@ -98,10 +98,10 @@ |
| 36 | + res.v = _mm_loadl_pi(_mm_set1_ps(0.0f), reinterpret_cast<const __m64*>(&from)); |
| 37 | + #elif EIGEN_GNUC_AT_LEAST(4,6) |
| 38 | + // Suppress annoying "may be used uninitialized in this function" warning with gcc >= 4.6 |
| 39 | +- #pragma GCC diagnostic push |
| 40 | +- #pragma GCC diagnostic ignored "-Wuninitialized" |
| 41 | ++ //#pragma GCC diagnostic push |
| 42 | ++ //#pragma GCC diagnostic ignored "-Wuninitialized" |
| 43 | + res.v = _mm_loadl_pi(res.v, (const __m64*)&from); |
| 44 | +- #pragma GCC diagnostic pop |
| 45 | ++ //#pragma GCC diagnostic pop |
| 46 | + #else |
| 47 | + res.v = _mm_loadl_pi(res.v, (const __m64*)&from); |
| 48 | + #endif |
| 49 | +diff -ru eigen-3.3.5/Eigen/src/Core/util/DisableStupidWarnings.h inst/include/Eigen/src/Core/util/DisableStupidWarnings.h |
| 50 | +--- eigen-3.3.5/Eigen/src/Core/util/DisableStupidWarnings.h 2018-07-23 04:33:42.000000000 -0500 |
| 51 | ++++ inst/include/Eigen/src/Core/util/DisableStupidWarnings.h 2018-11-22 21:02:32.261638153 -0600 |
| 52 | +@@ -4,7 +4,6 @@ |
| 53 | + #ifdef _MSC_VER |
| 54 | + // 4100 - unreferenced formal parameter (occurred e.g. in aligned_allocator::destroy(pointer p)) |
| 55 | + // 4101 - unreferenced local variable |
| 56 | +- // 4127 - conditional expression is constant |
| 57 | + // 4181 - qualifier applied to reference type ignored |
| 58 | + // 4211 - nonstandard extension used : redefined extern to static |
| 59 | + // 4244 - 'argument' : conversion from 'type1' to 'type2', possible loss of data |
| 60 | +@@ -20,7 +19,7 @@ |
| 61 | + #ifndef EIGEN_PERMANENTLY_DISABLE_STUPID_WARNINGS |
| 62 | + #pragma warning( push ) |
| 63 | + #endif |
| 64 | +- #pragma warning( disable : 4100 4101 4127 4181 4211 4244 4273 4324 4503 4512 4522 4700 4714 4717 4800) |
| 65 | ++ #pragma warning( disable : 4100 4101 4181 4211 4244 4273 4324 4503 4512 4522 4700 4714 4717 4800) |
| 66 | + |
| 67 | + #elif defined __INTEL_COMPILER |
| 68 | + // 2196 - routine is both "inline" and "noinline" ("noinline" assumed) |
| 69 | +@@ -38,21 +37,22 @@ |
| 70 | + #elif defined __clang__ |
| 71 | + // -Wconstant-logical-operand - warning: use of logical && with constant operand; switch to bitwise & or remove constant |
| 72 | + // this is really a stupid warning as it warns on compile-time expressions involving enums |
| 73 | +- #ifndef EIGEN_PERMANENTLY_DISABLE_STUPID_WARNINGS |
| 74 | +- #pragma clang diagnostic push |
| 75 | +- #endif |
| 76 | +- #pragma clang diagnostic ignored "-Wconstant-logical-operand" |
| 77 | ++ //#ifndef EIGEN_PERMANENTLY_DISABLE_STUPID_WARNINGS |
| 78 | ++ // #pragma clang diagnostic push |
| 79 | ++ //#endif |
| 80 | ++ //#pragma clang diagnostic ignored "-Wconstant-logical-operand" |
| 81 | + |
| 82 | + #elif defined __GNUC__ && __GNUC__>=6 |
| 83 | + |
| 84 | +- #ifndef EIGEN_PERMANENTLY_DISABLE_STUPID_WARNINGS |
| 85 | +- #pragma GCC diagnostic push |
| 86 | +- #endif |
| 87 | +- #pragma GCC diagnostic ignored "-Wignored-attributes" |
| 88 | ++ //#ifndef EIGEN_PERMANENTLY_DISABLE_STUPID_WARNINGS |
| 89 | ++ // #pragma GCC diagnostic push |
| 90 | ++ //#endif |
| 91 | ++ //#pragma GCC diagnostic ignored "-Wignored-attributes" |
| 92 | + |
| 93 | + #endif |
| 94 | + |
| 95 | + #if defined __NVCC__ |
| 96 | ++ #pragma diag_suppress boolean_controlling_expr_is_constant |
| 97 | + // Disable the "statement is unreachable" message |
| 98 | + #pragma diag_suppress code_is_unreachable |
| 99 | + // Disable the "dynamic initialization in unreachable code" message |
| 100 | +@@ -70,6 +70,7 @@ |
| 101 | + #pragma diag_suppress 2671 |
| 102 | + #pragma diag_suppress 2735 |
| 103 | + #pragma diag_suppress 2737 |
| 104 | ++ #pragma diag_suppress 2739 |
| 105 | + #endif |
| 106 | + |
| 107 | + #endif // not EIGEN_WARNINGS_DISABLED |
| 108 | +Only in eigen-3.3.5/unsupported/: bench |
| 109 | +Only in eigen-3.3.5/unsupported/: CMakeLists.txt |
| 110 | +Only in eigen-3.3.5/unsupported/: doc |
| 111 | +Only in eigen-3.3.5/unsupported/Eigen: CMakeLists.txt |
| 112 | +Only in eigen-3.3.5/unsupported/Eigen/CXX11: CMakeLists.txt |
| 113 | +Only in eigen-3.3.5/unsupported/Eigen/src/EulerAngles: CMakeLists.txt |
| 114 | +diff -ru eigen-3.3.5/unsupported/Eigen/src/IterativeSolvers/DGMRES.h inst/include/unsupported/Eigen/src/IterativeSolvers/DGMRES.h |
| 115 | +--- eigen-3.3.5/unsupported/Eigen/src/IterativeSolvers/DGMRES.h 2018-07-23 04:33:42.000000000 -0500 |
| 116 | ++++ inst/include/unsupported/Eigen/src/IterativeSolvers/DGMRES.h 2018-11-22 21:12:59.577162671 -0600 |
| 117 | +@@ -173,7 +173,7 @@ |
| 118 | + /** |
| 119 | + * Set the restart value (default is 30) |
| 120 | + */ |
| 121 | +- Index set_restart(const Index restart) { m_restart=restart; } |
| 122 | ++ void set_restart(const Index restart) { m_restart=restart; } |
| 123 | + |
| 124 | + /** |
| 125 | + * Set the number of eigenvalues to deflate at each restart |
| 126 | +diff -ru eigen-3.3.5/unsupported/Eigen/src/SparseExtra/MatrixMarketIterator.h inst/include/unsupported/Eigen/src/SparseExtra/MatrixMarketIterator.h |
| 127 | +--- eigen-3.3.5/unsupported/Eigen/src/SparseExtra/MatrixMarketIterator.h 2018-07-23 04:33:42.000000000 -0500 |
| 128 | ++++ inst/include/unsupported/Eigen/src/SparseExtra/MatrixMarketIterator.h 2018-11-22 21:03:35.872739714 -0600 |
| 129 | +@@ -193,7 +193,9 @@ |
| 130 | + std::string curfile; |
| 131 | + curfile = m_folder + "/" + m_curs_id->d_name; |
| 132 | + // Discard if it is a folder |
| 133 | ++#if !(defined(__sun) || defined(_AIX) || defined(__hpux) || defined(__sgi) || defined(__HAIKU__)) |
| 134 | + if (m_curs_id->d_type == DT_DIR) continue; //FIXME This may not be available on non BSD systems |
| 135 | ++#endif |
| 136 | + // struct stat st_buf; |
| 137 | + // stat (curfile.c_str(), &st_buf); |
| 138 | + // if (S_ISDIR(st_buf.st_mode)) continue; |
| 139 | +Only in eigen-3.3.5/unsupported/: README.txt |
| 140 | +Only in eigen-3.3.5/unsupported/: test |
0 commit comments