Skip to content

Commit 8cc32f5

Browse files
authored
Merge branch 'OpenMathLib:develop' into issue5050
2 parents 09e75f1 + a588ea9 commit 8cc32f5

File tree

5 files changed

+16
-8
lines changed

5 files changed

+16
-8
lines changed

.cirrus.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -125,9 +125,9 @@ task:
125125
- make USE_OPENMP=1
126126

127127
FreeBSD_task:
128-
name: FreeBSD-gcc12
128+
name: FreeBSD-gcc
129129
freebsd_instance:
130-
image_family: freebsd-13-3
130+
image_family: freebsd-14-1
131131
install_script:
132132
- pkg update -f && pkg upgrade -y && pkg install -y gmake gcc
133133
compile_script:
@@ -136,9 +136,9 @@ FreeBSD_task:
136136

137137

138138
FreeBSD_task:
139-
name: freebsd-gcc12-ilp64
139+
name: freebsd-gcc-ilp64
140140
freebsd_instance:
141-
image_family: freebsd-13-3
141+
image_family: freebsd-14-1
142142
install_script:
143143
- pkg update -f && pkg upgrade -y && pkg install -y gmake gcc
144144
compile_script:
@@ -148,7 +148,7 @@ FreeBSD_task:
148148
FreeBSD_task:
149149
name: FreeBSD-clang-openmp
150150
freebsd_instance:
151-
image_family: freebsd-13-3
151+
image_family: freebsd-14-1
152152
install_script:
153153
- pkg update -f && pkg upgrade -y && pkg install -y gmake gcc
154154
- ln -s /usr/local/lib/gcc13/libgfortran.so.5.0.0 /usr/lib/libgfortran.so

lapack-netlib/LAPACKE/src/lapacke_cgesvd_work.c

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,11 +74,13 @@ lapack_int LAPACKE_cgesvd_work( int matrix_layout, char jobu, char jobvt,
7474
LAPACKE_xerbla( "LAPACKE_cgesvd_work", info );
7575
return info;
7676
}
77-
if( ldvt < ncols_vt ) {
77+
if( LAPACKE_lsame( jobvt, 'a' ) || LAPACKE_lsame( jobvt, 's' ) ) {
78+
if( ldvt < ncols_vt ) {
7879
info = -12;
7980
LAPACKE_xerbla( "LAPACKE_cgesvd_work", info );
8081
return info;
8182
}
83+
}
8284
/* Query optimal working array(s) size if requested */
8385
if( lwork == -1 ) {
8486
LAPACK_cgesvd( &jobu, &jobvt, &m, &n, a, &lda_t, s, u, &ldu_t, vt,

lapack-netlib/LAPACKE/src/lapacke_dgesvd_work.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,11 +72,13 @@ lapack_int LAPACKE_dgesvd_work( int matrix_layout, char jobu, char jobvt,
7272
LAPACKE_xerbla( "LAPACKE_dgesvd_work", info );
7373
return info;
7474
}
75+
if( LAPACKE_lsame( jobvt, 'a' ) || LAPACKE_lsame( jobvt, 's' ) ) {
7576
if( ldvt < ncols_vt ) {
7677
info = -12;
7778
LAPACKE_xerbla( "LAPACKE_dgesvd_work", info );
7879
return info;
7980
}
81+
}
8082
/* Query optimal working array(s) size if requested */
8183
if( lwork == -1 ) {
8284
LAPACK_dgesvd( &jobu, &jobvt, &m, &n, a, &lda_t, s, u, &ldu_t, vt,

lapack-netlib/LAPACKE/src/lapacke_sgesvd_work.c

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,11 +72,13 @@ lapack_int LAPACKE_sgesvd_work( int matrix_layout, char jobu, char jobvt,
7272
LAPACKE_xerbla( "LAPACKE_sgesvd_work", info );
7373
return info;
7474
}
75-
if( ldvt < ncols_vt ) {
75+
if( LAPACKE_lsame( jobvt, 'a' ) || LAPACKE_lsame( jobvt, 's' ) ) {
76+
if( ldvt < ncols_vt ) {
7677
info = -12;
7778
LAPACKE_xerbla( "LAPACKE_sgesvd_work", info );
7879
return info;
7980
}
81+
}
8082
/* Query optimal working array(s) size if requested */
8183
if( lwork == -1 ) {
8284
LAPACK_sgesvd( &jobu, &jobvt, &m, &n, a, &lda_t, s, u, &ldu_t, vt,

lapack-netlib/LAPACKE/src/lapacke_zgesvd_work.c

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,11 +74,13 @@ lapack_int LAPACKE_zgesvd_work( int matrix_layout, char jobu, char jobvt,
7474
LAPACKE_xerbla( "LAPACKE_zgesvd_work", info );
7575
return info;
7676
}
77-
if( ldvt < ncols_vt ) {
77+
if( LAPACKE_lsame( jobvt, 'a' ) || LAPACKE_lsame( jobvt, 's' ) ) {
78+
if( ldvt < ncols_vt ) {
7879
info = -12;
7980
LAPACKE_xerbla( "LAPACKE_zgesvd_work", info );
8081
return info;
8182
}
83+
}
8284
/* Query optimal working array(s) size if requested */
8385
if( lwork == -1 ) {
8486
LAPACK_zgesvd( &jobu, &jobvt, &m, &n, a, &lda_t, s, u, &ldu_t, vt,

0 commit comments

Comments
 (0)