Merge branch 'master' into sparse_sym

Author: jalvesz

CHANGELOG.md

@@ -1,3 +1,9 @@
+## Unreleased
+
+Changes to the existing build system
+  - Fixed absolute paths in generated pkg-config file for external BLAS/LAPACK 
+    [#1109](https://github.com/fortran-lang/stdlib/issues/1109)
+
 # Version 0.8.1
 
 Full release notes available at [v0.8.1] tag.

config/export_pc.cmake

@@ -5,6 +5,9 @@ function(resolve_pc_libs out_var root_target)
     set(_result "")
     set(_visited "")
 
+    # List of imported targets to skip (handled separately for pkg-config)
+    set(_skip_targets "BLAS::BLAS" "LAPACK::LAPACK")
+
     function(_resolve target)
         # Prevent infinite recursion
         if(target IN_LIST _visited)
@@ -13,6 +16,12 @@ function(resolve_pc_libs out_var root_target)
         list(APPEND _visited "${target}")
         set(_visited "${_visited}" PARENT_SCOPE)
 
+        # Skip BLAS/LAPACK imported targets — they will be handled
+        # separately via Requires.private / Libs.private
+        if(target IN_LIST _skip_targets)
+            return()
+        endif()
+
         if(TARGET "${target}")
             # Recurse into PUBLIC/INTERFACE deps first
             get_target_property(deps "${target}" INTERFACE_LINK_LIBRARIES)
@@ -50,10 +59,151 @@ function(resolve_pc_libs out_var root_target)
     set(${out_var} "${_result}" PARENT_SCOPE)
 endfunction()
 
+# Convert absolute library paths to -l flags
+# e.g. /usr/lib/libopenblas.so       -> -lopenblas
+#      /usr/lib/libopenblas.so.0.3   -> -lopenblas
+#      /usr/lib/libopenblas.dll.a    -> -lopenblas
+function(libs_to_linker_flags out_var libs)
+    set(_flags "")
+    foreach(lib IN LISTS libs)
+        if(IS_ABSOLUTE "${lib}")
+            # Extract the full filename, then strip everything from the first dot
+            # onwards. Using NAME_WE would only strip the last extension, which
+            # breaks for versioned libraries (e.g. libopenblas.so.0.3 -> libopenblas.so.0).
+            get_filename_component(_name "${lib}" NAME)
+            string(REGEX REPLACE "\\..*$" "" _name "${_name}")
+            # Strip leading "lib" prefix if present
+            string(REGEX REPLACE "^lib" "" _name "${_name}")
+            list(APPEND _flags "-l${_name}")
+        else()
+            # Already a flag like -lopenblas or -lm
+            list(APPEND _flags "${lib}")
+        endif()
+    endforeach()
+    list(REMOVE_DUPLICATES _flags)
+    set(${out_var} "${_flags}" PARENT_SCOPE)
+endfunction()
+
 resolve_pc_libs(PC_LIBS ${PROJECT_NAME})
 
 string(REPLACE ";" " " PC_CONTENT "${PC_LIBS}")
 
+# --- Handle BLAS/LAPACK for pkg-config ---
+# Use Requires.private when a vendor .pc file exists,
+# otherwise fall back to Libs.private with -l flags.
+set(PC_REQUIRES_PRIVATE "")
+set(PC_LIBS_PRIVATE "")
+
+if(BLAS_FOUND OR LAPACK_FOUND)
+    find_package(PkgConfig QUIET)
+
+    # Known pkg-config names for common BLAS/LAPACK vendors.
+    # We try the most specific names first, then fall back to generic ones.
+    set(_blas_pc_names
+        openblas           # OpenBLAS
+        blas-openblas      # Debian/Ubuntu OpenBLAS
+        mkl-dynamic-lp64-seq   # Intel MKL (dynamic, LP64, sequential)
+        mkl-dynamic-ilp64-seq  # Intel MKL (dynamic, ILP64, sequential)
+        mkl-dynamic-lp64-iomp  # Intel MKL (dynamic, LP64, OpenMP)
+        mkl-dynamic-ilp64-iomp # Intel MKL (dynamic, ILP64, OpenMP)
+        mkl-static-lp64-seq    # Intel MKL (static, LP64, sequential)
+        mkl-static-ilp64-seq   # Intel MKL (static, ILP64, sequential)
+        blas                   # Generic BLAS
+        blas-netlib            # Netlib BLAS
+    )
+    set(_lapack_pc_names
+        lapack             # Generic LAPACK
+        lapack-netlib      # Netlib LAPACK
+    )
+
+    # BLAS packages that are known to also provide LAPACK
+    set(_blas_includes_lapack_list
+        openblas
+        blas-openblas
+        mkl-dynamic-lp64-seq
+        mkl-dynamic-ilp64-seq
+        mkl-dynamic-lp64-iomp
+        mkl-dynamic-ilp64-iomp
+        mkl-static-lp64-seq
+        mkl-static-ilp64-seq
+    )
+
+    set(_blas_pc_found FALSE)
+    set(_blas_includes_lapack FALSE)
+    set(_lapack_pc_found FALSE)
+
+    if(PKG_CONFIG_FOUND)
+        # --- Detect BLAS pkg-config package ---
+        if(BLAS_FOUND)
+            foreach(_pkg IN LISTS _blas_pc_names)
+                pkg_check_modules(_BLAS_PC_${_pkg} QUIET "${_pkg}")
+                if(_BLAS_PC_${_pkg}_FOUND)
+                    list(APPEND PC_REQUIRES_PRIVATE "${_pkg}")
+                    set(_blas_pc_found TRUE)
+                    if(_pkg IN_LIST _blas_includes_lapack_list)
+                        set(_blas_includes_lapack TRUE)
+                    endif()
+                    message(STATUS "pkg-config: using '${_pkg}' for BLAS")
+                    break()
+                endif()
+            endforeach()
+        endif()
+
+        # --- Detect LAPACK pkg-config package ---
+        # Skip separate LAPACK detection if the BLAS package already includes LAPACK
+        # (e.g. OpenBLAS, MKL). Standalone BLAS packages like netlib still need this.
+        if(LAPACK_FOUND AND NOT _blas_includes_lapack)
+            foreach(_pkg IN LISTS _lapack_pc_names)
+                pkg_check_modules(_LAPACK_PC_${_pkg} QUIET "${_pkg}")
+                if(_LAPACK_PC_${_pkg}_FOUND)
+                    list(APPEND PC_REQUIRES_PRIVATE "${_pkg}")
+                    set(_lapack_pc_found TRUE)
+                    message(STATUS "pkg-config: using '${_pkg}' for LAPACK")
+                    break()
+                endif()
+            endforeach()
+        endif()
+    endif()
+
+    # --- Fallback: convert absolute paths to -l flags ---
+    if(BLAS_FOUND AND NOT _blas_pc_found)
+        libs_to_linker_flags(_blas_flags "${BLAS_LIBRARIES}")
+        list(APPEND PC_LIBS_PRIVATE ${_blas_flags})
+        message(STATUS "pkg-config: no .pc file found for BLAS, using linker flags: ${_blas_flags}")
+    endif()
+
+    if(LAPACK_FOUND AND NOT _lapack_pc_found AND NOT _blas_includes_lapack)
+        libs_to_linker_flags(_lapack_flags "${LAPACK_LIBRARIES}")
+        list(APPEND PC_LIBS_PRIVATE ${_lapack_flags})
+        message(STATUS "pkg-config: no .pc file found for LAPACK, using linker flags: ${_lapack_flags}")
+    endif()
+endif()
+
+# Flatten lists to space-separated strings
+string(REPLACE ";" " " PC_REQUIRES_PRIVATE "${PC_REQUIRES_PRIVATE}")
+string(REPLACE ";" " " PC_LIBS_PRIVATE "${PC_LIBS_PRIVATE}")
+
+# Handle absolute vs relative install paths for libdir
+if(IS_ABSOLUTE "${CMAKE_INSTALL_LIBDIR}")
+    set(PC_LIBDIR "${CMAKE_INSTALL_LIBDIR}")
+else()
+    set(PC_LIBDIR "\${prefix}/${CMAKE_INSTALL_LIBDIR}")
+endif()
+
+# Handle absolute vs relative install paths for includedir
+if(IS_ABSOLUTE "${CMAKE_INSTALL_INCLUDEDIR}")
+    set(PC_INCLUDEDIR "${CMAKE_INSTALL_INCLUDEDIR}")
+else()
+    set(PC_INCLUDEDIR "\${prefix}/${CMAKE_INSTALL_INCLUDEDIR}")
+endif()
+
+# Handle absolute vs relative install paths for moduledir
+if(IS_ABSOLUTE "${CMAKE_INSTALL_MODULEDIR}")
+    set(PC_MODULEDIR "${CMAKE_INSTALL_MODULEDIR}")
+else()
+    set(PC_MODULEDIR "\${prefix}/${CMAKE_INSTALL_MODULEDIR}")
+endif()
+
 configure_file(
   "${CMAKE_CURRENT_SOURCE_DIR}/config/template.pc"
   "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}.pc"
@@ -64,4 +214,3 @@ install(
   "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}.pc"
   DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig"
 )
-

config/template.pc

@@ -1,10 +1,12 @@
 prefix=@CMAKE_INSTALL_PREFIX@
-libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@
-includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@
-moduledir=${prefix}/@CMAKE_INSTALL_MODULEDIR@
+libdir=@PC_LIBDIR@
+includedir=@PC_INCLUDEDIR@
+moduledir=@PC_MODULEDIR@
 
 Name: @PROJECT_NAME@
 Description: @PROJECT_DESCRIPTION@
 Version: @PROJECT_VERSION@
-Libs: -L${libdir} @PC_CONTENT@
+Requires.private: @PC_REQUIRES_PRIVATE@
 Cflags: -I${includedir} -I${moduledir}
+Libs: -L${libdir} @PC_CONTENT@
+Libs.private: @PC_LIBS_PRIVATE@

doc/specs/stdlib_sparse.md

@@ -338,7 +338,7 @@ If the `diagonal` array has not been previously allocated, the `diag` subroutine
 
 ### Syntax
 
-`call ` [[stdlib_sparse_conversion(module):csr2sellc(interface)]] `(csr,ell[,num_nz_rows])`
+`call ` [[stdlib_sparse_conversion(module):csr2ell(interface)]] `(csr,ell[,num_nz_rows])`
 
 ### Arguments
 
@@ -361,4 +361,39 @@ If the `diagonal` array has not been previously allocated, the `diag` subroutine
 ### Example
 ```fortran
 {!example/linalg/example_sparse_spmv.f90!}
-```
+```
+
+<!-- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -->
+## Operator overloading (`+`, `-`, `*`, `/`) {#operators}
+
+### Status
+
+Experimental
+
+### Description
+
+The definition of all standard arithmetic operators have been overloaded to be applicable for the matrix types defined by `stdlib_sparse`. The operators have been overloaded to support the following tuple combinations of the left-hand-side of the operation: same type and kind matrix-matrix, matrix-scalar and scalar-matrix.
+
+### Syntax
+
+- Matrix-matrix operators :
+
+`C = A + B`
+
+`C = A - B`
+
+`C = A * B`
+
+`C = A / B`
+
+- Matrix scalar operators : 
+
+`B = A + alpha` or `B = alpha + A` 
+
+`B = A - alpha` or `B = alpha - A`
+
+`B = A * alpha` or `B = alpha * A`
+
+`B = A / alpha` or `B = alpha / A`
+
+*Note*: scalar addition and subtraction operators perform element-wise operations only on the stored (non-zero) values, not on the full mathematical matrix. Meaning, the sparsity pattern is preserved.

src/linalg/stdlib_linalg.fypp

@@ -876,8 +876,7 @@ module stdlib_linalg
     !! This interface provides methods for computing the determinant of a matrix.
     !! Supported data types include `real` and `complex`.
     !! 
-    !!@note The provided functions are intended for square matrices only.          
-    !!@note BLAS/LAPACK backends do not currently support extended precision (``xdp``).
+    !!@note The provided functions are intended for square matrices only.
     !! 
     !!### Example
     !!
@@ -898,10 +897,8 @@ module stdlib_linalg
     !!```
     !!     
     #:for rk,rt in RC_KINDS_TYPES
-    #:if rk!="xdp" 
     module procedure stdlib_linalg_${rt[0]}$${rk}$determinant
     module procedure stdlib_linalg_pure_${rt[0]}$${rk}$determinant
-    #:endif
     #:endfor
   end interface det
 
@@ -920,7 +917,6 @@ module stdlib_linalg
     !! Supported data types include real and complex.
     !!
     !!@note The provided functions are intended for square matrices.
-    !!@note BLAS/LAPACK backends do not currently support extended precision (``xdp``).
     !!
     !!### Example
     !!
@@ -935,15 +931,12 @@ module stdlib_linalg
     !!```
     !     
     #:for rk,rt in RC_KINDS_TYPES
-    #:if rk!="xdp"
     module procedure stdlib_linalg_pure_${rt[0]}$${rk}$determinant
-    #:endif
     #:endfor        
   end interface operator(.det.)
 
   interface
     #:for rk,rt in RC_KINDS_TYPES
-    #:if rk!="xdp" 
     module function stdlib_linalg_${rt[0]}$${rk}$determinant(a,overwrite_a,err) result(det)
         !> Input matrix a[m,n]
         ${rt}$, intent(inout), target :: a(:,:)
@@ -960,7 +953,6 @@ module stdlib_linalg
         !> Matrix determinant
         ${rt}$ :: det                
     end function stdlib_linalg_pure_${rt[0]}$${rk}$determinant
-    #:endif
     #:endfor
   end interface  
 
@@ -1216,7 +1208,6 @@ module stdlib_linalg
      !! Preallocated space for both eigenvalues `lambda` and the eigenvector matrices must be user-provided.      
      !! 
      !!@note The solution is based on LAPACK's general eigenproblem solvers `*GEEV`.
-     !!@note BLAS/LAPACK backends do not currently support extended precision (``xdp``).
      !!       
     #:for rk,rt,ri in RC_KINDS_TYPES
     #:for ep,ei in EIG_PROBLEM_LIST
@@ -1294,7 +1285,6 @@ module stdlib_linalg
      !! as an optional `type(linalg_state_type)` output flag. 
      !! 
      !!@note The solution is based on LAPACK's general eigenproblem solvers `*GEEV`.
-     !!@note BLAS/LAPACK backends do not currently support extended precision (``xdp``).
      !!       
     #:for rk,rt,ri in RC_KINDS_TYPES
     #:for ep,ei in EIG_PROBLEM_LIST
@@ -1349,7 +1339,6 @@ module stdlib_linalg
      !! Preallocated space for both eigenvalues `lambda` and the eigenvector matrix must be user-provided.      
      !! 
      !!@note The solution is based on LAPACK's eigenproblem solvers `*SYEV`/`*HEEV`.
-     !!@note BLAS/LAPACK backends do not currently support extended precision (``xdp``).
      !!      
     #:for rk,rt,ri in RC_KINDS_TYPES
     module subroutine stdlib_linalg_eigh_${ri}$(a,lambda,vectors,upper_a,overwrite_a,err)
@@ -1392,7 +1381,6 @@ module stdlib_linalg
      !! as an optional `type(linalg_state_type)` output flag. 
      !! 
      !!@note The solution is based on LAPACK's eigenproblem solvers `*SYEV`/`*HEEV`.
-     !!@note BLAS/LAPACK backends do not currently support extended precision (``xdp``).
      !!         
     #:for rk,rt,ri in RC_KINDS_TYPES
     module function stdlib_linalg_eigvalsh_${ri}$(a,upper_a,err) result(lambda)

src/linalg/stdlib_linalg_determinant.fypp

@@ -13,9 +13,7 @@ submodule (stdlib_linalg) stdlib_linalg_determinant
 
      contains
 
-     ! BLAS/LAPACK backends do not currently support xdp
      #:for rk,rt in RC_KINDS_TYPES
-     #:if rk!="xdp" 
      pure module function stdlib_linalg_pure_${rt[0]}$${rk}$determinant(a) result(det)     
      !!### Summary
      !! Compute determinant of a real square matrix (pure interface).
@@ -233,7 +231,6 @@ submodule (stdlib_linalg) stdlib_linalg_determinant
 
      end function stdlib_linalg_${rt[0]}$${rk}$determinant
 
-     #:endif
      #:endfor
 
 end submodule stdlib_linalg_determinant

src/sparse/CMakeLists.txt

@@ -2,6 +2,7 @@ set(sparse_fppFiles
     stdlib_sparse_constants.fypp
     stdlib_sparse_conversion.fypp
     stdlib_sparse_kinds.fypp
+    stdlib_sparse_operators.fypp
     stdlib_sparse_spmv.fypp
     )