From e1a02b014e382d8bb9c9953a27446561e0a17169 Mon Sep 17 00:00:00 2001 From: Vasilis Vryniotis Date: Sat, 12 Dec 2020 13:29:36 +0000 Subject: [PATCH 1/2] Removing VISION_API from backward() methods and adding a ops.h --- torchvision/csrc/ops/deform_conv2d.h | 4 +--- torchvision/csrc/ops/ops.h | 8 ++++++++ torchvision/csrc/ops/ps_roi_align.h | 2 +- torchvision/csrc/ops/ps_roi_pool.h | 2 +- torchvision/csrc/ops/roi_align.h | 2 +- torchvision/csrc/ops/roi_pool.h | 2 +- 6 files changed, 13 insertions(+), 7 deletions(-) create mode 100644 torchvision/csrc/ops/ops.h diff --git a/torchvision/csrc/ops/deform_conv2d.h b/torchvision/csrc/ops/deform_conv2d.h index a72d8ddde9c..924db0faaee 100644 --- a/torchvision/csrc/ops/deform_conv2d.h +++ b/torchvision/csrc/ops/deform_conv2d.h @@ -24,9 +24,7 @@ VISION_API at::Tensor deform_conv2d( namespace detail { -VISION_API -std::tuple -_deform_conv2d_backward( +std::tuple _deform_conv2d_backward( const at::Tensor& grad, const at::Tensor& input, const at::Tensor& weight, diff --git a/torchvision/csrc/ops/ops.h b/torchvision/csrc/ops/ops.h new file mode 100644 index 00000000000..77995e44197 --- /dev/null +++ b/torchvision/csrc/ops/ops.h @@ -0,0 +1,8 @@ +#pragma once + +#include "deform_conv2d.h" +#include "nms.h" +#include "ps_roi_align.h" +#include "ps_roi_pool.h" +#include "roi_align.h" +#include "roi_pool.h" diff --git a/torchvision/csrc/ops/ps_roi_align.h b/torchvision/csrc/ops/ps_roi_align.h index 907662d2dfc..c5ed865982c 100644 --- a/torchvision/csrc/ops/ps_roi_align.h +++ b/torchvision/csrc/ops/ps_roi_align.h @@ -16,7 +16,7 @@ VISION_API std::tuple ps_roi_align( namespace detail { -VISION_API at::Tensor _ps_roi_align_backward( +at::Tensor _ps_roi_align_backward( const at::Tensor& grad, const at::Tensor& rois, const at::Tensor& channel_mapping, diff --git a/torchvision/csrc/ops/ps_roi_pool.h b/torchvision/csrc/ops/ps_roi_pool.h index 7de748ce0ff..20c2511e7aa 100644 --- a/torchvision/csrc/ops/ps_roi_pool.h +++ b/torchvision/csrc/ops/ps_roi_pool.h @@ -15,7 +15,7 @@ VISION_API std::tuple ps_roi_pool( namespace detail { -VISION_API at::Tensor _ps_roi_pool_backward( +at::Tensor _ps_roi_pool_backward( const at::Tensor& grad, const at::Tensor& rois, const at::Tensor& channel_mapping, diff --git a/torchvision/csrc/ops/roi_align.h b/torchvision/csrc/ops/roi_align.h index 33ff2d18fd1..2ddb6ac3945 100644 --- a/torchvision/csrc/ops/roi_align.h +++ b/torchvision/csrc/ops/roi_align.h @@ -17,7 +17,7 @@ VISION_API at::Tensor roi_align( namespace detail { -VISION_API at::Tensor _roi_align_backward( +at::Tensor _roi_align_backward( const at::Tensor& grad, const at::Tensor& rois, double spatial_scale, diff --git a/torchvision/csrc/ops/roi_pool.h b/torchvision/csrc/ops/roi_pool.h index 6994e68fb4a..25ef5a1986d 100644 --- a/torchvision/csrc/ops/roi_pool.h +++ b/torchvision/csrc/ops/roi_pool.h @@ -15,7 +15,7 @@ VISION_API std::tuple roi_pool( namespace detail { -VISION_API at::Tensor _roi_pool_backward( +at::Tensor _roi_pool_backward( const at::Tensor& grad, const at::Tensor& rois, const at::Tensor& argmax, From f492c427b52f5c8fe4a82cfd459d8992628148ca Mon Sep 17 00:00:00 2001 From: Vasilis Vryniotis Date: Sat, 12 Dec 2020 13:37:52 +0000 Subject: [PATCH 2/2] Fixing clang format. --- torchvision/csrc/ops/deform_conv2d.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/torchvision/csrc/ops/deform_conv2d.h b/torchvision/csrc/ops/deform_conv2d.h index 924db0faaee..a35be02aac8 100644 --- a/torchvision/csrc/ops/deform_conv2d.h +++ b/torchvision/csrc/ops/deform_conv2d.h @@ -24,7 +24,8 @@ VISION_API at::Tensor deform_conv2d( namespace detail { -std::tuple _deform_conv2d_backward( +std::tuple +_deform_conv2d_backward( const at::Tensor& grad, const at::Tensor& input, const at::Tensor& weight,