Skip to content

Commit 4490848

Browse files
committed
Merge branch 'master' of github.com:jprhyne/lapack
2 parents d1f787c + fd3985f commit 4490848

File tree

12 files changed

+19
-15
lines changed

12 files changed

+19
-15
lines changed

.github/workflows/cmake.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -75,12 +75,12 @@ jobs:
7575
- name: Install ninja-build tool
7676
uses: seanmiddleditch/gha-setup-ninja@16b940825621068d98711680b6c3ff92201f8fc0 # v3
7777

78-
- name: Use GCC-11 on MacOS
78+
- name: Use GCC-14 on MacOS
7979
if: ${{ matrix.os == 'macos-latest' }}
8080
run: >
8181
cmake -B build -G Ninja
82-
-D CMAKE_C_COMPILER="gcc-11"
83-
-D CMAKE_Fortran_COMPILER="gfortran-11"
82+
-D CMAKE_C_COMPILER="gcc-14"
83+
-D CMAKE_Fortran_COMPILER="gfortran-14"
8484
-D USE_FLAT_NAMESPACE:BOOL=ON
8585
8686
- name: Special flags for Windows
@@ -237,4 +237,4 @@ jobs:
237237
fi
238238
done
239239
exit 0
240-
fi
240+
fi

.github/workflows/makefile.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,8 +90,8 @@ jobs:
9090
echo "DOCSDIR = ${{github.workspace}}/DOCS" >> make.inc
9191
- name: Alias for GCC compilers
9292
run: |
93-
sudo ln -s $(which gcc-11) /usr/local/bin/gcc
94-
sudo ln -s $(which gfortran-11) /usr/local/bin/gfortran
93+
sudo ln -s $(which gcc-14) /usr/local/bin/gcc
94+
sudo ln -s $(which gfortran-14) /usr/local/bin/gfortran
9595
- name: Install
9696
run: |
9797
make -s -j2 all

