Merge branch 'fortran-lang:master' into gmres

Author: jalvesz

.github/workflows/ci_flang.yml

@@ -0,0 +1,69 @@
+name: CI_Flang
+
+on:
+  push:
+    branches: [master]
+  pull_request:
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+  cancel-in-progress: true
+
+env:
+  CMAKE_BUILD_PARALLEL_LEVEL: "2"
+  CTEST_PARALLEL_LEVEL: "2"
+  CTEST_TEST_TIMEOUT: "5"
+
+jobs:
+  Build:
+    runs-on: ubuntu-latest
+
+    steps:
+    - name: Checkout code
+      uses: actions/checkout@v4
+
+    - name: Set up Python 3.x
+      uses: actions/setup-python@v5
+      with:
+        python-version: 3.x
+
+    - name: Install fypp
+      run: pip install --upgrade fypp
+
+    - name: Setup Flang
+      uses: minhqdao/setup-fortran@v1
+      id: setup-fortran
+      with:
+        compiler: flang
+        version: latest
+
+    - name: Configure with CMake
+      run: >-
+        cmake -Wdev
+        -DCMAKE_BUILD_TYPE=Release
+        -DCMAKE_Fortran_COMPILER=${{ steps.setup-fortran.outputs.fc }}
+        -DCMAKE_C_COMPILER=${{ steps.setup-fortran.outputs.cc }}
+        -DCMAKE_MAXIMUM_RANK:STRING=4
+        -DCMAKE_INSTALL_PREFIX=$PWD/_dist
+        -DFIND_BLAS:BOOL=FALSE
+        -DWITH_XDP=off
+        -DWITH_QP=off
+        -S . -B build
+
+    - name: Build
+      run: cmake --build build --parallel
+
+    - name: Catch build fail
+      if: failure()
+      run: cmake --build build --verbose --parallel 1
+
+    - name: Test
+      run: >-
+        ctest
+        --test-dir build
+        --parallel
+        --output-on-failure
+        --no-tests=error
+
+    - name: Install project
+      run: cmake --install build

README.md

@@ -94,6 +94,7 @@ GCC Fortran (MSYS) | 13 | Windows Server 2022 (10.0.20348 Build 1547) | x86_64
 GCC Fortran (MinGW) | 13 | Windows Server 2022 (10.0.20348 Build 1547) | x86_64
 Intel oneAPI LLVM | 2024.1 | Ubuntu 24.04.3 LTS | x86_64
 Intel oneAPI classic | 2021.10 | Ubuntu 22.04.5 LTS | x86_64
