Merge pull request #315 from easifem/dev

Updates in easifemBase (May 2024)
easifem · Jun 3, 2024 · 1a26f41 · 1a26f41
2 parents 2d410f2 + c90105f
commit 1a26f41
Show file tree

Hide file tree

Showing 95 changed files with 8,593 additions and 7,498 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -23,9 +23,9 @@ project(${PROJECT_NAME})
 
 enable_language(C Fortran CXX)
 
-set(VERSION_MAJOR "23")
-set(VERSION_MINOR "6")
-set(VERSION_BugFix "0")
+set(VERSION_MAJOR "24")
+set(VERSION_MINOR "4")
+set(VERSION_BugFix "5")
 
 set(PROJECT_VERSION ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_BugFix})
 

diff --git a/release_install.py b/release_install.py
@@ -19,7 +19,7 @@
 else:
     cmake_def = ""
     cmake_def += ' -G "Ninja"'  # Unix Makefiles, Ninja, Ninja Multi-Config
-    cmake_def += " -D USE_OpenMP:BOOL=ON"  # OFF
+    cmake_def += " -D USE_OPENMP:BOOL=ON"  # OFF
     cmake_def += " -D CMAKE_BUILD_TYPE:STRING=Release" 
     cmake_def += " -D BUILD_SHARED_LIBS:BOOL=ON"
     cmake_def += " -D USE_PLPLOT:BOOL=ON"
@@ -34,8 +34,8 @@
     cmake_def += " -D USE_PARPACK:BOOL=OFF"
     cmake_def += " -D USE_METIS:BOOL=OFF"
     cmake_def += " -D USE_LUA:BOOL=ON"
-    cmake_def += " -D USE_Int32:BOOL=ON"
-    cmake_def += " -D USE_Real64:BOOL=ON"
+    cmake_def += " -D USE_INT32:BOOL=ON"
+    cmake_def += " -D USE_REAL64:BOOL=ON"
     cmake_def += " -D COLOR_DISP:BOOL=OFF"
     cmake_def += " -D CMAKE_EXPORT_COMPILE_COMMANDS:BOOL=ON"
 

diff --git a/src/modules/BLAS95/src/F77_BLAS.F90 b/src/modules/BLAS95/src/F77_BLAS.F90
@@ -2281,7 +2281,7 @@ PURE SUBROUTINE SGEMM_BATCH(TRANSA_ARRAY, TRANSB_ARRAY, M_ARRAY, N_ARRAY,&
      &                        K_ARRAY, ALPHA_ARRAY, A_ARRAY, LDA_ARRAY,    &
      &                        B_ARRAY, LDB_ARRAY, BETA_ARRAY, C_ARRAY,     &
      &                        LDC_ARRAY, GROUP_COUNT, GROUP_SIZE)
-    USE, intrinsic :: ISO_C_BINDING
+    USE, INTRINSIC :: ISO_C_BINDING
     INTEGER, PARAMETER :: WP = KIND(1.0E0)
     INTEGER(KIND=C_SIZE_T), INTENT(IN) :: A_ARRAY(*)
     INTEGER(KIND=C_SIZE_T), INTENT(IN) :: B_ARRAY(*)
@@ -2303,7 +2303,7 @@ PURE SUBROUTINE DGEMM_BATCH(TRANSA_ARRAY, TRANSB_ARRAY, M_ARRAY, N_ARRAY,&
      &                        K_ARRAY, ALPHA_ARRAY, A_ARRAY, LDA_ARRAY,    &
      &                        B_ARRAY, LDB_ARRAY, BETA_ARRAY, C_ARRAY,     &
      &                        LDC_ARRAY, GROUP_COUNT, GROUP_SIZE)
-    USE, intrinsic :: ISO_C_BINDING
+    USE, INTRINSIC :: ISO_C_BINDING
     INTEGER, PARAMETER :: WP = KIND(1.0D0)
     INTEGER(KIND=C_SIZE_T), INTENT(IN) :: A_ARRAY(*)
     INTEGER(KIND=C_SIZE_T), INTENT(IN) :: B_ARRAY(*)
@@ -2326,7 +2326,7 @@ PURE SUBROUTINE CGEMM_BATCH(TRANSA_ARRAY, TRANSB_ARRAY, M_ARRAY, N_ARRAY,&
      &                        K_ARRAY, ALPHA_ARRAY, A_ARRAY, LDA_ARRAY,    &
      &                        B_ARRAY, LDB_ARRAY, BETA_ARRAY, C_ARRAY,     &
      &                        LDC_ARRAY, GROUP_COUNT, GROUP_SIZE)
