gdl/gdl-std.patch
Orion Poplawski dca5c8f3f4 Use eccodes where available
Add patches to fix build
Use cmake3 for EPEL7 compat
2019-02-13 14:04:38 -07:00

65 lines
2.7 KiB
Diff

diff -up gdl-0.9.9/src/dSFMT/dSFMT-common.h.std gdl-0.9.9/src/dSFMT/dSFMT-common.h
--- gdl-0.9.9/src/dSFMT/dSFMT-common.h.std 2018-12-01 07:19:52.000000000 -0700
+++ gdl-0.9.9/src/dSFMT/dSFMT-common.h 2019-02-12 21:32:20.568719598 -0700
@@ -44,25 +44,25 @@ static const union X128I_T sse2_param_ma
#if defined(HAVE_ALTIVEC)
inline static void do_recursion(w128_t *r, w128_t *a, w128_t * b,
w128_t *lung) {
- const vector unsigned char sl1 = ALTI_SL1;
- const vector unsigned char sl1_perm = ALTI_SL1_PERM;
- const vector unsigned int sl1_msk = ALTI_SL1_MSK;
- const vector unsigned char sr1 = ALTI_SR;
- const vector unsigned char sr1_perm = ALTI_SR_PERM;
- const vector unsigned int sr1_msk = ALTI_SR_MSK;
- const vector unsigned char perm = ALTI_PERM;
- const vector unsigned int msk1 = ALTI_MSK;
- vector unsigned int w, x, y, z;
+ const __vector unsigned char sl1 = ALTI_SL1;
+ const __vector unsigned char sl1_perm = ALTI_SL1_PERM;
+ const __vector unsigned int sl1_msk = ALTI_SL1_MSK;
+ const __vector unsigned char sr1 = ALTI_SR;
+ const __vector unsigned char sr1_perm = ALTI_SR_PERM;
+ const __vector unsigned int sr1_msk = ALTI_SR_MSK;
+ const __vector unsigned char perm = ALTI_PERM;
+ const __vector unsigned int msk1 = ALTI_MSK;
+ __vector unsigned int w, x, y, z;
z = a->s;
w = lung->s;
- x = vec_perm(w, (vector unsigned int)perm, perm);
- y = vec_perm(z, (vector unsigned int)sl1_perm, sl1_perm);
+ x = vec_perm(w, (__vector unsigned int)perm, perm);
+ y = vec_perm(z, (__vector unsigned int)sl1_perm, sl1_perm);
y = vec_sll(y, sl1);
y = vec_and(y, sl1_msk);
w = vec_xor(x, b->s);
w = vec_xor(w, y);
- x = vec_perm(w, (vector unsigned int)sr1_perm, sr1_perm);
+ x = vec_perm(w, (__vector unsigned int)sr1_perm, sr1_perm);
x = vec_srl(x, sr1);
x = vec_and(x, sr1_msk);
y = vec_and(w, msk1);
diff -up gdl-0.9.9/src/dSFMT/dSFMT.h.std gdl-0.9.9/src/dSFMT/dSFMT.h
--- gdl-0.9.9/src/dSFMT/dSFMT.h.std 2018-12-01 07:19:52.000000000 -0700
+++ gdl-0.9.9/src/dSFMT/dSFMT.h 2019-02-12 21:31:11.001860961 -0700
@@ -143,7 +143,7 @@ extern "C" {
/** 128-bit data structure */
union W128_T {
- vector unsigned int s;
+ __vector unsigned int s;
uint64_t u[2];
uint32_t u32[4];
double d[2];
diff -up gdl-0.9.9/src/randomgenerators.cpp.std gdl-0.9.9/src/randomgenerators.cpp
--- gdl-0.9.9/src/randomgenerators.cpp.std 2018-12-01 07:19:52.000000000 -0700
+++ gdl-0.9.9/src/randomgenerators.cpp 2019-02-12 21:31:11.002860973 -0700
@@ -35,7 +35,6 @@
namespace lib {
- using namespace std;
#ifdef USE_EIGEN
/* following are some modified codes taken from the GNU Scientific Library.
*