Merge branch 'hotfix-1.0.1' into release

dftbplus · Nov 3, 2020 · cd7c2a7 · cd7c2a7
2 parents cd758a2 + 779f6b5
commit cd7c2a7
Show file tree

Hide file tree

Showing 6 changed files with 60 additions and 53 deletions.
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -4,6 +4,15 @@ Change Log
 
 Notable project changes in various releases.
 
+1.0.1
+=====
+
+Fixed
+-----
+
+* ScaLAPACK interfaces use only assumed-size arrays (no fixed size ones) to
+  avoid linking problems with NAG compiled applications
+
 
 1.0
 ===
@@ -21,5 +30,5 @@ Changed
 
 * The Fypp-preprocessor is not shipped with ScalapackFx but is an external
   requirement.
-  
+
 * Name convention for processes (master -> lead, slave -> follow).
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -8,7 +8,7 @@ include(ScalapackFxUtils)
 
 include(${CMAKE_CURRENT_SOURCE_DIR}/config.cmake)
 
-project(ScalapackFx VERSION 1.0 LANGUAGES Fortran)
+project(ScalapackFx VERSION 1.0.1 LANGUAGES Fortran)
 
 setup_build_type()
 

diff --git a/doc/doxygen/Doxyfile b/doc/doxygen/Doxyfile
@@ -32,7 +32,7 @@ PROJECT_NAME           = "ScaLAPACKFX"
 # This could be handy for archiving the generated documentation or
 # if some version control system is used.
 
-PROJECT_NUMBER = "1.0"
+PROJECT_NUMBER = "1.0.1"
 
 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewer

diff --git a/doc/sphinx/conf.py b/doc/sphinx/conf.py
@@ -48,7 +48,7 @@
 version = '1.0'
 
 # The full version, including alpha/beta/rc tags.
-release = '1.0'
+release = '1.0.1'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

diff --git a/lib/pblas.fpp b/lib/pblas.fpp
@@ -12,11 +12,11 @@
     character, intent(in) :: uplo
     integer, intent(in) :: nn
     real(${KIND}$), intent(in) :: alpha
-    integer, intent(in) :: descx(DLEN_)
+    integer, intent(in) :: descx(*)
     ${TYPE}$(${KIND}$), intent(in) :: xx(descx(LLD_), *)
     integer, intent(in) :: ix, jx
     integer, intent(in) :: incx
-    integer, intent(in) :: desca(DLEN_)
+    integer, intent(in) :: desca(*)
     ${TYPE}$(${KIND}$), intent(inout) :: aa(desca(LLD_), *)
     integer, intent(in) :: ia, ja
   end subroutine ${NAME}$
@@ -38,11 +38,11 @@
     character, intent(in) :: uplo, trans
     integer, intent(in) :: nn, kk
     real(${KIND}$), intent(in) :: alpha
-    integer, intent(in) :: desca(DLEN_)
+    integer, intent(in) :: desca(*)
     ${TYPE}$(${KIND}$), intent(in) :: aa(desca(LLD_), *)
     integer, intent(in) :: ia, ja
     real(${KIND}$), intent(in) :: beta
-    integer, intent(in) :: descc(DLEN_)
+    integer, intent(in) :: descc(*)
     ${TYPE}$(${KIND}$), intent(inout) :: cc(descc(LLD_), *)
     integer, intent(in) :: ic, jc
   end subroutine ${NAME}$
@@ -64,14 +64,14 @@
     character, intent(in) :: uplo
     integer, intent(in) :: nn
     ${TYPE}$(${KIND}$), intent(in) :: alpha
-    integer, intent(in) :: desca(DLEN_)
+    integer, intent(in) :: desca(*)
     ${TYPE}$(${KIND}$), intent(in) :: aa(desca(LLD_), *)
     integer, intent(in) :: ia, ja
