Reduce unnecessary header inclusions in models and io.

Author: datumbox

examples/cpp/hello_world/main.cpp

@@ -1,4 +1,6 @@
 #include <iostream>
+#include <torch/torch.h>
+#include <torchvision/vision.h>
 #include <torchvision/models/resnet.h>
 
 int main()

test/tracing/frcnn/test_frcnn_tracing.cpp

@@ -1,6 +1,6 @@
-#include <ATen/ATen.h>
 #include <torch/script.h>
 #include <torch/torch.h>
+#include <torchvision/vision.h>
 #include <torchvision/ops/nms.h>
 
 #ifdef _WIN32

torchvision/csrc/io/image/cpu/read_image_cpu.cpp

@@ -1,4 +1,5 @@
 #include "read_image_cpu.h"
+
 #include "readjpeg_cpu.h"
 #include "readpng_cpu.h"
 

torchvision/csrc/io/image/cpu/read_image_cpu.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include <torch/torch.h>
+#include <torch/types.h>
 #include "../image_read_mode.h"
 
 C10_EXPORT torch::Tensor decode_image(

torchvision/csrc/io/image/cpu/read_write_file_cpu.h

@@ -1,8 +1,7 @@
 #pragma once
 
-#include <errno.h>
 #include <sys/stat.h>
-#include <torch/torch.h>
+#include <torch/types.h>
 
 C10_EXPORT torch::Tensor read_file(const std::string& filename);
 

torchvision/csrc/io/image/cpu/readjpeg_cpu.cpp

@@ -1,16 +1,12 @@
 #include "readjpeg_cpu.h"
 
-#include <ATen/ATen.h>
-
 #if !JPEG_FOUND
 torch::Tensor decodeJPEG(const torch::Tensor& data, ImageReadMode mode) {
   TORCH_CHECK(
       false, "decodeJPEG: torchvision not compiled with libjpeg support");
 }
 #else
-#include <jpeglib.h>
-#include <setjmp.h>
-#include "jpegcommon.h"
+#include "../jpegcommon.h"
 
 struct torch_jpeg_mgr {
   struct jpeg_source_mgr pub;

torchvision/csrc/io/image/cpu/readjpeg_cpu.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include <torch/torch.h>
+#include <torch/types.h>
 #include "../image_read_mode.h"
 
 C10_EXPORT torch::Tensor decodeJPEG(

torchvision/csrc/io/image/cpu/readpng_cpu.cpp

@@ -1,7 +1,5 @@
 #include "readpng_cpu.h"
 
-#include <ATen/ATen.h>
-
 #if !PNG_FOUND
 torch::Tensor decodePNG(const torch::Tensor& data, ImageReadMode mode) {
   TORCH_CHECK(false, "decodePNG: torchvision not compiled with libPNG support");

torchvision/csrc/io/image/cpu/readpng_cpu.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include <torch/torch.h>
+#include <torch/types.h>
 #include "../image_read_mode.h"
 
 C10_EXPORT torch::Tensor decodePNG(

torchvision/csrc/io/image/cpu/writejpeg_cpu.cpp

@@ -1,8 +1,5 @@
 #include "writejpeg_cpu.h"
 
-#include <setjmp.h>
-#include <string>
-
 #if !JPEG_FOUND
 
 torch::Tensor encodeJPEG(const torch::Tensor& data, int64_t quality) {
@@ -11,9 +8,7 @@ torch::Tensor encodeJPEG(const torch::Tensor& data, int64_t quality) {
 }
 
 #else
-
-#include <jpeglib.h>
-#include "jpegcommon.h"
+#include "../jpegcommon.h"
 
 torch::Tensor encodeJPEG(const torch::Tensor& data, int64_t quality) {
   // Define compression structures and error handling

torchvision/csrc/io/image/cpu/writejpeg_cpu.h

@@ -1,5 +1,5 @@
 #pragma once
 
-#include <torch/torch.h>
+#include <torch/types.h>
 
 C10_EXPORT torch::Tensor encodeJPEG(const torch::Tensor& data, int64_t quality);

torchvision/csrc/io/image/cpu/writepng_cpu.cpp

@@ -1,17 +1,14 @@
 #include "writejpeg_cpu.h"
 
-#include <setjmp.h>
-#include <string>
-
 #if !PNG_FOUND
 
 torch::Tensor encodePNG(const torch::Tensor& data, int64_t compression_level) {
   TORCH_CHECK(false, "encodePNG: torchvision not compiled with libpng support");
 }
 
 #else
-
 #include <png.h>
+#include <setjmp.h>
 
 struct torch_mem_encode {
   char* buffer;

torchvision/csrc/io/image/cpu/writepng_cpu.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include <torch/torch.h>
+#include <torch/types.h>
 
 C10_EXPORT torch::Tensor encodePNG(
     const torch::Tensor& data,

torchvision/csrc/io/image/image.cpp

@@ -1,6 +1,5 @@
-
 #include "image.h"
-#include <ATen/ATen.h>
+
 #include <Python.h>
 
 // If we are in a Windows environment, we need to define

torchvision/csrc/io/image/image.h

@@ -1,8 +1,5 @@
 #pragma once
 
-// Comment
-#include <torch/script.h>
-#include <torch/torch.h>
 #include "cpu/read_image_cpu.h"
 #include "cpu/read_write_file_cpu.h"
 #include "cpu/readjpeg_cpu.h"

torchvision/csrc/io/image/jpegcommon.cpp

@@ -1,7 +1,6 @@
+#if JPEG_FOUND
 #include "jpegcommon.h"
-#include <string>
 
-#if JPEG_FOUND
 void torch_jpeg_error_exit(j_common_ptr cinfo) {
   /* cinfo->err really points to a torch_jpeg_error_mgr struct, so coerce
    * pointer */

torchvision/csrc/io/image/jpegcommon.h

@@ -8,7 +8,6 @@
 #if JPEG_FOUND
 #include <jpeglib.h>
 #include <setjmp.h>
-#include <string>
 
 static const JOCTET EOI_BUFFER[1] = {JPEG_EOI};
 struct torch_jpeg_error_mgr {

torchvision/csrc/models/alexnet.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include <torch/torch.h>
+#include <torch/nn.h>
 #include "../macros.h"
 
 namespace vision {

torchvision/csrc/models/densenet.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include <torch/torch.h>
+#include <torch/nn.h>
 #include "../macros.h"
 
 namespace vision {

torchvision/csrc/models/googlenet.cpp

@@ -1,7 +1,5 @@
 #include "googlenet.h"
 
-#include "modelsimpl.h"
-
 namespace vision {
 namespace models {
 

torchvision/csrc/models/googlenet.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include <torch/torch.h>
+#include <torch/nn.h>
 #include "../macros.h"
 
 namespace vision {

torchvision/csrc/models/inception.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include <torch/torch.h>
+#include <torch/nn.h>
 #include "../macros.h"
 
 namespace vision {

torchvision/csrc/models/mnasnet.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include <torch/torch.h>
+#include <torch/nn.h>
 #include "../macros.h"
 
 namespace vision {

torchvision/csrc/models/mobilenet.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include <torch/torch.h>
+#include <torch/nn.h>
 #include "../macros.h"
 
 namespace vision {

torchvision/csrc/models/modelsimpl.h

@@ -1,10 +1,6 @@
 #pragma once
 
-#include <torch/torch.h>
-
-#ifndef TORCH_CHECK
-#define TORCH_CHECK AT_CHECK
-#endif
+#include <torch/nn.h>
 
 namespace vision {
 namespace models {

torchvision/csrc/models/resnet.cpp

@@ -1,7 +1,5 @@
 #include "resnet.h"
 
-#include "modelsimpl.h"
-
 namespace vision {
 namespace models {
 namespace _resnetimpl {

torchvision/csrc/models/resnet.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include <torch/torch.h>
+#include <torch/nn.h>
 #include "../macros.h"
 
 namespace vision {

torchvision/csrc/models/shufflenetv2.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include <torch/torch.h>
+#include <torch/nn.h>
 #include "../macros.h"
 
 namespace vision {

torchvision/csrc/models/squeezenet.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include <torch/torch.h>
+#include <torch/nn.h>
 #include "../macros.h"
 
 namespace vision {

torchvision/csrc/models/vgg.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include <torch/torch.h>
+#include <torch/nn.h>
 #include "../macros.h"
 
 namespace vision {