Merge pull request #137 from hikettei/cnn-patch

[BugFix] Dynamic Shape and LazyAxis Comparison

source/nn/conv.lisp

@@ -65,11 +65,9 @@ Note: When `Conv2D` is initialised, the output is displayed as -1. This is becau
 			   C_in  = in-channels
 			   C_out = out-channels
 			   ;; H_out = floor(((H_in + 2 * padding[0] - dilation[0] * (kernel_size[0] - 1) - 1) / stride[0]) + 1)
-			   H_out = (floor (+ 1 (/ (+ H_in (* 2 (car padding)) (* (- (car dilation)) (- (car kernel-size) 1)) -1)
-						      (car stride))))
+			   H_out = (conv-out-size H_in (car padding) (car dilation) (car kernel-size) (car stride))
 			   ;; W_out = floor(((W_in + 2 * padding[1] - dilation[1] * (kernel_size[1] - 1) - 1) / stride[1]) + 1)
-			   W_out = (floor (+ 1 (/ (+ W_in (* 2 (second padding)) (* (- (second dilation)) (- (second kernel-size) 1)) -1)
-						      (second stride)))))
+			   W_out = (conv-out-size W_in (second padding) (second dilation) (second kernel-size) (second stride)))
 	   :on-call-> apply-conv2d)
 
   (assert (typep kernel-size 'list)

source/vm/lazy-subscript.lisp

@@ -253,15 +253,22 @@ No macro usings are allowed; functions and fixnum, list are available.
   (let* ((lazyir (parse-lazy-exp expression))
 	 (args   (ir->args lazyir))
 	 (form   (ir->list lazyir)))
-    (if (and (typep (lazyir-car lazyir) 'fixnum)
-	     (eql (lazyir-type lazyir) :number))
-	(lazyir-car lazyir)
-	(%make-lazyaxis
-	 args
-	 lazyir
-	 (if (listp form)
-	     #'(lambda () (interpret-lazy lazyir))
-	     #'(lambda () form))))))
+
+    (when (and
+	   (typep (lazyir-car lazyir) 'fixnum)
+	   (eql (lazyir-type lazyir) :number))
+      (return-from make-lazyaxis (lazyir-car lazyir)))
+
+    (when (eql (lazyir-type lazyir) :dynamic-shape)
+      (return-from make-lazyaxis
+	(cadr (second (lazyir-car lazyir)))))
+
+    (%make-lazyaxis
+     args
+     lazyir
+     (if (listp form)
+	 #'(lambda () (interpret-lazy lazyir))
+	 #'(lambda () form)))))
 
 (defun make-dumpable-lazy-axis (expression)
   (let* ((lazyir (parse-lazy-exp expression))

source/vm/t/lazy-axis.lisp

@@ -126,3 +126,11 @@
 
 ;; CNN with activation
 
+(defun lazyaxis-and-symbol-comparison ()
+  (build (softmax-cross-entropy
+	  (!reshape (call (Conv2D 3 6 `(5 5)) (make-input `(N 3 25 25) :X)) (~ N C H W -> N (* C H W)))
+	  (make-input `(N 2646) :X))))
+
+(test lazyaxis-and-symbol-comparison
+  (is (lazyaxis-and-symbol-comparison)))
+