Merge branch 'master' of https://github.com/fortran-lang/stdlib into fix-diff2-bounds-check

Author: srinjoy933

CMakeLists.txt

@@ -4,8 +4,8 @@ cmake_minimum_required(VERSION 3.14.0)
 set(CMAKE_USER_MAKE_RULES_OVERRIDE ${CMAKE_CURRENT_SOURCE_DIR}/config/DefaultFlags.cmake)
 
 project(fortran_stdlib
-	LANGUAGES Fortran C
-        DESCRIPTION "Community driven and agreed upon de facto standard library for Fortran"
+  LANGUAGES Fortran C
+  DESCRIPTION "Community driven and agreed upon de facto standard library for Fortran"
 )
 
 # Read version from file
@@ -116,8 +116,19 @@ endif()
 
 # --- find preprocessor
 find_program(FYPP fypp)
-if(NOT FYPP)
-  message(FATAL_ERROR "Preprocessor fypp not found! Please install fypp following the instructions in https://fypp.readthedocs.io/en/stable/fypp.html#installing")
+if(NOT FYPP OR "${FYPP}" MATCHES "NOTFOUND")
+  message(FATAL_ERROR 
+    "\n [stdlib Build Error]: Preprocessor 'fypp' not found!\n"
+    " ------------------------------------------------------------------------\n"
+    " The fypp preprocessor is required to generate Fortran source from templates.\n\n"
+    " Please install fypp following the instructions at https://github.com/aradi/fypp\n\n"
+    " To diagnose your installation, please run the following in your terminal:\n"
+    "   Windows:      'where fypp' and 'where python'\n"
+    "   Linux/macOS:  'which fypp' and 'which python'\n\n"
+    " Ensure the executable is in your PATH or set it manually during configuration:\n"
+    "   cmake -B build -DFYPP_EXECUTABLE=/path/to/fypp\n"
+    " ------------------------------------------------------------------------\n"
+  )
 endif()
 
 # Custom preprocessor flags
@@ -156,4 +167,4 @@ install(EXPORT ${PROJECT_NAME}-targets
 )
 
 # Export a pkg-config file
-include(${PROJECT_SOURCE_DIR}/config/export_pc.cmake)
+include(${PROJECT_SOURCE_DIR}/config/export_pc.cmake)

cmake/stdlib.cmake

@@ -10,6 +10,12 @@
 #
 function(preprocess preproc preprocopts srcext trgext srcfiles trgfiles)
 
+  # Defensive check: Ensure the preprocessor path is valid before defining custom commands.
+  # This prevents "empty command" errors during the build phase.
+  if(NOT preproc OR "${preproc}" MATCHES "NOTFOUND")
+    message(FATAL_ERROR "preprocess function called with invalid preprocessor path: '${preproc}'")
+  endif()
+
   set(_trgfiles)
   foreach(srcfile IN LISTS srcfiles)
     get_filename_component(filename ${srcfile} NAME)
