openacc/Makefile

@@ -1,32 +1,34 @@
 include ../Make.inc
 
-
+# Compilers and flags
 #CC=mpicc
 #FC=mpif90
 #FCOPT=-O0 -march=native
 #OFFLOAD=-fopenacc -foffload=nvptx-none="-march=sm_70"
 
+# Directories
 LIBDIR=../lib
 INCDIR=../include
 MODDIR=../modules
 IMPLDIR=./impl 
 
+# Include and library paths
 INCLUDES=-I$(LIBDIR) -I$(INCDIR) -I$(MODDIR) 
 FINCLUDES=$(FMFLAG). $(FMFLAG)$(INCDIR) $(FMFLAG)$(MODDIR) $(FIFLAG). 
 CINCLUDES=
 #LIBS=-L$(LIBDIR) -lpsb_util -lpsb_ext -lpsb_base -lopenblas -lmetis
 
-
+# Source files
 FOBJS= psb_i_oacc_vect_mod.o psb_d_oacc_vect_mod.o \
 	psb_oacc_mod.o  psb_d_oacc_csr_mat_mod.o \
 	psb_oacc_env_mod.o
 
-
+# Library name
 LIBNAME=libpsb_openacc.a
 
 OBJS=$(COBJS) $(FOBJS)
 
-
+# Rules
 lib: objs ilib 
 	ar cur $(LIBNAME) $(OBJS)
 	/bin/cp -p $(LIBNAME) $(LIBDIR)

openacc/impl/Makefile

@@ -2,7 +2,6 @@ include ../../Make.inc
 LIBDIR=../../lib
 INCDIR=../../include
 MODDIR=../../modules
-UP=..
 #
 # Compilers and such
 #
@@ -10,30 +9,13 @@ UP=..
 FINCLUDES=$(FMFLAG).. $(FMFLAG)$(MODDIR) $(FMFLAG)$(INCDIR) $(FIFLAG).. 
 LIBNAME=libpsb_openacc.a
 
-OBJS= psb_d_oacc_csr_vect_mv.o psb_d_oacc_csr_inner_vect_sv.o \
+OBJS= psb_d_oacc_csr_vect_mv.o psb_d_oacc_mlt_v_2.o psb_d_oacc_mlt_v.o
-	psb_d_oacc_csr_csmm.o psb_d_oacc_csr_csmv.o psb_d_oacc_csr_scals.o \
-	psb_d_oacc_csr_scal.o psb_d_oacc_csr_allocate_mnnz.o \
-	psb_d_oacc_csr_reallocate_nz.o psb_d_oacc_csr_cp_from_coo.o \
-	psb_d_oacc_csr_cp_from_fmt.o psb_d_oacc_csr_mv_from_coo.o \
-	psb_d_oacc_csr_mv_from_fmt.o psb_d_oacc_csr_mold.o \
-	psb_d_oacc_mlt_v_2.o psb_d_oacc_mlt_v.o
 
 objs: $(OBJS)
 
 lib: objs
 	ar cur ../$(LIBNAME) $(OBJS)
 
-
-psb_d_oacc_csr_vect_mv.o psb_d_oacc_csr_inner_vect_sv.o \
-	psb_d_oacc_csr_csmm.o psb_d_oacc_csr_csmv.o psb_d_oacc_csr_scals.o \
-	psb_d_oacc_csr_scal.o psb_d_oacc_csr_allocate_mnnz.o \
-	psb_d_oacc_csr_reallocate_nz.o psb_d_oacc_csr_cp_from_coo.o \
-	psb_d_oacc_csr_cp_from_fmt.o psb_d_oacc_csr_mv_from_coo.o \
-	psb_d_oacc_csr_mv_from_fmt.o psb_d_oacc_csr_mold.o: $(UP)/psb_d_oacc_csr_mat_mod.o
-
-psb_d_oacc_mlt_v_2.o psb_d_oacc_mlt_v.o: $(UP)/psb_d_oacc_vect_mod.o
-
-
 clean:
 	/bin/rm -f $(OBJS)
 

openacc/impl/psb_d_oacc_csr_allocate_mnnz.F90

@@ -1,35 +0,0 @@
-submodule (psb_d_oacc_csr_mat_mod) psb_d_oacc_csr_allocate_mnnz_impl
-  use psb_base_mod
-contains
-  module subroutine psb_d_oacc_csr_allocate_mnnz(m, n, a, nz)
-    implicit none 
-    integer(psb_ipk_), intent(in) :: m, n
-    class(psb_d_oacc_csr_sparse_mat), intent(inout) :: a
-    integer(psb_ipk_), intent(in), optional :: nz
-    integer(psb_ipk_) :: info
-    integer(psb_ipk_) :: err_act, nz_
-    character(len=20)  :: name='allocate_mnz'
-    logical, parameter :: debug=.false.
-
-    call psb_erractionsave(err_act)
-    info = psb_success_
-
-    call a%psb_d_csr_sparse_mat%allocate(m, n, nz)
-
-    if (.not.allocated(a%val)) then
-      allocate(a%val(nz))
-      allocate(a%ja(nz))
-      allocate(a%irp(m+1))
-    end if
-
-    call a%set_dev()
-    if (info /= 0) goto 9999
-
-    call psb_erractionrestore(err_act)
-    return
-
-9999 call psb_error_handler(err_act)
-    return
-
-  end subroutine psb_d_oacc_csr_allocate_mnnz
-end submodule psb_d_oacc_csr_allocate_mnnz_impl

