commit 5f7d1f02f22e5f9ab5d6ed482389de41c2763baa
author Alisson Gusatti Azzolini <azzolini@fb.com> Fri Dec 02 15:08:52 2016 -0800
committer Bram Wasti <bwasti@dev11999.prn1.facebook.com> Mon Dec 05 11:53:27 2016 -0800
tree 345f5d6b127e37177172431fd41bf49f7462ac85
parent 1aba4280d82a9fee8a9f649412afc898bcd7471e

Use native reader for evaluation

Summary:
Since hashing is different.

This should be ready to commit now. Running ads nn canaries.

Differential Revision: D4264009

fbshipit-source-id: 3aa16b0c47c61f9a442b0375524c5f1580af5892

caffe2/python/control.py

diff --git a/caffe2/python/control.py b/caffe2/python/control.py
index de629d2..6c220e2 100644
--- a/caffe2/python/control.py
+++ b/caffe2/python/control.py
@@ -197,6 +197,9 @@
             last_cond = curr_cond
         else:
             last_cond = merged_net.__getattr__(relation)([last_cond, curr_cond])
+        # merge attributes
+        for k, v in condition_nets[i]._attr_dict.items():
+            merged_net._attr_dict[k] += v
 
     merged_net.AddExternalOutput(last_cond)