@@ -87,8 +93,8 @@ function(configure_stdlib_target target_name regular_sources_var fypp_files_var
     endif()
 
     set(LIB_MOD_DIR ${CMAKE_CURRENT_BINARY_DIR}/mod_files/${target_name}/)
-    #set(INSTALL_MOD_DIR "${CMAKE_INSTALL_MODULEDIR}/${target_name}")
     set(INSTALL_MOD_DIR "${CMAKE_INSTALL_MODULEDIR}")
+    
     # We need the module directory before we finish the configure stage since the
     # build interface might resolve before the module directory is generated by CMake
     if(NOT EXISTS "${LIB_MOD_DIR}")
@@ -115,7 +121,7 @@ endfunction()
 # Determine if a module will be compiled
 #
 # Defines a CMake function that creates an ON/OFF option for a given stdlib module,
-#sets a compile definition accordingly, and prints its enabled/disabled status.
+# sets a compile definition accordingly, and prints its enabled/disabled status.
 #
 # Args:
 #     module [in]: Name of the module to be compiled
@@ -133,4 +139,4 @@ function(check_modular module)
         add_compile_definitions(STDLIB_${umodule}=0)
     endif()
 
-endfunction()
+endfunction()

doc/specs/stdlib_sparse.md

@@ -296,14 +296,16 @@ If the `diagonal` array has not been previously allocated, the `diag` subroutine
 
 ### Syntax
 
-`call ` [[stdlib_sparse_conversion(module):coo2csr(interface)]] `(coo,csr)`
+`call ` [[stdlib_sparse_conversion(module):coo2csr(interface)]] `(coo,csr[,sort_data])`
 
 ### Arguments
 
 `coo` : Shall be a `COO` type of `real` or `complex` type. It is an `intent(in)` argument.
 
 `csr` : Shall be a `CSR` type of `real` or `complex` type. It is an `intent(out)` argument.
 
+`sort_data`, `optional` : Shall be a `logical` argument to determine whether data in the COO graph should be sorted before obtaining the CSR representation. The transformation from COO to CSR depends on the former being sorted in row-major order and not having duplicate pairs. Using this boolean will call a sorting routine at the cost of extra runtime, default `.false.`. It is an `intent(in)` argument.
+
 ### Syntax
 
 `call ` [[stdlib_sparse_conversion(module):coo2csc(interface)]] `(coo,csc)`

src/sparse/stdlib_sparse_conversion.fypp

@@ -6,6 +6,7 @@
 !!
 ! This code was modified from https://github.com/jalvesz/FSPARSE by its author: Alves Jose
 module stdlib_sparse_conversion
+    use stdlib_optval, only: optval
     use stdlib_sorting, only: sort
     use stdlib_sparse_constants
     use stdlib_sparse_kinds
@@ -215,11 +216,20 @@ contains
     #:endfor
 
     #:for k1, t1, s1 in (KINDS_TYPES)
-    subroutine coo2csr_${s1}$(COO,CSR)
-        type(COO_${s1}$_type), intent(in)  :: COO
-        type(CSR_${s1}$_type), intent(out) :: CSR
+    subroutine coo2csr_${s1}$(COO, CSR, sort_data)
+        type(COO_${s1}$_type), intent(inout) :: COO
+        type(CSR_${s1}$_type), intent(out)   :: CSR
+        logical, intent(in), optional :: sort_data
+        logical :: sort_data_
         integer(ilp) :: i
 
+        sort_data_ = optval(x=sort_data, default=.false.)
+
+        if(sort_data_) then
+            call sort_coo_unique_${s1}$( COO%index, COO%data, COO%nnz, COO%nrows, COO%ncols )
+            COO%is_sorted = .true.
+        end if
+
         CSR%nnz = COO%nnz; CSR%nrows = COO%nrows; CSR%ncols = COO%ncols
         CSR%storage = COO%storage
 

test/math/test_stdlib_math.fypp

@@ -589,7 +589,6 @@ contains
         ${t1}$ :: x(6) = [${t1}$ :: 0, 5, 15, 30, 50, 75]
         ${t1}$ :: A(1, 3) = reshape([${t1}$ :: 1, 3, 5], [1, 3])
         ${t1}$ :: B(2) = [${t1}$ :: 1, 2]
-        ${t1}$ :: p_bad(1, 4) = reshape([${t1}$ :: 2, 2, 2, 2], [1, 4])
 
         !> rank-1 diff
         call check(error, all_close(diff(x), [${t1}$ :: 5, 10, 15, 20, 25]), &
@@ -629,15 +628,6 @@ contains
         call check(error, size(diff(B, 3)), 0, "size(diff(B, 3)) in test_diff_real_${k1}$ failed")
         if (allocated(error)) return
 
-        ! --- REGRESSION TEST START ---
-        !> Mismatched prepend/append cross-dimensions should return zero-sized array
-        call check(error, size(diff(A, dim=1, prepend=p_bad)), 0, &
-            "prepend shape mismatch test in test_diff_real_${k1}$ failed")
-        if (allocated(error)) return
-        call check(error, size(diff(A, dim=1, append=p_bad)), 0, &
-            "append shape mismatch test in test_diff_real_${k1}$ failed")
-        if (allocated(error)) return
-        ! --- REGRESSION TEST END ---
 
     end subroutine test_diff_real_${k1}$
     #:endfor