Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Renamed vision.h files to vision_cpu.h and vision_cuda.h #1051

Merged
merged 1 commit into from
Jun 25, 2019
Merged

Renamed vision.h files to vision_cpu.h and vision_cuda.h #1051

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions torchvision/csrc/ROIAlign.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
4 changes: 2 additions & 2 deletions torchvision/csrc/ROIPool.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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<at::Tensor, at::Tensor> ROIPool_forward(
Expand Down
2 changes: 1 addition & 1 deletion torchvision/csrc/cpu/ROIAlign_cpu.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#include <ATen/TensorUtils.h>
#include "cpu/vision.h"
#include "cpu/vision_cpu.h"

// implementation taken from Caffe2
template <typename T>
Expand Down
2 changes: 1 addition & 1 deletion torchvision/csrc/cpu/nms_cpu.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "cpu/vision.h"
#include "cpu/vision_cpu.h"

template <typename scalar_t>
at::Tensor nms_cpu_kernel(
Expand Down
0 torchvision/csrc/cpu/vision.h → torchvision/csrc/cpu/vision_cpu.h
View file
Open in desktop
File renamed without changes.
0 torchvision/csrc/cuda/vision.h → torchvision/csrc/cuda/vision_cuda.h
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions torchvision/csrc/nms.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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(
Expand Down