From 4ed5f7dbb994f19355eb861966fef6e9760c0fce Mon Sep 17 00:00:00 2001 From: Dong Li Date: Fri, 26 May 2017 04:38:16 -0700 Subject: [PATCH] Disable neon when enable gpu. --- paddle/cuda/include/hl_matrix_type.cuh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/paddle/cuda/include/hl_matrix_type.cuh b/paddle/cuda/include/hl_matrix_type.cuh index 2ced2fb1ab1..77f73167fe6 100644 --- a/paddle/cuda/include/hl_matrix_type.cuh +++ b/paddle/cuda/include/hl_matrix_type.cuh @@ -38,7 +38,7 @@ typedef double2 vecType; #endif #elif defined(__SSE3__) #include "hl_cpu_simd_sse.cuh" -#elif defined(__ARM_NEON) || defined(__ARM_NEON__) +#elif (defined(__ARM_NEON) || defined(__ARM_NEON__)) && !defined(__NVCC__) #include "hl_cpu_simd_neon.cuh" #else #include "hl_cpu_scalar.cuh" -- GitLab