Skip to content

Commit cd7c2a7

Browse files
aradiaradi
committed
Merge branch 'hotfix-1.0.1' into release
2 parents cd758a2 + 779f6b5 commit cd7c2a7

File tree

6 files changed

+60
-53
lines changed

6 files changed

+60
-53
lines changed

‎CHANGELOG.rst‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,15 @@ Change Log
44

55
Notable project changes in various releases.
66

7+
1.0.1
8+
=====
9+
10+
Fixed
11+
-----
12+
13+
* ScaLAPACK interfaces use only assumed-size arrays (no fixed size ones) to
14+
avoid linking problems with NAG compiled applications
15+
716

817
1.0
918
===
@@ -21,5 +30,5 @@ Changed
2130

2231
* The Fypp-preprocessor is not shipped with ScalapackFx but is an external
2332
requirement.
24-
33+
2534
* Name convention for processes (master -> lead, slave -> follow).

‎CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ include(ScalapackFxUtils)
88

99
include(${CMAKE_CURRENT_SOURCE_DIR}/config.cmake)
1010

11-
project(ScalapackFx VERSION 1.0 LANGUAGES Fortran)
11+
project(ScalapackFx VERSION 1.0.1 LANGUAGES Fortran)
1212

1313
setup_build_type()
1414

‎doc/doxygen/Doxyfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ PROJECT_NAME = "ScaLAPACKFX"
3232
# This could be handy for archiving the generated documentation or
3333
# if some version control system is used.
3434

35-
PROJECT_NUMBER = "1.0"
35+
PROJECT_NUMBER = "1.0.1"
3636

3737
# Using the PROJECT_BRIEF tag one can provide an optional one line description
3838
# for a project that appears at the top of each page and should give viewer

‎doc/sphinx/conf.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
version = '1.0'
4949

5050
# The full version, including alpha/beta/rc tags.
51-
release = '1.0'
51+
release = '1.0.1'
5252

5353
# The language for content autogenerated by Sphinx. Refer to documentation
5454
# for a list of supported languages.

