From 4fdae4dda9776d6049b8b0d4cbef89bf543610e5 Mon Sep 17 00:00:00 2001 From: Desire NUENTSA Date: Wed, 6 Mar 2013 16:35:12 +0100 Subject: [PATCH] Fix bug in SparseLU kernel for 32bits indices --- Eigen/src/SparseLU/SparseLU_gemm_kernel.h | 26 +++++++++++------------ 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/Eigen/src/SparseLU/SparseLU_gemm_kernel.h b/Eigen/src/SparseLU/SparseLU_gemm_kernel.h index be90a94cc..c8edf1cac 100644 --- a/Eigen/src/SparseLU/SparseLU_gemm_kernel.h +++ b/Eigen/src/SparseLU/SparseLU_gemm_kernel.h @@ -104,21 +104,21 @@ void sparselu_gemm(int m, int n, int d, const Scalar* A, int lda, const Scalar* a2 = a3 = a0; } -#define KMADD(c, a, b, tmp) tmp = b; tmp = pmul(a,tmp); c = padd(c,tmp); +#define KMADD(c, a, b, tmp) {tmp = b; tmp = pmul(a,tmp); c = padd(c,tmp);} #define WORK(I) \ c0 = pload(C0+i+(I)*PacketSize); \ c1 = pload(C1+i+(I)*PacketSize); \ - KMADD(c0, a0, b00, t0); \ - KMADD(c1, a0, b01, t1); \ + KMADD(c0, a0, b00, t0) \ + KMADD(c1, a0, b01, t1) \ a0 = pload(A0+i+(I+1)*PacketSize); \ - KMADD(c0, a1, b10, t0); \ - KMADD(c1, a1, b11, t1); \ + KMADD(c0, a1, b10, t0) \ + KMADD(c1, a1, b11, t1) \ a1 = pload(A1+i+(I+1)*PacketSize); \ - if(RK==4) KMADD(c0, a2, b20, t0); \ - if(RK==4) KMADD(c1, a2, b21, t1); \ + if(RK==4) KMADD(c0, a2, b20, t0) \ + if(RK==4) KMADD(c1, a2, b21, t1) \ if(RK==4) a2 = pload(A2+i+(I+1)*PacketSize); \ - if(RK==4) KMADD(c0, a3, b30, t0); \ - if(RK==4) KMADD(c1, a3, b31, t1); \ + if(RK==4) KMADD(c0, a3, b30, t0) \ + if(RK==4) KMADD(c1, a3, b31, t1) \ if(RK==4) a3 = pload(A3+i+(I+1)*PacketSize); \ pstore(C0+i+(I)*PacketSize, c0); \ pstore(C1+i+(I)*PacketSize, c1) @@ -204,13 +204,13 @@ void sparselu_gemm(int m, int n, int d, const Scalar* A, int lda, const Scalar* #define WORK(I) \ c0 = pload(C0+i+(I)*PacketSize); \ - KMADD(c0, a0, b00, t0); \ + KMADD(c0, a0, b00, t0) \ a0 = pload(A0+i+(I+1)*PacketSize); \ - KMADD(c0, a1, b10, t0); \ + KMADD(c0, a1, b10, t0) \ a1 = pload(A1+i+(I+1)*PacketSize); \ - if(RK==4) KMADD(c0, a2, b20, t0); \ + if(RK==4) KMADD(c0, a2, b20, t0) \ if(RK==4) a2 = pload(A2+i+(I+1)*PacketSize); \ - if(RK==4) KMADD(c0, a3, b30, t0); \ + if(RK==4) KMADD(c0, a3, b30, t0) \ if(RK==4) a3 = pload(A3+i+(I+1)*PacketSize); \ pstore(C0+i+(I)*PacketSize, c0);