openacc/impl/psb_d_oacc_csr_cp_from_coo.F90

@@ -1,26 +0,0 @@
-submodule (psb_d_oacc_csr_mat_mod) psb_d_oacc_csr_cp_from_coo_impl
-  use psb_base_mod
-contains
-  module subroutine psb_d_oacc_csr_cp_from_coo(a, b, info)
-    implicit none
-
-    class(psb_d_oacc_csr_sparse_mat), intent(inout) :: a
-    class(psb_d_coo_sparse_mat), intent(in)         :: b
-    integer(psb_ipk_), intent(out)                  :: info
-
-    info = psb_success_
-
-    call a%psb_d_csr_sparse_mat%cp_from_coo(b, info)
-    if (info /= 0) goto 9999
-
-    call a%set_dev()
-    if (info /= 0) goto 9999
-
-    return
-
-9999 continue
-    info = psb_err_alloc_dealloc_
-    return
-
-  end subroutine psb_d_oacc_csr_cp_from_coo
-end submodule psb_d_oacc_csr_cp_from_coo_impl

openacc/impl/psb_d_oacc_csr_cp_from_fmt.F90

@@ -1,24 +0,0 @@
-submodule (psb_d_oacc_csr_mat_mod) psb_d_oacc_csr_cp_from_fmt_impl
-  use psb_base_mod
-contains
-  module subroutine psb_d_oacc_csr_cp_from_fmt(a, b, info)
-    implicit none 
-
-    class(psb_d_oacc_csr_sparse_mat), intent(inout) :: a
-    class(psb_d_base_sparse_mat), intent(in) :: b
-    integer(psb_ipk_), intent(out)            :: info
-
-    info = psb_success_
-
-    select type(b)
-    type is (psb_d_coo_sparse_mat)
-      call a%cp_from_coo(b, info)
-    class default
-      call a%psb_d_csr_sparse_mat%cp_from_fmt(b, info)
-      if (info /= 0) return
-
-      !$acc update device(a%val, a%ja, a%irp)
-    end select
-
-  end subroutine psb_d_oacc_csr_cp_from_fmt
-end submodule psb_d_oacc_csr_cp_from_fmt_impl

openacc/impl/psb_d_oacc_csr_csmm.F90

@@ -1,86 +0,0 @@
-submodule (psb_d_oacc_csr_mat_mod) psb_d_oacc_csr_csmm_impl
-  use psb_base_mod
-contains
-  module subroutine psb_d_oacc_csr_csmm(alpha, a, x, beta, y, info, trans)
-    implicit none
-    class(psb_d_oacc_csr_sparse_mat), intent(in) :: a
-    real(psb_dpk_), intent(in)          :: alpha, beta
-    real(psb_dpk_), intent(in)          :: x(:,:)
-    real(psb_dpk_), intent(inout)       :: y(:,:)
-    integer(psb_ipk_), intent(out)       :: info
-    character, optional, intent(in)      :: trans
-
-    character :: trans_
-    integer(psb_ipk_) :: i, j, m, n,k, nxy
-    logical :: tra
-    integer(psb_ipk_) :: err_act
-    character(len=20) :: name = 'd_oacc_csmm'
-    logical, parameter :: debug = .false.
-
-    info = psb_success_
-    call psb_erractionsave(err_act)
-
-    if (present(trans)) then
-      trans_ = trans
-    else
-      trans_ = 'N'
-    end if
-
-    if (.not.a%is_asb()) then
-      info = psb_err_invalid_mat_state_
-      call psb_errpush(info, name)
-      goto 9999
-    endif
-    tra = (psb_toupper(trans_) == 'T') .or. (psb_toupper(trans_) == 'C')
-
-    if (tra) then
-      m = a%get_ncols()
-      n = a%get_nrows()
-    else
-      n = a%get_ncols()
-      m = a%get_nrows()
-    end if
-
-    if (size(x,1) < n) then
-      info = 36
-      call psb_errpush(info, name, i_err = (/3 * ione, n, izero, izero, izero/))
-      goto 9999
-    end if
-
-    if (size(y,1) < m) then
-      info = 36
-      call psb_errpush(info, name, i_err = (/5 * ione, m, izero, izero, izero/))
-      goto 9999
-    end if
-
-    if (tra) then
-      call a%psb_d_csr_sparse_mat%spmm(alpha, x, beta, y, info, trans)
-    else
-      nxy = min(size(x,2), size(y,2))
-
-      !$acc parallel loop collapse(2) present(a, x, y)
-      do j = 1, nxy
-        do i = 1, m
-          y(i,j) = beta * y(i,j)
-        end do
-      end do
-
-      !$acc parallel loop collapse(2) present(a, x, y)
-      do j = 1, nxy
-        do i = 1, n
-          do k = a%irp(i), a%irp(i+1) - 1
-            y(a%ja(k), j) = y(a%ja(k), j) + alpha * a%val(k) * x(i, j)
-          end do
-        end do
-      end do
-    endif
-
-    call psb_erractionrestore(err_act)
-    return
-
-9999 call psb_error_handler(err_act)
-    return
-
-  end subroutine psb_d_oacc_csr_csmm
-end submodule psb_d_oacc_csr_csmm_impl
-