‎lib/pblas.fpp‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,11 @@
1212
character, intent(in) :: uplo
1313
integer, intent(in) :: nn
1414
real(${KIND}$), intent(in) :: alpha
15-
integer, intent(in) :: descx(DLEN_)
15+
integer, intent(in) :: descx(*)
1616
${TYPE}$(${KIND}$), intent(in) :: xx(descx(LLD_), *)
1717
integer, intent(in) :: ix, jx
1818
integer, intent(in) :: incx
19-
integer, intent(in) :: desca(DLEN_)
19+
integer, intent(in) :: desca(*)
2020
${TYPE}$(${KIND}$), intent(inout) :: aa(desca(LLD_), *)
2121
integer, intent(in) :: ia, ja
2222
end subroutine ${NAME}$
@@ -38,11 +38,11 @@
3838
character, intent(in) :: uplo, trans
3939
integer, intent(in) :: nn, kk
4040
real(${KIND}$), intent(in) :: alpha
41-
integer, intent(in) :: desca(DLEN_)
41+
integer, intent(in) :: desca(*)
4242
${TYPE}$(${KIND}$), intent(in) :: aa(desca(LLD_), *)
4343
integer, intent(in) :: ia, ja
4444
real(${KIND}$), intent(in) :: beta
45-
integer, intent(in) :: descc(DLEN_)
45+
integer, intent(in) :: descc(*)
4646
${TYPE}$(${KIND}$), intent(inout) :: cc(descc(LLD_), *)
4747
integer, intent(in) :: ic, jc
4848
end subroutine ${NAME}$
@@ -64,14 +64,14 @@
6464
character, intent(in) :: uplo
6565
integer, intent(in) :: nn
6666
${TYPE}$(${KIND}$), intent(in) :: alpha
67-
integer, intent(in) :: desca(DLEN_)
67+
integer, intent(in) :: desca(*)
6868
${TYPE}$(${KIND}$), intent(in) :: aa(desca(LLD_), *)
6969
integer, intent(in) :: ia, ja
70-
integer, intent(in) :: descx(DLEN_)
70+
integer, intent(in) :: descx(*)
7171
${TYPE}$(${KIND}$), intent(in) :: xx(descx(LLD_), *)
7272
integer, intent(in) :: ix, jx, incx
7373
${TYPE}$(${KIND}$), intent(in) :: beta
74-
integer, intent(in) :: descy(DLEN_)
74+
integer, intent(in) :: descy(*)
7575
${TYPE}$(${KIND}$), intent(inout) :: yy(descy(LLD_), *)
7676
integer, intent(in) :: iy, jy, incy
7777
end subroutine ${NAME}$
@@ -95,14 +95,14 @@
9595
integer, intent(in) :: mm
9696
integer, intent(in) :: nn
9797
${TYPE}$(${KIND}$), intent(in) :: alpha
98-
integer, intent(in) :: desca(DLEN_)
98+
integer, intent(in) :: desca(*)
9999
${TYPE}$(${KIND}$), intent(in) :: aa(desca(LLD_), *)
100100
integer, intent(in) :: ia, ja
101101
${TYPE}$(${KIND}$), intent(in) :: beta
102-
integer, intent(in) :: descb(DLEN_)
102+
integer, intent(in) :: descb(*)
103103
${TYPE}$(${KIND}$), intent(in) :: bb(descb(LLD_), *)
104104
integer, intent(in) :: ib, jb
105-
integer, intent(in) :: descc(DLEN_)
105+
integer, intent(in) :: descc(*)
106106
${TYPE}$(${KIND}$), intent(in) :: cc(descc(LLD_), *)
107107
integer, intent(in) :: ic, jc
108108
end subroutine ${NAME}$
@@ -123,10 +123,10 @@
123123
character, intent(in) :: side, uplo, transa, diag
124124
integer, intent(in) :: mm, nn
125125
${TYPE}$(${KIND}$), intent(in) :: alpha
126-
integer, intent(in) :: desca(DLEN_)
126+
integer, intent(in) :: desca(*)
127127
${TYPE}$(${KIND}$), intent(in) :: aa(desca(LLD_), *)
128128
integer, intent(in) :: ia, ja
129-
integer, intent(in) :: descb(DLEN_)
129+
integer, intent(in) :: descb(*)
130130
${TYPE}$(${KIND}$), intent(in) :: bb(descb(LLD_), *)
131131
integer, intent(in) :: ib, jb
132132
end subroutine ${NAME}$
@@ -147,14 +147,14 @@
147147
character, intent(in) :: transa, transb
148148
integer, intent(in) :: mm, nn, kk
149149
${TYPE}$(${KIND}$), intent(in) :: alpha
150-
integer, intent(in) :: desca(DLEN_)
150+
integer, intent(in) :: desca(*)
151151
${TYPE}$(${KIND}$), intent(in) :: aa(desca(LLD_), *)
152152
integer, intent(in) :: ia, ja
153-
integer, intent(in) :: descb(DLEN_)
153+
integer, intent(in) :: descb(*)
154154
${TYPE}$(${KIND}$), intent(in) :: bb(descb(LLD_), *)
155155
integer, intent(in) :: ib, jb
156156
${TYPE}$(${KIND}$), intent(in) :: beta
157-
integer, intent(in) :: descc(DLEN_)
157+
integer, intent(in) :: descc(*)
158158
${TYPE}$(${KIND}$), intent(inout) :: cc(descb(LLD_), *)
159159
integer, intent(in) :: ic, jc
160160
end subroutine ${NAME}$
@@ -174,11 +174,11 @@
174174
integer, intent(in) :: mm, nn
175175
${TYPE}$(${KIND}$), intent(in) :: alpha
176176
integer, intent(in) :: ia, ja
177-
integer, intent(in) :: desca(DLEN_)
177+
integer, intent(in) :: desca(*)
178178
${TYPE}$(${KIND}$), intent(in) :: aa(desca(LLD_), *)
179179
${TYPE}$(${KIND}$), intent(in) :: beta
180180
integer, intent(in) :: ic, jc
181-
integer, intent(in) :: descc(DLEN_)
181+
integer, intent(in) :: descc(*)
182182
${TYPE}$(${KIND}$), intent(inout) :: cc(descc(LLD_), *)
183183
end subroutine ${NAME}$
184184

