Skip to content

Commit 5693cc1

Browse files
yixuaneddelbuettel
yixuan
authored and
eddelbuettel
committed
diff file for manual patches
1 parent a251a5d commit 5693cc1

File tree

2 files changed

+164
-0
lines changed

2 files changed

+164
-0
lines changed

‎.Rbuildignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
patch/*
12
vignettes/jss835
23
vignettes/RcppEigen-intro-nojss.*
34
NEWS.org

‎patch/Eigen.diff‎

Lines changed: 163 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,163 @@
1+
Only in ./eigen-eigen-88c4604601b9/: bench
2+
Only in ./eigen-eigen-88c4604601b9/: blas
3+
Only in ./eigen-eigen-88c4604601b9/: cmake
4+
Only in ./eigen-eigen-88c4604601b9/: CMakeLists.txt
5+
Only in ./eigen-eigen-88c4604601b9/: COPYING.BSD
6+
Only in ./eigen-eigen-88c4604601b9/: COPYING.GPL
7+
Only in ./eigen-eigen-88c4604601b9/: COPYING.LGPL
8+
Only in ./eigen-eigen-88c4604601b9/: COPYING.MINPACK
9+
Only in ./eigen-eigen-88c4604601b9/: COPYING.MPL2
10+
Only in ./eigen-eigen-88c4604601b9/: COPYING.README
11+
Only in ./eigen-eigen-88c4604601b9/: CTestConfig.cmake
12+
Only in ./eigen-eigen-88c4604601b9/: CTestCustom.cmake.in
13+
Only in ./eigen-eigen-88c4604601b9/: debug
14+
Only in ./eigen-eigen-88c4604601b9/: demos
15+
Only in ./eigen-eigen-88c4604601b9/: doc
16+
diff -r -u ./eigen-eigen-88c4604601b9/Eigen/CholmodSupport ./include/Eigen/CholmodSupport
17+
--- ./eigen-eigen-88c4604601b9/Eigen/CholmodSupport 2018-01-03 15:55:52.000000000 -0500
18+
+++ ./include/Eigen/CholmodSupport 2018-02-04 14:06:06.527035000 -0500
19+
@@ -13,7 +13,7 @@
20+
#include "src/Core/util/DisableStupidWarnings.h"
21+
22+
extern "C" {
23+
- #include <cholmod.h>
24+
+ #include <RcppEigenCholmod.h>
25+
}
26+
27+
/** \ingroup Support_modules
28+
Only in ./eigen-eigen-88c4604601b9/Eigen: CMakeLists.txt
29+
diff -r -u ./eigen-eigen-88c4604601b9/Eigen/src/Core/arch/CUDA/Half.h ./include/Eigen/src/Core/arch/CUDA/Half.h
30+
--- ./eigen-eigen-88c4604601b9/Eigen/src/Core/arch/CUDA/Half.h 2018-01-03 15:55:52.000000000 -0500
31+
+++ ./include/Eigen/src/Core/arch/CUDA/Half.h 2018-02-06 08:19:30.904301638 -0500
32+
@@ -119,12 +119,14 @@
33+
EIGEN_DEVICE_FUNC EIGEN_EXPLICIT_CAST(unsigned long) const {
34+
return static_cast<unsigned long>(half_impl::half_to_float(*this));
35+
}
36+
+ #if EIGEN_HAS_CXX11
37+
EIGEN_DEVICE_FUNC EIGEN_EXPLICIT_CAST(long long) const {
38+
return static_cast<long long>(half_impl::half_to_float(*this));
39+
}
40+
EIGEN_DEVICE_FUNC EIGEN_EXPLICIT_CAST(unsigned long long) const {
41+
return static_cast<unsigned long long>(half_to_float(*this));
42+
}
43+
+ #endif
44+
EIGEN_DEVICE_FUNC EIGEN_EXPLICIT_CAST(float) const {
45+
return half_impl::half_to_float(*this);
46+
}
47+
diff -r -u ./eigen-eigen-88c4604601b9/Eigen/src/Core/arch/SSE/Complex.h ./include/Eigen/src/Core/arch/SSE/Complex.h
48+
--- ./eigen-eigen-88c4604601b9/Eigen/src/Core/arch/SSE/Complex.h 2018-01-03 15:55:52.000000000 -0500
49+
+++ ./include/Eigen/src/Core/arch/SSE/Complex.h 2018-02-05 13:46:26.921642310 -0500
50+
@@ -98,10 +98,10 @@
51+
res.v = _mm_loadl_pi(_mm_set1_ps(0.0f), reinterpret_cast<const __m64*>(&from));
52+
#elif EIGEN_GNUC_AT_LEAST(4,6)
53+
// Suppress annoying "may be used uninitialized in this function" warning with gcc >= 4.6
54+
- #pragma GCC diagnostic push
55+
- #pragma GCC diagnostic ignored "-Wuninitialized"
56+
+ // #pragma GCC diagnostic push
57+
+ // #pragma GCC diagnostic ignored "-Wuninitialized"
58+
res.v = _mm_loadl_pi(res.v, (const __m64*)&from);
59+
- #pragma GCC diagnostic pop
60+
+ // #pragma GCC diagnostic pop
61+
#else
62+
res.v = _mm_loadl_pi(res.v, (const __m64*)&from);
63+
#endif
64+
diff -r -u ./eigen-eigen-88c4604601b9/Eigen/src/Core/util/DisableStupidWarnings.h ./include/Eigen/src/Core/util/DisableStupidWarnings.h
65+
--- ./eigen-eigen-88c4604601b9/Eigen/src/Core/util/DisableStupidWarnings.h 2018-01-03 15:55:52.000000000 -0500
66+
+++ ./include/Eigen/src/Core/util/DisableStupidWarnings.h 2018-02-05 13:46:26.925644780 -0500
67+
@@ -4,7 +4,6 @@
68+
#ifdef _MSC_VER
69+
// 4100 - unreferenced formal parameter (occurred e.g. in aligned_allocator::destroy(pointer p))
70+
// 4101 - unreferenced local variable
71+
- // 4127 - conditional expression is constant
72+
// 4181 - qualifier applied to reference type ignored
73+
// 4211 - nonstandard extension used : redefined extern to static
74+
// 4244 - 'argument' : conversion from 'type1' to 'type2', possible loss of data
75+
@@ -20,7 +19,7 @@
76+
#ifndef EIGEN_PERMANENTLY_DISABLE_STUPID_WARNINGS
77+
#pragma warning( push )
78+
#endif
79+
- #pragma warning( disable : 4100 4101 4127 4181 4211 4244 4273 4324 4503 4512 4522 4700 4714 4717 4800)
80+
+ #pragma warning( disable : 4100 4101 4181 4211 4244 4273 4324 4503 4512 4522 4700 4714 4717 4800)
81+
82+
#elif defined __INTEL_COMPILER
83+
// 2196 - routine is both "inline" and "noinline" ("noinline" assumed)
84+
@@ -38,21 +37,25 @@
85+
#elif defined __clang__
86+
// -Wconstant-logical-operand - warning: use of logical && with constant operand; switch to bitwise & or remove constant
87+
// this is really a stupid warning as it warns on compile-time expressions involving enums
88+
- #ifndef EIGEN_PERMANENTLY_DISABLE_STUPID_WARNINGS
89+
- #pragma clang diagnostic push
90+
- #endif
91+
- #pragma clang diagnostic ignored "-Wconstant-logical-operand"
92+
+ // #ifndef EIGEN_PERMANENTLY_DISABLE_STUPID_WARNINGS
93+
+ // #pragma clang diagnostic push
94+
+ // #endif
95+
+ // #pragma clang diagnostic ignored "-Wconstant-logical-operand"
96+
+ // #if __clang_major__ >= 3 && __clang_minor__ >= 5
97+
+ // #pragma clang diagnostic ignored "-Wabsolute-value"
98+
+ // #endif
99+
100+
#elif defined __GNUC__ && __GNUC__>=6
101+
102+
- #ifndef EIGEN_PERMANENTLY_DISABLE_STUPID_WARNINGS
103+
- #pragma GCC diagnostic push
104+
- #endif
105+
- #pragma GCC diagnostic ignored "-Wignored-attributes"
106+
+ // #ifndef EIGEN_PERMANENTLY_DISABLE_STUPID_WARNINGS
107+
+ // #pragma GCC diagnostic push
108+
+ // #endif
109+
+ // #pragma GCC diagnostic ignored "-Wignored-attributes"
110+
111+
#endif
112+
113+
#if defined __NVCC__
114+
+ #pragma diag_suppress boolean_controlling_expr_is_constant
115+
// Disable the "statement is unreachable" message
116+
#pragma diag_suppress code_is_unreachable
117+
// Disable the "dynamic initialization in unreachable code" message
118+
@@ -70,6 +73,7 @@
119+
#pragma diag_suppress 2671
120+
#pragma diag_suppress 2735
121+
#pragma diag_suppress 2737
122+
+ #pragma diag_suppress 2739
123+
#endif
124+
125+
#endif // not EIGEN_WARNINGS_DISABLED
126+
Only in ./eigen-eigen-88c4604601b9/: eigen3.pc.in
127+
Only in ./eigen-eigen-88c4604601b9/: failtest
128+
Only in ./eigen-eigen-88c4604601b9/: .hg_archival.txt
129+
Only in ./eigen-eigen-88c4604601b9/: .hgeol
130+
Only in ./eigen-eigen-88c4604601b9/: .hgignore
131+
Only in ./eigen-eigen-88c4604601b9/: .hgtags
132+
Only in ./eigen-eigen-88c4604601b9/: INSTALL
133+
Only in ./eigen-eigen-88c4604601b9/: lapack
134+
Only in ./include: RcppEigenCholmod.h
135+
Only in ./include: RcppEigenForward.h
136+
Only in ./include: RcppEigen.h
137+
Only in ./include: RcppEigenStubs.h
138+
Only in ./include: RcppEigenWrap.h
139+
Only in ./eigen-eigen-88c4604601b9/: README.md
140+
Only in ./eigen-eigen-88c4604601b9/: scripts
141+
Only in ./eigen-eigen-88c4604601b9/: signature_of_eigen3_matrix_library
142+
Only in ./eigen-eigen-88c4604601b9/: test
143+
Only in ./eigen-eigen-88c4604601b9/unsupported: bench
144+
Only in ./eigen-eigen-88c4604601b9/unsupported: CMakeLists.txt
145+
Only in ./eigen-eigen-88c4604601b9/unsupported: doc
146+
Only in ./eigen-eigen-88c4604601b9/unsupported/Eigen: CMakeLists.txt
147+
Only in ./eigen-eigen-88c4604601b9/unsupported/Eigen/CXX11: CMakeLists.txt
148+
Only in ./eigen-eigen-88c4604601b9/unsupported/Eigen/src/EulerAngles: CMakeLists.txt
149+
diff -r -u ./eigen-eigen-88c4604601b9/unsupported/Eigen/src/SparseExtra/MatrixMarketIterator.h ./include/unsupported/Eigen/src/SparseExtra/MatrixMarketIterator.h
150+
--- ./eigen-eigen-88c4604601b9/unsupported/Eigen/src/SparseExtra/MatrixMarketIterator.h 2018-01-03 15:55:52.000000000 -0500
151+
+++ ./include/unsupported/Eigen/src/SparseExtra/MatrixMarketIterator.h 2018-02-04 14:10:32.572055000 -0500
152+
@@ -193,7 +193,9 @@
153+
std::string curfile;
154+
curfile = m_folder + "/" + m_curs_id->d_name;
155+
// Discard if it is a folder
156+
+#if !(defined(__sun) || defined(_AIX) || defined(__hpux) || defined(__sgi) || defined(__HAIKU__))
157+
if (m_curs_id->d_type == DT_DIR) continue; //FIXME This may not be available on non BSD systems
158+
+#endif
159+
// struct stat st_buf;
160+
// stat (curfile.c_str(), &st_buf);
161+
// if (S_ISDIR(st_buf.st_mode)) continue;
162+
Only in ./eigen-eigen-88c4604601b9/unsupported: README.txt
163+
Only in ./eigen-eigen-88c4604601b9/unsupported: test

0 commit comments

Comments
 (0)