openacc/impl/psb_d_oacc_csr_csmv.F90

@@ -1,81 +0,0 @@
-submodule (psb_d_oacc_csr_mat_mod) psb_d_oacc_csr_csmv_impl
-  use psb_base_mod
-contains
-  module subroutine psb_d_oacc_csr_csmv(alpha, a, x, beta, y, info, trans)
-    implicit none 
-    class(psb_d_oacc_csr_sparse_mat), intent(in) :: a
-    real(psb_dpk_), intent(in)          :: alpha, beta
-    real(psb_dpk_), intent(in)          :: x(:)
-    real(psb_dpk_), intent(inout)       :: y(:)
-    integer(psb_ipk_), intent(out)       :: info
-    character, optional, intent(in)      :: trans
-
-    character :: trans_
-    integer(psb_ipk_) :: i, j, m, n
-    logical :: tra
-    integer(psb_ipk_) :: err_act
-    character(len=20) :: name = 'd_oacc_csmv'
-    logical, parameter :: debug = .false.
-
-    call psb_erractionsave(err_act)
-    info = psb_success_
-
-    if (present(trans)) then
-      trans_ = trans
-    else
-      trans_ = 'N'
-    end if
-
-    if (.not.a%is_asb()) then 
-      info = psb_err_invalid_mat_state_
-      call psb_errpush(info, name)
-      goto 9999
-    endif
-
-    tra = (psb_toupper(trans_) == 'T') .or. (psb_toupper(trans_) == 'C')
-
-    if (tra) then 
-      m = a%get_ncols()
-      n = a%get_nrows()
-    else
-      n = a%get_ncols()
-      m = a%get_nrows()
-    end if
-
-    if (size(x,1) < n) then 
-      info = 36
-      call psb_errpush(info, name, i_err = (/3 * ione, n, izero, izero, izero/))
-      goto 9999
-    end if
-
-    if (size(y,1) < m) then 
-      info = 36
-      call psb_errpush(info, name, i_err = (/5 * ione, m, izero, izero, izero/))
-      goto 9999
-    end if
-
-    if (tra) then 
-      call a%psb_d_csr_sparse_mat%spmm(alpha, x, beta, y, info, trans) 
-    else
-      !$acc parallel loop present(a, x, y)
-      do i = 1, m
-        y(i) = beta * y(i)
-      end do
-
-      !$acc parallel loop present(a, x, y)
-      do i = 1, n
-        do j = a%irp(i), a%irp(i+1) - 1
-          y(a%ja(j)) = y(a%ja(j)) + alpha * a%val(j) * x(i)
-        end do
-      end do
-    endif
-
-    call psb_erractionrestore(err_act)
-    return
-
-9999 call psb_error_handler(err_act)
-    return
-
-  end subroutine psb_d_oacc_csr_csmv
-end submodule psb_d_oacc_csr_csmv_impl
-

openacc/impl/psb_d_oacc_csr_inner_vect_sv.F90

