Added elsort type in fortran interface

lanl · Jan 8, 2020 · e20dd9c · e20dd9c
1 parent 91e0cbc
commit e20dd9c
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 2 deletions.
diff --git a/example_build.sh b/example_build.sh
@@ -10,7 +10,7 @@ MY_PATH=$(pwd)
 export CC=${CC:=gcc}
 export FC=${FC:=gfortran}
 export CXX=${CXX:=g++}
-export BLAS_VENDOR=${BLAS_VENDOR:=MKL}
+export BLAS_VENDOR=${BLAS_VENDOR:=GNU}
 export BML_OPENMP=${BML_OPENMP:=yes}
 export INSTALL_DIR=${INSTALL_DIR:="${MY_PATH}/install"}
 export BML_TESTING=${BML_TESTING:=yes}

diff --git a/src/Fortran-interface/bml_interface_m.F90 b/src/Fortran-interface/bml_interface_m.F90
@@ -31,6 +31,12 @@ module bml_interface_m
   !! Matrix type is ellblock.
   integer, parameter :: bml_matrix_type_ellblock_enum_id = 3
 
+  !> The enum values of the C API. Keep this synchronized with the
+  !! enum in bml_types.h.
+  !!
+  !! Matrix type is ellblock.
+  integer, parameter :: bml_matrix_type_ellsort_enum_id = 4
+
   !> The enum values of the C API. Keep this synchronized with the
   !! enum in bml_types.h.
   !!
@@ -106,6 +112,8 @@ function get_matrix_id(type_string) result(id)
       id = bml_matrix_type_ellpack_enum_id
     case(BML_MATRIX_ELLBLOCK)
       id = bml_matrix_type_ellblock_enum_id
+    case(BML_MATRIX_ELLSORT)
+      id = bml_matrix_type_ellsort_enum_id
     case default
       print *, "unknown matrix type"//trim(type_string)
       error stop

diff --git a/src/Fortran-interface/bml_introspection_m.F90 b/src/Fortran-interface/bml_introspection_m.F90
@@ -93,6 +93,10 @@ function bml_get_type(a)
       bml_get_type = "dense"
     case(2)
       bml_get_type = "ellpack"
+    case(3)
+      bml_get_type = "ellblock"
+    case(4)
+      bml_get_type = "ellsort"
     case default
       stop 'Unknown matrix type in bml_get_type'
     end select

diff --git a/src/Fortran-interface/bml_types_m.F90 b/src/Fortran-interface/bml_types_m.F90
@@ -8,7 +8,7 @@ module bml_types_m
 
   public :: bml_vector_t, bml_matrix_t
   public :: bml_deallocate
-  public :: BML_MATRIX_DENSE, BML_MATRIX_ELLPACK, BML_MATRIX_ELLBLOCK
+  public :: BML_MATRIX_DENSE, BML_MATRIX_ELLPACK, BML_MATRIX_ELLBLOCK, BML_MATRIX_ELLSORT
   public :: BML_ELEMENT_REAL, BML_ELEMENT_COMPLEX
   public :: BML_DMODE_SEQUENTIAL, BML_DMODE_DISTRIBUTED
   public :: BML_DMODE_GRAPH_DISTRIBUTED
@@ -50,6 +50,9 @@ module bml_types_m
   !> The bml-ellblock matrix type identifier.
   character(len=*), parameter :: BML_MATRIX_ELLBLOCK = "ellblock"
 
+  !> The bml-ellblock matrix type identifier.
+  character(len=*), parameter :: BML_MATRIX_ELLSORT = "ellsort"
+
   !> The single precision identifier.
   character(len=*), parameter :: BML_ELEMENT_REAL = "real"