-    integer, intent(in) :: descx(DLEN_)
+    integer, intent(in) :: descx(*)
     ${TYPE}$(${KIND}$), intent(in) :: xx(descx(LLD_), *)
     integer, intent(in) :: ix, jx, incx
     ${TYPE}$(${KIND}$), intent(in) :: beta
-    integer, intent(in) :: descy(DLEN_)
+    integer, intent(in) :: descy(*)
     ${TYPE}$(${KIND}$), intent(inout) :: yy(descy(LLD_), *)
     integer, intent(in) :: iy, jy, incy
   end subroutine ${NAME}$
@@ -95,14 +95,14 @@
     integer, intent(in) :: mm
     integer, intent(in) :: nn
     ${TYPE}$(${KIND}$), intent(in) :: alpha
-    integer, intent(in) :: desca(DLEN_)
+    integer, intent(in) :: desca(*)
     ${TYPE}$(${KIND}$), intent(in) :: aa(desca(LLD_), *)
     integer, intent(in) :: ia, ja
     ${TYPE}$(${KIND}$), intent(in) :: beta
-    integer, intent(in) :: descb(DLEN_)
+    integer, intent(in) :: descb(*)
     ${TYPE}$(${KIND}$), intent(in) :: bb(descb(LLD_), *)
     integer, intent(in) :: ib, jb
-    integer, intent(in) :: descc(DLEN_)
+    integer, intent(in) :: descc(*)
     ${TYPE}$(${KIND}$), intent(in) :: cc(descc(LLD_), *)
     integer, intent(in) :: ic, jc
   end subroutine ${NAME}$
@@ -123,10 +123,10 @@
     character, intent(in) :: side, uplo, transa, diag
     integer, intent(in) :: mm, nn
     ${TYPE}$(${KIND}$), intent(in) :: alpha
-    integer, intent(in) :: desca(DLEN_)
+    integer, intent(in) :: desca(*)
     ${TYPE}$(${KIND}$), intent(in) :: aa(desca(LLD_), *)
     integer, intent(in) :: ia, ja
-    integer, intent(in) :: descb(DLEN_)
+    integer, intent(in) :: descb(*)
     ${TYPE}$(${KIND}$), intent(in) :: bb(descb(LLD_), *)
     integer, intent(in) :: ib, jb
   end subroutine ${NAME}$
@@ -147,14 +147,14 @@
     character, intent(in) :: transa, transb
     integer, intent(in) :: mm, nn, kk
     ${TYPE}$(${KIND}$), intent(in) :: alpha
-    integer, intent(in) :: desca(DLEN_)
+    integer, intent(in) :: desca(*)
     ${TYPE}$(${KIND}$), intent(in) :: aa(desca(LLD_), *)
     integer, intent(in) :: ia, ja
-    integer, intent(in) :: descb(DLEN_)
+    integer, intent(in) :: descb(*)
     ${TYPE}$(${KIND}$), intent(in) :: bb(descb(LLD_), *)
     integer, intent(in) :: ib, jb
     ${TYPE}$(${KIND}$), intent(in) :: beta
-    integer, intent(in) :: descc(DLEN_)
+    integer, intent(in) :: descc(*)
     ${TYPE}$(${KIND}$), intent(inout) :: cc(descb(LLD_), *)
     integer, intent(in) :: ic, jc
   end subroutine ${NAME}$
@@ -174,11 +174,11 @@
     integer, intent(in)   :: mm, nn
     ${TYPE}$(${KIND}$), intent(in)    :: alpha
     integer, intent(in)   :: ia, ja
-    integer, intent(in)   :: desca(DLEN_)
+    integer, intent(in)   :: desca(*)
     ${TYPE}$(${KIND}$), intent(in)    :: aa(desca(LLD_), *)
     ${TYPE}$(${KIND}$), intent(in)    :: beta
     integer, intent(in)   :: ic, jc