LAPACKE/src/lapacke_ctfsm.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ lapack_int API_SUFFIX(LAPACKE_ctfsm)( int matrix_layout, char transr, char side,
4545
#ifndef LAPACK_DISABLE_NAN_CHECK
4646
if( LAPACKE_get_nancheck() ) {
4747
lapack_int mn = m;
48-
if( LAPACKE_lsame( side, 'r' ) ) mn = n;
48+
if( API_SUFFIX(LAPACKE_lsame)( side, 'r' ) ) mn = n;
4949
/* Optionally check input matrices for NaNs */
5050
if( IS_C_NONZERO(alpha) ) {
5151
if( API_SUFFIX(LAPACKE_ctf_nancheck)( matrix_layout, transr, uplo, diag, mn, a ) ) {

LAPACKE/src/lapacke_ctfsm_work.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ lapack_int API_SUFFIX(LAPACKE_ctfsm_work)( int matrix_layout, char transr, char
5151
lapack_int mn = m;
5252
lapack_complex_float* b_t = NULL;
5353
lapack_complex_float* a_t = NULL;
54-
if( LAPACKE_lsame( side, 'r' ) ) mn = n;
54+
if( API_SUFFIX(LAPACKE_lsame)( side, 'r' ) ) mn = n;
5555
/* Check leading dimension(s) */
5656
if( ldb < m ) {
5757
info = -12;

LAPACKE/src/lapacke_dtfsm.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ lapack_int API_SUFFIX(LAPACKE_dtfsm)( int matrix_layout, char transr, char side,
4545
if( LAPACKE_get_nancheck() ) {
4646
/* Optionally check input matrices for NaNs */
4747
lapack_int mn = m;
48-
if( LAPACKE_lsame( side, 'r' ) ) mn = n;
48+
if( API_SUFFIX(LAPACKE_lsame)( side, 'r' ) ) mn = n;
4949
if( IS_D_NONZERO(alpha) ) {
5050
if( API_SUFFIX(LAPACKE_dtf_nancheck)( matrix_layout, transr, uplo, diag, mn, a ) ) {
5151
return -10;

LAPACKE/src/lapacke_dtfsm_work.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ lapack_int API_SUFFIX(LAPACKE_dtfsm_work)( int matrix_layout, char transr, char
5050
lapack_int mn = m;
5151
double* b_t = NULL;
5252
double* a_t = NULL;
53-
if( LAPACKE_lsame( side, 'r' ) ) mn = n;
53+
if( API_SUFFIX(LAPACKE_lsame)( side, 'r' ) ) mn = n;
5454
/* Check leading dimension(s) */
5555
if( ldb < m ) {
5656
info = -12;

LAPACKE/src/lapacke_stfsm.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ lapack_int API_SUFFIX(LAPACKE_stfsm)( int matrix_layout, char transr, char side,
4444
#ifndef LAPACK_DISABLE_NAN_CHECK
4545
if( LAPACKE_get_nancheck() ) {
4646
lapack_int mn = m;
47-
if( LAPACKE_lsame( side, 'r' ) ) mn = n;
47+
if( API_SUFFIX(LAPACKE_lsame)( side, 'r' ) ) mn = n;
4848
/* Optionally check input matrices for NaNs */
4949
if( IS_S_NONZERO(alpha) ) {
5050
if( API_SUFFIX(LAPACKE_stf_nancheck)( matrix_layout, transr, uplo, diag, mn, a ) ) {

LAPACKE/src/lapacke_stfsm_work.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ lapack_int API_SUFFIX(LAPACKE_stfsm_work)( int matrix_layout, char transr, char
5050
lapack_int mn = MAX(1,m);
5151
float* b_t = NULL;
5252
float* a_t = NULL;
53-
if( LAPACKE_lsame( side, 'r' ) ) mn = n;
53+
if( API_SUFFIX(LAPACKE_lsame)( side, 'r' ) ) mn = n;
5454
/* Check leading dimension(s) */
5555
if( ldb < m ) {
5656
info = -12;

LAPACKE/src/lapacke_ztfsm.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ lapack_int API_SUFFIX(LAPACKE_ztfsm)( int matrix_layout, char transr, char side,
4545
#ifndef LAPACK_DISABLE_NAN_CHECK
4646
if( LAPACKE_get_nancheck() ) {
4747
lapack_int mn = m;
48-
if( LAPACKE_lsame( side, 'r' ) ) mn = n;
48+
if( API_SUFFIX(LAPACKE_lsame)( side, 'r' ) ) mn = n;
4949
/* Optionally check input matrices for NaNs */
5050
if( IS_Z_NONZERO(alpha) ) {
5151
if( API_SUFFIX(LAPACKE_ztf_nancheck)( matrix_layout, transr, uplo, diag, mn, a ) ) {

LAPACKE/src/lapacke_ztfsm_work.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ lapack_int API_SUFFIX(LAPACKE_ztfsm_work)( int matrix_layout, char transr, char
5151
lapack_int mn = m;
5252
lapack_complex_double* b_t = NULL;
5353
lapack_complex_double* a_t = NULL;
54-
if( LAPACKE_lsame( side, 'r' ) ) mn = n;
54+
if( API_SUFFIX(LAPACKE_lsame)( side, 'r' ) ) mn = n;
5555
/* Check leading dimension(s) */
5656
if( ldb < m ) {
5757
info = -12;
@@ -86,7 +86,7 @@ lapack_int API_SUFFIX(LAPACKE_ztfsm_work)( int matrix_layout, char transr, char
8686
b_t, &ldb_t );
8787
info = 0; /* LAPACK call is ok! */
8888
/* Transpose output matrices */
89-
LAPACKE_zge_trans( LAPACK_COL_MAJOR, m, n, b_t, ldb_t, b, ldb );
89+
API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, m, n, b_t, ldb_t, b, ldb );
9090
/* Release memory and exit */
9191
if( IS_Z_NONZERO(alpha) ) {
9292
LAPACKE_free( a_t );

0 commit comments

Comments
 (0)