@@ -1,83 +0,0 @@
-submodule (psb_d_oacc_csr_mat_mod) psb_d_oacc_csr_inner_vect_sv_impl
-  use psb_base_mod
-contains
-  module subroutine psb_d_oacc_csr_inner_vect_sv(alpha, a, x, beta, y, info, trans)
-    implicit none
-    class(psb_d_oacc_csr_sparse_mat), intent(in) :: a
-    real(psb_dpk_), intent(in) :: alpha, beta
-    class(psb_d_base_vect_type), intent(inout) :: x, y
-    integer(psb_ipk_), intent(out) :: info
-    character, optional, intent(in) :: trans
-
-    real(psb_dpk_), allocatable :: rx(:), ry(:)
-    logical :: tra
-    character :: trans_
-    integer(psb_ipk_) :: err_act
-    character(len=20) :: name = 'd_oacc_csr_inner_vect_sv'
-    logical, parameter :: debug = .false.
-    integer(psb_ipk_) :: i
-
-    call psb_get_erraction(err_act)
-    info = psb_success_
-
-    if (present(trans)) then
-      trans_ = trans
-    else
-      trans_ = 'N'
-    end if
-
-    if (.not.a%is_asb()) then
-      info = psb_err_invalid_mat_state_
-      call psb_errpush(info, name)
-      goto 9999
-    endif
-
-    tra = (psb_toupper(trans_) == 'T') .or. (psb_toupper(trans_) == 'C')
-
-    if (tra .or. (beta /= dzero)) then
-      call x%sync()
-      call y%sync()
-      call a%psb_d_csr_sparse_mat%inner_spsm(alpha, x, beta, y, info, trans)
-      call y%set_host()
-    else
-      select type (xx => x)
-      type is (psb_d_vect_oacc)
-        select type(yy => y)
-        type is (psb_d_vect_oacc)
-          if (xx%is_host()) call xx%sync()
-          if (beta /= dzero) then
-            if (yy%is_host()) call yy%sync()
-          end if
-          !$acc parallel loop present(a, xx, yy)
-          do i = 1, size(a%val)
-            yy%v(i) = alpha * a%val(i) * xx%v(a%ja(i)) + beta * yy%v(i)
-          end do
-          call yy%set_dev()
-        class default
-          rx = xx%get_vect()
-          ry = y%get_vect()
-          call a%psb_d_csr_sparse_mat%inner_spsm(alpha, rx, beta, ry, info)
-          call y%bld(ry)
-        end select
-      class default
-        rx = x%get_vect()
-        ry = y%get_vect()
-        call a%psb_d_csr_sparse_mat%inner_spsm(alpha, rx, beta, ry, info)
-        call y%bld(ry)
-      end select
-    endif
-
-    if (info /= psb_success_) then
-      info = psb_err_from_subroutine_
-      call psb_errpush(info, name, a_err = 'csrg_vect_sv')
-      goto 9999
-    endif
-
-    call psb_erractionrestore(err_act)
-    return
-
-9999 call psb_error_handler(err_act)
-    return
-  end subroutine psb_d_oacc_csr_inner_vect_sv
-end submodule psb_d_oacc_csr_inner_vect_sv_impl
-

openacc/impl/psb_d_oacc_csr_mold.F90

@@ -1,35 +0,0 @@
-submodule (psb_d_oacc_csr_mat_mod) psb_d_oacc_csr_mold_impl
-  use psb_base_mod
-contains  
-  module subroutine psb_d_oacc_csr_mold(a, b, info)    
-    implicit none 
-    class(psb_d_oacc_csr_sparse_mat), intent(in)                 :: a
-    class(psb_d_base_sparse_mat), intent(inout), allocatable :: b
-    integer(psb_ipk_), intent(out)                    :: info
-    integer(psb_ipk_) :: err_act
-    character(len=20)  :: name='csr_mold'
-    logical, parameter :: debug=.false.
-
-    call psb_get_erraction(err_act)
-
-    info = 0 
-    if (allocated(b)) then 
-      call b%free()
-      deallocate(b, stat=info)
-    end if
-    if (info == 0) allocate(psb_d_oacc_csr_sparse_mat :: b, stat=info)
-
-    if (info /= psb_success_) then 
-      info = psb_err_alloc_dealloc_ 
-      call psb_errpush(info, name)
-      goto 9999
-    end if
-    return
-
-9999 call psb_error_handler(err_act)
-
-    return
-
-  end subroutine psb_d_oacc_csr_mold
-end submodule psb_d_oacc_csr_mold_impl
-

openacc/impl/psb_d_oacc_csr_mv_from_coo.F90

@@ -1,25 +0,0 @@
-submodule (psb_d_oacc_csr_mat_mod) psb_d_oacc_csr_mv_from_coo_impl
-  use psb_base_mod
-contains
-  module subroutine psb_d_oacc_csr_mv_from_coo(a, b, info)
-    implicit none 
-
-    class(psb_d_oacc_csr_sparse_mat), intent(inout) :: a
-    class(psb_d_coo_sparse_mat), intent(inout)  :: b
-    integer(psb_ipk_), intent(out)              :: info
-
-    info = psb_success_
-
-    call a%psb_d_csr_sparse_mat%mv_from_coo(b, info)
-    if (info /= 0) goto 9999
-
-    !$acc update device(a%val, a%ja, a%irp)
-
-    return
-
-9999 continue
-    info = psb_err_alloc_dealloc_
-    return
-
-  end subroutine psb_d_oacc_csr_mv_from_coo
-end submodule psb_d_oacc_csr_mv_from_coo_impl

openacc/impl/psb_d_oacc_csr_mv_from_fmt.F90

