fix builder 1.17.0

RapidAI · Feb 5, 2024 · 491978a · 491978a
1 parent ba7e886
commit 491978a
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 9 deletions.
diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
@@ -14,7 +14,7 @@ jobs:
       fail-fast: false
       matrix:
         ver:
-          - { onnx: v1.17.0, ndk: 22.1.7171670 }
+          - { onnx: v1.17.0, ndk: 26.1.10909125 }
         list:
           - { arch: armeabi-v7a, min: 19 }
           - { arch: arm64-v8a, min: 21 }

diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
@@ -15,9 +15,10 @@ jobs:
       matrix:
         os_name: [ubuntu]
         ver:
-          - { onnx: v1.17.0, cmake: 3.28.1, python: 3.8.18, gradle: 8.5, jdk: openjdk-8-jdk }
+          - { onnx: v1.17.0, cmake: 3.28.2, python: 3.8.18, gradle: 8.5, jdk: openjdk-8-jdk }
         list:
           - { os_ver: 20.04, os_id: focal }
+          - { os_ver: 22.04, os_id: jammy }
         arch:
           [
             amd64,

diff --git a/build-onnxruntime-android.sh b/build-onnxruntime-android.sh
@@ -43,7 +43,6 @@ function pyBuild() {
   echo ANDROID_NDK_HOME=$ANDROID_NDK_HOME
   python3 $DIR/tools/ci_build/build.py --build_dir $DIR/build-android-$1 \
     --config Release \
-    --build \
     --parallel \
     --skip_tests \
     --build_shared_lib \
@@ -56,17 +55,19 @@ function pyBuild() {
     --cmake_extra_defines CMAKE_INSTALL_PREFIX=./install onnxruntime_BUILD_UNIT_TESTS=OFF
 
   pushd build-android-$1/Release
+  cmake --build . --config Release -j $NUM_THREADS
   collectLibs
   popd
 }
 
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 sysOS=$(uname -s)
+NUM_THREADS=1
 
 if [ $sysOS == "Darwin" ]; then
-  echo "I'm MacOS"
+  NUM_THREADS=$(sysctl -n hw.ncpu)
 elif [ $sysOS == "Linux" ]; then
-  echo "I'm Linux"
+  NUM_THREADS=$(nproc)
 else
   echo "Other OS: $sysOS"
   exit 0

diff --git a/build-onnxruntime.bat b/build-onnxruntime.bat
@@ -87,7 +87,6 @@ else (
 )
 python %~dp0\tools\ci_build\build.py --build_dir %~dp0\build-%~1-%~2-%~3 ^
     --config Release ^
-	--build ^
 	--parallel ^
 	--skip_tests ^
 	--build_shared_lib ^
@@ -96,6 +95,7 @@ python %~dp0\tools\ci_build\build.py --build_dir %~dp0\build-%~1-%~2-%~3 ^
 	%VS_FLAG% ^
 	--cmake_extra_defines CMAKE_INSTALL_PREFIX=./install onnxruntime_BUILD_UNIT_TESTS=OFF
 pushd "build-%~1-%~2-%~3"\Release
+cmake --build . --config Release -j %NUMBER_OF_PROCESSORS%
 call :collectLibs
 popd
 GOTO:EOF
diff --git a/build-onnxruntime.sh b/build-onnxruntime.sh
@@ -39,11 +39,12 @@ function collectLibs() {
 
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 sysOS=$(uname -s)
+NUM_THREADS=1
 
 if [ $sysOS == "Darwin" ]; then
-  echo "I'm MacOS"
+  NUM_THREADS=$(sysctl -n hw.ncpu)
 elif [ $sysOS == "Linux" ]; then
-  echo "I'm Linux"
+  NUM_THREADS=$(nproc)
 else
   echo "Other OS: $sysOS"
   exit 0
@@ -53,13 +54,13 @@ fi
 python3 $DIR/tools/ci_build/build.py --build_dir $DIR/build-$sysOS \
     --allow_running_as_root \
     --config Release \
-    --build \
     --parallel \
     --skip_tests \
     --build_shared_lib \
     --build_java \
     --cmake_extra_defines CMAKE_INSTALL_PREFIX=./install onnxruntime_BUILD_UNIT_TESTS=OFF
 
 pushd build-$sysOS/Release
+cmake --build . --config Release -j $NUM_THREADS
 collectLibs
 popd