+[Flang LLVM](https://flang.llvm.org/docs/) | 22 | Ubuntu 24.04.3 LTS | x86_64
 
 The following combinations are known to work, but they are not tested in the CI:
 

doc/specs/stdlib_io.md

@@ -321,3 +321,136 @@ Exceptions trigger an `error stop` unless the optional `err` argument is provide
 {!example/io/example_get_file.f90!}
 ```
 
+## Matrix Market Format I/O
+
+### Status
+
+Experimental
+
+### Description
+
+The Matrix Market I/O module provides support for reading and writing matrices in the Matrix Market format, a simple ASCII format for sparse and dense matrices developed at NIST. The format supports real, complex, and integer matrices with various symmetry properties.
+
+### `load_mm` - load a matrix from Matrix Market file
+
+Loads a 2D matrix from a Matrix Market format file. Symmetric matrices are expanded to full storage.
+
+#### Syntax
+
+- To load a matrix of `array` format:
+
+`call ` [[stdlib_io_mm(module):load_mm(interface)]] `(filename, matrix [, iostat, iomsg])`
+
+- To load a matrix of `coordinate` format:
+
+`call ` [[stdlib_io_mm(module):load_mm(interface)]] `(filename, index, data [, iostat, iomsg])`
+
+#### Arguments
+
+**`Array` format**
+
+`call ` [[stdlib_io_mm(module):load_mm(interface)]] `(filename, matrix [, iostat, iomsg])`
+
+- `filename`: Shall be a character expression containing the Matrix Market file name to read from.
+
+- `matrix`: Shall be an allocatable rank-2 array of type `real`, `complex`, or `integer` that will contain the loaded matrix.
+
+- `iostat` (optional): Shall be a scalar of type `integer` that receives the error status. Zero indicates success.
+
+- `iomsg` (optional): Shall be an allocatable character string that receives the error message if iostat is non-zero.
+
+**`Coordinate` format**
+
+`call ` [[stdlib_io_mm(module):load_mm(interface)]] `(filename, index, data [, iostat, iomsg])`
+
+- `filename`: Shall be a character expression containing the Matrix Market file name to read from.
+
+- `index`: Shall be an allocatable rank-2 array of type `integer` that will contain the indices of the loaded matrix.
+
+- `data`: Shall be an allocatable rank-1 array of type `real`, `complex`, or `integer` that will contain the values of the loaded matrix.
+
+- `iostat` (optional): Shall be a scalar of type `integer` that receives the error status. Zero indicates success.
+
+- `iomsg` (optional): Shall be an allocatable character string that receives the error message if iostat is non-zero.
+
+### `save_mm` - save a matrix to Matrix Market file
+
+Saves a 2D matrix to Matrix Market format file.
+
+#### Syntax
+
+- To save a matrix of `array` format:
+
+`call ` [[stdlib_io_mm(module):save_mm(interface)]] `(filename, matrix [, comment, format, symmetry, iostat, iomsg])`
+
+- To save a matrix of `coordinate` format:
+
+`call ` [[stdlib_io_mm(module):save_mm(interface)]] `(filename, index, data [, comment, format, symmetry, iostat, iomsg])`
+
+#### Arguments
+
+**`Array` format**
+
+`call ` [[stdlib_io_mm(module):save_mm(interface)]] `(filename, matrix [, comment, format, symmetry, iostat, iomsg])`
+
+- `filename`: Shall be a character expression containing the Matrix Market file name to write to.
+
+- `matrix`: Shall be a rank-2 array of type `real`, `complex`, or `integer` to save.
+
+- `comment` (optional): Shall be a character expression containing additional comments for the file header.
+
+- `format` (optional): Shall be a character expression specifying how entries are written.
+
+- `symmetry` (optional): Shall be a character expression defining the symmetry of the matrix. Allowed values: `auto`, `general`, `symmetric`, `skew-symmetric`, `hermitian`.
+    - `auto`: Detects the symmetry automatically, falls back to `general` if no symmetry is found.
+    - `general`: all entries are stored
+    - `symmetric` / `hermitian`: only the lower triangle (including diagonal) is stored
+    - `skew-symmetric`: only the strictly lower triangle (excluding diagonal) is stored
+
+  Default: `general`
+
+- `iostat` (optional): Shall be a scalar of type `integer` that receives the error status. Zero indicates success.
+
+- `iomsg` (optional): Shall be an allocatable character string that receives the error message if iostat is non-zero.
+
+**`Coordinate` format**
+
+`call ` [[stdlib_io_mm(module):save_mm(interface)]] `(filename, index, data [, comment, format, symmetry, iostat, iomsg])`
+
+- `filename`: Shall be a character expression containing the Matrix Market file name to write to.
+
+- `index`: Shall be a rank-2 `integer` array of shape `(2, n)` specifying the indices of the entries. 
+    - index(1,:) shall contain row indices
+    - index(2,:) shall contain column indices
+
+- `data`: Shall be a rank-1 array of type `real`, `complex`, or `integer` to save. 
+    - If `size(data) == n`, the values for each index are written.
+    - If `size(data) == 1`, a `pattern` matrix is written (no explicit values)
+
+- `comment` (optional): Shall be a character expression containing additional comments for the file header.
+
+- `format` (optional): Shall be a character expression specifying how entries are written.
+
+- `symmetry` (optional): Shall be a character expression defining the symmetry of the matrix. Allowed values: `general`, `symmetric`, `skew-symmetric`, `hermitian`. 
+    - `general`: all entries are stored
+    - `symmetric` / `hermitian`: only the lower triangle (including diagonal) is stored
+    - `skew-symmetric`: only the strictly lower triangle (excluding diagonal) is stored
+
+- `iostat` (optional): Shall be a scalar of type `integer` that receives the error status. Zero indicates success.
+
+- `iomsg` (optional): Shall be an allocatable character string that receives the error message if iostat is non-zero.
+
+### Matrix Market Format Details
+
+The Matrix Market format supports:
+
+- **Object types**: Currently only `matrix` is supported
+- **Formats**: `coordinate` (sparse) and `array` (dense)  
+- **Data types**: `real`, `complex`, `integer`, `pattern`
+- **Symmetry**: `general`, `symmetric`, `skew-symmetric`, `hermitian`, `auto` (Currently only supported for `array` format)
+
+### Example
+
+```fortran
+{!example/io/example_matrix_market.f90!}
+```

example/io/CMakeLists.txt

@@ -3,6 +3,7 @@ ADD_EXAMPLE(fmt_constants)
 ADD_EXAMPLE(get_file)
 ADD_EXAMPLE(loadnpy)
 ADD_EXAMPLE(loadtxt)
+ADD_EXAMPLE(matrix_market)
 ADD_EXAMPLE(open)
 ADD_EXAMPLE(savenpy)
 ADD_EXAMPLE(savetxt)

example/io/example_matrix_market.f90

@@ -0,0 +1,90 @@
+program example_matrix_market
+    use stdlib_io_mm, only : load_mm, save_mm
+    use stdlib_kinds, only : dp
+    use stdlib_error, only: error_stop
+    implicit none
+
+    real(dp), allocatable :: matrix(:,:), matrix2(:,:)
+    integer, allocatable  :: index(:,:)
+    complex(dp), allocatable :: data(:)
+    character(len=*), parameter :: dense_filename = "example_dense.mtx"
+    character(len=*), parameter :: sparse_filename = "example_sparse.mtx"
+    integer :: iostat, i
+    character(len=:), allocatable :: errmsg
+    character(len=:), allocatable :: iomsg
+
+    ! Create a test dense matrix
+    allocate(matrix(3,3))
+    matrix = reshape([1.0_dp, 2.0_dp, 3.0_dp, &
+                      4.0_dp, 5.0_dp, 6.0_dp, &
+                      7.0_dp, 8.0_dp, 9.0_dp], [3,3])
+
+    print *, "=== Dense Matrix Example ==="
+    print *, "Original dense matrix:"
+    call print_matrix(matrix)
+
+    ! Save dense matrix to Matrix Market file
+    call save_mm(dense_filename, matrix, format="ES24.15E2", symmetry="general", iostat=iostat, iomsg=iomsg)
+    if (iostat /= 0) then
+        errmsg = "Error saving dense matrix: " // trim(iomsg)
+        call error_stop(errmsg)
+    end if
+
+    print *, "Dense matrix saved to ", dense_filename
+
+    ! Load dense matrix from Matrix Market file  
+    call load_mm(dense_filename, matrix2, iostat=iostat, iomsg=iomsg)
+    if (iostat /= 0) then
+        errmsg = "Error loading dense matrix: " // trim(iomsg)
+        call error_stop(errmsg)
+    end if
+
+    print *, "Loaded dense matrix:"
+    call print_matrix(matrix2)
+
+    print *, "=== Sparse Matrix Example ==="
+    ! Create a test sparse matrix
+    allocate(index(2,6))
+    allocate(data(6))
+    index(:,1) = [1,1]; data(1) = (10.0_dp, -1.5_dp)
+    index(:,2) = [2,2]; data(2) = (20.0_dp, 2.0_dp)
+    index(:,3) = [3,3]; data(3) = (30.0_dp, 3.0_dp)
+    index(:,4) = [4,4]; data(4) = (40.0_dp, -4.0_dp)
+    index(:,5) = [1,4]; data(5) = ( 5.0_dp, -7.5_dp)
+    index(:,6) = [3,1]; data(6) = (15.0_dp, 25.0_dp)
+
+    ! Save sparse matrix to Matrix Market file
+    call save_mm(sparse_filename, index, data, format="ES24.15E2", symmetry="general", iostat=iostat, iomsg=iomsg)
+    if (iostat /= 0) then
+        errmsg = "Error saving sparse matrix: " // trim(iomsg)
+        call error_stop(errmsg)
+    end if
+
+    print *, "Sparse matrix saved to ", sparse_filename
+
+    ! Load sparse matrix from Matrix Market file
+    call load_mm(sparse_filename, index, data, iostat=iostat, iomsg=iomsg)
+    if (iostat /= 0) then
+        errmsg = "Error loading sparse matrix: " // trim(iomsg)
+        call error_stop(errmsg)
+    end if
+
+    print *, "Loaded sparse matrix (COO format):"
+    print *, "Data (row, col, value):"
+    do i = 1, size(data)
+        print *, index(1,i), index(2,i), data(i)
+    end do
+
+contains
+
+    subroutine print_matrix(mat)
+        real(dp), intent(in) :: mat(:,:)
+        integer :: i
+        
+        do i = 1, size(mat, 1)
+            print *, mat(i, :)
+        end do
+        print *
+    end subroutine print_matrix
+
+end program example_matrix_market

src/datetime/stdlib_datetime.f90

@@ -682,7 +682,7 @@ pure subroutine civil_from_days(z, y, m, d)
         end if
         era = int(era64)
         doe = int(zz - era64 * 146097_int64)
-        yoe = (doe - doe/1461 + doe/36524 &
+        yoe = (doe - doe/1460 + doe/36524 &
                - doe/146096) / 365
         y = yoe + era * 400
         doy = doe - (365*yoe + yoe/4 - yoe/100)

src/io/CMakeLists.txt

@@ -3,6 +3,9 @@ set(io_fppFiles
     stdlib_io_npy.fypp
     stdlib_io_npy_load.fypp
     stdlib_io_npy_save.fypp
+    stdlib_io_mm.fypp
+    stdlib_io_mm_load.fypp
+    stdlib_io_mm_save.fypp
     )
 
 set(io_cppFiles