WIP: revert the order of include

fixstars · Sep 4, 2024 · b590153 · b590153
1 parent 352919b
commit b590153
Show file tree

Hide file tree

Showing 24 changed files with 34 additions and 33 deletions.
diff --git a/example/fpga_dnn_compile.cc b/example/fpga_dnn_compile.cc
@@ -2,8 +2,8 @@
 #include <iostream>
 
 #include "ion-bb-core/bb.h"
-#include "ion-bb-dnn/bb.h"
 #include "ion-bb-fpga/bb.h"
+#include "ion-bb-dnn/bb.h"
 #include "ion-bb-image-io/bb.h"
 
 using namespace ion;

diff --git a/example/gender_count.cc b/example/gender_count.cc
@@ -1,5 +1,5 @@
-#include <ion/ion.h>
 #include <iostream>
+#include <ion/ion.h>
 
 using namespace ion;
 

diff --git a/example/u3v.cc b/example/u3v.cc
@@ -1,12 +1,12 @@
-#include <filesystem>
 #include <fstream>
 #include <iostream>
 #include <string>
+#include <filesystem>
 
 // to display
 #include <opencv2/core.hpp>
-#include <opencv2/highgui.hpp>
 #include <opencv2/imgproc.hpp>
+#include <opencv2/highgui.hpp>
 
 // ion
 #include <ion/ion.h>

diff --git a/example/u3v_camera1_opencv/u3v_camera1_opencv.cc b/example/u3v_camera1_opencv/u3v_camera1_opencv.cc
@@ -1,6 +1,6 @@
 #include <opencv2/core.hpp>
-#include <opencv2/highgui.hpp>
 #include <opencv2/imgproc.hpp>
+#include <opencv2/highgui.hpp>
 
 #include <ion/ion.h>
 

diff --git a/example/u3v_camera2_opencv/u3v_camera2_opencv.cc b/example/u3v_camera2_opencv/u3v_camera2_opencv.cc
@@ -1,6 +1,6 @@
 #include <opencv2/core.hpp>
-#include <opencv2/highgui.hpp>
 #include <opencv2/imgproc.hpp>
+#include <opencv2/highgui.hpp>
 
 #include <ion/ion.h>
 

diff --git a/example/u3v_fake.cc b/example/u3v_fake.cc
@@ -1,6 +1,6 @@
 #include <opencv2/core.hpp>
-#include <opencv2/highgui.hpp>
 #include <opencv2/imgproc.hpp>
+#include <opencv2/highgui.hpp>
 
 #include <ion/ion.h>
 

diff --git a/include/ion/builder.h b/include/ion/builder.h
@@ -2,8 +2,8 @@
 #define ION_BUILDER_H
 
 #include <string>
-#include <unordered_map>
 #include <vector>
+#include <unordered_map>
 
 #include <Halide.h>
 

diff --git a/include/ion/c_ion.h b/include/ion/c_ion.h
@@ -1,8 +1,8 @@
 #ifndef ION_C_ION_H
 #define ION_C_ION_H
 
-#include <stdbool.h>
 #include <stdint.h>