@@ -1,24 +0,0 @@
-submodule (psb_d_oacc_csr_mat_mod) psb_d_oacc_csr_mv_from_fmt_impl
-  use psb_base_mod
-contains
-  module subroutine psb_d_oacc_csr_mv_from_fmt(a, b, info)
-    implicit none 
-
-    class(psb_d_oacc_csr_sparse_mat), intent(inout) :: a
-    class(psb_d_base_sparse_mat), intent(inout) :: b
-    integer(psb_ipk_), intent(out)              :: info
-
-    info = psb_success_
-
-    select type(b)
-    type is (psb_d_coo_sparse_mat)
-      call a%mv_from_coo(b, info)
-    class default
-      call a%psb_d_csr_sparse_mat%mv_from_fmt(b, info)
-      if (info /= 0) return
-
-      !$acc update device(a%val, a%ja, a%irp)
-    end select
-
-  end subroutine psb_d_oacc_csr_mv_from_fmt
-end submodule psb_d_oacc_csr_mv_from_fmt_impl

openacc/impl/psb_d_oacc_csr_reallocate_nz.F90

@@ -1,28 +0,0 @@
-submodule (psb_d_oacc_csr_mat_mod) psb_d_oacc_csr_reallocate_nz_impl
-  use psb_base_mod
-contains
-  module subroutine psb_d_oacc_csr_reallocate_nz(nz, a)
-    implicit none 
-    integer(psb_ipk_), intent(in) :: nz
-    class(psb_d_oacc_csr_sparse_mat), intent(inout) :: a
-    integer(psb_ipk_) :: info
-    integer(psb_ipk_) :: err_act
-    character(len=20)  :: name='d_oacc_csr_reallocate_nz'
-    logical, parameter :: debug=.false.
-
-    call psb_erractionsave(err_act)
-    info = psb_success_
-
-    call a%psb_d_csr_sparse_mat%reallocate(nz)
-
-    call a%set_dev()
-    if (info /= 0) goto 9999
-
-    call psb_erractionrestore(err_act)
-    return
-
-9999 call psb_error_handler(err_act)
-    return
-
-  end subroutine psb_d_oacc_csr_reallocate_nz
-end submodule psb_d_oacc_csr_reallocate_nz_impl

openacc/impl/psb_d_oacc_csr_scal.F90

@@ -1,53 +0,0 @@
-submodule (psb_d_oacc_csr_mat_mod) psb_d_oacc_csr_scal_impl
-  use psb_base_mod
-contains
-  module subroutine psb_d_oacc_csr_scal(d, a, info, side)
-    implicit none 
-    class(psb_d_oacc_csr_sparse_mat), intent(inout) :: a
-    real(psb_dpk_), intent(in)      :: d(:)
-    integer(psb_ipk_), intent(out)  :: info
-    character, intent(in), optional :: side
-
-    integer(psb_ipk_)  :: err_act
-    character(len=20)  :: name='scal'
-    logical, parameter :: debug=.false.
-    integer(psb_ipk_)  :: i, j
-
-    info  = psb_success_
-    call psb_erractionsave(err_act)
-
-    if (a%is_host()) call a%sync()
-
-    if (present(side)) then
-      if (side == 'L') then
-        !$acc parallel loop present(a, d)
-        do i = 1, a%get_nrows()
-          do j = a%irp(i), a%irp(i+1) - 1
-            a%val(j) = a%val(j) * d(i)
-          end do
-        end do
-      else if (side == 'R') then
-        !$acc parallel loop present(a, d)
-        do i = 1, a%get_ncols()
-          do j = a%irp(i), a%irp(i+1) - 1
-            a%val(j) = a%val(j) * d(a%ja(j))
-          end do
-        end do
-      end if
-    else
-      !$acc parallel loop present(a, d)
-      do i = 1, size(a%val)
-        a%val(i) = a%val(i) * d(i)
-      end do
-    end if
-
-    call a%set_dev()
-
-    call psb_erractionrestore(err_act)
-    return
-
-9999 call psb_error_handler(err_act)
-    return
-
-  end subroutine psb_d_oacc_csr_scal
-end submodule psb_d_oacc_csr_scal_impl

openacc/impl/psb_d_oacc_csr_scals.F90

@@ -1,34 +0,0 @@
-submodule (psb_d_oacc_csr_mat_mod) psb_d_oacc_csr_scals_impl
-  use psb_base_mod
-contains
-  module subroutine psb_d_oacc_csr_scals(d, a, info)
-    implicit none 
-    class(psb_d_oacc_csr_sparse_mat), intent(inout) :: a
-    real(psb_dpk_), intent(in)      :: d
-    integer(psb_ipk_), intent(out)  :: info
-
-    integer(psb_ipk_) :: err_act
-    character(len=20)  :: name='scal'
-    logical, parameter :: debug=.false.
-    integer(psb_ipk_) :: i
-
-    info  = psb_success_
-    call psb_erractionsave(err_act)
-
-    if (a%is_host()) call a%sync()
-
-    !$acc parallel loop present(a)
-    do i = 1, size(a%val)
-      a%val(i) = a%val(i) * d
-    end do
-
-    call a%set_dev()
-
-    call psb_erractionrestore(err_act)
-    return
-
-9999 call psb_error_handler(err_act)
-    return
-
-  end subroutine psb_d_oacc_csr_scals
-end submodule psb_d_oacc_csr_scals_impl

