Merge pull request #2813 from longjon/net-spec-imp
authorEvan Shelhamer <shelhamer@imaginarynumber.net>
Sat, 8 Aug 2015 04:06:29 +0000 (21:06 -0700)
committerEvan Shelhamer <shelhamer@imaginarynumber.net>
Sat, 8 Aug 2015 04:06:29 +0000 (21:06 -0700)
Python net spec cleanups and top-less layers

1  2 
python/caffe/test/test_net_spec.py

@@@ -41,9 -41,17 +41,17 @@@ def anon_lenet(batch_size)
      loss = L.SoftmaxWithLoss(ip2, label)
      return loss.to_proto()
  
+ def silent_net():
+     n = caffe.NetSpec()
+     n.data, n.data2 = L.DummyData(shape=[dict(dim=[3]), dict(dim=[4, 2])],
+                                   ntop=2)
+     n.silence_data = L.Silence(n.data, ntop=0)
+     n.silence_data2 = L.Silence(n.data2, ntop=0)
+     return n.to_proto()
  class TestNetSpec(unittest.TestCase):
      def load_net(self, net_proto):
 -        f = tempfile.NamedTemporaryFile(delete=False)
 +        f = tempfile.NamedTemporaryFile(mode='w+', delete=False)
          f.write(str(net_proto))
          f.close()
          return caffe.Net(f.name, caffe.TEST)