From acec4342d7de0a99c1c3746f8bd9e69d629ae4a1 Mon Sep 17 00:00:00 2001 From: Peter Bell Date: Tue, 21 Dec 2021 15:04:46 +0000 Subject: [PATCH 1/2] Fix missing Torch includes --- torchvision/csrc/io/image/image.cpp | 1 + torchvision/csrc/ops/autocast/deform_conv2d_kernel.cpp | 1 + torchvision/csrc/ops/autocast/nms_kernel.cpp | 1 + torchvision/csrc/ops/autocast/ps_roi_align_kernel.cpp | 1 + torchvision/csrc/ops/autocast/ps_roi_pool_kernel.cpp | 1 + torchvision/csrc/ops/autocast/roi_align_kernel.cpp | 1 + torchvision/csrc/ops/autocast/roi_pool_kernel.cpp | 1 + torchvision/csrc/ops/deform_conv2d.cpp | 2 ++ torchvision/csrc/ops/interpolate_aa.cpp | 2 ++ torchvision/csrc/ops/nms.cpp | 2 ++ torchvision/csrc/ops/ps_roi_align.cpp | 2 ++ torchvision/csrc/ops/ps_roi_pool.cpp | 2 ++ torchvision/csrc/ops/roi_align.cpp | 2 ++ torchvision/csrc/ops/roi_pool.cpp | 2 ++ 14 files changed, 21 insertions(+) diff --git a/torchvision/csrc/io/image/image.cpp b/torchvision/csrc/io/image/image.cpp index 37d64013cb2..cd08649433e 100644 --- a/torchvision/csrc/io/image/image.cpp +++ b/torchvision/csrc/io/image/image.cpp @@ -1,6 +1,7 @@ #include "image.h" #include +#include // If we are in a Windows environment, we need to define // initialization functions for the _custom_ops extension diff --git a/torchvision/csrc/ops/autocast/deform_conv2d_kernel.cpp b/torchvision/csrc/ops/autocast/deform_conv2d_kernel.cpp index 28c325be9b1..4f082fa0006 100644 --- a/torchvision/csrc/ops/autocast/deform_conv2d_kernel.cpp +++ b/torchvision/csrc/ops/autocast/deform_conv2d_kernel.cpp @@ -1,6 +1,7 @@ #include "../deform_conv2d.h" #include +#include #include namespace vision { diff --git a/torchvision/csrc/ops/autocast/nms_kernel.cpp b/torchvision/csrc/ops/autocast/nms_kernel.cpp index 3a0ead004fd..96c9ad041de 100644 --- a/torchvision/csrc/ops/autocast/nms_kernel.cpp +++ b/torchvision/csrc/ops/autocast/nms_kernel.cpp @@ -1,6 +1,7 @@ #include "../nms.h" #include +#include #include namespace vision { diff --git a/torchvision/csrc/ops/autocast/ps_roi_align_kernel.cpp b/torchvision/csrc/ops/autocast/ps_roi_align_kernel.cpp index c93b26c8ad3..bce987b0f71 100644 --- a/torchvision/csrc/ops/autocast/ps_roi_align_kernel.cpp +++ b/torchvision/csrc/ops/autocast/ps_roi_align_kernel.cpp @@ -1,6 +1,7 @@ #include "../ps_roi_align.h" #include +#include #include namespace vision { diff --git a/torchvision/csrc/ops/autocast/ps_roi_pool_kernel.cpp b/torchvision/csrc/ops/autocast/ps_roi_pool_kernel.cpp index 1421680ea98..3cf1e7f80d7 100644 --- a/torchvision/csrc/ops/autocast/ps_roi_pool_kernel.cpp +++ b/torchvision/csrc/ops/autocast/ps_roi_pool_kernel.cpp @@ -1,6 +1,7 @@ #include "../ps_roi_pool.h" #include +#include #include namespace vision { diff --git a/torchvision/csrc/ops/autocast/roi_align_kernel.cpp b/torchvision/csrc/ops/autocast/roi_align_kernel.cpp index 95457224ac0..78cb2309bbe 100644 --- a/torchvision/csrc/ops/autocast/roi_align_kernel.cpp +++ b/torchvision/csrc/ops/autocast/roi_align_kernel.cpp @@ -1,6 +1,7 @@ #include "../roi_align.h" #include +#include #include namespace vision { diff --git a/torchvision/csrc/ops/autocast/roi_pool_kernel.cpp b/torchvision/csrc/ops/autocast/roi_pool_kernel.cpp index d317c38c792..3aaa038a9b4 100644 --- a/torchvision/csrc/ops/autocast/roi_pool_kernel.cpp +++ b/torchvision/csrc/ops/autocast/roi_pool_kernel.cpp @@ -1,6 +1,7 @@ #include "../roi_pool.h" #include +#include #include namespace vision { diff --git a/torchvision/csrc/ops/deform_conv2d.cpp b/torchvision/csrc/ops/deform_conv2d.cpp index 895b121bd0f..d8f2c9b6ff4 100644 --- a/torchvision/csrc/ops/deform_conv2d.cpp +++ b/torchvision/csrc/ops/deform_conv2d.cpp @@ -1,5 +1,7 @@ #include "deform_conv2d.h" +#include +#include #include namespace vision { diff --git a/torchvision/csrc/ops/interpolate_aa.cpp b/torchvision/csrc/ops/interpolate_aa.cpp index 7f1680246a0..6594f78d731 100644 --- a/torchvision/csrc/ops/interpolate_aa.cpp +++ b/torchvision/csrc/ops/interpolate_aa.cpp @@ -1,5 +1,7 @@ #include "interpolate_aa.h" +#include +#include #include namespace vision { diff --git a/torchvision/csrc/ops/nms.cpp b/torchvision/csrc/ops/nms.cpp index 6604f10b5f2..07a934bce5a 100644 --- a/torchvision/csrc/ops/nms.cpp +++ b/torchvision/csrc/ops/nms.cpp @@ -1,5 +1,7 @@ #include "nms.h" +#include +#include #include namespace vision { diff --git a/torchvision/csrc/ops/ps_roi_align.cpp b/torchvision/csrc/ops/ps_roi_align.cpp index 5725eb04929..6d091b3c695 100644 --- a/torchvision/csrc/ops/ps_roi_align.cpp +++ b/torchvision/csrc/ops/ps_roi_align.cpp @@ -1,5 +1,7 @@ #include "ps_roi_align.h" +#include +#include #include namespace vision { diff --git a/torchvision/csrc/ops/ps_roi_pool.cpp b/torchvision/csrc/ops/ps_roi_pool.cpp index c62a0a65dfe..c9f64661033 100644 --- a/torchvision/csrc/ops/ps_roi_pool.cpp +++ b/torchvision/csrc/ops/ps_roi_pool.cpp @@ -1,5 +1,7 @@ #include "ps_roi_pool.h" +#include +#include #include namespace vision { diff --git a/torchvision/csrc/ops/roi_align.cpp b/torchvision/csrc/ops/roi_align.cpp index 82b87b925f3..e2465d6261e 100644 --- a/torchvision/csrc/ops/roi_align.cpp +++ b/torchvision/csrc/ops/roi_align.cpp @@ -1,5 +1,7 @@ #include "roi_align.h" +#include +#include #include namespace vision { diff --git a/torchvision/csrc/ops/roi_pool.cpp b/torchvision/csrc/ops/roi_pool.cpp index 0509f82d0c3..53969e247ee 100644 --- a/torchvision/csrc/ops/roi_pool.cpp +++ b/torchvision/csrc/ops/roi_pool.cpp @@ -1,5 +1,7 @@ #include "roi_pool.h" +#include +#include #include namespace vision { From a2834adc8bb2acf0325d8f5d06af5da973984fa6 Mon Sep 17 00:00:00 2001 From: Peter Bell Date: Wed, 22 Dec 2021 14:32:21 +0000 Subject: [PATCH 2/2] Import op_registration directly --- torchvision/csrc/io/image/image.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/torchvision/csrc/io/image/image.cpp b/torchvision/csrc/io/image/image.cpp index cd08649433e..13a73829e86 100644 --- a/torchvision/csrc/io/image/image.cpp +++ b/torchvision/csrc/io/image/image.cpp @@ -1,7 +1,7 @@ #include "image.h" +#include #include -#include // If we are in a Windows environment, we need to define // initialization functions for the _custom_ops extension