commit cf5a21e4a1cd923c82f0089025536368db169481
author Bram Wasti <bwasti@fb.com> Wed Sep 19 15:28:00 2018 -0700
committer Facebook Github Bot <facebook-github-bot@users.noreply.github.com> Wed Sep 19 15:33:26 2018 -0700
tree 825e5ea3b424a74d661b37e3f8e85853bb1443bd
parent c30790797ff084873a8f9e6abd7bc1af31fecb3c

Add back proto opt disable feature that was lost during refactor (#11875)

Summary:
Pull Request resolved: https://github.com/pytorch/pytorch/pull/11875

Seems like the refactor to predictor_config dropped some functionality that is now blocking other teams

rFBS2b30208263c14ce7039f27c618a3b232bf11ee33 is the change that was missed

hoping to land this quickly :)

Reviewed By: jonmorton

Differential Revision: D9948324

fbshipit-source-id: 1628f7c51c06319fa7ca5dc9d59799135bb82c5f

caffe2/predictor/predictor_config.cc

diff --git a/caffe2/predictor/predictor_config.cc b/caffe2/predictor/predictor_config.cc
index aabff0d..d49632a 100644
--- a/caffe2/predictor/predictor_config.cc
+++ b/caffe2/predictor/predictor_config.cc
@@ -1,8 +1,10 @@
 #include "predictor_config.h"
 #include "caffe2/core/init.h"
+#include "caffe2/utils/proto_utils.h"
 #ifdef CAFFE2_OPTIMIZER
 #include "caffe2/opt/optimizer.h"
 #endif
+
 namespace caffe2 {
 
 namespace {
@@ -69,7 +71,8 @@
 #if CAFFE2_MOBILE
   GlobalInit();
 #endif
-  if (optimization) {
+  if (optimization &&
+      !ArgumentHelper::HasArgument(*config.predict_net, "disable_nomnigraph")) {
 #ifdef CAFFE2_OPTIMIZER
     try {
       *config.predict_net =