X-Git-Url: https://www.fleuret.org/cgi-bin/gitweb/gitweb.cgi?p=pytorch.git;a=blobdiff_plain;f=conv_chain.py;h=3077874c1ea50310452bf15dd6b2f496a705eef6;hp=d10798f4b2fd58b97b31283f4a9301fba210bff1;hb=1f7353f882933264f76a4584ba8cf36f055e4658;hpb=dcb8e93a2f882abf1a30326fe419a592484deb18

diff --git a/conv_chain.py b/conv_chain.py
index d10798f..3077874 100755
--- a/conv_chain.py
+++ b/conv_chain.py
@@ -7,8 +7,8 @@
 
 ######################################################################
 
-def conv_chain(input_size, output_size, depth, cond):
-    if depth == 0:
+def conv_chain(input_size, output_size, remain_depth, cond):
+    if remain_depth == 0:
         if input_size == output_size:
             return [ [ ] ]
         else:
@@ -17,10 +17,10 @@ def conv_chain(input_size, output_size, depth, cond):
         r = [ ]
         for kernel_size in range(1, input_size + 1):
             for stride in range(1, input_size):
-                if cond(depth, kernel_size, stride):
+                if cond(remain_depth, kernel_size, stride):
                     n = (input_size - kernel_size) // stride + 1
                     if n >= output_size and (n - 1) * stride + kernel_size == input_size:
-                        q = conv_chain(n, output_size, depth - 1, cond)
+                        q = conv_chain(n, output_size, remain_depth - 1, cond)
                         r += [ [ (kernel_size, stride) ] + u for u in q ]
         return r
 
@@ -35,7 +35,7 @@ if __name__ == "__main__":
 
     c = conv_chain(
         input_size = 64, output_size = 8,
-        depth = 5,
+        remain_depth = 5,
         # We want kernels smaller than 4, strides smaller than the
         # kernels, and strides of 1 except in the two last layers
         cond = lambda d, k, s: k <= 4 and s <= k and (s == 1 or d <= 2)