-    USE, intrinsic :: ISO_C_BINDING
+    USE, INTRINSIC :: ISO_C_BINDING
     INTEGER, PARAMETER :: WP = KIND(1.0E0)
     INTEGER(KIND=C_SIZE_T), INTENT(IN) :: A_ARRAY(*)
     INTEGER(KIND=C_SIZE_T), INTENT(IN) :: B_ARRAY(*)
@@ -2348,7 +2348,7 @@ PURE SUBROUTINE ZGEMM_BATCH(TRANSA_ARRAY, TRANSB_ARRAY, M_ARRAY, N_ARRAY,&
      &                        K_ARRAY, ALPHA_ARRAY, A_ARRAY, LDA_ARRAY,    &
      &                        B_ARRAY, LDB_ARRAY, BETA_ARRAY, C_ARRAY,     &
      &                        LDC_ARRAY, GROUP_COUNT, GROUP_SIZE)
-    USE, intrinsic :: ISO_C_BINDING
+    USE, INTRINSIC :: ISO_C_BINDING
     INTEGER, PARAMETER :: WP = KIND(1.0D0)
     INTEGER(KIND=C_SIZE_T), INTENT(IN) :: A_ARRAY(*)
     INTEGER(KIND=C_SIZE_T), INTENT(IN) :: B_ARRAY(*)
@@ -2373,7 +2373,7 @@ PURE SUBROUTINE CGEMM3M_BATCH(TRANSA_ARRAY, TRANSB_ARRAY, M_ARRAY,      &
      &                          N_ARRAY, K_ARRAY, ALPHA_ARRAY, A_ARRAY,    &
      &                          LDA_ARRAY, B_ARRAY, LDB_ARRAY, BETA_ARRAY, &
      &                          C_ARRAY, LDC_ARRAY, GROUP_COUNT, GROUP_SIZE)
-    USE, intrinsic :: ISO_C_BINDING
+    USE, INTRINSIC :: ISO_C_BINDING
     INTEGER, PARAMETER :: WP = KIND(1.0E0)
     INTEGER(KIND=C_SIZE_T), INTENT(IN) :: A_ARRAY(*)
     INTEGER(KIND=C_SIZE_T), INTENT(IN) :: B_ARRAY(*)
@@ -2395,7 +2395,7 @@ PURE SUBROUTINE ZGEMM3M_BATCH(TRANSA_ARRAY, TRANSB_ARRAY, M_ARRAY,      &
      &                          N_ARRAY, K_ARRAY, ALPHA_ARRAY, A_ARRAY,    &
      &                          LDA_ARRAY, B_ARRAY, LDB_ARRAY, BETA_ARRAY, &
      &                          C_ARRAY, LDC_ARRAY, GROUP_COUNT, GROUP_SIZE)
-    USE, intrinsic :: ISO_C_BINDING
+    USE, INTRINSIC :: ISO_C_BINDING
     INTEGER, PARAMETER :: WP = KIND(1.0D0)
     INTEGER(KIND=C_SIZE_T), INTENT(IN) :: A_ARRAY(*)
     INTEGER(KIND=C_SIZE_T), INTENT(IN) :: B_ARRAY(*)
@@ -2419,7 +2419,7 @@ END SUBROUTINE ZGEMM3M_BATCH
 PURE SUBROUTINE STRSM_BATCH(SIDE_ARRAY, UPLO_ARRAY, TRANSA_ARRAY, DIAG_ARRAY,&
   &                        M_ARRAY, N_ARRAY, ALPHA_ARRAY, A_ARRAY, LDA_ARRAY,&
          &                        B_ARRAY, LDB_ARRAY, GROUP_COUNT, GROUP_SIZE)
-    USE, intrinsic :: ISO_C_BINDING
+    USE, INTRINSIC :: ISO_C_BINDING
     INTEGER, PARAMETER :: WP = KIND(1.0E0)
     INTEGER(KIND=C_SIZE_T), INTENT(IN) :: A_ARRAY(*)
     INTEGER(KIND=C_SIZE_T), INTENT(IN) :: B_ARRAY(*)
@@ -2438,7 +2438,7 @@ END SUBROUTINE STRSM_BATCH
 PURE SUBROUTINE DTRSM_BATCH(SIDE_ARRAY, UPLO_ARRAY, TRANSA_ARRAY, DIAG_ARRAY,&
   &                        M_ARRAY, N_ARRAY, ALPHA_ARRAY, A_ARRAY, LDA_ARRAY,&
          &                        B_ARRAY, LDB_ARRAY, GROUP_COUNT, GROUP_SIZE)
