修复脚本错误

benjaminwan · Oct 14, 2021 · 7e6473c · 7e6473c
1 parent 01fc274
commit 7e6473c
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 67 deletions.
diff --git a/build-default.sh b/build-default.sh
@@ -14,42 +14,42 @@ fi
 
 mkdir -p ${sysOS}-BIN-CPU
 pushd ${sysOS}-BIN-CPU
-cmake -DCMAKE_INSTALL_PREFIX=install -DCMAKE_BUILD_TYPE=Release -DOCR_OUTPUT="BIN" -DOCR_VULKAN=OFF ..
+cmake -DCMAKE_INSTALL_PREFIX=install -DCMAKE_BUILD_TYPE=Release -DOCR_OUTPUT="BIN" -DOCR_VULKAN="CPU" ..
 cmake --build . --config Release -j $NUM_THREADS
 cmake --build . --config Release --target install
 popd
 
 mkdir -p ${sysOS}-BIN-GPU
 pushd ${sysOS}-BIN-GPU
-cmake -DCMAKE_INSTALL_PREFIX=install -DCMAKE_BUILD_TYPE=Release -DOCR_OUTPUT="BIN" -DOCR_VULKAN=ON ..
+cmake -DCMAKE_INSTALL_PREFIX=install -DCMAKE_BUILD_TYPE=Release -DOCR_OUTPUT="BIN" -DOCR_VULKAN="GPU" ..
 cmake --build . --config Release -j $NUM_THREADS
 cmake --build . --config Release --target install
 popd
 
 mkdir -p ${sysOS}-JNI-CPU
 pushd ${sysOS}-JNI-CPU
-cmake -DCMAKE_INSTALL_PREFIX=install -DCMAKE_BUILD_TYPE=Release -DOCR_OUTPUT="JNI" -DOCR_VULKAN=OFF ..
+cmake -DCMAKE_INSTALL_PREFIX=install -DCMAKE_BUILD_TYPE=Release -DOCR_OUTPUT="JNI" -DOCR_VULKAN="CPU" ..
 cmake --build . --config Release -j $NUM_THREADS
 cmake --build . --config Release --target install
 popd
 
 mkdir -p ${sysOS}-JNI-GPU
 pushd ${sysOS}-JNI-GPU
-cmake -DCMAKE_INSTALL_PREFIX=install -DCMAKE_BUILD_TYPE=Release -DOCR_OUTPUT="JNI" -DOCR_VULKAN=ON ..
+cmake -DCMAKE_INSTALL_PREFIX=install -DCMAKE_BUILD_TYPE=Release -DOCR_OUTPUT="JNI" -DOCR_VULKAN="GPU" ..
 cmake --build . --config Release -j $NUM_THREADS
 cmake --build . --config Release --target install
 popd
 
 mkdir -p ${sysOS}-CLIB-CPU
 pushd ${sysOS}-CLIB-CPU
-cmake -DCMAKE_INSTALL_PREFIX=install -DCMAKE_BUILD_TYPE=Release -DOCR_OUTPUT="CLIB" -DOCR_VULKAN=OFF ..
+cmake -DCMAKE_INSTALL_PREFIX=install -DCMAKE_BUILD_TYPE=Release -DOCR_OUTPUT="CLIB" -DOCR_VULKAN="CPU" ..
 cmake --build . --config Release -j $NUM_THREADS
 cmake --build . --config Release --target install
 popd
 
 mkdir -p ${sysOS}-CLIB-GPU
 pushd ${sysOS}-CLIB-GPU
-cmake -DCMAKE_INSTALL_PREFIX=install -DCMAKE_BUILD_TYPE=Release -DOCR_OUTPUT="CLIB" -DOCR_VULKAN=ON ..
+cmake -DCMAKE_INSTALL_PREFIX=install -DCMAKE_BUILD_TYPE=Release -DOCR_OUTPUT="CLIB" -DOCR_VULKAN="GPU" ..
 cmake --build . --config Release -j $NUM_THREADS
 cmake --build . --config Release --target install
 popd