+#include <stdbool.h>
 
 #if defined __cplusplus
 extern "C" {

diff --git a/src/bb/dnn/picosha2.h b/src/bb/dnn/picosha2.h
@@ -32,10 +32,10 @@ THE SOFTWARE.
 
 #include <algorithm>
 #include <cassert>
-#include <fstream>
 #include <iterator>
 #include <sstream>
 #include <vector>
+#include <fstream>
 namespace picosha2 {
 typedef unsigned long word_t;
 typedef unsigned char byte_t;

diff --git a/src/bb/dnn/rt_json.h b/src/bb/dnn/rt_json.h
@@ -3,10 +3,10 @@
 
 #include <chrono>
 #include <exception>
-#include <queue>
 #include <sstream>
 #include <thread>
 #include <tuple>
+#include <queue>
 
 #include "json/json.hpp"
 

diff --git a/src/bb/dnn/rt_opencv.h b/src/bb/dnn/rt_opencv.h
@@ -4,9 +4,9 @@
 #include <unordered_map>
 #include <vector>
 
-#include <opencv2/dnn.hpp>
-#include <opencv2/highgui.hpp>
 #include <opencv2/imgproc.hpp>
+#include <opencv2/highgui.hpp>
+#include <opencv2/dnn.hpp>
 
 #include "rt_util.h"
 #include "httplib.h"

diff --git a/src/bb/image-io/gendc_separator/PartHeader.h b/src/bb/image-io/gendc_separator/PartHeader.h
@@ -1,8 +1,8 @@
 #ifndef PARTHEADER_H
 #define PARTHEADER_H
-#include <array>
 #include <iostream>
 #include <vector>
+#include <array>
 
 // for std::setw
 #include <iomanip>

diff --git a/src/bb/image-io/gendc_separator/tools.h b/src/bb/image-io/gendc_separator/tools.h
@@ -1,8 +1,8 @@
 #ifndef TOOLS_H
 #define TOOLS_H
 
-#include <sstream>
 #include <string>
+#include <sstream>
 
 #include "Descriptor.h"
 

diff --git a/src/bb/image-io/rt.h b/src/bb/image-io/rt.h
@@ -27,9 +27,9 @@ class RegisterExtern {
 }  // namespace ion
 #define ION_REGISTER_EXTERN(NAME) static auto ion_register_extern_##NAME = ion::bb::image_io::RegisterExtern(#NAME, NAME);
 
-#include "rt_display.h"
-#include "rt_file.h"
 #include "rt_u3v.h"
+#include "rt_file.h"
+#include "rt_display.h"
 
 #ifdef __linux__
 #include "rt_realsense.h"

diff --git a/src/bb/image-io/rt_file.h b/src/bb/image-io/rt_file.h
@@ -14,8 +14,8 @@
 
 #include "log.h"
 
-#include "httplib.h"
 #include "rt_common.h"
+#include "httplib.h"
 
 #include "opencv_loader.h"
 

diff --git a/src/bb/llm/bb.cc b/src/bb/llm/bb.cc
@@ -1,8 +1,8 @@
-#include <condition_variable>
 #include <fstream>
-#include <mutex>
 #include <queue>
 #include <thread>
+#include <mutex>
+#include <condition_variable>
 
 #include <Halide.h>
 
@@ -16,8 +16,8 @@
 // #include "base64.hpp"
 #include "clip.h"
 #include "common.h"
-#include "llava.h"
 #include "sampling.h"
+#include "llava.h"
 
 namespace ion {
 namespace bb {

diff --git a/src/bb/llm/common.h b/src/bb/llm/common.h
@@ -11,12 +11,12 @@
 #include "log.h"
 
 #include <cmath>
-#include <random>
 #include <string>
+#include <vector>
+#include <random>
 #include <thread>
-#include <tuple>
 #include <unordered_map>
-#include <vector>
+#include <tuple>
 
 #ifdef _WIN32
 #define DIRECTORY_SEPARATOR '\\'

diff --git a/src/bb/llm/grammar-parser.h b/src/bb/llm/grammar-parser.h
@@ -11,10 +11,10 @@
 
 #pragma once
 #include "llama.h"
-#include <cstdint>
+#include <vector>
 #include <map>
+#include <cstdint>
 #include <string>
-#include <vector>
 
 namespace grammar_parser {
 struct parse_state {

diff --git a/src/builder.cc b/src/builder.cc
@@ -6,8 +6,8 @@
 #include "ion/builder.h"
 #include "ion/util.h"
 
-#include "uuid/sole.hpp"
 #include "json/json.hpp"
+#include "uuid/sole.hpp"
 
 #include "dynamic_module.h"
 #include "log.h"

diff --git a/src/c_ion.cc b/src/c_ion.cc
@@ -1,8 +1,9 @@
 #include <exception>
 
-#include <HalideBuffer.h>
-#include <ion/c_ion.h>
 #include <ion/ion.h>
+#include <ion/c_ion.h>
+#include <HalideBuffer.h>
+
 
 #include "log.h"
 

diff --git a/src/log.cc b/src/log.cc
@@ -3,8 +3,8 @@
 #endif
 #include "spdlog/cfg/helpers.h"
 #include "spdlog/details/os.h"
-#include "spdlog/sinks/basic_file_sink.h"
 #include "spdlog/sinks/stdout_color_sinks.h"
+#include "spdlog/sinks/basic_file_sink.h"
 
 #include "log.h"
 

diff --git a/src/metadata.cc b/src/metadata.cc
@@ -3,9 +3,9 @@
 #include "ion/building_block.h"
 #include "ion/port.h"
 
+#include "json/json.hpp"
 #include "metadata.h"
 #include "serializer.h"
-#include "json/json.hpp"
 
 namespace {
 

diff --git a/src/port.cc b/src/port.cc
@@ -1,7 +1,7 @@
 #include "ion/port.h"
 
-#include "log.h"
 #include "uuid/sole.hpp"
+#include "log.h"
 
 namespace ion {
 

diff --git a/src/target.cc b/src/target.cc
@@ -1,7 +1,7 @@
 #include <Halide.h>
 
-#include "ion/target.h"
 #include "ion/type.h"
+#include "ion/target.h"
 
 namespace ion {