openacc/impl/psb_d_oacc_csr_vect_mv.F90

@@ -1,7 +1,6 @@
-submodule (psb_d_oacc_csr_mat_mod) psb_d_oacc_csr_vect_mv_impl
+subroutine psb_d_oacc_csr_vect_mv(alpha, a, x, beta, y, info, trans)
     use psb_base_mod
-contains
+    use psb_d_oacc_csr_mat_mod, psb_protect_name => psb_d_oacc_csr_vect_mv
-  module subroutine psb_d_oacc_csr_vect_mv(alpha, a, x, beta, y, info, trans)
     implicit none
 
     real(psb_dpk_), intent(in)        :: alpha, beta
@@ -60,4 +59,3 @@ contains
     end subroutine inner_spmv
 
 end subroutine psb_d_oacc_csr_vect_mv
-end submodule psb_d_oacc_csr_vect_mv_impl

openacc/impl/psb_d_oacc_mlt_v.f90

@@ -1,8 +1,6 @@
-submodule (psb_d_oacc_vect_mod) psb_d_oacc_mlt_v_impl
-  use psb_string_mod
-contains
 
-  module subroutine psb_d_oacc_mlt_v(x, y, info)
+subroutine d_oacc_mlt_v(x, y, info)
+  use psb_d_oacc_vect_mod, psb_protect_name => d_oacc_mlt_v
 
   implicit none 
   class(psb_d_base_vect_type), intent(inout) :: x
@@ -30,5 +28,4 @@ contains
     end do
     call y%set_host()
   end select
-  end subroutine psb_d_oacc_mlt_v
+end subroutine d_oacc_mlt_v
-end submodule psb_d_oacc_mlt_v_impl

openacc/impl/psb_d_oacc_mlt_v_2.f90

@@ -1,7 +1,6 @@
-submodule (psb_d_oacc_vect_mod) d_oacc_mlt_v_2_impl
+subroutine d_oacc_mlt_v_2(alpha, x, y, beta, z, info, conjgx, conjgy)
+  use psb_d_oacc_vect_mod, psb_protect_name => d_oacc_mlt_v_2
   use psb_string_mod
-contains
-  module subroutine d_oacc_mlt_v_2(alpha, x, y, beta, z, info, conjgx, conjgy)
   implicit none 
   real(psb_dpk_), intent(in)                 :: alpha, beta
   class(psb_d_base_vect_type), intent(inout) :: x
@@ -51,5 +50,4 @@ contains
     call z%set_host()
   end select
 end subroutine d_oacc_mlt_v_2
-end submodule d_oacc_mlt_v_2_impl
 

openacc/psb_d_oacc_csr_mat_mod.F90

@@ -12,22 +12,6 @@ module psb_d_oacc_csr_mat_mod
     type, extends(psb_d_csr_sparse_mat) :: psb_d_oacc_csr_sparse_mat
         integer(psb_ipk_) :: devstate = is_host
     contains
-    procedure, nopass  :: get_fmt       => d_oacc_csr_get_fmt
-    procedure, pass(a) :: sizeof        => d_oacc_csr_sizeof
-    procedure, pass(a) :: vect_mv       => psb_d_oacc_csr_vect_mv
-    procedure, pass(a) :: in_vect_sv    => psb_d_oacc_csr_inner_vect_sv
-    procedure, pass(a) :: csmm          => psb_d_oacc_csr_csmm
-    procedure, pass(a) :: csmv          => psb_d_oacc_csr_csmv
-    procedure, pass(a) :: scals         => psb_d_oacc_csr_scals
-    procedure, pass(a) :: scalv         => psb_d_oacc_csr_scal
-    procedure, pass(a) :: reallocate_nz => psb_d_oacc_csr_reallocate_nz
-    procedure, pass(a) :: allocate_mnnz => psb_d_oacc_csr_allocate_mnnz
-    procedure, pass(a) :: cp_from_coo   => psb_d_oacc_csr_cp_from_coo
-    procedure, pass(a) :: cp_from_fmt   => psb_d_oacc_csr_cp_from_fmt
-    procedure, pass(a) :: mv_from_coo   => psb_d_oacc_csr_mv_from_coo
-    procedure, pass(a) :: mv_from_fmt   => psb_d_oacc_csr_mv_from_fmt
-    procedure, pass(a) :: free          => d_oacc_csr_free
-    procedure, pass(a) :: mold          => psb_d_oacc_csr_mold
         procedure, pass(a) :: all         => d_oacc_csr_all
         procedure, pass(a) :: is_host     => d_oacc_csr_is_host
         procedure, pass(a) :: is_sync     => d_oacc_csr_is_sync
@@ -37,42 +21,12 @@ module psb_d_oacc_csr_mat_mod
         procedure, pass(a) :: set_dev     => d_oacc_csr_set_dev
         procedure, pass(a) :: sync_space  => d_oacc_csr_sync_space
         procedure, pass(a) :: sync        => d_oacc_csr_sync