-    integer, intent(in)   :: descc(DLEN_)
+    integer, intent(in)   :: descc(*)
     ${TYPE}$(${KIND}$), intent(inout) :: cc(descc(LLD_), *)
   end subroutine ${NAME}$
 

diff --git a/lib/scalapack.fpp b/lib/scalapack.fpp
@@ -21,7 +21,7 @@ module scalapack_module
     import
     character, intent(in) :: uplo
     integer, intent(in) :: nn
-    integer, intent(in) :: ia, ja, desca(DLEN_)
+    integer, intent(in) :: ia, ja, desca(*)
     ${FTYPES}$, intent(inout) :: aa(desca(LLD_), *)
     integer, intent(out) :: info
   end subroutine p${TYPEABBREV}$potrf
@@ -37,7 +37,7 @@ module scalapack_module
     import
     character, intent(in) :: uplo
     integer, intent(in) :: nn
-    integer, intent(in) :: ia, ja, desca(DLEN_)
+    integer, intent(in) :: ia, ja, desca(*)
     ${FTYPES}$, intent(inout) :: aa(desca(LLD_), *)
     integer, intent(out) :: info
   end subroutine p${TYPEABBREV}$potri
@@ -53,7 +53,7 @@ module scalapack_module
     import
     character, intent(in) :: uplo, diag
     integer, intent(in) :: nn
-    integer, intent(in) :: ia, ja, desca(DLEN_)
+    integer, intent(in) :: ia, ja, desca(*)
     ${FTYPE}$, intent(inout) :: aa(desca(LLD_), *)
     integer, intent(out) :: info
   end subroutine p${TYPEABBREV}$trtri
@@ -69,7 +69,7 @@ module scalapack_module
     import
     integer, intent(in) :: mm
     integer, intent(in) :: nn
-    integer, intent(in) :: ia, ja, desca(DLEN_)
+    integer, intent(in) :: ia, ja, desca(*)
     ${FTYPES}$, intent(inout) :: aa(desca(LLD_), *)
     integer, intent(out) :: ipiv(*)
     integer, intent(out) :: info
@@ -91,9 +91,9 @@ module scalapack_module
     integer, intent(in) :: ibtype
     character, intent(in) :: uplo
     integer, intent(in) :: nn
-    integer, intent(in) :: ia, ja, desca(DLEN_)
+    integer, intent(in) :: ia, ja, desca(*)
     real(${KIND}$), intent(inout) :: aa(desca(LLD_), *)
-    integer, intent(in) :: ib, jb, descb(DLEN_)
+    integer, intent(in) :: ib, jb, descb(*)
     real(${KIND}$), intent(in) :: bb(descb(LLD_), *)
     real(${KIND}$), intent(out) :: scale
     integer, intent(out) :: info
@@ -113,9 +113,9 @@ module scalapack_module
     integer, intent(in) :: ibtype
     character, intent(in) :: uplo
     integer, intent(in) :: nn
-    integer, intent(in) :: ia, ja, desca(DLEN_)
+    integer, intent(in) :: ia, ja, desca(*)
     complex(${KIND}$), intent(inout) :: aa(desca(LLD_), *)
-    integer, intent(in) :: ib, jb, descb(DLEN_)
+    integer, intent(in) :: ib, jb, descb(*)
     complex(${KIND}$), intent(in) :: bb(descb(LLD_), *)
     real(${KIND}$), intent(out) :: scale
     integer, intent(out) :: info
@@ -133,9 +133,9 @@ module scalapack_module
     import
     character, intent(in) :: jobz, uplo
     integer, intent(in) :: nn
-    integer, intent(in) :: ia, ja, desca(DLEN_)
+    integer, intent(in) :: ia, ja, desca(*)
     real(${KIND}$), intent(inout) :: aa(desca(LLD_), *)
