From 493e00869afd3935b78da3573cd9474d51d3d174 Mon Sep 17 00:00:00 2001 From: ShahriarSS Date: Tue, 25 Jun 2019 23:50:17 +0430 Subject: [PATCH] Renamed vision.h files to vision_cpu.h and vision_cuda.h --- torchvision/csrc/ROIAlign.h | 4 ++-- torchvision/csrc/ROIPool.h | 4 ++-- torchvision/csrc/cpu/ROIAlign_cpu.cpp | 2 +- torchvision/csrc/cpu/nms_cpu.cpp | 2 +- torchvision/csrc/cpu/{vision.h => vision_cpu.h} | 0 torchvision/csrc/cuda/{vision.h => vision_cuda.h} | 0 torchvision/csrc/nms.h | 4 ++-- 7 files changed, 8 insertions(+), 8 deletions(-) rename torchvision/csrc/cpu/{vision.h => vision_cpu.h} (100%) rename torchvision/csrc/cuda/{vision.h => vision_cuda.h} (100%) diff --git a/torchvision/csrc/ROIAlign.h b/torchvision/csrc/ROIAlign.h index 5abc9120372..2e914ac0092 100644 --- a/torchvision/csrc/ROIAlign.h +++ b/torchvision/csrc/ROIAlign.h @@ -1,9 +1,9 @@ #pragma once -#include "cpu/vision.h" +#include "cpu/vision_cpu.h" #ifdef WITH_CUDA -#include "cuda/vision.h" +#include "cuda/vision_cuda.h" #endif // Interface for Python diff --git a/torchvision/csrc/ROIPool.h b/torchvision/csrc/ROIPool.h index 23c91391986..8885be4739f 100644 --- a/torchvision/csrc/ROIPool.h +++ b/torchvision/csrc/ROIPool.h @@ -1,9 +1,9 @@ #pragma once -#include "cpu/vision.h" +#include "cpu/vision_cpu.h" #ifdef WITH_CUDA -#include "cuda/vision.h" +#include "cuda/vision_cuda.h" #endif std::tuple ROIPool_forward( diff --git a/torchvision/csrc/cpu/ROIAlign_cpu.cpp b/torchvision/csrc/cpu/ROIAlign_cpu.cpp index 8d7841a7861..92b67704e56 100644 --- a/torchvision/csrc/cpu/ROIAlign_cpu.cpp +++ b/torchvision/csrc/cpu/ROIAlign_cpu.cpp @@ -1,5 +1,5 @@ #include -#include "cpu/vision.h" +#include "cpu/vision_cpu.h" // implementation taken from Caffe2 template diff --git a/torchvision/csrc/cpu/nms_cpu.cpp b/torchvision/csrc/cpu/nms_cpu.cpp index 5f6d2c3b1fd..5d5567291d9 100644 --- a/torchvision/csrc/cpu/nms_cpu.cpp +++ b/torchvision/csrc/cpu/nms_cpu.cpp @@ -1,4 +1,4 @@ -#include "cpu/vision.h" +#include "cpu/vision_cpu.h" template at::Tensor nms_cpu_kernel( diff --git a/torchvision/csrc/cpu/vision.h b/torchvision/csrc/cpu/vision_cpu.h similarity index 100% rename from torchvision/csrc/cpu/vision.h rename to torchvision/csrc/cpu/vision_cpu.h diff --git a/torchvision/csrc/cuda/vision.h b/torchvision/csrc/cuda/vision_cuda.h similarity index 100% rename from torchvision/csrc/cuda/vision.h rename to torchvision/csrc/cuda/vision_cuda.h diff --git a/torchvision/csrc/nms.h b/torchvision/csrc/nms.h index 48d8e5d32a6..2bae4e98603 100644 --- a/torchvision/csrc/nms.h +++ b/torchvision/csrc/nms.h @@ -1,8 +1,8 @@ #pragma once -#include "cpu/vision.h" +#include "cpu/vision_cpu.h" #ifdef WITH_CUDA -#include "cuda/vision.h" +#include "cuda/vision_cpu.h" #endif at::Tensor nms(