+        procedure, pass(a) :: vect_mv     => psb_d_oacc_csr_vect_mv
     end type psb_d_oacc_csr_sparse_mat
 
     interface 
-    module subroutine psb_d_oacc_csr_mold(a,b,info)
+        subroutine psb_d_oacc_csr_vect_mv(alpha, a, x, beta, y, info, trans)
-      class(psb_d_oacc_csr_sparse_mat), intent(in) :: a
+            import :: psb_d_oacc_csr_sparse_mat, psb_dpk_, psb_d_base_vect_type, psb_ipk_
-      class(psb_d_base_sparse_mat), intent(inout), allocatable :: b
-      integer(psb_ipk_), intent(out) :: info
-    end subroutine psb_d_oacc_csr_mold
-  end interface
-
-  interface
-    module subroutine psb_d_oacc_csr_cp_from_fmt(a,b,info)
-      class(psb_d_oacc_csr_sparse_mat), intent(inout) :: a
-      class(psb_d_base_sparse_mat), intent(in) :: b
-      integer(psb_ipk_), intent(out) :: info
-    end subroutine psb_d_oacc_csr_cp_from_fmt
-  end interface
-
-  interface 
-    module subroutine psb_d_oacc_csr_mv_from_coo(a,b,info)
-      class(psb_d_oacc_csr_sparse_mat), intent(inout) :: a
-      class(psb_d_coo_sparse_mat), intent(inout) :: b
-      integer(psb_ipk_), intent(out) :: info
-    end subroutine psb_d_oacc_csr_mv_from_coo
-  end interface
-
-  interface
-    module subroutine psb_d_oacc_csr_mv_from_fmt(a,b,info)
-      class(psb_d_oacc_csr_sparse_mat), intent(inout) :: a
-      class(psb_d_base_sparse_mat), intent(inout) :: b
-      integer(psb_ipk_), intent(out) :: info
-    end subroutine psb_d_oacc_csr_mv_from_fmt
-  end interface
-
-  interface 
-    module subroutine psb_d_oacc_csr_vect_mv(alpha, a, x, beta, y, info, trans)
             class(psb_d_oacc_csr_sparse_mat), intent(in) :: a
             real(psb_dpk_), intent(in) :: alpha, beta
             class(psb_d_base_vect_type), intent(inout) :: x, y
@@ -81,123 +35,8 @@ module psb_d_oacc_csr_mat_mod
         end subroutine psb_d_oacc_csr_vect_mv
     end interface
 
-  interface
-    module subroutine psb_d_oacc_csr_inner_vect_sv(alpha, a, x, beta, y, info, trans)
-      class(psb_d_oacc_csr_sparse_mat), intent(in) :: a
-      real(psb_dpk_), intent(in) :: alpha, beta
-      class(psb_d_base_vect_type), intent(inout) :: x,y
-      integer(psb_ipk_), intent(out) :: info
-      character, optional, intent(in) :: trans
-    end subroutine psb_d_oacc_csr_inner_vect_sv
-  end interface
-
-  interface
-    module subroutine psb_d_oacc_csr_csmm(alpha, a, x, beta, y, info, trans)
-      class(psb_d_oacc_csr_sparse_mat), intent(in) :: a
-      real(psb_dpk_), intent(in) :: alpha, beta, x(:,:)
-      real(psb_dpk_), intent(inout) :: y(:,:)
-      integer(psb_ipk_), intent(out) :: info
-      character, optional, intent(in) :: trans
-    end subroutine psb_d_oacc_csr_csmm
-  end interface
-
-  interface
-    module subroutine psb_d_oacc_csr_csmv(alpha, a, x, beta, y, info, trans)
-      class(psb_d_oacc_csr_sparse_mat), intent(in) :: a
-      real(psb_dpk_), intent(in) :: alpha, beta, x(:)
-      real(psb_dpk_), intent(inout) :: y(:)
-      integer(psb_ipk_), intent(out) :: info
-      character, optional, intent(in) :: trans
-    end subroutine psb_d_oacc_csr_csmv
-  end interface
-
-  interface
-    module subroutine psb_d_oacc_csr_scals(d, a, info)
-      class(psb_d_oacc_csr_sparse_mat), intent(inout) :: a
-      real(psb_dpk_), intent(in) :: d
-      integer(psb_ipk_), intent(out) :: info
-    end subroutine psb_d_oacc_csr_scals
-  end interface
-
-  interface 
-    module subroutine psb_d_oacc_csr_scal(d,a,info,side)
-      class(psb_d_oacc_csr_sparse_mat), intent(inout) :: a
-      real(psb_dpk_), intent(in) :: d(:)
-      integer(psb_ipk_), intent(out) :: info
-      character, optional, intent(in) :: side
-    end subroutine psb_d_oacc_csr_scal
-  end interface
-
-  interface
-    module subroutine psb_d_oacc_csr_reallocate_nz(nz,a)
-      class(psb_d_oacc_csr_sparse_mat), intent(inout) :: a
-      integer(psb_ipk_), intent(in) :: nz
-    end subroutine psb_d_oacc_csr_reallocate_nz
-  end interface
-
-  interface
-    module subroutine psb_d_oacc_csr_allocate_mnnz(m,n,a,nz)
-      class(psb_d_oacc_csr_sparse_mat), intent(inout) :: a
-      integer(psb_ipk_), intent(in) :: m,n
-      integer(psb_ipk_), intent(in), optional :: nz
-    end subroutine psb_d_oacc_csr_allocate_mnnz
-  end interface
-
-  interface 
-    module subroutine psb_d_oacc_csr_cp_from_coo(a,b,info)
-      class(psb_d_oacc_csr_sparse_mat), intent(inout) :: a
-      class(psb_d_coo_sparse_mat), intent(in) :: b
-      integer(psb_ipk_), intent(out) :: info
-    end subroutine psb_d_oacc_csr_cp_from_coo
-  end interface
-
 contains
 
