Additional fixes for draw_net

[nitheeshas]

The previous fix #5477 for draw_net had some issues

• draw.py still wasn't working for most of the nets.
• The unittest didn't get executed:
  • unittest didn't have call for unittest.main() (not sure if there is any way to run unittest without this).
  • import statement for text_format should be from google.protobuf import text_format.

These are fixed in this PR.

[lukeyeager]

unittest didn't have call for unittest.main() (not sure if there is any way to run unittest without this).

Ah, I usually use nose or pytest instead of unittest directly. My bad.

[lukeyeager]

draw.py still wasn't working for most of the nets.

What's the error you're seeing?

The unittest didn't get executed.

Actually, yes it does. Turn on the -v flag to check if you like:

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3056d75..d53be93 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -99,7 +99,7 @@ add_custom_target(lint COMMAND ${CMAKE_COMMAND} -P ${PROJECT_SOURCE_DIR}/cmake/l
 
 # ---[ pytest target
 if(BUILD_python)
-  add_custom_target(pytest COMMAND python${python_version} -m unittest discover -s caffe/test WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/python )
+  add_custom_target(pytest COMMAND python${python_version} -m unittest discover -v -s caffe/test WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/python )
   add_dependencies(pytest pycaffe)
 endif()

[lukeyeager]

I can't see that any of these changes are required.

[lukeyeager]

Why do you think this is necessary?

>>> from caffe.proto import caffe_pb2
>>> net = caffe_pb2.NetParameter()
>>> layer = net.layer.add()
>>> layer.convolution_param.kernel_size
[]
>>> layer.convolution_param.kernel_size.append(1)
>>> layer.convolution_param.kernel_size
[1]
>>> len(layer.convolution_param.kernel_size)
1
>>> len(layer.convolution_param.kernel_size._values)
1

Looks like it should work as-is.

[nitheeshas]

I'm getting AttributeError: 'google.protobuf.pyext._message.RepeatedScalarConta' object has no attribute '_values' when trying with the included example nets.

This happens when using protobuf>2.6.1 (NVIDIA#303). I have tested the PR with protobuf==2.5.0 and it works fine, just in case.

[lukeyeager]

Personally, I feel like the existing syntax is slightly clearer.

[nitheeshas]

The existing syntax is more clear, but its returning error:
AttributeError: 'module' object has no attribute 'text_format'

Replacing the import statement as mentioned in PR fixed it. draw_net.py also uses the same syntax, probably because of this issue.

[lukeyeager]

This isn't necessary when the pytest target is python -m unittest discover

[nitheeshas]

Yes this isn't necessary when running the unittest as you mentioned. My bad!

[lukeyeager]

Aha! So all the fixes are for protobuf >= 3.0. That makes sense. Sounds good to me.

[shelhamer]

Thanks for the further fixes @nitheeshas !