Merge branch 'master' into generalized_lagtm

Author: jvdp1

.github/workflows/CI.yml

@@ -26,6 +26,7 @@ jobs:
           - {compiler: gcc, version: 12}
           - {compiler: gcc, version: 13}
           - {compiler: gcc, version: 14}
+          - {compiler: gcc, version: 15}
           - {compiler: intel, version: '2024.1'}          
         build: [cmake]        
         include:
@@ -43,6 +44,8 @@ jobs:
             toolchain: {compiler: intel, version: '2024.1'}
           - os: macos-14
             toolchain: {compiler: gcc, version: 10}
+          - os: ubuntu-latest
+            toolchain: {compiler: gcc, version: 15}
     env:
       BUILD_DIR: ${{ matrix.build == 'cmake' && 'build' || '.' }}
 

.github/workflows/ci_modular.yml

@@ -24,6 +24,7 @@ jobs:
           - {compiler: gcc, version: 14}
         build: [cmake]        
         with_bitset: [On, Off]
+        with_stats: [On, Off]
     env:
       BUILD_DIR: ${{ matrix.build == 'cmake' && 'build' || '.' }}
 
@@ -56,6 +57,7 @@ jobs:
         -DCMAKE_INSTALL_PREFIX=$PWD/_dist
         -DFIND_BLAS:STRING=FALSE
         -DSTDLIB_NO_BITSET:STRING=${{ matrix.with_bitset }}
+        -DSTDLIB_NO_STATS:STRING=${{ matrix.with_stats }}
         -S . -B ${{ env.BUILD_DIR }}
 
     - name: Build and compile

CMakeLists.txt

@@ -56,6 +56,13 @@ if(STDLIB_NO_BITSET)
   add_compile_definitions(STDLIB_NO_BITSET)
 endif() 
 
+option(STDLIB_NO_STATS "Does not compile STDLIB STATS" OFF)
+
+if(STDLIB_NO_STATS)
+  message(STATUS "Disable stdlib stats module")
+  add_compile_definitions(STDLIB_NO_STATS)
+endif() 
+
 option(FIND_BLAS "Find external BLAS and LAPACK" ON)
 
 # --- find external BLAS and LAPACK

README.md

@@ -88,7 +88,7 @@ The following combinations are tested on the default branch of stdlib:
 Name | Version | Platform | Architecture
 --- | --- | --- | ---
 GCC Fortran | 10, 11, 12, 13, 14 | Ubuntu 24.04.3 LTS | x86_64
-GCC Fortran | 11, 12, 13, 14 | macOS 14.8.2 (23J126) | Arm64
+GCC Fortran | 11, 12, 13, 14, 15 | macOS 14.8.2 (23J126) | Arm64
 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

example/CMakeLists.txt

@@ -38,10 +38,12 @@ add_subdirectory(selection)
 add_subdirectory(sorting)
 add_subdirectory(specialfunctions_gamma)
 add_subdirectory(specialmatrices)
-add_subdirectory(stats)
-add_subdirectory(stats_distribution_exponential)
-add_subdirectory(stats_distribution_normal)
-add_subdirectory(stats_distribution_uniform)
+if (NOT STDLIB_NO_STATS)
+  add_subdirectory(stats)
+  add_subdirectory(stats_distribution_exponential)
+  add_subdirectory(stats_distribution_normal)
+  add_subdirectory(stats_distribution_uniform)
+endif()
 add_subdirectory(stringlist_type)
 add_subdirectory(strings)
 add_subdirectory(string_type)

include/macros.inc

@@ -5,3 +5,10 @@
 #else
 #define STDLIB_BITSET 1
 #endif
+
+!Default: compile the stats module
+#ifdef STDLIB_NO_STATS
+#define STDLIB_STATS 0
+#else
+#define STDLIB_STATS 1
+#endif

src/CMakeLists.txt

@@ -4,6 +4,9 @@ endif()
 add_subdirectory(blas)
 add_subdirectory(lapack)
 add_subdirectory(lapack_extended)
+if (NOT STDLIB_NO_STATS)
+  add_subdirectory(stats)
+endif()
 
 set(fppFiles
     stdlib_ascii.fypp
@@ -59,19 +62,6 @@ set(fppFiles
     stdlib_specialfunctions.fypp
     stdlib_specialmatrices.fypp
     stdlib_specialmatrices_tridiagonal.fypp
-    stdlib_stats.fypp
-    stdlib_stats_corr.fypp
-    stdlib_stats_cov.fypp
-    stdlib_stats_mean.fypp
-    stdlib_stats_median.fypp
-    stdlib_stats_moment.fypp
-    stdlib_stats_moment_all.fypp
-    stdlib_stats_moment_mask.fypp
-    stdlib_stats_moment_scalar.fypp
-    stdlib_stats_distribution_uniform.fypp
-    stdlib_stats_distribution_normal.fypp
-    stdlib_stats_distribution_exponential.fypp
-    stdlib_stats_var.fypp
     stdlib_quadrature.fypp
     stdlib_quadrature_trapz.fypp
     stdlib_quadrature_simps.fypp
@@ -125,4 +115,5 @@ configure_stdlib_target(${PROJECT_NAME} f90Files fppFiles cppFiles)
 
 target_link_libraries(${PROJECT_NAME} PUBLIC
   $<$<NOT:$<BOOL:${STDLIB_NO_BITSET}>>:bitsets>
-  blas lapack lapack_extended)
+  $<$<NOT:$<BOOL:${STDLIB_NO_STATS}>>:stats>
+  blas lapack lapack_extended)

src/stats/CMakeLists.txt

@@ -0,0 +1,32 @@
+set(stats_cppFiles
+    ../stdlib_linalg_constants.fypp
+    )
+
+set(stats_fppFiles
+    ../stdlib_ascii.fypp
+    ../stdlib_io.fypp
+    ../stdlib_kinds.fypp
+    ../stdlib_optval.fypp
+    ../stdlib_error.fypp
+    ../stdlib_linalg.fypp
+    ../stdlib_linalg_diag.fypp
+    ../stdlib_linalg_state.fypp
+    ../stdlib_random.fypp
+    ../stdlib_selection.fypp
+    ../stdlib_string_type.fypp
+    stdlib_stats_corr.fypp
+    stdlib_stats_cov.fypp
+    stdlib_stats_distribution_exponential.fypp
+    stdlib_stats_distribution_normal.fypp
+    stdlib_stats_distribution_uniform.fypp
+    stdlib_stats.fypp
+    stdlib_stats_mean.fypp
+    stdlib_stats_median.fypp
+    stdlib_stats_moment_all.fypp
+    stdlib_stats_moment.fypp
+    stdlib_stats_moment_mask.fypp
+    stdlib_stats_moment_scalar.fypp
+    stdlib_stats_var.fypp
+)
+
+configure_stdlib_target(stats "" stats_fppFiles stats_cppFiles)