Modify directory external and build_scripts name (#225)

modify directory name

CMakeLists.txt

@@ -29,7 +29,7 @@ if(NOT PY_LIBRARY_NAME)
 endif()
 include(ExternalProject)
 add_subdirectory(${CSRCS_DIR_NAME}/fastdeploy)
-include(external/utils.cmake)
+include(${PROJECT_SOURCE_DIR}/cmake/utils.cmake)
 
 # Set C++11 as standard for the whole project
 if(NOT MSVC)
@@ -132,25 +132,25 @@ string(STRIP "${FASTDEPLOY_VERSION}" FASTDEPLOY_VERSION)
 
 set(THIRD_PARTY_PATH ${CMAKE_CURRENT_BINARY_DIR}/third_libs)
 
-include(external/eigen.cmake)
+include(${PROJECT_SOURCE_DIR}/cmake/eigen.cmake)
 
 if(ENABLE_PADDLE_FRONTEND)
   add_definitions(-DENABLE_PADDLE_FRONTEND)
-  include(${PROJECT_SOURCE_DIR}/external/paddle2onnx.cmake)
+  include(${PROJECT_SOURCE_DIR}/cmake/paddle2onnx.cmake)
   list(APPEND DEPEND_LIBS external_paddle2onnx)
 endif(ENABLE_PADDLE_FRONTEND)
 
 if(ENABLE_ORT_BACKEND)
   add_definitions(-DENABLE_ORT_BACKEND)
   list(APPEND ALL_DEPLOY_SRCS ${DEPLOY_ORT_SRCS})
-  include(external/onnxruntime.cmake)
+  include(${PROJECT_SOURCE_DIR}/cmake/onnxruntime.cmake)
   list(APPEND DEPEND_LIBS external_onnxruntime)
 endif()
 
 if(ENABLE_PADDLE_BACKEND)
   add_definitions(-DENABLE_PADDLE_BACKEND)
   list(APPEND ALL_DEPLOY_SRCS ${DEPLOY_PADDLE_SRCS})
-  include(external/paddle_inference.cmake)
+  include(${PROJECT_SOURCE_DIR}/cmake/paddle_inference.cmake)
   if(NOT APPLE)
     list(APPEND DEPEND_LIBS external_paddle_inference external_dnnl external_omp)
   else()
@@ -163,7 +163,7 @@ endif()
 if(ENABLE_OPENVINO_BACKEND)
   add_definitions(-DENABLE_OPENVINO_BACKEND)
   list(APPEND ALL_DEPLOY_SRCS ${DEPLOY_OPENVINO_SRCS})
-  include(external/openvino.cmake)
+  include(${PROJECT_SOURCE_DIR}/cmake/openvino.cmake)
   list(APPEND DEPEND_LIBS external_openvino)
 endif()
 
@@ -210,7 +210,7 @@ if(ENABLE_TRT_BACKEND)
   endif()
   find_package(Python COMPONENTS Interpreter Development REQUIRED)
   message(STATUS "Copying ${TRT_DIRECTORY}/lib to ${CMAKE_CURRENT_BINARY_DIR}/third_libs/install/tensorrt/lib ...")
-  execute_process(COMMAND ${Python_EXECUTABLE} ${PROJECT_SOURCE_DIR}/build_scripts/copy_directory.py ${TRT_DIRECTORY}/lib ${CMAKE_CURRENT_BINARY_DIR}/third_libs/install/tensorrt/lib)
+  execute_process(COMMAND ${Python_EXECUTABLE} ${PROJECT_SOURCE_DIR}/scripts/copy_directory.py ${TRT_DIRECTORY}/lib ${CMAKE_CURRENT_BINARY_DIR}/third_libs/install/tensorrt/lib)
   if(UNIX)
     execute_process(COMMAND sh -c "ls *.so*" WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/third_libs/install/tensorrt/lib
   	          COMMAND sh -c "xargs patchelf --set-rpath '$ORIGIN'" WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/third_libs/install/tensorrt/lib
@@ -234,7 +234,7 @@ if(ENABLE_VISION)
   list(APPEND DEPEND_LIBS yaml-cpp)
   list(APPEND ALL_DEPLOY_SRCS ${DEPLOY_VISION_SRCS})
   include_directories(${PROJECT_SOURCE_DIR}/third_party/yaml-cpp/include)
-  include(external/opencv.cmake)
+  include(${PROJECT_SOURCE_DIR}/cmake/opencv.cmake)
   list(APPEND DEPEND_LIBS ${OpenCV_LIBS})
 
   if(ENABLE_VISION_VISUALIZE)
@@ -250,7 +250,7 @@ endif()
 if(ENABLE_TEXT)
   add_definitions(-DENABLE_TEXT)
   list(APPEND ALL_DEPLOY_SRCS ${DEPLOY_TEXT_SRCS})
-  include(external/faster_tokenizer.cmake)
+  include(${PROJECT_SOURCE_DIR}/cmake/faster_tokenizer.cmake)
 endif()
 
 configure_file(${PROJECT_SOURCE_DIR}/FastDeploy.cmake.in ${PROJECT_SOURCE_DIR}/FastDeploy.cmake @ONLY)
@@ -306,13 +306,13 @@ endif()
 
 if (WITH_TESTING AND EXISTS ${PROJECT_SOURCE_DIR}/tests)
   add_definitions(-DWITH_TESTING)
-  include(external/gtest.cmake)
-  include(external/gflags.cmake)
-  include(external/glog.cmake)
+  include(${PROJECT_SOURCE_DIR}/cmake/gtest.cmake)
+  include(${PROJECT_SOURCE_DIR}/cmake/gflags.cmake)
+  include(${PROJECT_SOURCE_DIR}/cmake/glog.cmake)
   add_subdirectory(tests)
 endif()
 
-include(external/summary.cmake)
+include(${PROJECT_SOURCE_DIR}/cmake/summary.cmake)
 fastdeploy_summary()
 if(WIN32)
   install(

cmake/openvino.cmake

@@ -124,7 +124,7 @@ else()
 endif()
 
 if(UNIX)
-  add_custom_target(patchelf_openvino ALL COMMAND bash -c "sh ${PROJECT_SOURCE_DIR}/build_scripts/patch_lib.sh ${OPENVINO_INSTALL_DIR}/lib" DEPENDS ${LIBRARY_NAME})
+  add_custom_target(patchelf_openvino ALL COMMAND bash -c "sh ${PROJECT_SOURCE_DIR}/scripts/patch_lib.sh ${OPENVINO_INSTALL_DIR}/lib" DEPENDS ${LIBRARY_NAME})
 endif()
 
 add_library(external_openvino STATIC IMPORTED GLOBAL)

python/setup.py

@@ -70,7 +70,7 @@ if os.getenv("CMAKE_CXX_COMPILER", None) is not None:
     setup_configs["CMAKE_CXX_COMPILER"] = os.getenv("CMAKE_CXX_COMPILER")
 
 SRC_DIR = os.path.join(TOP_DIR, PACKAGE_NAME)
-CMAKE_BUILD_DIR = os.path.join(TOP_DIR, '.setuptools-cmake-build')
+CMAKE_BUILD_DIR = os.path.join(TOP_DIR, 'python', '.setuptools-cmake-build')
 
 WINDOWS = (os.name == 'nt')
 
@@ -328,9 +328,9 @@ ext_modules = [
 # no need to do fancy stuff so far
 if PACKAGE_NAME != "fastdeploy":
     packages = setuptools.find_packages(
-        exclude=['fastdeploy*', 'build_scripts'])
+        exclude=['fastdeploy*', 'scripts'])
 else:
-    packages = setuptools.find_packages(exclude=['build_scripts'])
+    packages = setuptools.find_packages(exclude=['scripts'])
 
 ################################################################################
 # Test
@@ -359,7 +359,7 @@ if sys.argv[1] == "install" or sys.argv[1] == "bdist_wheel":
         )
         sys.exit(0)
     sys.path.append(TOP_DIR)
-    from build_scripts.process_libraries import process_libraries
+    from scripts.process_libraries import process_libraries
     all_lib_data = process_libraries(
         os.path.split(os.path.abspath(__file__))[0])
     package_data[PACKAGE_NAME].extend(all_lib_data)