From 6aacc1b2dddac9d55a2ccc5afa2db1d14e8a07a1 Mon Sep 17 00:00:00 2001
From: Tim Khatkevich <timk@fb.com>
Date: Fri, 8 Mar 2019 05:43:17 -0800
Subject: [PATCH] Support failback for more operators in ideep (#17747)

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

RMACRegions, Normalize and RoIPooling

Reviewed By: dskhudia

Differential Revision: D14365096

fbshipit-source-id: dafcb7077515e03c2880832a442015b70fc7140d
---
 caffe2/ideep/operators/operator_fallback_ideep.cc | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/caffe2/ideep/operators/operator_fallback_ideep.cc b/caffe2/ideep/operators/operator_fallback_ideep.cc
index 04e87a7..f705673 100644
--- a/caffe2/ideep/operators/operator_fallback_ideep.cc
+++ b/caffe2/ideep/operators/operator_fallback_ideep.cc
@@ -2,12 +2,10 @@
 #include <caffe2/ideep/utils/ideep_operator.h>
 
 #include <caffe2/operators/abs_op.h>
-#include <caffe2/operators/atan_op.h>
 #include <caffe2/operators/accuracy_op.h>
 #include <caffe2/operators/affine_channel_op.h>
+#include <caffe2/operators/atan_op.h>
 #include <caffe2/operators/batch_matmul_op.h>
-#include "caffe2/operators/bbox_transform_op.h"
-#include "caffe2/operators/box_with_nms_limit_op.h"
 #include <caffe2/operators/cast_op.h>
 #include <caffe2/operators/clip_op.h>
 #include <caffe2/operators/collect_and_distribute_fpn_rpn_proposals_op.h>
@@ -29,17 +27,20 @@
 #include <caffe2/operators/given_tensor_fill_op.h>
 #include <caffe2/operators/load_save_op.h>
 #include <caffe2/operators/loss_op.h>
+#include <caffe2/operators/normalize_op.h>
 #include <caffe2/operators/order_switch_ops.h>
 #include <caffe2/operators/pad_op.h>
 #include <caffe2/operators/prelu_op.h>
 #include <caffe2/operators/reduce_ops.h>
+#include <caffe2/operators/rmac_regions_op.h>
 #include <caffe2/operators/roi_align_op.h>
 #include <caffe2/operators/roi_align_rotated_op.h>
+#include <caffe2/operators/roi_pool_op.h>
 #include <caffe2/operators/scale_op.h>
 #include <caffe2/operators/slice_op.h>
-#include <caffe2/operators/sqrt_op.h>
 #include <caffe2/operators/softmax_op.h>
 #include <caffe2/operators/softmax_with_loss_op.h>
+#include <caffe2/operators/sqrt_op.h>
 #include <caffe2/operators/stop_gradient.h>
 #include <caffe2/operators/tanh_op.h>
 #include <caffe2/operators/tensor_protos_db_input.h>
@@ -48,6 +49,8 @@
 #include <caffe2/queue/queue_ops.h>
 #include <caffe2/sgd/iter_op.h>
 #include <caffe2/sgd/learning_rate_op.h>
+#include "caffe2/operators/bbox_transform_op.h"
+#include "caffe2/operators/box_with_nms_limit_op.h"
 
 #ifdef CAFFE2_USE_GLOO
 #include <caffe2/contrib/gloo/common_world_ops.h>
@@ -124,6 +127,10 @@ REGISTER_IDEEP_OPERATOR(Load, IDEEPFallbackOp<LoadOp<CPUContext>>);
 REGISTER_IDEEP_OPERATOR(Save, IDEEPFallbackOp<SaveOp<CPUContext>>);
 
 REGISTER_IDEEP_OPERATOR(
+    RMACRegions,
+    IDEEPFallbackOp<RMACRegionsOp<CPUContext>>);
+REGISTER_IDEEP_OPERATOR(RoIPool, IDEEPFallbackOp<RoIPoolOp<float, CPUContext>>);
+REGISTER_IDEEP_OPERATOR(
     RoIAlign,
     IDEEPFallbackOp<RoIAlignOp<float, CPUContext>>);
 REGISTER_IDEEP_OPERATOR(
@@ -260,6 +267,9 @@ REGISTER_IDEEP_OPERATOR(
 REGISTER_IDEEP_OPERATOR(Gather, IDEEPFallbackOp<GatherOp<CPUContext>>);
 
 REGISTER_IDEEP_OPERATOR(
+    Normalize,
+    IDEEPFallbackOp<NormalizeOp<float, CPUContext>>);
+REGISTER_IDEEP_OPERATOR(
     ReduceL2,
     IDEEPFallbackOp<
         ReduceOp<TensorTypes<float>, CPUContext, L2Reducer<CPUContext>>>);
-- 
2.7.4