code indent

Signed-off-by: dreamflyforever <[email protected]>
dreamflyforever · Dec 20, 2023 · 980151c · 980151c
1 parent 2fe58d9
commit 980151c
Show file tree

Hide file tree

Showing 16 changed files with 11 additions and 11 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -10,13 +10,13 @@ SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pthread")
 find_package(OpenCV)
 
 include_directories(${OpenCV_INCLUDE_DIRS})
-include_directories(.  /usr/local/include)
+include_directories(inc  /usr/local/include)
 set(CMAKE_CXX_STANDARD 11)
 
 link_libraries(${SDK_INC}/libMNN.dylib)
-add_executable(pmnn file_set_table.cpp pre_process.cpp core.cpp get_file_size.cpp)
-add_executable(smnn inference.cpp)
-add_executable(fmnn file_set_table.cpp pre_process.cpp fork.cpp get_file_size.cpp)
+add_executable(pmnn src/file_set_table.cpp src/pre_process.cpp src/core.cpp src/get_file_size.cpp)
+add_executable(smnn src/inference.cpp)
+add_executable(fmnn src/file_set_table.cpp src/pre_process.cpp src/fork.cpp src/get_file_size.cpp)
 target_link_libraries(pmnn ${OpenCV_LIBS})
 target_link_libraries(smnn ${OpenCV_LIBS})
 target_link_libraries(fmnn ${OpenCV_LIBS})
diff --git a/CMakeLists.txt_pi b/CMakeLists.txt_pi
@@ -10,13 +10,13 @@ SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pthread")
 find_package(OpenCV)
 
 include_directories(${OpenCV_INCLUDE_DIRS})
-include_directories(.  /usr/local/include)
+include_directories(inc  /usr/local/include)
 set(CMAKE_CXX_STANDARD 11)
 
 link_libraries(${SDK_INC}/libMNN.so)
-add_executable(pmnn file_set_table.cpp pre_process.cpp core.cpp get_file_size.cpp)
+add_executable(pmnn src/file_set_table.cpp src/pre_process.cpp src/core.cpp src/get_file_size.cpp)
 add_executable(smnn inference.cpp)
-add_executable(fmnn file_set_table.cpp pre_process.cpp fork.cpp get_file_size.cpp)
+add_executable(fmnn src/file_set_table.cpp src/pre_process.cpp src/fork.cpp src/get_file_size.cpp)
 target_link_libraries(pmnn ${OpenCV_LIBS})
 target_link_libraries(smnn ${OpenCV_LIBS})
 target_link_libraries(fmnn ${OpenCV_LIBS})
diff --git a/README.md b/README.md
@@ -12,7 +12,7 @@ mkidr build; cd build; cmake ..; make ; sudo make install
 modify CMakeFileList.txt lib position
 
 ### performance
-80ms handle 1 picture(pixel 128 * 128) in raspberry4B platform
+80ms handle 1 picture(pixel 96 * 96) in raspberry4B platform
 
 ### license
 MIT by Jim
diff --git a/pre_process.hpp → inc/pre_process.hpp b/pre_process.hpp → inc/pre_process.hpp
diff --git a/libdeos.so → lib/libdeos.so b/libdeos.so → lib/libdeos.so
diff --git a/libenos.so → lib/libenos.so b/libenos.so → lib/libenos.so
diff --git a/libknos.so → lib/libknos.so b/libknos.so → lib/libknos.so
diff --git a/best_pref.mnn → model/best_pref.mnn b/best_pref.mnn → model/best_pref.mnn
diff --git a/s0_589_G15_96pix.mnn → model/s0_589_G15_96pix.mnn b/s0_589_G15_96pix.mnn → model/s0_589_G15_96pix.mnn
diff --git a/core.cpp → src/core.cpp b/core.cpp → src/core.cpp
@@ -133,8 +133,8 @@ int main(int argc, char *argv[])
 	//std::string modelFile = argv[1];
 #if 1
 	/*pi board*/
-	//std::string encryptedModelFile = "../libenos.so";
-	std::string encryptedModelFile = "/lib/arm-linux-gnueabihf/libenos.so";
+	std::string encryptedModelFile = "../libenos.so";
+	//std::string encryptedModelFile = "/lib/arm-linux-gnueabihf/libenos.so";
 	std::string decryptedModelFile = "libdeos.so";
 
 	std::string password = "myPassword123";  // 设置加密和解密的密码
@@ -169,7 +169,7 @@ int main(int argc, char *argv[])
 			//hp_printf("wrong modle\n");
 			memcpy(model_path, argv[1], strlen(argv[1]));
 	}
-	//hp_printf("%s\n", model_path);
+	hp_printf("%s\n", model_path);
 #endif
         g_start = get_ms();
 	pthread_mutex_init(&buf_mtx, NULL);

diff --git a/encode.cpp → src/encode.cpp b/encode.cpp → src/encode.cpp
diff --git a/file_set_table.cpp → src/file_set_table.cpp b/file_set_table.cpp → src/file_set_table.cpp
diff --git a/fork.cpp → src/fork.cpp b/fork.cpp → src/fork.cpp
diff --git a/get_file_size.cpp → src/get_file_size.cpp b/get_file_size.cpp → src/get_file_size.cpp
diff --git a/inference.cpp → src/inference.cpp b/inference.cpp → src/inference.cpp
diff --git a/pre_process.cpp → src/pre_process.cpp b/pre_process.cpp → src/pre_process.cpp