-    USE, intrinsic :: ISO_C_BINDING
+    USE, INTRINSIC :: ISO_C_BINDING
     INTEGER, PARAMETER :: WP = KIND(1.0D0)
     INTEGER(KIND=C_SIZE_T), INTENT(IN) :: A_ARRAY(*)
     INTEGER(KIND=C_SIZE_T), INTENT(IN) :: B_ARRAY(*)
@@ -2457,7 +2457,7 @@ END SUBROUTINE DTRSM_BATCH
 PURE SUBROUTINE CTRSM_BATCH(SIDE_ARRAY, UPLO_ARRAY, TRANSA_ARRAY, DIAG_ARRAY,&
   &                        M_ARRAY, N_ARRAY, ALPHA_ARRAY, A_ARRAY, LDA_ARRAY,&
          &                        B_ARRAY, LDB_ARRAY, GROUP_COUNT, GROUP_SIZE)
-    USE, intrinsic :: ISO_C_BINDING
+    USE, INTRINSIC :: ISO_C_BINDING
     INTEGER, PARAMETER :: WP = KIND(1.0E0)
     INTEGER(KIND=C_SIZE_T), INTENT(IN) :: A_ARRAY(*)
     INTEGER(KIND=C_SIZE_T), INTENT(IN) :: B_ARRAY(*)
@@ -2476,7 +2476,7 @@ END SUBROUTINE CTRSM_BATCH
 PURE SUBROUTINE ZTRSM_BATCH(SIDE_ARRAY, UPLO_ARRAY, TRANSA_ARRAY, DIAG_ARRAY,&
   &                        M_ARRAY, N_ARRAY, ALPHA_ARRAY, A_ARRAY, LDA_ARRAY,&
          &                        B_ARRAY, LDB_ARRAY, GROUP_COUNT, GROUP_SIZE)
-    USE, intrinsic :: ISO_C_BINDING
+    USE, INTRINSIC :: ISO_C_BINDING
     INTEGER, PARAMETER :: WP = KIND(1.0D0)
     INTEGER(KIND=C_SIZE_T), INTENT(IN) :: A_ARRAY(*)
     INTEGER(KIND=C_SIZE_T), INTENT(IN) :: B_ARRAY(*)

diff --git a/src/modules/BLAS95/src/F95_BLAS.F90 b/src/modules/BLAS95/src/F95_BLAS.F90
@@ -24,12 +24,39 @@ MODULE F95_BLAS
 IMPLICIT NONE
 PRIVATE
 
+PUBLIC :: IAMAX
+PUBLIC :: SWAP
+PUBLIC :: SCAL
+PUBLIC :: ROTMG
+PUBLIC :: ROTM
+PUBLIC :: ROTG
+PUBLIC :: ROT
+PUBLIC :: NRM2
+PUBLIC :: DOTU
+PUBLIC :: DOT
+PUBLIC :: DOTC
+PUBLIC :: SDOT
+PUBLIC :: COPY
+PUBLIC :: AXPY
+PUBLIC :: ASUM
+PUBLIC :: GEMV
+
+#ifndef USE_NativeBLAS
+PUBLIC :: IAMIN
+#endif
+
+#ifndef USE_APPLE_NativeBLAS
+PUBLIC :: CABS1
+#endif
+
+!----------------------------------------------------------------------------
+!
+!----------------------------------------------------------------------------
+
 INTERFACE ASUM
   MODULE PROCEDURE SASUM_F95, SCASUM_F95, DASUM_F95, DZASUM_F95
 END INTERFACE ASUM
 
-PUBLIC :: ASUM
-
 !----------------------------------------------------------------------------
 !
 !----------------------------------------------------------------------------
@@ -38,8 +65,6 @@ MODULE F95_BLAS
   MODULE PROCEDURE SAXPY_F95, DAXPY_F95, CAXPY_F95, ZAXPY_F95
 END INTERFACE AXPY
 
-PUBLIC :: AXPY
-
 !----------------------------------------------------------------------------
 !
 !----------------------------------------------------------------------------
@@ -48,8 +73,6 @@ MODULE F95_BLAS
   MODULE PROCEDURE SCOPY_F95, DCOPY_F95, CCOPY_F95, ZCOPY_F95
 END INTERFACE COPY
 
-PUBLIC :: COPY
-
 !----------------------------------------------------------------------------
 !
 !----------------------------------------------------------------------------
@@ -58,8 +81,6 @@ MODULE F95_BLAS
   MODULE PROCEDURE SDOT_F95, DDOT_F95
 END INTERFACE DOT
 
