Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .github/workflows/ci_modular.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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' || '.' }}

Expand Down Expand Up @@ -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
Expand Down
7 changes: 7 additions & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
10 changes: 6 additions & 4 deletions example/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
7 changes: 7 additions & 0 deletions include/macros.inc
Original file line number Diff line number Diff line change
Expand Up @@ -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
17 changes: 4 additions & 13 deletions src/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,9 @@ if (NOT STDLIB_NO_BITSET)
endif()
add_subdirectory(blas)
add_subdirectory(lapack)
if (NOT STDLIB_NO_STATS)
add_subdirectory(stats)
endif()

set(fppFiles
stdlib_ascii.fypp
Expand Down Expand Up @@ -58,19 +61,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
Expand Down Expand Up @@ -124,4 +114,5 @@ configure_stdlib_target(${PROJECT_NAME} f90Files fppFiles cppFiles)

target_link_libraries(${PROJECT_NAME} PUBLIC
$<$<NOT:$<BOOL:${STDLIB_NO_BITSET}>>:bitsets>
$<$<NOT:$<BOOL:${STDLIB_NO_STATS}>>:stats>
blas lapack)
32 changes: 32 additions & 0 deletions src/stats/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -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)
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
4 changes: 3 additions & 1 deletion test/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,9 @@ add_subdirectory(optval)
add_subdirectory(selection)
add_subdirectory(sorting)
add_subdirectory(specialfunctions)
add_subdirectory(stats)
if (NOT STDLIB_NO_STATS)
add_subdirectory(stats)
endif()
add_subdirectory(string)
add_subdirectory(system)
add_subdirectory(quadrature)
Expand Down
Loading