Fix usage of serial AXPBY

base/psblas/psb_caxpby.f90

@@ -384,9 +384,9 @@ subroutine  psb_caxpby(alpha, x, beta,y,desc_a,info, n, jx, jy)
 
   if ((in /= 0)) then
     if(desc_a%get_local_rows() > 0) then
-      call caxpby(desc_a%get_local_cols(),in,&
+      call pab_geaxpby(desc_a%get_local_cols(),in,&
-           & alpha,x(iix:,jjx),lldx,beta,&
+           & alpha,x(iix:,jjx:),beta,&
-           & y(iiy:,jjy),lldy,info)
+           & y(iiy:,jjy:),info)
     end if
   end if
 
@@ -510,9 +510,8 @@ subroutine  psb_caxpbyv(alpha, x, beta,y,desc_a,info)
   end if
 
   if(desc_a%get_local_rows() > 0) then
-    call caxpby(desc_a%get_local_cols(),ione,&
+    call psb_geaxpby(desc_a%get_local_cols(),&
-         & alpha,x,lldx,beta,&
+         & alpha,x,beta,y,info)
-         & y,lldy,info)
   end if
 
   call psb_erractionrestore(err_act)
@@ -642,9 +641,8 @@ subroutine  psb_caxpbyvout(alpha, x, beta,y, z, desc_a,info)
   end if
 
   if(desc_a%get_local_rows() > 0) then
-    call caxpbyv2(desc_a%get_local_cols(),ione,&
+    call psb_geaxpby(desc_a%get_local_cols(),&
-         & alpha,x,lldx,beta,&
+         & alpha,x,beta,y,z,info)
-         & y,lldy,z,lldz,info)
   end if
 
   call psb_erractionrestore(err_act)

base/psblas/psb_daxpby.f90

@@ -384,9 +384,9 @@ subroutine  psb_daxpby(alpha, x, beta,y,desc_a,info, n, jx, jy)
 
   if ((in /= 0)) then
     if(desc_a%get_local_rows() > 0) then
-      call daxpby(desc_a%get_local_cols(),in,&
+      call pab_geaxpby(desc_a%get_local_cols(),in,&
-           & alpha,x(iix:,jjx),lldx,beta,&
+           & alpha,x(iix:,jjx:),beta,&
-           & y(iiy:,jjy),lldy,info)
+           & y(iiy:,jjy:),info)
     end if
   end if
 
@@ -510,9 +510,8 @@ subroutine  psb_daxpbyv(alpha, x, beta,y,desc_a,info)
   end if
 
   if(desc_a%get_local_rows() > 0) then
-    call daxpby(desc_a%get_local_cols(),ione,&
+    call psb_geaxpby(desc_a%get_local_cols(),&
-         & alpha,x,lldx,beta,&
+         & alpha,x,beta,y,info)
-         & y,lldy,info)
   end if
 
   call psb_erractionrestore(err_act)
@@ -642,9 +641,8 @@ subroutine  psb_daxpbyvout(alpha, x, beta,y, z, desc_a,info)
   end if
 
   if(desc_a%get_local_rows() > 0) then
-    call daxpbyv2(desc_a%get_local_cols(),ione,&
+    call psb_geaxpby(desc_a%get_local_cols(),&
-         & alpha,x,lldx,beta,&
+         & alpha,x,beta,y,z,info)
-         & y,lldy,z,lldz,info)
   end if
 
   call psb_erractionrestore(err_act)

base/psblas/psb_saxpby.f90

@@ -384,9 +384,9 @@ subroutine  psb_saxpby(alpha, x, beta,y,desc_a,info, n, jx, jy)
 
   if ((in /= 0)) then
     if(desc_a%get_local_rows() > 0) then
-      call saxpby(desc_a%get_local_cols(),in,&
+      call pab_geaxpby(desc_a%get_local_cols(),in,&
-           & alpha,x(iix:,jjx),lldx,beta,&
+           & alpha,x(iix:,jjx:),beta,&
-           & y(iiy:,jjy),lldy,info)
+           & y(iiy:,jjy:),info)
     end if
   end if
 
@@ -510,9 +510,8 @@ subroutine  psb_saxpbyv(alpha, x, beta,y,desc_a,info)
   end if
 
   if(desc_a%get_local_rows() > 0) then
-    call saxpby(desc_a%get_local_cols(),ione,&
+    call psb_geaxpby(desc_a%get_local_cols(),&
-         & alpha,x,lldx,beta,&
+         & alpha,x,beta,y,info)
-         & y,lldy,info)
   end if
 
   call psb_erractionrestore(err_act)
@@ -642,9 +641,8 @@ subroutine  psb_saxpbyvout(alpha, x, beta,y, z, desc_a,info)
   end if
 
   if(desc_a%get_local_rows() > 0) then
-    call saxpbyv2(desc_a%get_local_cols(),ione,&
+    call psb_geaxpby(desc_a%get_local_cols(),&
-         & alpha,x,lldx,beta,&
+         & alpha,x,beta,y,z,info)
-         & y,lldy,z,lldz,info)
   end if
 
   call psb_erractionrestore(err_act)

base/psblas/psb_zaxpby.f90

@@ -384,9 +384,9 @@ subroutine  psb_zaxpby(alpha, x, beta,y,desc_a,info, n, jx, jy)
 
   if ((in /= 0)) then
     if(desc_a%get_local_rows() > 0) then
-      call zaxpby(desc_a%get_local_cols(),in,&
+      call pab_geaxpby(desc_a%get_local_cols(),in,&
-           & alpha,x(iix:,jjx),lldx,beta,&
+           & alpha,x(iix:,jjx:),beta,&
-           & y(iiy:,jjy),lldy,info)
+           & y(iiy:,jjy:),info)
     end if
   end if
 
@@ -510,9 +510,8 @@ subroutine  psb_zaxpbyv(alpha, x, beta,y,desc_a,info)
   end if
 
   if(desc_a%get_local_rows() > 0) then
-    call zaxpby(desc_a%get_local_cols(),ione,&
+    call psb_geaxpby(desc_a%get_local_cols(),&
-         & alpha,x,lldx,beta,&
+         & alpha,x,beta,y,info)
-         & y,lldy,info)
   end if
 
   call psb_erractionrestore(err_act)
@@ -642,9 +641,8 @@ subroutine  psb_zaxpbyvout(alpha, x, beta,y, z, desc_a,info)
   end if
 
   if(desc_a%get_local_rows() > 0) then
-    call zaxpbyv2(desc_a%get_local_cols(),ione,&
+    call psb_geaxpby(desc_a%get_local_cols(),&
-         & alpha,x,lldx,beta,&
+         & alpha,x,beta,y,z,info)
-         & y,lldy,z,lldz,info)
   end if
 
   call psb_erractionrestore(err_act)