-    integer, intent(in) :: iz, jz, descz(DLEN_)
+    integer, intent(in) :: iz, jz, descz(*)
     real(${KIND}$), intent(out) :: ww(nn), zz(descz(LLD_),*)
     real(${KIND}$), intent(inout) :: work(*)
     integer, intent(in) :: lwork
@@ -154,9 +154,9 @@ module scalapack_module
     import
     character, intent(in) :: jobz, uplo
     integer, intent(in) :: nn
-    integer, intent(in) :: ia, ja, desca(DLEN_)
+    integer, intent(in) :: ia, ja, desca(*)
     complex(${KIND}$), intent(inout) :: aa(desca(LLD_), *)
-    integer, intent(in) :: iz, jz, descz(DLEN_)
+    integer, intent(in) :: iz, jz, descz(*)
     real(${KIND}$), intent(out) :: ww(nn)
     complex(${KIND}$), intent(out) ::  zz(descz(LLD_),*)
     complex(${KIND}$), intent(inout) :: work(*)
@@ -178,9 +178,9 @@ module scalapack_module
     import
     character, intent(in) :: jobz, uplo
     integer, intent(in) :: nn
-    integer, intent(in) :: ia, ja, desca(DLEN_)
+    integer, intent(in) :: ia, ja, desca(*)
     real(${KIND}$), intent(inout) :: aa(desca(LLD_), *)
-    integer, intent(in) :: iz, jz, descz(DLEN_)
+    integer, intent(in) :: iz, jz, descz(*)
     real(${KIND}$), intent(out) :: ww(nn), zz(descz(LLD_),*)
     real(${KIND}$), intent(inout) :: work(*)
     integer, intent(in) :: lwork
@@ -201,9 +201,9 @@ module scalapack_module
     import
     character, intent(in) :: jobz, uplo
     integer, intent(in) :: nn
-    integer, intent(in) :: ia, ja, desca(DLEN_)
+    integer, intent(in) :: ia, ja, desca(*)
     complex(${KIND}$), intent(inout) :: aa(desca(LLD_), *)
-    integer, intent(in) :: iz, jz, descz(DLEN_)
+    integer, intent(in) :: iz, jz, descz(*)
     real(${KIND}$), intent(out) :: ww(nn)
     complex(${KIND}$), intent(out) ::  zz(descz(LLD_),*)
     complex(${KIND}$), intent(inout) :: work(*)
@@ -227,14 +227,14 @@ module scalapack_module
     import
     character, intent(in) :: jobz, range, uplo
     integer, intent(in) :: nn
-    integer, intent(in) :: desca(DLEN_)
+    integer, intent(in) :: desca(*)
     real(${KIND}$), intent(inout) :: aa(desca(LLD_), *)
     integer, intent(in) :: ia, ja
     real(${KIND}$), intent(in) :: vl, vu
     integer, intent(in) :: il, iu
     integer, intent(out) :: mm, nz
     real(${KIND}$), intent(out) :: ww(nn)
-    integer, intent(in) :: descz(DLEN_)
+    integer, intent(in) :: descz(*)
     real(${KIND}$), intent(out) :: zz(descz(LLD_),*)
     integer, intent(in) :: iz, jz
     real(${KIND}$), intent(inout) :: work(*)
@@ -258,14 +258,14 @@ module scalapack_module
     import
     character, intent(in) :: jobz, range, uplo
     integer, intent(in) :: nn
-    integer, intent(in) :: desca(DLEN_)
+    integer, intent(in) :: desca(*)
     complex(${KIND}$), intent(inout) :: aa(desca(LLD_), *)
     integer, intent(in) :: ia, ja
     real(${KIND}$), intent(in) :: vl, vu
     integer, intent(in) :: il, iu
     integer, intent(out) :: mm, nz
     real(${KIND}$), intent(out) :: ww(nn)
-    integer, intent(in) :: descz(DLEN_)
+    integer, intent(in) :: descz(*)
     complex(${KIND}$), intent(out) ::  zz(descz(LLD_),*)
     integer, intent(in) :: iz, jz
     complex(${KIND}$), intent(inout) :: work(*)
