Merge pull request #1088 from jvdp1/simpli_cpp

Simplification of CPP macros for modularizing stdlib

Author: jvdp1

.github/workflows/ci_modular.yml

@@ -56,8 +56,8 @@ jobs:
         -DCMAKE_MAXIMUM_RANK:String=4
         -DCMAKE_INSTALL_PREFIX=$PWD/_dist
         -DFIND_BLAS:STRING=FALSE
-        -DSTDLIB_NO_BITSET:STRING=${{ matrix.with_bitset }}
-        -DSTDLIB_NO_STATS:STRING=${{ matrix.with_stats }}
+        -DSTDLIB_BITSET:STRING=${{ matrix.with_bitset }}
+        -DSTDLIB_STATS:STRING=${{ matrix.with_stats }}
         -S . -B ${{ env.BUILD_DIR }}
 
     - name: Build and compile

CMakeLists.txt

@@ -49,18 +49,24 @@ if(NOT DEFINED CMAKE_MAXIMUM_RANK)
   set(CMAKE_MAXIMUM_RANK 4 CACHE STRING "Maximum array rank for generated procedures")
 endif()
 
-option(STDLIB_NO_BITSET "Does not compile STDLIB BITSET" OFF)
+option(STDLIB_BITSET "Compile STDLIB BITSET" ON)
 
-if(STDLIB_NO_BITSET)
+if(STDLIB_BITSET)
+  message(STATUS "Enable stdlib bitset module")
+  add_compile_definitions(STDLIB_BITSET=1)
+else()
   message(STATUS "Disable stdlib bitset module")
-  add_compile_definitions(STDLIB_NO_BITSET)
+  add_compile_definitions(STDLIB_BITSET=0)
 endif() 
 
-option(STDLIB_NO_STATS "Does not compile STDLIB STATS" OFF)
+option(STDLIB_STATS "Compile STDLIB STATS" ON)
 
-if(STDLIB_NO_STATS)
+if(STDLIB_STATS)
+  message(STATUS "Enable stdlib stats module")
+  add_compile_definitions(STDLIB_STATS=1)
+else()
   message(STATUS "Disable stdlib stats module")
-  add_compile_definitions(STDLIB_NO_STATS)
+  add_compile_definitions(STDLIB_STATS=0)
 endif() 
 
 option(FIND_BLAS "Find external BLAS and LAPACK" ON)

example/CMakeLists.txt

@@ -19,7 +19,7 @@ endmacro(ADD_EXAMPLEPP)
 add_subdirectory(ansi)
 add_subdirectory(array)
 add_subdirectory(ascii)
-if (NOT STDLIB_NO_BITSET)
+if (STDLIB_BITSET)
   add_subdirectory(bitsets)
 endif()
 add_subdirectory(constants)
@@ -38,7 +38,7 @@ add_subdirectory(selection)
 add_subdirectory(sorting)
 add_subdirectory(specialfunctions_gamma)
 add_subdirectory(specialmatrices)
-if (NOT STDLIB_NO_STATS)
+if (STDLIB_STATS)
   add_subdirectory(stats)
   add_subdirectory(stats_distribution_exponential)
   add_subdirectory(stats_distribution_normal)

example/sorting/CMakeLists.txt

@@ -3,6 +3,6 @@ ADD_EXAMPLE(sort)
 ADD_EXAMPLE(sort_adjoint)
 ADD_EXAMPLE(sort_index)
 ADD_EXAMPLE(radix_sort)
-if (NOT STDLIB_NO_BITSET)
+if (STDLIB_BITSET)
   ADD_EXAMPLE(sort_bitset)
 endif()

include/common.fypp

@@ -151,7 +151,7 @@ $:"s" if cmplx=="c" else "d" if cmplx=="z" else "x" if cmplx=="y" else "q" if cm
 #:set BITSET_INIT = ["" for k in BITSET_KINDS]
 
 #! Bitset CPP directive to be considered during templating
-#:set BITSET_CPPS = ["STDLIB_BITSET == 1" for k in BITSET_KINDS]
+#:set BITSET_CPPS = ["STDLIB_BITSET" for k in BITSET_KINDS]
 
 #! Collected (kind, type) tuples for bitset types
 #:set BITSET_KINDS_TYPES = list(zip(BITSET_KINDS, BITSET_TYPES, BITSET_INIT, BITSET_CPPS))

include/macros.inc

@@ -1,14 +1,10 @@
 
 !Default: compile the bitset module
-#ifdef STDLIB_NO_BITSET
-#define STDLIB_BITSET 0
-#else
+#if !defined STDLIB_BITSET
 #define STDLIB_BITSET 1
 #endif
 
 !Default: compile the stats module
-#ifdef STDLIB_NO_STATS
-#define STDLIB_STATS 0
-#else
+#if !defined STDLIB_STATS
 #define STDLIB_STATS 1
 #endif

src/CMakeLists.txt

@@ -1,10 +1,10 @@
-if (NOT STDLIB_NO_BITSET)
+if (STDLIB_BITSET)
   add_subdirectory(bitsets)
 endif()
 add_subdirectory(blas)
 add_subdirectory(lapack)
 add_subdirectory(lapack_extended)
-if (NOT STDLIB_NO_STATS)
+if (STDLIB_STATS)
   add_subdirectory(stats)
 endif()
 
@@ -115,6 +115,6 @@ set(f90Files
 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 lapack_extended)
+  $<$<BOOL:${STDLIB_BITSET}>:bitsets>
+  $<$<BOOL:${STDLIB_STATS}>:stats>
+  blas lapack lapack_extended)

src/stdlib_math.fypp

@@ -5,7 +5,7 @@
 module stdlib_math
     use stdlib_kinds, only: int8, int16, int32, int64, sp, dp, xdp, qp
     use stdlib_optval, only: optval
-#if STDLIB_BITSET == 1
+#if STDLIB_BITSET
     use stdlib_bitsets, only: bitset_64, bitset_large
 #endif
 

src/stdlib_sorting.fypp

@@ -135,7 +135,7 @@ module stdlib_sorting
     use stdlib_string_type, only: string_type, assignment(=), operator(>), &
         operator(>=), operator(<), operator(<=)
 
-#if STDLIB_BITSET == 1
+#if STDLIB_BITSET
     use stdlib_bitsets, only: bitset_64, bitset_large, &
         assignment(=), operator(>), operator(>=), operator(<), operator(<=)
 #endif

test/CMakeLists.txt

@@ -29,7 +29,7 @@ endmacro(ADDTESTPP)
 
 add_subdirectory(array)
 add_subdirectory(ascii)
-if (NOT STDLIB_NO_BITSET)
+if (STDLIB_BITSET)
   add_subdirectory(bitsets)
 endif()
 add_subdirectory(constants)
@@ -44,7 +44,7 @@ add_subdirectory(optval)
 add_subdirectory(selection)
 add_subdirectory(sorting)
 add_subdirectory(specialfunctions)
-if (NOT STDLIB_NO_STATS)
+if (STDLIB_STATS)
   add_subdirectory(stats)
 endif()
 add_subdirectory(string)