diff --git a/build.bat b/build.bat
@@ -68,41 +68,4 @@ cmake --build . --config %BUILD_TYPE% --target install
 popd
 GOTO:EOF
 
-:makeAllExe
-mkdir win-cpu-%VSCMD_ARG_TGT_ARCH%
-pushd win-cpu-%VSCMD_ARG_TGT_ARCH%
-cmake -G "NMake Makefiles" -DCMAKE_BUILD_TYPE=Release -DOCR_JNI=OFF -DOCR_CLIB=OFF -DOCR_STATIC=ON -DOCR_VULKAN=OFF ..
-nmake
-popd
-
-mkdir win-gpu-%VSCMD_ARG_TGT_ARCH%
-pushd win-gpu-%VSCMD_ARG_TGT_ARCH%
-cmake -G "NMake Makefiles" -DCMAKE_BUILD_TYPE=Release -DOCR_JNI=OFF -DOCR_CLIB=OFF -DOCR_STATIC=ON -DOCR_VULKAN=ON ..
-nmake
-popd
-
-mkdir win-jni-cpu-%VSCMD_ARG_TGT_ARCH%
-pushd win-jni-cpu-%VSCMD_ARG_TGT_ARCH%
-cmake -G "NMake Makefiles" -DCMAKE_BUILD_TYPE=Release -DOCR_JNI=ON -DOCR_CLIB=OFF -DOCR_STATIC=ON -DOCR_VULKAN=OFF ..
-nmake
-popd
-
-mkdir win-jni-gpu-%VSCMD_ARG_TGT_ARCH%
-pushd win-jni-gpu-%VSCMD_ARG_TGT_ARCH%
-cmake -G "NMake Makefiles" -DCMAKE_BUILD_TYPE=Release -DOCR_JNI=ON -DOCR_CLIB=OFF -DOCR_STATIC=ON -DOCR_VULKAN=ON ..
-nmake
-popd
-
-mkdir win-clib-cpu-%VSCMD_ARG_TGT_ARCH%
-pushd win-clib-cpu-%VSCMD_ARG_TGT_ARCH%
-cmake -G "NMake Makefiles" -DCMAKE_BUILD_TYPE=Release -DOCR_JNI=OFF -DOCR_CLIB=ON -DOCR_STATIC=ON -DOCR_VULKAN=OFF ..
-nmake
-popd
-
-mkdir win-clib-gpu-%VSCMD_ARG_TGT_ARCH%
-pushd win-clib-gpu-%VSCMD_ARG_TGT_ARCH%
-cmake -G "NMake Makefiles" -DCMAKE_BUILD_TYPE=Release -DOCR_JNI=OFF -DOCR_CLIB=ON -DOCR_STATIC=ON -DOCR_VULKAN=ON ..
-nmake
-popd
-
 @ENDLOCAL
diff --git a/build.sh b/build.sh
@@ -52,7 +52,7 @@ fi
 mkdir -p $sysOS-$BUILD_OUTPUT-$BUILD_VULKAN
 pushd $sysOS-$BUILD_OUTPUT-$BUILD_VULKAN
 
-echo "cmake -DCMAKE_BUILD_TYPE=${BUILD_TYPE} -DOCR_OUTPUT=${BUILD_OUTPUT} -DOCR_VULKAN=${BUILD_VULKAN} .."
+echo "cmake -DCMAKE_INSTALL_PREFIX=install -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DOCR_OUTPUT=$BUILD_OUTPUT -DOCR_VULKAN=$BUILD_VULKAN .."
 cmake -DCMAKE_INSTALL_PREFIX=install -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DOCR_OUTPUT=$BUILD_OUTPUT -DOCR_VULKAN=$BUILD_VULKAN ..
 cmake --build . --config $BUILD_TYPE -j $NUM_THREADS
 cmake --build . --config $BUILD_TYPE --target install

