Enable autocast for NMS and ROIAlign on ROCm (#2637)

* add autocasting on ROCm

* enable ROIAlign autocasting on ROCm

* enable NMS autocasting on ROCm

* fix to use correct torch CUDA APIs

Author: ashishfarmer

torchvision/csrc/ROIAlign.h

@@ -7,6 +7,7 @@
 #include "cuda/vision_cuda.h"
 #endif
 #ifdef WITH_HIP
+#include "autocast.h"
 #include "hip/vision_cuda.h"
 #endif
 
@@ -37,7 +38,7 @@ at::Tensor roi_align(
       aligned);
 }
 
-#ifdef WITH_CUDA
+#if defined(WITH_CUDA) || defined(WITH_HIP)
 at::Tensor ROIAlign_autocast(
     const at::Tensor& input,
     const at::Tensor& rois,

torchvision/csrc/autocast.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#ifdef WITH_CUDA
+#if defined(WITH_CUDA) || defined(WITH_HIP)
 namespace autocast {
 
 inline bool is_eligible(const at::Tensor& arg) {

torchvision/csrc/cuda/nms_cuda.cu

@@ -1,11 +1,6 @@
 #include <ATen/ATen.h>
 #include <ATen/cuda/CUDAContext.h>
-
-#if defined(WITH_CUDA)
 #include <c10/cuda/CUDAGuard.h>
-#elif defined(WITH_HIP)
-#include <c10/hip/HIPGuard.h>
-#endif
 
 #include "cuda_helpers.h"
 
@@ -98,10 +93,8 @@ at::Tensor nms_cuda(const at::Tensor& dets,
       " and ",
       scores.size(0))
 
-#if defined(WITH_CUDA)
+#if defined(WITH_CUDA) || defined(WITH_HIP)
   at::cuda::CUDAGuard device_guard(dets.device());
-#elif defined(WITH_HIP)
-  at::cuda::HIPGuard device_guard(dets.device());
 #else
   AT_ERROR("Not compiled with GPU support");
 #endif

torchvision/csrc/nms.h

@@ -6,6 +6,7 @@
 #include "cuda/vision_cuda.h"
 #endif
 #ifdef WITH_HIP
+#include "autocast.h"
 #include "hip/vision_cuda.h"
 #endif
 
@@ -20,7 +21,7 @@ at::Tensor nms(
   return op.call(dets, scores, iou_threshold);
 }
 
-#ifdef WITH_CUDA
+#if defined(WITH_CUDA) || defined(WITH_HIP)
 at::Tensor nms_autocast(
     const at::Tensor& dets,
     const at::Tensor& scores,

torchvision/csrc/vision.cpp

@@ -72,7 +72,7 @@ TORCH_LIBRARY_IMPL(torchvision, CUDA, m) {
 #endif
 
 // Autocast only needs to wrap forward pass ops.
-#if defined(WITH_CUDA)
+#if defined(WITH_CUDA) || defined(WITH_HIP)
 TORCH_LIBRARY_IMPL(torchvision, Autocast, m) {
   m.impl("roi_align", ROIAlign_autocast);
   m.impl("nms", nms_autocast);