Merge pull request #97 from tgorni/devel

Upgraded cublas interface

Author: kousuke-nakano

src/a_module_tests/test_dgemm.f90

@@ -14,6 +14,7 @@
 ! along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 program test_dgemm
+    use allio, only: cublas_handle
     implicit none
 
     real*8, allocatable, dimension(:, :) :: A, B, C, C_orig
@@ -59,6 +60,14 @@ program test_dgemm
 
     C = 0
 
+#if defined(_OFFLOAD) && defined(_CUBLAS)
+#ifdef RISC
+        call cublas_handle_init_(cublas_handle)
+#else
+        call cublas_handle_init(cublas_handle)
+#endif
+#endif
+
 #if defined(_OFFLOAD) && defined(_CUBLAS)
 !$omp target data map(to:A,B)
 !$omp target data map(from:C)

src/a_module_tests/test_dgemm_b.f90

@@ -14,6 +14,7 @@
 ! along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 program test_dgemm_b
+    use allio, only: cublas_handle
     implicit none
 
     real*8, allocatable, dimension(:, :) :: A, B, AB, BB, CB, CB_i
@@ -79,6 +80,14 @@ program test_dgemm_b
     BB = 0
     CB_i = CB
 
+#if defined(_OFFLOAD) && defined(_CUBLAS)
+#ifdef RISC
+        call cublas_handle_init_(cublas_handle)
+#else
+        call cublas_handle_init(cublas_handle)
+#endif
+#endif
+
 #if defined(_OFFLOAD) && defined(_CUBLAS)
 !$omp target data map(to:A,B)
 !$omp target data map(tofrom:AB,BB,CB)

src/a_module_tests/test_dgemv.f90

@@ -14,6 +14,7 @@
 ! along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 program test_dgemv
+    use allio, only: cublas_handle
     implicit none
 
     real*8, allocatable, dimension(:, :) :: B
@@ -27,6 +28,11 @@ program test_dgemv
 
 #if defined(_OFFLOAD) && defined(_CUBLAS)
     yes_on_target = .true.
+#ifdef RISC
+        call cublas_handle_init_(cublas_handle)
+#else
+        call cublas_handle_init(cublas_handle)
+#endif
 #endif
 
     ! gen = 1 : Generate matrices

src/a_module_tests/test_dgemv_.f90

@@ -14,6 +14,7 @@
 ! along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 program test_dgemv_
+    use allio, only: cublas_handle
     implicit none
 
     real*8, allocatable, dimension(:, :) :: B
@@ -27,6 +28,11 @@ program test_dgemv_
 
 #if defined(_OFFLOAD) && defined(_CUBLAS)
     yes_on_target = .true.
+#ifdef RISC
+        call cublas_handle_init_(cublas_handle)
+#else
+        call cublas_handle_init(cublas_handle)
+#endif
 #endif
 
     ! gen = 1 : Generate matrices

src/a_module_tests/test_dger.f90

@@ -17,6 +17,7 @@ program test_dger
 
 #if defined(_OFFLOAD)
     use constants, only: yes_ontarget
+    use allio, only: cublas_handle
 #endif
 
     implicit none
@@ -31,6 +32,14 @@ program test_dger
     yes_ontarget = .true.
 #endif
 
+#if defined(_OFFLOAD) && defined(_CUBLAS)
+#ifdef RISC
+    call cublas_handle_init_(cublas_handle)
+#else
+    call cublas_handle_init(cublas_handle)
+#endif
+#endif
+
     read (*, *) s
 
     allocate (A(s, s))

src/a_module_tests/test_dger2.f90

@@ -17,6 +17,7 @@ program test_dger2
 
 #if defined(_OFFLOAD)
     use constants, only: yes_ontarget
+    use allio, only: cublas_handle
 #endif
 
     implicit none
@@ -31,6 +32,14 @@ program test_dger2
     yes_ontarget = .true.
 #endif
 
+#if defined(_OFFLOAD) && defined(_CUBLAS)
+#ifdef RISC
+    call cublas_handle_init_(cublas_handle)
+#else
+    call cublas_handle_init(cublas_handle)
+#endif
+#endif
+
     read (*, *) s
 
     allocate (A(s, s))

src/a_module_tests/test_dtrsm.f90

@@ -14,13 +14,22 @@
 ! along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 program test_dtrsm
+    use allio, only: cublas_handle
     implicit none
 
     real*8, allocatable, dimension(:, :) :: A, B, C, C_orig
     real*8 :: one = 1.d0, zero = 0.d0
     integer :: s, gen, ii, jj
     character(len=1) :: uplo, side, trans
 
+#if defined(_OFFLOAD) && defined(_CUBLAS)
+#ifdef RISC
+    call cublas_handle_init_(cublas_handle)
+#else
+    call cublas_handle_init(cublas_handle)
+#endif
+#endif
+
     ! gen = 1 : Generate matrices
     ! gen = 0 : Compare matrices
 

src/a_module_tests/test_zgemm.f90

@@ -14,6 +14,7 @@
 ! along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 program test_zgemm
+    use allio, only: cublas_handle
     implicit none
 
     complex*16, allocatable, dimension(:, :) :: A, B, C, C_orig
@@ -25,6 +26,14 @@ program test_zgemm
     character(len=1) :: first, second
     character(len=100) :: message, str_tmp1, str_tmp2
 
+#if defined(_OFFLOAD) && defined(_CUBLAS)
+#ifdef RISC
+    call cublas_handle_init_(cublas_handle)
+#else
+    call cublas_handle_init(cublas_handle)
+#endif
+#endif
+
     ! gen = 1 : Generate matrices
     ! gen = 0 : Compare matrices
 

src/a_module_tests/test_zgemm_b.f90

@@ -14,6 +14,7 @@
 ! along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 program test_zgemm_b
+    use allio, only: cublas_handle
     implicit none
 
     complex*16, allocatable, dimension(:, :) :: A, B, AB, BB, CB, CB_i
@@ -26,6 +27,14 @@ program test_zgemm_b
     character(len=1) :: first, second
     character(len=100) :: message, str_tmp1, str_tmp2
 
+#if defined(_OFFLOAD) && defined(_CUBLAS)
+#ifdef RISC
+    call cublas_handle_init_(cublas_handle)
+#else
+    call cublas_handle_init(cublas_handle)
+#endif
+#endif
+
     ! gen = 1 : Generate matrices
     ! gen = 0 : Compare matrices
 

src/a_module_tests/test_zgemv.f90

@@ -14,6 +14,7 @@
 ! along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 program test_zgemv
+    use allio, only: cublas_handle
     implicit none
 
     complex*16, allocatable, dimension(:, :) :: B
@@ -30,6 +31,14 @@ program test_zgemv
     yes_on_target = .true.
 #endif
 
+#if defined(_OFFLOAD) && defined(_CUBLAS)
+#ifdef RISC
+    call cublas_handle_init_(cublas_handle)
+#else
+    call cublas_handle_init(cublas_handle)
+#endif
+#endif
+
     ! gen = 1 : Generate matrices
     ! gen = 0 : Compare matrices