-
-  subroutine d_oacc_csr_free(a)
-    use psb_base_mod
-    implicit none 
-    class(psb_d_oacc_csr_sparse_mat), intent(inout) :: a
-    integer(psb_ipk_) :: info
-
-    if (allocated(a%val)) then
-      !$acc exit data delete(a%val)
-    end if
-    if (allocated(a%ja)) then
-      !$acc exit data delete(a%ja)
-    end if
-    if (allocated(a%irp)) then
-      !$acc exit data delete(a%irp)
-    end if
-
-    call a%psb_d_csr_sparse_mat%free()
-
-    return
-  end subroutine d_oacc_csr_free
-
-
-
-  function d_oacc_csr_sizeof(a) result(res)
-    implicit none
-    class(psb_d_oacc_csr_sparse_mat), intent(in) :: a
-    integer(psb_epk_) :: res
-
-    if (a%is_dev()) call a%sync()
-
-    res = 8
-    res = res + psb_sizeof_dp * size(a%val)
-    res = res + psb_sizeof_ip * size(a%irp)
-    res = res + psb_sizeof_ip * size(a%ja)
-
-  end function d_oacc_csr_sizeof
-
-
-  function d_oacc_csr_get_fmt() result(res)
-    implicit none
-    character(len=5) :: res
-    res = 'CSR_oacc'
-  end function d_oacc_csr_get_fmt
-
     subroutine d_oacc_csr_all(m, n, nz, a, info)
         implicit none 
         integer(psb_ipk_), intent(in)      :: m, n, nz

openacc/psb_d_oacc_vect_mod.F90

@@ -49,8 +49,8 @@ module psb_d_oacc_vect_mod
     procedure, pass(z) :: abgdxyz     => d_oacc_abgdxyz
     procedure, pass(y) :: mlt_a       => d_oacc_mlt_a
     procedure, pass(z) :: mlt_a_2     => d_oacc_mlt_a_2
-    procedure, pass(y) :: mlt_v       => psb_d_oacc_mlt_v
+    procedure, pass(y) :: mlt_v       => d_oacc_mlt_v
-    procedure, pass(z) :: mlt_v_2     => psb_d_oacc_mlt_v_2
+    procedure, pass(z) :: mlt_v_2     => d_oacc_mlt_v_2
     procedure, pass(x) :: scal        => d_oacc_scal 
     procedure, pass(x) :: nrm2        => d_oacc_nrm2
     procedure, pass(x) :: amax        => d_oacc_amax
@@ -63,17 +63,19 @@ module psb_d_oacc_vect_mod
   real(psb_dpk_), allocatable :: v1(:),v2(:),p(:)
 
   interface
-    module subroutine psb_d_oacc_mlt_v(x, y, info)
+    subroutine d_oacc_mlt_v(x, y, info)
+      import
       implicit none 
       class(psb_d_base_vect_type), intent(inout) :: x
       class(psb_d_vect_oacc), intent(inout)       :: y
       integer(psb_ipk_), intent(out)             :: info
-    end subroutine psb_d_oacc_mlt_v
+    end subroutine d_oacc_mlt_v
   end interface
   
 
   interface
-    module subroutine psb_d_oacc_mlt_v_2(alpha, x, y, beta, z, info, conjgx, conjgy)
+    subroutine d_oacc_mlt_v_2(alpha, x, y, beta, z, info, conjgx, conjgy)
+      import
       implicit none 
       real(psb_dpk_), intent(in)                 :: alpha, beta
       class(psb_d_base_vect_type), intent(inout) :: x
@@ -81,7 +83,7 @@ module psb_d_oacc_vect_mod
       class(psb_d_vect_oacc), intent(inout)      :: z
       integer(psb_ipk_), intent(out)             :: info
       character(len=1), intent(in), optional     :: conjgx, conjgy
-    end subroutine psb_d_oacc_mlt_v_2
+    end subroutine d_oacc_mlt_v_2
   end interface
   
 contains