better network model

2017-08-01 23:03:02 +02:00
parent 300b0af5dd
commit e8355cee67
22 changed files with 166 additions and 179 deletions
@@ -4,12 +4,11 @@

 namespace tkDNN {

-Conv2d::Conv2d( Network *net, dataDim_t in_dim, int out_ch, 
-                int kernelH, int kernelW, int strideH, int strideW,
-                int paddingH, int paddingW,
+Conv2d::Conv2d( Network *net, int out_ch, int kernelH, int kernelW, 
+                int strideH, int strideW, int paddingH, int paddingW,
                const char* fname_weights, bool batchnorm) : 
    
-    LayerWgs(net, in_dim, in_dim.c, out_ch, kernelH, kernelW, 1, 
+    LayerWgs(net, net->getOutputDim().c, out_ch, kernelH, kernelW, 1, 
             fname_weights, batchnorm) {

    this->kernelH = kernelH;