diff --git a/.gitignore b/.gitignore index c960c0e..9c18754 100644 --- a/.gitignore +++ b/.gitignore @@ -4,6 +4,7 @@ __pycache__ books +project # PyInstaller # Usually these files are written by a python script from a template diff --git a/core/blocks.py b/core/blocks.py index 09789a3..82c2c2a 100644 --- a/core/blocks.py +++ b/core/blocks.py @@ -35,7 +35,7 @@ def block_Unconv( name, botton, top, s_filer=256, n_filer=64, offset="(1,0,0)", to_ConvRes( name='ccr_res_{}'.format(name), offset="(0,0,0)", to="(unpool_{}-east)".format(name), s_filer=str(s_filer), n_filer=str(n_filer), width=size[2], height=size[0], depth=size[1], opacity=opacity ), to_Conv( name='ccr_{}'.format(name), offset="(0,0,0)", to="(ccr_res_{}-east)".format(name), s_filer=str(s_filer), n_filer=str(n_filer), width=size[2], height=size[0], depth=size[1] ), to_ConvRes( name='ccr_res_c_{}'.format(name), offset="(0,0,0)", to="(ccr_{}-east)".format(name), s_filer=str(s_filer), n_filer=str(n_filer), width=size[2], height=size[0], depth=size[1], opacity=opacity ), - to_Conv( name='{}'.format(top), offset="(0,0,0)", to="(ccr_res_c_{}-east)".format(name), s_filer=str(s_filer), n_filer=str(n_filer), width=size[2], height=size[0], depth=size[1] ), + to_Conv( name='{}'.format(top), offset="(0,0,0)", to="(ccr_res_c_{}-east)".format(name), s_filer=str(s_filer), n_filer=str(n_filer), width=size[2], height=size[0], depth=size[1] ), to_connection( "{}".format( botton ), "unpool_{}".format( name ) @@ -43,3 +43,33 @@ def block_Unconv( name, botton, top, s_filer=256, n_filer=64, offset="(1,0,0)", ] + + +def block_Res( num, name, botton, top, s_filer=256, n_filer=64, offset="(0,0,0)", size=(32,32,3.5), opacity=0.5 ): + lys = [] + layers = [ *[ '{}_{}'.format(name,i) for i in range(num-1) ], top] + for name in layers: + ly = [ to_Conv( + name='{}'.format(name), + offset=offset, + to="({}-east)".format( botton ), + s_filer=str(s_filer), + n_filer=str(n_filer), + width=size[2], + height=size[0], + depth=size[1] + ), + to_connection( + "{}".format( botton ), + "{}".format( name ) + ) + ] + botton = name + lys+=ly + + lys += [ + to_skip( of=layers[1], to=layers[-2], pos=1.25), + ] + return lys + +