Merge pull request #199 from longjon/pycaffe-ordereddict
authorEvan Shelhamer <shelhamer@imaginarynumber.net>
Tue, 18 Mar 2014 00:07:36 +0000 (17:07 -0700)
committerEvan Shelhamer <shelhamer@imaginarynumber.net>
Tue, 18 Mar 2014 00:07:36 +0000 (17:07 -0700)
Update Python interface, using OrderedDict for blobs and layers to expose activations, params, and diffs.

1  2 
Makefile
python/caffe/detection/detector.py

diff --cc Makefile
Simple merge
Simple merge