From 5c03f7361154678a1fadb9d408e4f16011f9a325 Mon Sep 17 00:00:00 2001 From: Martin Kroeker Date: Tue, 20 Aug 2024 17:05:15 +0200 Subject: [PATCH 01/10] add missing API_SUFFIX wrapper --- LAPACKE/src/lapacke_ctfsm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/LAPACKE/src/lapacke_ctfsm.c b/LAPACKE/src/lapacke_ctfsm.c index fc75890bd5..1d50a59707 100644 --- a/LAPACKE/src/lapacke_ctfsm.c +++ b/LAPACKE/src/lapacke_ctfsm.c @@ -45,7 +45,7 @@ lapack_int API_SUFFIX(LAPACKE_ctfsm)( int matrix_layout, char transr, char side, #ifndef LAPACK_DISABLE_NAN_CHECK if( LAPACKE_get_nancheck() ) { lapack_int mn = m; - if( LAPACKE_lsame( side, 'r' ) ) mn = n; + if( API_SUFFIX(LAPACKE_lsame)( side, 'r' ) ) mn = n; /* Optionally check input matrices for NaNs */ if( IS_C_NONZERO(alpha) ) { if( API_SUFFIX(LAPACKE_ctf_nancheck)( matrix_layout, transr, uplo, diag, mn, a ) ) { From 4b85a11e56e5b69b929efeafc1bdc9f135ee2a36 Mon Sep 17 00:00:00 2001 From: Martin Kroeker Date: Tue, 20 Aug 2024 17:07:42 +0200 Subject: [PATCH 02/10] Add missing API_SUFFIX wrapper --- LAPACKE/src/lapacke_ctfsm_work.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/LAPACKE/src/lapacke_ctfsm_work.c b/LAPACKE/src/lapacke_ctfsm_work.c index 50f123579c..1916df9d5a 100644 --- a/LAPACKE/src/lapacke_ctfsm_work.c +++ b/LAPACKE/src/lapacke_ctfsm_work.c @@ -51,7 +51,7 @@ lapack_int API_SUFFIX(LAPACKE_ctfsm_work)( int matrix_layout, char transr, char lapack_int mn = m; lapack_complex_float* b_t = NULL; lapack_complex_float* a_t = NULL; - if( LAPACKE_lsame( side, 'r' ) ) mn = n; + if( API_SUFFIX(LAPACKE_lsame)( side, 'r' ) ) mn = n; /* Check leading dimension(s) */ if( ldb < m ) { info = -12; From e612c6df83bd19c5bff083d083773e4c788192dc Mon Sep 17 00:00:00 2001 From: Martin Kroeker Date: Tue, 20 Aug 2024 17:09:17 +0200 Subject: [PATCH 03/10] Add missing API_SUFFIX wrapper --- LAPACKE/src/lapacke_dtfsm_work.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/LAPACKE/src/lapacke_dtfsm_work.c b/LAPACKE/src/lapacke_dtfsm_work.c index 938de2f96e..30396d6ed7 100644 --- a/LAPACKE/src/lapacke_dtfsm_work.c +++ b/LAPACKE/src/lapacke_dtfsm_work.c @@ -50,7 +50,7 @@ lapack_int API_SUFFIX(LAPACKE_dtfsm_work)( int matrix_layout, char transr, char lapack_int mn = m; double* b_t = NULL; double* a_t = NULL; - if( LAPACKE_lsame( side, 'r' ) ) mn = n; + if( API_SUFFIX(LAPACKE_lsame)( side, 'r' ) ) mn = n; /* Check leading dimension(s) */ if( ldb < m ) { info = -12; From a7b82edbae14b4ee3dd160ae97be2f5f0631ff8b Mon Sep 17 00:00:00 2001 From: Martin Kroeker Date: Tue, 20 Aug 2024 17:10:17 +0200 Subject: [PATCH 04/10] Add missing API_SUFFIX wrapper --- LAPACKE/src/lapacke_dtfsm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/LAPACKE/src/lapacke_dtfsm.c b/LAPACKE/src/lapacke_dtfsm.c index c0a33f3188..964d500815 100644 --- a/LAPACKE/src/lapacke_dtfsm.c +++ b/LAPACKE/src/lapacke_dtfsm.c @@ -45,7 +45,7 @@ lapack_int API_SUFFIX(LAPACKE_dtfsm)( int matrix_layout, char transr, char side, if( LAPACKE_get_nancheck() ) { /* Optionally check input matrices for NaNs */ lapack_int mn = m; - if( LAPACKE_lsame( side, 'r' ) ) mn = n; + if( API_SUFFIX(LAPACKE_lsame)( side, 'r' ) ) mn = n; if( IS_D_NONZERO(alpha) ) { if( API_SUFFIX(LAPACKE_dtf_nancheck)( matrix_layout, transr, uplo, diag, mn, a ) ) { return -10; From 04b02f01074c92b644d0e8fd51987baefeec8f95 Mon Sep 17 00:00:00 2001 From: Martin Kroeker Date: Tue, 20 Aug 2024 17:11:12 +0200 Subject: [PATCH 05/10] Add missing API_SUFFIX wrapper --- LAPACKE/src/lapacke_stfsm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/LAPACKE/src/lapacke_stfsm.c b/LAPACKE/src/lapacke_stfsm.c index 23c8730c8c..55f0b1a2e7 100644 --- a/LAPACKE/src/lapacke_stfsm.c +++ b/LAPACKE/src/lapacke_stfsm.c @@ -44,7 +44,7 @@ lapack_int API_SUFFIX(LAPACKE_stfsm)( int matrix_layout, char transr, char side, #ifndef LAPACK_DISABLE_NAN_CHECK if( LAPACKE_get_nancheck() ) { lapack_int mn = m; - if( LAPACKE_lsame( side, 'r' ) ) mn = n; + if( API_SUFFIX(LAPACKE_lsame)( side, 'r' ) ) mn = n; /* Optionally check input matrices for NaNs */ if( IS_S_NONZERO(alpha) ) { if( API_SUFFIX(LAPACKE_stf_nancheck)( matrix_layout, transr, uplo, diag, mn, a ) ) { From 8048b74f54dd37bbfb9d3f064a98ac6a31540ffa Mon Sep 17 00:00:00 2001 From: Martin Kroeker Date: Tue, 20 Aug 2024 17:11:57 +0200 Subject: [PATCH 06/10] Add missing API_SUFFIX wrapper --- LAPACKE/src/lapacke_stfsm_work.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/LAPACKE/src/lapacke_stfsm_work.c b/LAPACKE/src/lapacke_stfsm_work.c index c601472d64..8d828c0828 100644 --- a/LAPACKE/src/lapacke_stfsm_work.c +++ b/LAPACKE/src/lapacke_stfsm_work.c @@ -50,7 +50,7 @@ lapack_int API_SUFFIX(LAPACKE_stfsm_work)( int matrix_layout, char transr, char lapack_int mn = MAX(1,m); float* b_t = NULL; float* a_t = NULL; - if( LAPACKE_lsame( side, 'r' ) ) mn = n; + if( API_SUFFIX(LAPACKE_lsame)( side, 'r' ) ) mn = n; /* Check leading dimension(s) */ if( ldb < m ) { info = -12; From 4416581d7532317932e3b7fc37a60cdc399b4a46 Mon Sep 17 00:00:00 2001 From: Martin Kroeker Date: Tue, 20 Aug 2024 17:12:47 +0200 Subject: [PATCH 07/10] Add missing API_SUFFIX wrapper --- LAPACKE/src/lapacke_ztfsm_work.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/LAPACKE/src/lapacke_ztfsm_work.c b/LAPACKE/src/lapacke_ztfsm_work.c index 11e269598f..9ffeb83c16 100644 --- a/LAPACKE/src/lapacke_ztfsm_work.c +++ b/LAPACKE/src/lapacke_ztfsm_work.c @@ -51,7 +51,7 @@ lapack_int API_SUFFIX(LAPACKE_ztfsm_work)( int matrix_layout, char transr, char lapack_int mn = m; lapack_complex_double* b_t = NULL; lapack_complex_double* a_t = NULL; - if( LAPACKE_lsame( side, 'r' ) ) mn = n; + if( API_SUFFIX(LAPACKE_lsame)( side, 'r' ) ) mn = n; /* Check leading dimension(s) */ if( ldb < m ) { info = -12; From 9d56cfff6daa66eaca3a38f5a2a859613af26682 Mon Sep 17 00:00:00 2001 From: Martin Kroeker Date: Tue, 20 Aug 2024 17:13:38 +0200 Subject: [PATCH 08/10] Add missing API_SUFFIX wrapper --- LAPACKE/src/lapacke_ztfsm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/LAPACKE/src/lapacke_ztfsm.c b/LAPACKE/src/lapacke_ztfsm.c index 43ea9aabe8..bde4b044b6 100644 --- a/LAPACKE/src/lapacke_ztfsm.c +++ b/LAPACKE/src/lapacke_ztfsm.c @@ -45,7 +45,7 @@ lapack_int API_SUFFIX(LAPACKE_ztfsm)( int matrix_layout, char transr, char side, #ifndef LAPACK_DISABLE_NAN_CHECK if( LAPACKE_get_nancheck() ) { lapack_int mn = m; - if( LAPACKE_lsame( side, 'r' ) ) mn = n; + if( API_SUFFIX(LAPACKE_lsame)( side, 'r' ) ) mn = n; /* Optionally check input matrices for NaNs */ if( IS_Z_NONZERO(alpha) ) { if( API_SUFFIX(LAPACKE_ztf_nancheck)( matrix_layout, transr, uplo, diag, mn, a ) ) { From 427a9b4526f99b194ead02bd21eb0349691ffc6f Mon Sep 17 00:00:00 2001 From: Martin Kroeker Date: Tue, 20 Aug 2024 17:16:31 +0200 Subject: [PATCH 09/10] Add another missing API_SUFFIX wrapper --- LAPACKE/src/lapacke_ztfsm_work.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/LAPACKE/src/lapacke_ztfsm_work.c b/LAPACKE/src/lapacke_ztfsm_work.c index 9ffeb83c16..d1d139f028 100644 --- a/LAPACKE/src/lapacke_ztfsm_work.c +++ b/LAPACKE/src/lapacke_ztfsm_work.c @@ -86,7 +86,7 @@ lapack_int API_SUFFIX(LAPACKE_ztfsm_work)( int matrix_layout, char transr, char b_t, &ldb_t ); info = 0; /* LAPACK call is ok! */ /* Transpose output matrices */ - LAPACKE_zge_trans( LAPACK_COL_MAJOR, m, n, b_t, ldb_t, b, ldb ); + API_SUFFIX(LAPACKE_zge_trans)( LAPACK_COL_MAJOR, m, n, b_t, ldb_t, b, ldb ); /* Release memory and exit */ if( IS_Z_NONZERO(alpha) ) { LAPACKE_free( a_t ); From 417b73f4abe124313ff1cf7360913a6ae9bb7cc4 Mon Sep 17 00:00:00 2001 From: Martin Kroeker Date: Tue, 1 Oct 2024 16:06:29 +0200 Subject: [PATCH 10/10] Use gcc-14 on MacOS following removal of gcc-11 --- .github/workflows/cmake.yml | 8 ++++---- .github/workflows/makefile.yml | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml index 71c592e2dd..087ed262d4 100644 --- a/.github/workflows/cmake.yml +++ b/.github/workflows/cmake.yml @@ -75,12 +75,12 @@ jobs: - name: Install ninja-build tool uses: seanmiddleditch/gha-setup-ninja@16b940825621068d98711680b6c3ff92201f8fc0 # v3 - - name: Use GCC-11 on MacOS + - name: Use GCC-14 on MacOS if: ${{ matrix.os == 'macos-latest' }} run: > cmake -B build -G Ninja - -D CMAKE_C_COMPILER="gcc-11" - -D CMAKE_Fortran_COMPILER="gfortran-11" + -D CMAKE_C_COMPILER="gcc-14" + -D CMAKE_Fortran_COMPILER="gfortran-14" -D USE_FLAT_NAMESPACE:BOOL=ON - name: Special flags for Windows @@ -237,4 +237,4 @@ jobs: fi done exit 0 - fi \ No newline at end of file + fi diff --git a/.github/workflows/makefile.yml b/.github/workflows/makefile.yml index 81a39302af..eb6720dbaa 100644 --- a/.github/workflows/makefile.yml +++ b/.github/workflows/makefile.yml @@ -90,8 +90,8 @@ jobs: echo "DOCSDIR = ${{github.workspace}}/DOCS" >> make.inc - name: Alias for GCC compilers run: | - sudo ln -s $(which gcc-11) /usr/local/bin/gcc - sudo ln -s $(which gfortran-11) /usr/local/bin/gfortran + sudo ln -s $(which gcc-14) /usr/local/bin/gcc + sudo ln -s $(which gfortran-14) /usr/local/bin/gfortran - name: Install run: | make -s -j2 all