Further cleaning up headers and cpp files:

datumbox · datumbox · commit ea64eabfa320 · 2020-12-02T15:02:24.000Z
- Replace general.h with macros.h
- Add header in vision.cpp
- Remove models.h from vision.h
diff --git a/torchvision/csrc/models/alexnet.h b/torchvision/csrc/models/alexnet.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <torch/torch.h>
-#include "general.h"
+#include "../macros.h"
 
 namespace vision {
 namespace models {
diff --git a/torchvision/csrc/models/densenet.h b/torchvision/csrc/models/densenet.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <torch/torch.h>
-#include "general.h"
+#include "../macros.h"
 
 namespace vision {
 namespace models {
diff --git a/torchvision/csrc/models/general.h b/torchvision/csrc/models/general.h
diff --git a/torchvision/csrc/models/googlenet.h b/torchvision/csrc/models/googlenet.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <torch/torch.h>
-#include "general.h"
+#include "../macros.h"
 
 namespace vision {
 namespace models {
diff --git a/torchvision/csrc/models/inception.h b/torchvision/csrc/models/inception.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <torch/torch.h>
-#include "general.h"
+#include "../macros.h"
 
 namespace vision {
 namespace models {
diff --git a/torchvision/csrc/models/mnasnet.h b/torchvision/csrc/models/mnasnet.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <torch/torch.h>
-#include "general.h"
+#include "../macros.h"
 
 namespace vision {
 namespace models {
diff --git a/torchvision/csrc/models/mobilenet.h b/torchvision/csrc/models/mobilenet.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <torch/torch.h>
-#include "general.h"
+#include "../macros.h"
 
 namespace vision {
 namespace models {
diff --git a/torchvision/csrc/models/resnet.h b/torchvision/csrc/models/resnet.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <torch/torch.h>
-#include "general.h"
+#include "../macros.h"
 
 namespace vision {
 namespace models {
diff --git a/torchvision/csrc/models/shufflenetv2.h b/torchvision/csrc/models/shufflenetv2.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <torch/torch.h>
-#include "general.h"
+#include "../macros.h"
 
 namespace vision {
 namespace models {
diff --git a/torchvision/csrc/models/squeezenet.h b/torchvision/csrc/models/squeezenet.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <torch/torch.h>
-#include "general.h"
+#include "../macros.h"
 
 namespace vision {
 namespace models {
diff --git a/torchvision/csrc/models/vgg.h b/torchvision/csrc/models/vgg.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <torch/torch.h>
-#include "general.h"
+#include "../macros.h"
 
 namespace vision {
 namespace models {
diff --git a/torchvision/csrc/vision.cpp b/torchvision/csrc/vision.cpp
@@ -1,3 +1,5 @@
+#include "vision.h"
+
 #include <Python.h>
 #include <torch/script.h>
 
diff --git a/torchvision/csrc/vision.h b/torchvision/csrc/vision.h
@@ -1,6 +1,5 @@
 #pragma once
 
-#include <torchvision/models/models.h>
 #include <cstdint>
 #include "macros.h"
 

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+#include "vision.h"`
	`2`	`+`
`1`	`3`	`#include <Python.h>`
`2`	`4`	`#include <torch/script.h>`
`3`	`5`