-PUBLIC :: DOT
-
 !----------------------------------------------------------------------------
 !
 !----------------------------------------------------------------------------
@@ -68,8 +89,6 @@ MODULE F95_BLAS
   MODULE PROCEDURE SDSDOT_F95, DSDOT_F95
 END INTERFACE SDOT
 
-PUBLIC :: SDOT
-
 !----------------------------------------------------------------------------
 !
 !----------------------------------------------------------------------------
@@ -78,8 +97,6 @@ MODULE F95_BLAS
   MODULE PROCEDURE CDOTC_F95, ZDOTC_F95
 END INTERFACE DOTC
 
-PUBLIC :: DOTC
-
 !----------------------------------------------------------------------------
 !
 !----------------------------------------------------------------------------
@@ -88,8 +105,6 @@ MODULE F95_BLAS
   MODULE PROCEDURE CDOTU_F95, ZDOTU_F95
 END INTERFACE DOTU
 
-PUBLIC :: DOTU
-
 !----------------------------------------------------------------------------
 !
 !----------------------------------------------------------------------------
@@ -98,8 +113,6 @@ MODULE F95_BLAS
   MODULE PROCEDURE SNRM2_F95, DNRM2_F95, SCNRM2_F95, DZNRM2_F95
 END INTERFACE NRM2
 
-PUBLIC :: NRM2
-
 !----------------------------------------------------------------------------
 !
 !----------------------------------------------------------------------------
@@ -108,8 +121,6 @@ MODULE F95_BLAS
   MODULE PROCEDURE SROT_F95, DROT_F95, CSROT_F95, ZDROT_F95
 END INTERFACE ROT
 
-PUBLIC :: ROT
-
 !----------------------------------------------------------------------------
 !
 !----------------------------------------------------------------------------
@@ -118,8 +129,6 @@ MODULE F95_BLAS
   MODULE PROCEDURE SROTG_F95, DROTG_F95, CROTG_F95, ZROTG_F95
 END INTERFACE ROTG
 
-PUBLIC :: ROTG
-
 !----------------------------------------------------------------------------
 !
 !----------------------------------------------------------------------------
@@ -128,8 +137,6 @@ MODULE F95_BLAS
   MODULE PROCEDURE SROTM_F95, DROTM_F95
 END INTERFACE ROTM
 
-PUBLIC :: ROTM
-
 !----------------------------------------------------------------------------
 !
 !----------------------------------------------------------------------------
@@ -138,8 +145,6 @@ MODULE F95_BLAS
   MODULE PROCEDURE SROTMG_F95, DROTMG_F95
 END INTERFACE ROTMG
 
-PUBLIC :: ROTMG
-
 !----------------------------------------------------------------------------
 !
 !----------------------------------------------------------------------------
@@ -149,8 +154,6 @@ MODULE F95_BLAS
     & ZDSCAL_F95
 END INTERFACE SCAL
 
-PUBLIC :: SCAL
-
 !----------------------------------------------------------------------------
 !
 !----------------------------------------------------------------------------
@@ -159,8 +162,6 @@ MODULE F95_BLAS
   MODULE PROCEDURE SSWAP_F95, DSWAP_F95, CSWAP_F95, ZSWAP_F95
 END INTERFACE SWAP
 
-PUBLIC :: SWAP
-
 !----------------------------------------------------------------------------
 !
 !----------------------------------------------------------------------------
@@ -169,8 +170,6 @@ MODULE F95_BLAS
   MODULE PROCEDURE ISAMAX_F95, IDAMAX_F95, ICAMAX_F95, IZAMAX_F95
 END INTERFACE IAMAX
 
-PUBLIC :: IAMAX
-
 !----------------------------------------------------------------------------
 !
 !----------------------------------------------------------------------------
@@ -179,9 +178,6 @@ MODULE F95_BLAS
 INTERFACE IAMIN
   MODULE PROCEDURE ISAMIN_F95, IDAMIN_F95, ICAMIN_F95, IZAMIN_F95
 END INTERFACE IAMIN
-
-PUBLIC :: IAMIN
-
 #endif
 
 !----------------------------------------------------------------------------
@@ -192,8 +188,6 @@ MODULE F95_BLAS
 INTERFACE CABS1
   MODULE PROCEDURE SCABS1_F95, DCABS1_F95
 END INTERFACE CABS1
-
-PUBLIC :: CABS1
 #endif
 
 !----------------------------------------------------------------------------
@@ -210,7 +204,6 @@ MODULE F95_BLAS
 END INTERFACE GEMV
 #endif
 
-PUBLIC :: GEMV
 CONTAINS
 
 #ifndef USE_APPLE_NativeBLAS