diff --git a/generate-vs-project.bat b/generate-vs-project.bat
@@ -15,32 +15,21 @@ else if %flag% == 2 (set BUILD_TYPE=Debug)^
 else (echo 输入错误！Input Error!)
 echo.
 
-echo "使用静态库时，编译出来的可执行文件较大，但部署起来比较方便。"
-echo "使用动态库时，编译出来的可执行文件较小，但部署的时候记得把dll复制到可执行文件目录"
-echo "请选择要使用的Opencv库选项并回车: 1)Static静态库，2)Shared动态库"
-set BUILD_STATIC=ON
-set /p flag=
-if %flag% == 1 (set BUILD_STATIC=ON)^
-else if %flag% == 2 (set BUILD_STATIC=OFF)^
-else (echo "输入错误！Input Error!")
-echo.
-
 echo "请选择要使用的ncnn库选项并回车: 1)ncnn(CPU)，2)ncnn(vulkan)"
-set BUILD_NCNN_VULKAN=OFF
+set BUILD_NCNN_VULKAN="CPU"
 set /p flag=
-if %flag% == 1 (set BUILD_NCNN_VULKAN=OFF)^
-else if %flag% == 2 (set BUILD_NCNN_VULKAN=ON)^
+if %flag% == 1 (set BUILD_NCNN_VULKAN="CPU")^
+else if %flag% == 2 (set BUILD_NCNN_VULKAN="GPU")^
 else (echo "输入错误！Input Error!")
 echo.
 
 echo "请注意：如果选择2)编译为JNI动态库时，必须安装配置Oracle JDK"
-echo "请选择编译输出类型并回车: 1)编译成可执行文件，2)编译成JNI动态库，3)编译成C层动态库"
-set BUILD_JNI=OFF
-set BUILD_CLIB=OFF
+echo "请选择编译输出类型并回车: 1)编译成可执行文件，2)编译成JNI动态库，3)编译成C动态库"
+set BUILD_OUTPUT="EXE"
 set /p flag=
-if %flag% == 1 (set BUILD_JNI=OFF)^
-else if %flag% == 2 (set BUILD_JNI=ON)^
-else if %flag% == 3 (set BUILD_CLIB=ON)^
+if %flag% == 1 (set BUILD_OUTPUT="BIN")^
+else if %flag% == 2 (set BUILD_OUTPUT="JNI")^
+else if %flag% == 3 (set BUILD_OUTPUT="CLIB")^
 else (echo 输入错误！Input Error!)
 echo.
 
@@ -90,8 +79,8 @@ popd
 GOTO:EOF
 
 :cmakeParams
-echo cmake -G "%~1" -A "%~2" -DOCR_JNI=%BUILD_JNI% -DOCR_CLIB=%BUILD_CLIB% -DOCR_STATIC=%BUILD_STATIC% -DOCR_VULKAN=%BUILD_NCNN_VULKAN% ..
-cmake -G "%~1" -A "%~2" -DOCR_JNI=%BUILD_JNI% -DOCR_CLIB=%BUILD_CLIB% -DOCR_STATIC=%BUILD_STATIC% -DOCR_VULKAN=%BUILD_NCNN_VULKAN% ..
+echo cmake -G "%~1" -A "%~2" -DOCR_OUTPUT=%BUILD_OUTPUT% -DOCR_VULKAN=%BUILD_NCNN_VULKAN% ..
+cmake -G "%~1" -A "%~2" -DOCR_OUTPUT=%BUILD_OUTPUT% -DOCR_VULKAN=%BUILD_NCNN_VULKAN% ..
 GOTO:EOF
 
 @ENDLOCAL
diff --git a/run-benchmark.sh b/run-benchmark.sh
@@ -1,7 +1,5 @@
 #!/usr/bin/env bash
 
-export DYLD_LIBRARY_PATH=./ncnn-static/macos/lib
-
 function PrepareVar(){
 echo "Gpu版本测试前请先安装Vulkan SDK v1.2.162.0，https://vulkan.lunarg.com/sdk/home"
 echo "请输入测试选项并回车: 1)CPU, 2)GPU"