From cf7f9298aac19657129ef4bdc54b83baee08b8c6 Mon Sep 17 00:00:00 2001 From: pedro Date: Thu, 31 Jan 2019 18:46:28 -0300 Subject: [PATCH] update --- README.md | 9 ++++++--- core/tikzeng.py | 2 +- test/test_simple.py | 9 ++++++--- test/unet.py | 2 -- 4 files changed, 13 insertions(+), 9 deletions(-) diff --git a/README.md b/README.md index eb8ac66..46807e3 100644 --- a/README.md +++ b/README.md @@ -25,10 +25,13 @@ Latex code for drawing neural networks for reports and presentation. Have a look to_head( '..' ), to_cor(), to_begin(), - to_Conv( 'conv1', 572, 64, offset="(0,0,0)", to="(0,0,0)" ), + to_Conv("conv1", 512, 64, offset="(0,0,0)", to="(0,0,0)", height=64, depth=64, width=2 ), to_Pool("pool1", offset="(0,0,0)", to="(conv1-east)"), - to_SoftMax( "soft1", "SOFT", 10 ,"(3,0,0)", "(pool1-east)" ), - to_connection( "pool1", "soft1"), + to_Conv("conv2", 128, 64, offset="(1,0,0)", to="(pool1-east)", height=32, depth=32, width=2 ), + to_connection( "pool1", "conv2"), + to_Pool("pool2", offset="(0,0,0)", to="(conv2-east)", height=28, depth=28, width=1), + to_SoftMax("soft1", 10 ,"(3,0,0)", "(pool1-east)", caption="SOFT" ), + to_connection("pool2", "soft1"), to_end() ] diff --git a/core/tikzeng.py b/core/tikzeng.py index 4f6adb5..a3320eb 100644 --- a/core/tikzeng.py +++ b/core/tikzeng.py @@ -149,7 +149,7 @@ def to_SoftMax( name, s_filer=10, offset="(0,0,0)", to="(0,0,0)", width=1.5, hei {Box={ name=""" + name +""", caption="""+ caption +""", - xlabel={{"","dummy"}}, + xlabel={{" ","dummy"}}, zlabel="""+ str(s_filer) +""", fill=\SoftmaxColor, opacity="""+ str(opacity) +""", diff --git a/test/test_simple.py b/test/test_simple.py index 10ac860..1da1833 100644 --- a/test/test_simple.py +++ b/test/test_simple.py @@ -8,10 +8,13 @@ arch = [ to_head( '..' ), to_cor(), to_begin(), - to_Conv( 'conv1', 572, 64, offset="(0,0,0)", to="(0,0,0)" ), + to_Conv("conv1", 512, 64, offset="(0,0,0)", to="(0,0,0)", height=64, depth=64, width=2 ), to_Pool("pool1", offset="(0,0,0)", to="(conv1-east)"), - to_SoftMax( "soft1", "SOFT", 10 ,"(3,0,0)", "(pool1-east)" ), - to_connection( "pool1", "soft1"), + to_Conv("conv2", 128, 64, offset="(1,0,0)", to="(pool1-east)", height=32, depth=32, width=2 ), + to_connection( "pool1", "conv2"), + to_Pool("pool2", offset="(0,0,0)", to="(conv2-east)", height=28, depth=28, width=1), + to_SoftMax("soft1", 10 ,"(3,0,0)", "(pool1-east)", caption="SOFT" ), + to_connection("pool2", "soft1"), to_end() ] diff --git a/test/unet.py b/test/unet.py index 845cb1e..87906e2 100644 --- a/test/unet.py +++ b/test/unet.py @@ -1,6 +1,4 @@ - - import sys sys.path.append('../') from core.tikzeng import *