Removed loops and add CMAKE_MAXIMUM_RANK

Author: jvdp1

.github/workflows/CI.yml

@@ -57,7 +57,7 @@ jobs:
       run: brew install gcc@${GCC_V} || brew upgrade gcc@${GCC_V} || true
 
     - name: Configure with CMake
-      run: cmake -Wdev -DCMAKE_BUILD_TYPE=Release -S . -B build
+      run: cmake -Wdev -DCMAKE_BUILD_TYPE=Release -DCMAKE_MAXIMUM_RANK=5 -S . -B build
 
     - name: Build and compile
       run: cmake --build build
@@ -80,6 +80,6 @@ jobs:
     - name: Test manual makefiles
       if: contains(matrix.os, 'ubuntu') && contains(matrix.gcc_v, '9')
       run: |
-        make -f Makefile.manual
+        make -f Makefile.manual FYPPFLAGS="-DMAXRANK=5"
         make -f Makefile.manual test
         make -f Makefile.manual clean

.github/workflows/ci_windows.yml

@@ -18,7 +18,7 @@ jobs:
     - name: Install fypp
       run: pip install fypp
 
-    - run: cmake -G "MinGW Makefiles" -DCMAKE_SH="CMAKE_SH-NOTFOUND" -Wdev -B build -DCMAKE_BUILD_TYPE=Debug -DCMAKE_Fortran_FLAGS_DEBUG="-Wall -Wextra -Wimplicit-interface -fPIC -g -fcheck=all -fbacktrace"
+    - run: cmake -G "MinGW Makefiles" -DCMAKE_SH="CMAKE_SH-NOTFOUND" -Wdev -B build -DCMAKE_BUILD_TYPE=Debug -DCMAKE_Fortran_FLAGS_DEBUG="-Wall -Wextra -Wimplicit-interface -fPIC -g -fcheck=all -fbacktrace" -DCMAKE_MAXIMUM_RANK=5
 
       env:
         FC: gfortran

CMakeLists.txt

@@ -18,4 +18,8 @@ check_fortran_source_compiles("error stop i; end" f18errorstop SRC_EXT f90)
 check_fortran_source_compiles("real, allocatable :: array(:, :, :, :, :, :, :, :, :, :); end" f03rank SRC_EXT f90)
 check_fortran_source_runs("use, intrinsic :: iso_fortran_env, only : real128; real(real128) :: x; x = x+1; end" f03real128)
 
+if(DEFINED CMAKE_MAXIMUM_RANK)
+  set(CMAKE_MAXIMUM_RANK ${CMAKE_MAXIMUM_RANK})
+endif()
+
 add_subdirectory(src)

src/CMakeLists.txt

@@ -19,19 +19,25 @@ foreach(infileName IN LISTS fppFiles)
     set(infile "${CMAKE_CURRENT_SOURCE_DIR}/${infileName}")
 
     # Custom command to do the processing
-if(f03rank)
-    add_custom_command(
-        OUTPUT "${outfile}"
-        COMMAND fypp "${infile}" "${outfile}"
-        MAIN_DEPENDENCY "${infile}"
-        VERBATIM)
-else()
-    add_custom_command(
-        OUTPUT "${outfile}"
-        COMMAND fypp -DVERSION90 "${infile}" "${outfile}"
-        MAIN_DEPENDENCY "${infile}"
-        VERBATIM)
-endif()
+    if(DEFINED CMAKE_MAXIMUM_RANK)
+        add_custom_command(
+            OUTPUT "${outfile}"
+            COMMAND fypp -DMAXRANK=${CMAKE_MAXIMUM_RANK} "${infile}" "${outfile}"
+            MAIN_DEPENDENCY "${infile}"
+            VERBATIM)
+    elseif(f03rank)
+        add_custom_command(
+            OUTPUT "${outfile}"
+            COMMAND fypp "${infile}" "${outfile}"
+            MAIN_DEPENDENCY "${infile}"
+            VERBATIM)
+    else()
+        add_custom_command(
+            OUTPUT "${outfile}"
+            COMMAND fypp -DVERSION90 "${infile}" "${outfile}"
+            MAIN_DEPENDENCY "${infile}"
+            VERBATIM)
+    endif()
 
     # Finally add output file to a list
     set(outFiles ${outFiles} "${outfile}")

src/stdlib_experimental_stats.fypp

@@ -49,15 +49,15 @@ interface mean
     module function mean_2_${k1}$_${k1}$(x, dim) result(res)
         ${t1}$, intent(in) :: x(:,:)
         integer, intent(in) :: dim
