|
| 1 | +commit a6f43886153bfa63a609720e02bcc9c6f4a50140 |
| 2 | +Author: q66 <daniel@octaforge.org> |
| 3 | +Date: Mon Jan 6 00:48:43 2020 +0100 |
| 4 | + |
| 5 | + Disable VSX on platforms without it |
| 6 | + |
| 7 | +diff --git contrib/lua-torch/torch7/lib/TH/THVector.c contrib/lua-torch/torch7/lib/TH/THVector.c |
| 8 | +index 4410578..c972b13 100644 |
| 9 | +--- contrib/lua-torch/torch7/lib/TH/THVector.c |
| 10 | ++++ contrib/lua-torch/torch7/lib/TH/THVector.c |
| 11 | +@@ -6,7 +6,7 @@ |
| 12 | + #include "vector/NEON.c" |
| 13 | + #endif |
| 14 | + |
| 15 | +-#ifdef __PPC64__ |
| 16 | ++#if defined(__PPC64__) && defined(__VSX__) |
| 17 | + #include "vector/VSX.c" |
| 18 | + #endif |
| 19 | + |
| 20 | +diff --git contrib/lua-torch/torch7/lib/TH/generic/THVectorDispatch.c contrib/lua-torch/torch7/lib/TH/generic/THVectorDispatch.c |
| 21 | +index 5b88852..8ab4f67 100644 |
| 22 | +--- contrib/lua-torch/torch7/lib/TH/generic/THVectorDispatch.c |
| 23 | ++++ contrib/lua-torch/torch7/lib/TH/generic/THVectorDispatch.c |
| 24 | +@@ -20,7 +20,7 @@ static FunctionDescription THVector_(fill_DISPATCHTABLE)[] = { |
| 25 | + #endif |
| 26 | + #endif |
| 27 | + |
| 28 | +- #if defined(__PPC64__) |
| 29 | ++ #if defined(__PPC64__) && defined(__VSX__) |
| 30 | + #if defined(TH_REAL_IS_DOUBLE) || defined(TH_REAL_IS_FLOAT) |
| 31 | + FUNCTION_IMPL(THVector_(fill_VSX), SIMDExtension_VSX), |
| 32 | + #endif |
| 33 | +@@ -85,7 +85,7 @@ static FunctionDescription THVector_(adds_DISPATCHTABLE)[] = { |
| 34 | + #endif |
| 35 | + #endif |
| 36 | + |
| 37 | +- #if defined(__PPC64__) |
| 38 | ++ #if defined(__PPC64__) && defined(__VSX__) |
| 39 | + #if defined(TH_REAL_IS_DOUBLE) || defined(TH_REAL_IS_FLOAT) |
| 40 | + FUNCTION_IMPL(THVector_(adds_VSX), SIMDExtension_VSX), |
| 41 | + #endif |
| 42 | +@@ -146,7 +146,7 @@ static FunctionDescription THVector_(muls_DISPATCHTABLE)[] = { |
| 43 | + #endif |
| 44 | + #endif |
| 45 | + |
| 46 | +- #if defined(__PPC64__) |
| 47 | ++ #if defined(__PPC64__) && defined(__VSX__) |
| 48 | + #if defined(TH_REAL_IS_DOUBLE) || defined(TH_REAL_IS_FLOAT) |
| 49 | + FUNCTION_IMPL(THVector_(muls_VSX), SIMDExtension_VSX), |
| 50 | + #endif |
| 51 | +diff --git contrib/lua-torch/torch7/lib/TH/generic/simd/simd.h contrib/lua-torch/torch7/lib/TH/generic/simd/simd.h |
| 52 | +index 83c4c56..0919f73 100644 |
| 53 | +--- contrib/lua-torch/torch7/lib/TH/generic/simd/simd.h |
| 54 | ++++ contrib/lua-torch/torch7/lib/TH/generic/simd/simd.h |
| 55 | +@@ -43,7 +43,7 @@ enum SIMDExtensions |
| 56 | + { |
| 57 | + #if defined(__NEON__) |
| 58 | + SIMDExtension_NEON = 0x1, |
| 59 | +-#elif defined(__PPC64__) |
| 60 | ++#elif defined(__PPC64__) && defined(__VSX__) |
| 61 | + SIMDExtension_VSX = 0x1, |
| 62 | + #else |
| 63 | + SIMDExtension_AVX2 = 0x1, |
0 commit comments