single shape macro

Author: jalvesz

include/common.fypp

@@ -230,29 +230,6 @@ ${prefix + joinstr.join([line.strip() for line in txt.split("\n")]) + suffix}$
   #:endif
 #:enddef
 
-#! Brace enclosed, comma separated Fortran expressions for a shape.
-#!
-#! It defines an output variable with the same shape as the input variable.
-#!
-#! Args:
-#!   varname (str): Name of the variable to be used as origin
-#!   origrank (int): Rank of the original variable
-#!
-#! Returns:
-#!   Shape expression enclosed in braces, so that it can be used as suffix to
-#!   define array shapes in declarations.
-#!
-#:def shape(varname, origrank)
-  #:assert origrank > 0
-  #:if origrank > 1
-    #:call join_lines(joinstr=", ", prefix="(", suffix=")")
-      #:for i in range(1, origrank+1)
-        size(${varname}$, ${i}$)
-      #:endfor
-    #:endcall
-  #:endif
-#:enddef
-
 
 #! Generates a routine name from a generic name, rank, type and kind
 #!

src/stdlib_specialfunctions.fypp

@@ -355,7 +355,7 @@ module stdlib_specialfunctions
         #:for rank in RANKS
         pure module function softmax_r${rank}$_${rk}$( x , dim ) result( y )
             ${rt}$, intent(in) :: x${ranksuffix(rank)}$
-            ${rt}$ :: y${shape('x', rank)}$
+            ${rt}$ :: y${shape_from_array_size('x', rank)}$
             integer, intent(in), optional :: dim
         end function
         #:endfor
@@ -377,7 +377,7 @@ module stdlib_specialfunctions
         #:for rank in RANKS
         pure module function softmax_grad_r${rank}$_${rk}$( x , dim ) result( y )
             ${rt}$, intent(in) :: x${ranksuffix(rank)}$
-            ${rt}$ :: y${shape('x', rank)}$
+            ${rt}$ :: y${shape_from_array_size('x', rank)}$
             integer, intent(in), optional :: dim
         end function
         #:endfor
@@ -399,7 +399,7 @@ module stdlib_specialfunctions
         #:for rank in RANKS
         pure module function logsoftmax_r${rank}$_${rk}$( x , dim ) result( y )
             ${rt}$, intent(in) :: x${ranksuffix(rank)}$
-            ${rt}$ :: y${shape('x', rank)}$
+            ${rt}$ :: y${shape_from_array_size('x', rank)}$
             integer, intent(in), optional :: dim
         end function
         #:endfor

src/stdlib_specialfunctions_activations.fypp

@@ -232,7 +232,7 @@ end function
 #:for rank in RANKS
 pure module function softmax_r${rank}$_${rk}$( x , dim ) result( y )
     ${rt}$, intent(in) :: x${ranksuffix(rank)}$
-    ${rt}$ :: y${shape('x', rank)}$
+    ${rt}$ :: y${shape_from_array_size('x', rank)}$
 
     integer, intent(in), optional :: dim
     integer :: dim_, j
@@ -271,7 +271,7 @@ end function
 #:for rank in RANKS
 pure module function softmax_grad_r${rank}$_${rk}$( x , dim ) result( y )
     ${rt}$, intent(in) :: x${ranksuffix(rank)}$
-    ${rt}$ :: y${shape('x', rank)}$
+    ${rt}$ :: y${shape_from_array_size('x', rank)}$
 
     integer, intent(in), optional :: dim
     integer :: dim_
@@ -300,7 +300,7 @@ end function
 #:for rank in RANKS
 pure module function logsoftmax_r${rank}$_${rk}$( x , dim ) result( y )
     ${rt}$, intent(in) :: x${ranksuffix(rank)}$
-    ${rt}$ :: y${shape('x', rank)}$
+    ${rt}$ :: y${shape_from_array_size('x', rank)}$
 
     integer, intent(in), optional :: dim
     integer :: dim_, j