-        ${t1}$ :: res(size(x)/size(x, dim))
+        ${t1}$ :: res(merge(size(x, 1), size(x, 2), mask = 1 < dim ))
     end function mean_2_${k1}$_${k1}$
 #:endfor
 
 #:for i1, k1, t1 in ikti
     module function mean_2_${k1}$_dp(x, dim) result(res)
         ${t1}$, intent(in) :: x(:,:)
         integer, intent(in) :: dim
-        real(dp) :: res(size(x)/size(x, dim))
+        real(dp) :: res(merge(size(x, 1), size(x, 2), mask = 1 < dim ))
     end function mean_2_${k1}$_dp
 #:endfor
 
@@ -66,7 +66,9 @@ interface mean
 #{if rank > 0}#(${":" + ",:" * (rank - 1)}$)#{endif}#
 #:enddef
 
-#:if VERSION90
+#:if defined('MAXRANK')
+#:set ranks = range(3,MAXRANK+1)
+#:elif VERSION90
 #:set ranks = range(3,8)
 #:else
 #:set ranks = range(3,16)
@@ -75,47 +77,47 @@ interface mean
 
 #:for i1, k1, t1 in iktr
 #:for rank in ranks
-module function mean_${rank}$_all_${k1}$_${k1}$(x) result(res)
-    ${t1}$, intent(in) :: x${ranksuffix(rank)}$
-    ${t1}$ :: res
-end function mean_${rank}$_all_${k1}$_${k1}$
+    module function mean_${rank}$_all_${k1}$_${k1}$(x) result(res)
+        ${t1}$, intent(in) :: x${ranksuffix(rank)}$
+        ${t1}$ :: res
+    end function mean_${rank}$_all_${k1}$_${k1}$
 #:endfor
 #:endfor
 
 #:for i1, k1, t1 in ikti
 #:for rank in ranks
-module function mean_${rank}$_all_${k1}$_dp(x) result(res)
-    ${t1}$, intent(in) :: x${ranksuffix(rank)}$
-    real(dp) :: res
-end function mean_${rank}$_all_${k1}$_dp
+    module function mean_${rank}$_all_${k1}$_dp(x) result(res)
+        ${t1}$, intent(in) :: x${ranksuffix(rank)}$
+        real(dp) :: res
+    end function mean_${rank}$_all_${k1}$_dp
 #:endfor
 #:endfor
 
 #:for i1, k1, t1 in iktr
 #:for rank in ranks
-module function mean_${rank}$_${k1}$_${k1}$(x, dim) result(res)
-    ${t1}$, intent(in) :: x${ranksuffix(rank)}$
-    integer, intent(in) :: dim
-    ${t1}$ :: res( &
+    module function mean_${rank}$_${k1}$_${k1}$(x, dim) result(res)
+        ${t1}$, intent(in) :: x${ranksuffix(rank)}$
+        integer, intent(in) :: dim
+        ${t1}$ :: res( &
 #:for imerge in range(1,rank-1)
-                  merge(size(x,${imerge}$),size(x,${imerge + 1}$),mask = ${imerge}$ < dim ), &
+                      merge(size(x,${imerge}$),size(x,${imerge + 1}$),mask = ${imerge}$ < dim ), &
 #:endfor
-                  merge(size(x,${rank-1}$),size(x,${rank}$),mask = ${rank-1}$ < dim ) )
-end function mean_${rank}$_${k1}$_${k1}$
+                      merge(size(x,${rank-1}$),size(x,${rank}$),mask = ${rank-1}$ < dim ) )
+    end function mean_${rank}$_${k1}$_${k1}$
 #:endfor
 #:endfor
 
 #:for i1, k1, t1 in ikti
 #:for rank in ranks
-module function mean_${rank}$_${k1}$_dp(x, dim) result(res)
-    ${t1}$, intent(in) :: x${ranksuffix(rank)}$
-    integer, intent(in) :: dim
-    real(dp) :: res( &
+    module function mean_${rank}$_${k1}$_dp(x, dim) result(res)
+        ${t1}$, intent(in) :: x${ranksuffix(rank)}$
+        integer, intent(in) :: dim
+        real(dp) :: res( &
 #:for imerge in range(1,rank-1)
-                  merge(size(x,${imerge}$),size(x,${imerge + 1}$),mask = ${imerge}$ < dim ), &
+                      merge(size(x,${imerge}$),size(x,${imerge + 1}$),mask = ${imerge}$ < dim ), &
 #:endfor
-                  merge(size(x,${rank-1}$),size(x,${rank}$),mask = ${rank-1}$ < dim ) )
-end function mean_${rank}$_${k1}$_dp
+                      merge(size(x,${rank-1}$),size(x,${rank}$),mask = ${rank-1}$ < dim ) )
+    end function mean_${rank}$_${k1}$_dp
 #:endfor
 #:endfor