Skip to content

Commit 6d15bb6

Browse files
authored
Merge branch 'fortran-lang:master' into refactor_lapack
2 parents 03ebf91 + 8916fc5 commit 6d15bb6

File tree

4 files changed

+4
-11
lines changed

4 files changed

+4
-11
lines changed

.github/workflows/ci_windows.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,7 @@ jobs:
1313
fail-fast: false
1414
matrix:
1515
include: [
16-
{ msystem: MINGW64, arch: x86_64 },
17-
{ msystem: MINGW32, arch: i686 }
16+
{ msystem: MINGW64, arch: x86_64 }
1817
]
1918
defaults:
2019
run:

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,15 +90,15 @@ Name | Version | Platform | Architecture
9090
GCC Fortran | 10, 11, 12, 13 | Ubuntu 22.04.2 LTS | x86_64
9191
GCC Fortran | 10, 11, 12, 13 | macOS 12.6.3 (21G419) | x86_64
9292
GCC Fortran (MSYS) | 13 | Windows Server 2022 (10.0.20348 Build 1547) | x86_64
93-
GCC Fortran (MinGW) | 13 | Windows Server 2022 (10.0.20348 Build 1547) | x86_64, i686
93+
GCC Fortran (MinGW) | 13 | Windows Server 2022 (10.0.20348 Build 1547) | x86_64
9494
Intel oneAPI LLVM | 2024.0 | Ubuntu 22.04.2 LTS | x86_64
9595
Intel oneAPI classic | 2023.1 | macOS 12.6.3 (21G419) | x86_64
9696

9797
The following combinations are known to work, but they are not tested in the CI:
9898

9999
Name | Version | Platform | Architecture
100100
--- | --- | --- | ---
101-
GCC Fortran (MinGW) | 9.3.0, 10.2.0, 11.2.0 | Windows 10 | x86_64, i686
101+
GCC Fortran (MinGW) | 9.3.0, 10.2.0, 11.2.0 | Windows 10 | x86_64
102102

103103
We try to test as many available compilers and platforms as possible.
104104
A list of tested compilers which are currently not working and the respective issue are listed below.

src/stdlib_linalg_norms.fypp

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -210,7 +210,6 @@ submodule(stdlib_linalg) stdlib_linalg_norms
210210

211211
integer(ilp) :: i
212212
real(${rk}$) :: rorder
213-
intrinsic :: abs, sum, sqrt, maxval, minval, conjg
214213

215214
! Initialize norm to zero
216215
nrm = 0.0_${rk}$
@@ -286,8 +285,6 @@ submodule(stdlib_linalg) stdlib_linalg_norms
286285

287286
type(linalg_state_type) :: err_
288287
integer(ilp) :: sze,norm_request
289-
real(${rk}$) :: rorder
290-
intrinsic :: abs, sum, sqrt, maxval, minval, conjg
291288

292289
sze = size(a,kind=ilp)
293290

@@ -371,11 +368,9 @@ submodule(stdlib_linalg) stdlib_linalg_norms
371368
type(linalg_state_type) :: err_
372369
integer(ilp) :: sze,lda,norm_request,${loop_variables('j',rank-1,1)}$
373370
logical :: contiguous_data
374-
real(${rk}$) :: rorder
375371
integer(ilp), dimension(${rank}$) :: spe,spack,perm,iperm
376372
integer(ilp), dimension(${rank}$), parameter :: dim_range = [(lda,lda=1_ilp,${rank}$_ilp)]
377373
${rt}$, allocatable :: apack${ranksuffix(rank)}$
378-
intrinsic :: abs, sum, sqrt, norm2, maxval, minval, conjg
379374

380375
! Input matrix properties
381376
sze = size (a,kind=ilp)
@@ -512,7 +507,7 @@ ${loop_variables_end(rank-1," "*12)}$
512507
type(linalg_state_type), intent(out), optional :: err
513508

514509
type(linalg_state_type) :: err_
515-
integer(ilp) :: j,m,n,lda,dims(2),norm_request,svd_errors
510+
integer(ilp) :: m,n,lda,dims(2),svd_errors
516511
integer(ilp), dimension(${rank}$) :: s,spack,perm,iperm
517512
integer(ilp), dimension(${rank}$), parameter :: dim_range = [(m,m=1_ilp,${rank}$_ilp)]
518513
integer(ilp) :: ${loop_variables('j',rank-2,2)}$

src/stdlib_sparse_conversion.fypp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -460,7 +460,6 @@ contains
460460

461461
#:for k1, t1, s1 in (KINDS_TYPES)
462462
recursive subroutine quicksort_i_${s1}$(a, b, first, last)
463-
integer, parameter :: wp = sp
464463
integer(ilp), intent(inout) :: a(*) !! reference table to sort
465464
${t1}$, intent(inout) :: b(*) !! secondary real data to sort w.r.t. a
466465
integer(ilp), intent(in) :: first, last

0 commit comments

Comments
 (0)