@@ -289,12 +289,12 @@ module scalapack_module
     import
     character, intent(in) :: jobu, jobvt
     integer, intent(in) :: mm, nn
-    integer, intent(in) :: ia, ja, desca(DLEN_)
+    integer, intent(in) :: ia, ja, desca(*)
     real(${KIND}$), intent(inout) :: aa(desca(LLD_), *)
     real(${KIND}$), intent(out) :: sigma(*)
-    integer, intent(in) :: iu, ju, descu(DLEN_)
+    integer, intent(in) :: iu, ju, descu(*)
     real(${KIND}$), intent(out) :: uu(descu(LLD_), *)
-    integer, intent(in) :: ivt, jvt, descvt(DLEN_)
+    integer, intent(in) :: ivt, jvt, descvt(*)
     real(${KIND}$), intent(out) :: vt(descvt(LLD_), *)
     real(${KIND}$), intent(inout) :: work(*)
     integer, intent(in) :: lwork
@@ -313,12 +313,12 @@ module scalapack_module
     import
     character, intent(in) :: jobu, jobvt
     integer, intent(in) :: mm, nn
-    integer, intent(in) :: ia, ja, desca(DLEN_)
+    integer, intent(in) :: ia, ja, desca(*)
     complex(${KIND}$), intent(inout) :: aa(desca(LLD_), *)
     real(${KIND}$), intent(out) :: sigma(*)
-    integer, intent(in) :: iu, ju, descu(DLEN_)
+    integer, intent(in) :: iu, ju, descu(*)
     complex(${KIND}$), intent(out) :: uu(descu(LLD_), *)
-    integer, intent(in) :: ivt, jvt, descvt(DLEN_)
+    integer, intent(in) :: ivt, jvt, descvt(*)
     complex(${KIND}$), intent(out) :: vt(descvt(LLD_), *)
     complex(${KIND}$), intent(inout) :: work(*)
     integer, intent(in) :: lwork
@@ -339,10 +339,10 @@ module scalapack_module
     character, intent(in) :: side, uplo, transa, diag
     integer, intent(in) :: mm, nn
     ${FTYPE}$, intent(in) :: alpha
-    integer, intent(in) :: desca(DLEN_)
+    integer, intent(in) :: desca(*)
     ${FTYPE}$, intent(in) :: aa(desca(LLD_), *)
     integer, intent(in) :: ia, ja
-    integer, intent(in) :: descb(DLEN_)
+    integer, intent(in) :: descb(*)
     ${FTYPE}$, intent(inout) :: bb(descb(LLD_), *)
     integer, intent(in) :: ib, jb
   end subroutine p${TYPEABBREV}$trsm
@@ -505,8 +505,7 @@ module scalapack_module
     !> Converts global matrix index into local.
     subroutine infog2l(grindx, gcindx, desc, nprow, npcol, myrow, mycol,&
         & lrindx, lcindx, rsrc, csrc)
-      import DLEN_
-      integer, intent(in) :: grindx, gcindx, desc(DLEN_)
+      integer, intent(in) :: grindx, gcindx, desc(*)
       integer, intent(in) :: nprow, npcol, myrow, mycol
       integer, intent(out) :: lrindx, lcindx, rsrc, csrc
     end subroutine infog2l
@@ -519,8 +518,7 @@ module scalapack_module
 
     !> Initializes a descriptor for a distributed array.
     subroutine descinit(desc, mm, nn, mb, nb, irsrc, icsrc, ictxt, lld, info)
-      import DLEN_
-      integer, intent(out) :: desc(DLEN_)
+      integer, intent(out) :: desc(*)
       integer, intent(in) :: mm, nn, mb, nb, irsrc, icsrc, ictxt, lld
       integer, intent(out) :: info
     end subroutine descinit