remove ops in the __caffe2 namespace (#47318)

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

Test Plan: Imported from OSS

Reviewed By: ezyang

Differential Revision: D24714807

Pulled By: bdhirsh

fbshipit-source-id: 7f040c12c0b3a0f322498386f849f693a64d1dcf
This commit is contained in:
Brian Hirsh 2020-11-16 14:32:48 -08:00 committed by Facebook GitHub Bot
parent 233192be73
commit 6ec2a89e01
7 changed files with 6 additions and 100 deletions

View File

@ -205,24 +205,4 @@ C10_EXPORT_CAFFE2_OP_TO_C10_CPU(
"Tensor output_1"
")",
BBoxTransformOpFloatCPU);
C10_EXPORT_CAFFE2_OP_TO_C10_CPU(
BBoxTransform2,
"__caffe2::BBoxTransform("
"Tensor rois, "
"Tensor deltas, "
"Tensor im_info, "
"float[] weights, "
"bool apply_scale, "
"bool rotated, "
"bool angle_bound_on, "
"int angle_bound_lo, "
"int angle_bound_hi, "
"float clip_angle_thresh, "
"bool legacy_plus_one"
") -> ("
"Tensor output_0, "
"Tensor output_1"
")",
BBoxTransformOpFloatCPU);
// clang-format on

View File

@ -338,31 +338,4 @@ C10_EXPORT_CAFFE2_OP_TO_C10_CPU(
")",
caffe2::BoxWithNMSLimitOp<caffe2::CPUContext>);
C10_EXPORT_CAFFE2_OP_TO_C10_CPU(
BoxWithNMSLimit2,
"__caffe2::BoxWithNMSLimit("
"Tensor scores, "
"Tensor boxes, "
"Tensor batch_splits, "
"float score_thresh, "
"float nms, "
"int detections_per_im, "
"bool soft_nms_enabled, "
"str soft_nms_method, "
"float soft_nms_sigma, "
"float soft_nms_min_score_thres, "
"bool rotated, "
"bool cls_agnostic_bbox_reg, "
"bool input_boxes_include_bg_cls, "
"bool output_classes_include_bg_cls, "
"bool legacy_plus_one "
") -> ("
"Tensor scores, "
"Tensor boxes, "
"Tensor classes, "
"Tensor batch_splits, "
"Tensor keeps, "
"Tensor keeps_size"
")",
caffe2::BoxWithNMSLimitOp<caffe2::CPUContext>);
// clang-format on

View File

@ -415,25 +415,6 @@ SHOULD_NOT_DO_GRADIENT(GenerateProposalsCPP);
} // namespace caffe2
// clang-format off
C10_EXPORT_CAFFE2_OP_TO_C10_CPU(
GenerateProposals2,
"__caffe2::GenerateProposals("
"Tensor scores, "
"Tensor bbox_deltas, "
"Tensor im_info, "
"Tensor anchors, "
"float spatial_scale, "
"int pre_nms_topN, "
"int post_nms_topN, "
"float nms_thresh, "
"float min_size, "
"bool angle_bound_on, "
"int angle_bound_lo, "
"int angle_bound_hi, "
"float clip_angle_thresh, "
"bool legacy_plus_one"
") -> (Tensor output_0, Tensor output_1)",
caffe2::GenerateProposalsOp<caffe2::CPUContext>);
C10_EXPORT_CAFFE2_OP_TO_C10_CPU(
GenerateProposals,
"_caffe2::GenerateProposals("

View File

@ -172,12 +172,4 @@ C10_EXPORT_CAFFE2_OP_TO_C10_CPU(
") -> Tensor keypoints",
HeatmapMaxKeypointOpFloatCPU);
C10_EXPORT_CAFFE2_OP_TO_C10_CPU(
HeatmapMaxKeypoint2,
"__caffe2::HeatmapMaxKeypoint("
"Tensor heatmaps, "
"Tensor bboxes_in, "
"bool should_output_softmax = True"
") -> Tensor keypoints",
HeatmapMaxKeypointOpFloatCPU);
// clang-format on

View File

@ -313,16 +313,3 @@ C10_EXPORT_CAFFE2_OP_TO_C10_CPU(
") -> Tensor",
caffe2::RoIAlignCPUOp<float>);
C10_EXPORT_CAFFE2_OP_TO_C10_CPU(
RoIAlign2,
"__caffe2::RoIAlign("
" Tensor features,"
" Tensor rois,"
" str order,"
" float spatial_scale,"
" int pooled_h,"
" int pooled_w,"
" int sampling_ratio,"
" bool aligned"
") -> Tensor",
caffe2::RoIAlignCPUOp<float>);

View File

@ -424,17 +424,4 @@ C10_EXPORT_CAFFE2_OP_TO_C10_CPU(
") -> Tensor",
RoIAlignRotatedOpFloatCPU);
C10_EXPORT_CAFFE2_OP_TO_C10_CPU(
RoIAlignRotated2,
"__caffe2::RoIAlignRotated("
"Tensor features, "
"Tensor rois, "
"str order, "
"float spatial_scale, "
"int pooled_h, "
"int pooled_w, "
"int sampling_ratio, "
"bool aligned"
") -> Tensor",
RoIAlignRotatedOpFloatCPU);
// clang-format on

View File

@ -177,6 +177,12 @@ allow_list = [
("aten::_foreach_floor_", datetime.date(2020, 11, 15)),
("aten::_foreach_log1p", datetime.date(2020, 11, 15)),
("aten::_foreach_neg", datetime.date(2020, 11, 15)),
("__caffe2::RoIAlign", datetime.date(2020, 11, 15)),
("__caffe2::HeatmapMaxKeypoint", datetime.date(2020, 11, 15)),
("__caffe2::BoxWithNMSLimit", datetime.date(2020, 11, 15)),
("__caffe2::BBoxTransform", datetime.date(2020, 11, 15)),
("__caffe2::GenerateProposals", datetime.date(2020, 11, 15)),
("__caffe2::RoIAlignRotated", datetime.date(2020, 11, 15)),
]
def allow_listed(schema, allow_list):