‎lib/scalapack.fpp‎

Lines changed: 30 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ module scalapack_module
2121
import
2222
character, intent(in) :: uplo
2323
integer, intent(in) :: nn
24-
integer, intent(in) :: ia, ja, desca(DLEN_)
24+
integer, intent(in) :: ia, ja, desca(*)
2525
${FTYPES}$, intent(inout) :: aa(desca(LLD_), *)
2626
integer, intent(out) :: info
2727
end subroutine p${TYPEABBREV}$potrf
@@ -37,7 +37,7 @@ module scalapack_module
3737
import
3838
character, intent(in) :: uplo
3939
integer, intent(in) :: nn
40-
integer, intent(in) :: ia, ja, desca(DLEN_)
40+
integer, intent(in) :: ia, ja, desca(*)
4141
${FTYPES}$, intent(inout) :: aa(desca(LLD_), *)
4242
integer, intent(out) :: info
4343
end subroutine p${TYPEABBREV}$potri
@@ -53,7 +53,7 @@ module scalapack_module
5353
import
5454
character, intent(in) :: uplo, diag
5555
integer, intent(in) :: nn
56-
integer, intent(in) :: ia, ja, desca(DLEN_)
56+
integer, intent(in) :: ia, ja, desca(*)
5757
${FTYPE}$, intent(inout) :: aa(desca(LLD_), *)
5858
integer, intent(out) :: info
5959
end subroutine p${TYPEABBREV}$trtri
@@ -69,7 +69,7 @@ module scalapack_module
6969
import
7070
integer, intent(in) :: mm
7171
integer, intent(in) :: nn
72-
integer, intent(in) :: ia, ja, desca(DLEN_)
72+
integer, intent(in) :: ia, ja, desca(*)
7373
${FTYPES}$, intent(inout) :: aa(desca(LLD_), *)
7474
integer, intent(out) :: ipiv(*)
7575
integer, intent(out) :: info
@@ -91,9 +91,9 @@ module scalapack_module
9191
integer, intent(in) :: ibtype
9292
character, intent(in) :: uplo
9393
integer, intent(in) :: nn
94-
integer, intent(in) :: ia, ja, desca(DLEN_)
94+
integer, intent(in) :: ia, ja, desca(*)
9595
real(${KIND}$), intent(inout) :: aa(desca(LLD_), *)
96-
integer, intent(in) :: ib, jb, descb(DLEN_)
96+
integer, intent(in) :: ib, jb, descb(*)
9797
real(${KIND}$), intent(in) :: bb(descb(LLD_), *)
9898
real(${KIND}$), intent(out) :: scale
9999
integer, intent(out) :: info
@@ -113,9 +113,9 @@ module scalapack_module
113113
integer, intent(in) :: ibtype
114114
character, intent(in) :: uplo
115115
integer, intent(in) :: nn
116-
integer, intent(in) :: ia, ja, desca(DLEN_)
116+
integer, intent(in) :: ia, ja, desca(*)
117117
complex(${KIND}$), intent(inout) :: aa(desca(LLD_), *)
118-
integer, intent(in) :: ib, jb, descb(DLEN_)
118+
integer, intent(in) :: ib, jb, descb(*)
119119
complex(${KIND}$), intent(in) :: bb(descb(LLD_), *)
120120
real(${KIND}$), intent(out) :: scale
121121
integer, intent(out) :: info
@@ -133,9 +133,9 @@ module scalapack_module
133133
import
134134
character, intent(in) :: jobz, uplo
135135
integer, intent(in) :: nn
136-
integer, intent(in) :: ia, ja, desca(DLEN_)
136+
integer, intent(in) :: ia, ja, desca(*)
137137
real(${KIND}$), intent(inout) :: aa(desca(LLD_), *)
138-
integer, intent(in) :: iz, jz, descz(DLEN_)
138+
integer, intent(in) :: iz, jz, descz(*)
139139
real(${KIND}$), intent(out) :: ww(nn), zz(descz(LLD_),*)
140140
real(${KIND}$), intent(inout) :: work(*)
141141
integer, intent(in) :: lwork
@@ -154,9 +154,9 @@ module scalapack_module
154154
import
155155
character, intent(in) :: jobz, uplo
156156
integer, intent(in) :: nn
157-
integer, intent(in) :: ia, ja, desca(DLEN_)
157+
integer, intent(in) :: ia, ja, desca(*)
158158
complex(${KIND}$), intent(inout) :: aa(desca(LLD_), *)
159-
integer, intent(in) :: iz, jz, descz(DLEN_)
159+
integer, intent(in) :: iz, jz, descz(*)
160160
real(${KIND}$), intent(out) :: ww(nn)
161161
complex(${KIND}$), intent(out) :: zz(descz(LLD_),*)
162162
complex(${KIND}$), intent(inout) :: work(*)
@@ -178,9 +178,9 @@ module scalapack_module
178178
import
179179
character, intent(in) :: jobz, uplo
180180
integer, intent(in) :: nn
181-
integer, intent(in) :: ia, ja, desca(DLEN_)
181+
integer, intent(in) :: ia, ja, desca(*)
182182
real(${KIND}$), intent(inout) :: aa(desca(LLD_), *)
183-
integer, intent(in) :: iz, jz, descz(DLEN_)
183+
integer, intent(in) :: iz, jz, descz(*)
184184
real(${KIND}$), intent(out) :: ww(nn), zz(descz(LLD_),*)
185185
real(${KIND}$), intent(inout) :: work(*)
186186
integer, intent(in) :: lwork
@@ -201,9 +201,9 @@ module scalapack_module
201201
import
202202
character, intent(in) :: jobz, uplo
203203
integer, intent(in) :: nn
204-
integer, intent(in) :: ia, ja, desca(DLEN_)
204+
integer, intent(in) :: ia, ja, desca(*)
205205
complex(${KIND}$), intent(inout) :: aa(desca(LLD_), *)
206-
integer, intent(in) :: iz, jz, descz(DLEN_)
206+
integer, intent(in) :: iz, jz, descz(*)
207207
real(${KIND}$), intent(out) :: ww(nn)
208208
complex(${KIND}$), intent(out) :: zz(descz(LLD_),*)
209209
complex(${KIND}$), intent(inout) :: work(*)
@@ -227,14 +227,14 @@ module scalapack_module
227227
import
228228
character, intent(in) :: jobz, range, uplo
229229
integer, intent(in) :: nn
230-
integer, intent(in) :: desca(DLEN_)
230+
integer, intent(in) :: desca(*)
231231
real(${KIND}$), intent(inout) :: aa(desca(LLD_), *)
232232
integer, intent(in) :: ia, ja
233233
real(${KIND}$), intent(in) :: vl, vu
234234
integer, intent(in) :: il, iu
235235
integer, intent(out) :: mm, nz
236236
real(${KIND}$), intent(out) :: ww(nn)
237-
integer, intent(in) :: descz(DLEN_)
237+
integer, intent(in) :: descz(*)
238238
real(${KIND}$), intent(out) :: zz(descz(LLD_),*)
239239
integer, intent(in) :: iz, jz
240240
real(${KIND}$), intent(inout) :: work(*)
@@ -258,14 +258,14 @@ module scalapack_module
258258
import
259259
character, intent(in) :: jobz, range, uplo
260260
integer, intent(in) :: nn
261-
integer, intent(in) :: desca(DLEN_)
261+
integer, intent(in) :: desca(*)
262262
complex(${KIND}$), intent(inout) :: aa(desca(LLD_), *)
263263
integer, intent(in) :: ia, ja
264264
real(${KIND}$), intent(in) :: vl, vu
265265
integer, intent(in) :: il, iu
266266
integer, intent(out) :: mm, nz
267267
real(${KIND}$), intent(out) :: ww(nn)
268-
integer, intent(in) :: descz(DLEN_)
268+
integer, intent(in) :: descz(*)
269269
complex(${KIND}$), intent(out) :: zz(descz(LLD_),*)
270270
integer, intent(in) :: iz, jz
271271
complex(${KIND}$), intent(inout) :: work(*)
@@ -289,12 +289,12 @@ module scalapack_module
289289
import
290290
character, intent(in) :: jobu, jobvt
291291
integer, intent(in) :: mm, nn
292-
integer, intent(in) :: ia, ja, desca(DLEN_)
292+
integer, intent(in) :: ia, ja, desca(*)
293293
real(${KIND}$), intent(inout) :: aa(desca(LLD_), *)
294294
real(${KIND}$), intent(out) :: sigma(*)
295-
integer, intent(in) :: iu, ju, descu(DLEN_)
295+
integer, intent(in) :: iu, ju, descu(*)
296296
real(${KIND}$), intent(out) :: uu(descu(LLD_), *)
297-
integer, intent(in) :: ivt, jvt, descvt(DLEN_)
297+
integer, intent(in) :: ivt, jvt, descvt(*)
298298
real(${KIND}$), intent(out) :: vt(descvt(LLD_), *)
299299
real(${KIND}$), intent(inout) :: work(*)
300300
integer, intent(in) :: lwork
@@ -313,12 +313,12 @@ module scalapack_module
313313
import
314314
character, intent(in) :: jobu, jobvt
315315
integer, intent(in) :: mm, nn
316-
integer, intent(in) :: ia, ja, desca(DLEN_)
316+
integer, intent(in) :: ia, ja, desca(*)
317317
complex(${KIND}$), intent(inout) :: aa(desca(LLD_), *)
318318
real(${KIND}$), intent(out) :: sigma(*)
319-
integer, intent(in) :: iu, ju, descu(DLEN_)
319+
integer, intent(in) :: iu, ju, descu(*)
320320
complex(${KIND}$), intent(out) :: uu(descu(LLD_), *)
321-
integer, intent(in) :: ivt, jvt, descvt(DLEN_)
321+
integer, intent(in) :: ivt, jvt, descvt(*)
322322
complex(${KIND}$), intent(out) :: vt(descvt(LLD_), *)
323323
complex(${KIND}$), intent(inout) :: work(*)
324324
integer, intent(in) :: lwork
@@ -339,10 +339,10 @@ module scalapack_module
339339
character, intent(in) :: side, uplo, transa, diag
340340
integer, intent(in) :: mm, nn
341341
${FTYPE}$, intent(in) :: alpha
342-
integer, intent(in) :: desca(DLEN_)
342+
integer, intent(in) :: desca(*)
343343
${FTYPE}$, intent(in) :: aa(desca(LLD_), *)
344344
integer, intent(in) :: ia, ja
345-
integer, intent(in) :: descb(DLEN_)
345+
integer, intent(in) :: descb(*)
346346
${FTYPE}$, intent(inout) :: bb(descb(LLD_), *)
347347
integer, intent(in) :: ib, jb
348348
end subroutine p${TYPEABBREV}$trsm
@@ -505,8 +505,7 @@ module scalapack_module
505505
!> Converts global matrix index into local.
506506
subroutine infog2l(grindx, gcindx, desc, nprow, npcol, myrow, mycol,&
507507
& lrindx, lcindx, rsrc, csrc)
508-
import DLEN_
509-
integer, intent(in) :: grindx, gcindx, desc(DLEN_)
508+
integer, intent(in) :: grindx, gcindx, desc(*)
510509
integer, intent(in) :: nprow, npcol, myrow, mycol
511510
integer, intent(out) :: lrindx, lcindx, rsrc, csrc
512511
end subroutine infog2l
@@ -519,8 +518,7 @@ module scalapack_module
519518

520519
!> Initializes a descriptor for a distributed array.
521520
subroutine descinit(desc, mm, nn, mb, nb, irsrc, icsrc, ictxt, lld, info)
522-
import DLEN_
523-
integer, intent(out) :: desc(DLEN_)
521+
integer, intent(out) :: desc(*)
524522
integer, intent(in) :: mm, nn, mb, nb, irsrc, icsrc, ictxt, lld
525523
integer, intent(out) :: info
526524
end subroutine descinit

0 commit comments

Comments
 (0)