From 78a8bf5d4b49a7626d738428decb564ea9b2a598 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Yihui=20He=20=E4=BD=95=E5=AE=9C=E6=99=96?= Date: Sun, 24 Sep 2017 11:53:18 -0400 Subject: [PATCH] Update net.py --- lib/net.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/lib/net.py b/lib/net.py index 154cf30..096b255 100644 --- a/lib/net.py +++ b/lib/net.py @@ -1340,7 +1340,7 @@ def setConv(c, d): rank = rankdic[conv] d_prime = rank if d_c < rank: d_c = rank - '''VH''' + '''spatial decomposition''' if True: t.tic() weights = self.param_data(conv) @@ -1369,11 +1369,11 @@ def setConv(c, d): print("V", V.shape) print("H", H.shape) - t.toc('VH') + t.toc('spatial_decomposition') self.insert(conv, conv_H) - '''ITQ''' + '''channel decomposition''' if True:# and conv != 'conv3_3': t.tic() feats_dict, _ = self.extract_features(names=conv, points_dict=self._points_dict, save=1) @@ -1394,9 +1394,9 @@ def setConv(c, d): self.insert(conv_H, conv_P, pad=0, kernel_size=1, bias=True, stride=1) - t.toc('ITQ') + t.toc('channel_decomposition') - '''CR''' + '''channel pruning''' if dcfgs.dic.vh and (conv in alldic or conv in pooldic) and (convnext in self.convs): t.tic() #if conv.startswith('conv4'): @@ -1420,7 +1420,7 @@ def setConv(c, d): self.WPQ[(key,1)] = self.WPQ[(key,1)][idxs] self.set_conv(key, num_output=sum(idxs)) - t.toc('CR') + t.toc('channel_pruning') # setup V H_params = {'bias':True} H_params.update(self.infer_pad_kernel(self.WPQ[(conv_H, 0)], conv))