diff --git a/torchvision/csrc/cpu/video/Video.cpp b/torchvision/csrc/cpu/video/Video.cpp index c80d8798768..9a995c23e6c 100644 --- a/torchvision/csrc/cpu/video/Video.cpp +++ b/torchvision/csrc/cpu/video/Video.cpp @@ -1,4 +1,3 @@ - #include "Video.h" #include #include @@ -9,22 +8,6 @@ using namespace std; using namespace ffmpeg; -// If we are in a Windows environment, we need to define -// initialization functions for the _custom_ops extension -// #ifdef _WIN32 -// #if PY_MAJOR_VERSION < 3 -// PyMODINIT_FUNC init_video_reader(void) { -// // No need to do anything. -// return NULL; -// } -// #else -// PyMODINIT_FUNC PyInit_video_reader(void) { -// // No need to do anything. -// return NULL; -// } -// #endif -// #endif - const size_t decoderTimeoutMs = 600000; const AVPixelFormat defaultVideoPixelFormat = AV_PIX_FMT_RGB24; const AVSampleFormat defaultAudioSampleFormat = AV_SAMPLE_FMT_FLT; diff --git a/torchvision/csrc/cpu/video/Video.h b/torchvision/csrc/cpu/video/Video.h index 8060adfcfce..f7d47c0454c 100644 --- a/torchvision/csrc/cpu/video/Video.h +++ b/torchvision/csrc/cpu/video/Video.h @@ -6,7 +6,6 @@ #include #include -#include #include #include diff --git a/torchvision/csrc/cpu/video_reader/VideoReader.cpp b/torchvision/csrc/cpu/video_reader/VideoReader.cpp index e50dc554956..7e0f62df1cb 100644 --- a/torchvision/csrc/cpu/video_reader/VideoReader.cpp +++ b/torchvision/csrc/cpu/video_reader/VideoReader.cpp @@ -12,18 +12,11 @@ using namespace ffmpeg; // If we are in a Windows environment, we need to define // initialization functions for the _custom_ops extension #ifdef _WIN32 -#if PY_MAJOR_VERSION < 3 -PyMODINIT_FUNC init_video_reader(void) { - // No need to do anything. - return NULL; -} -#else PyMODINIT_FUNC PyInit_video_reader(void) { // No need to do anything. return NULL; } #endif -#endif namespace video_reader { diff --git a/torchvision/csrc/empty_tensor_op.h b/torchvision/csrc/empty_tensor_op.h index 64a1c44f600..99448109762 100644 --- a/torchvision/csrc/empty_tensor_op.h +++ b/torchvision/csrc/empty_tensor_op.h @@ -2,8 +2,6 @@ // All pure C++ headers for the C++ frontend. #include -// Python bindings for the C++ frontend (includes Python.h). -#include class NewEmptyTensorOp : public torch::autograd::Function { public: diff --git a/torchvision/csrc/vision.cpp b/torchvision/csrc/vision.cpp index abfd78c5461..44c8346ff7b 100644 --- a/torchvision/csrc/vision.cpp +++ b/torchvision/csrc/vision.cpp @@ -17,22 +17,13 @@ #include "nms.h" // If we are in a Windows environment, we need to define -// initialization functions for the _C extension +// initialization functions for the _custom_ops extension #ifdef _WIN32 -#if PY_MAJOR_VERSION < 3 -PyMODINIT_FUNC init_C(void) { - // No need to do anything. - // extension.py will run on load - return NULL; -} -#else PyMODINIT_FUNC PyInit__C(void) { // No need to do anything. - // extension.py will run on load return NULL; } #endif -#endif namespace vision { int64_t cuda_version() noexcept {