edit builder v1.16.3

RapidAI · Feb 14, 2024 · ddc8b74 · ddc8b74
1 parent c50c700
commit ddc8b74
Show file tree

Hide file tree

Showing 10 changed files with 27 additions and 20 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.15.1, ndk: 22.1.7171670, gradle: 8.0.1 }
+          - { onnx: v1.16.3, ndk: 22.1.7171670, gradle: 8.5 }
         list:
           - { arch: armeabi-v7a, min: 19 }
           - { arch: arm64-v8a, min: 21 }
@@ -123,7 +123,7 @@ jobs:
       fail-fast: false
       matrix:
         ver:
-          - { onnx: v1.15.1 }
+          - { onnx: v1.16.3 }
 
     env:
       SHARED_PKG_NAME: onnxruntime-${{ matrix.ver.onnx }}-android-shared

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

diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
@@ -13,10 +13,11 @@ jobs:
       fail-fast: false
       matrix:
         ver:
-          - { onnx: v1.15.1, gradle: 8.0.1 }
+          - { onnx: v1.16.3, gradle: 8.5 }
         list:
           - { os_ver: 11 }
           - { os_ver: 12 }
+          - { os_ver: 13 }
 
     runs-on: macos-${{ matrix.list.os_ver }}
 

diff --git a/.github/workflows/musl.yml b/.github/workflows/musl.yml
@@ -14,7 +14,7 @@ jobs:
       fail-fast: false
       matrix:
         ver:
-          - { onnx: v1.15.1, musl: 11.3.1 }
+          - { onnx: v1.16.3, musl: 11.3.1 }
         arch:
           [
             aarch64-linux-musl,

diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
@@ -12,9 +12,8 @@ jobs:
       fail-fast: false
       matrix:
         ver:
-          - { onnx: v1.15.1 }
+          - { onnx: v1.16.3, gradle: 8.5 }
         list:
-          - { win_ver: 2019, vs_name: vs2019, vs_ver: v142 }
           - { win_ver: 2022, vs_name: vs2022, vs_ver: v143 }
         crt:
           [
@@ -45,6 +44,13 @@ jobs:
           java-version: '8'
           distribution: 'adopt'
 
+      - uses: gradle/actions/setup-gradle@v3
+        with:
+          gradle-version: ${{ matrix.ver.gradle }}
+
+      - name: test gradle
+        run: gradle --version
+
       # 检出代码
       - uses: actions/checkout@v3
 

diff --git a/build-onnxruntime-android.sh b/build-onnxruntime-android.sh
@@ -7,7 +7,7 @@ function collectLibs() {
   # shared lib
   cmake --build . --config Release --target install
 #  rm -r -f install/bin
-  mv install/include/onnxruntime/core/session/* install/include
+  mv install/include/onnxruntime/* install/include
   rm -rf install/include/onnxruntime
   echo "set(OnnxRuntime_INCLUDE_DIRS \"\${CMAKE_CURRENT_LIST_DIR}/include\")" > install/OnnxRuntimeConfig.cmake
   echo "include_directories(\${OnnxRuntime_INCLUDE_DIRS})" >> install/OnnxRuntimeConfig.cmake

diff --git a/build-onnxruntime-musl.sh b/build-onnxruntime-musl.sh
@@ -6,7 +6,7 @@ function collectLibs() {
   # shared lib
   cmake --build . --config Release --target install
 #  rm -r -f install/bin
-  mv install/include/onnxruntime/core/session/* install/include
+  mv install/include/onnxruntime/* install/include
   rm -rf install/include/onnxruntime
   echo "set(OnnxRuntime_INCLUDE_DIRS \"\${CMAKE_CURRENT_LIST_DIR}/include\")" > install/OnnxRuntimeConfig.cmake
   echo "include_directories(\${OnnxRuntime_INCLUDE_DIRS})" >> install/OnnxRuntimeConfig.cmake
@@ -53,7 +53,7 @@ function cmakeBuild() {
   cmake -DCMAKE_BUILD_TYPE=$1 \
     -DCMAKE_TOOLCHAIN_FILE=../musl-cross.toolchain.cmake \
     -DCMAKE_INSTALL_PREFIX=install \
-    $(cat ../onnxruntime_options-v1.15.1.txt) \
+    $(cat ../onnxruntime_options-v1.16.3.txt) \
     ../cmake
   cmake --build . -j $NUM_THREADS
   cmake --build . --target install

diff --git a/build-onnxruntime.bat b/build-onnxruntime.bat
@@ -6,8 +6,8 @@ cls
 SETLOCAL EnableDelayedExpansion
 
 IF "%1"=="" (
-    echo input VS_VER none, use v142
-	set VS_VER="v142"
+    echo input VS_VER none, use v143
+	set VS_VER="v143"
 )^
 ELSE (
 	echo input VS_VER:%1
@@ -42,7 +42,7 @@ GOTO:EOF
 :collectLibs
 cmake --build . --config Release --target install
 ::del /s/q install\*test*.exe
-copy install\include\onnxruntime\core\session\* install\include
+copy install\include\onnxruntime\* install\include
 rd /S /Q install\include\onnxruntime
 echo set(OnnxRuntime_INCLUDE_DIRS "${CMAKE_CURRENT_LIST_DIR}/include") > install/OnnxRuntimeConfig.cmake
 echo include_directories(${OnnxRuntime_INCLUDE_DIRS}) >> install/OnnxRuntimeConfig.cmake

diff --git a/build-onnxruntime.sh b/build-onnxruntime.sh
@@ -6,7 +6,7 @@ function collectLibs() {
   # shared lib
   cmake --build . --config Release --target install
 #  rm -r -f install/bin
-  mv install/include/onnxruntime/core/session/* install/include
+  mv install/include/onnxruntime/* install/include
   rm -rf install/include/onnxruntime
   echo "set(OnnxRuntime_INCLUDE_DIRS \"\${CMAKE_CURRENT_LIST_DIR}/include\")" > install/OnnxRuntimeConfig.cmake
   echo "include_directories(\${OnnxRuntime_INCLUDE_DIRS})" >> install/OnnxRuntimeConfig.cmake

diff --git a/onnxruntime_options-v1.15.1.txt → onnxruntime_options-v1.16.3.txt b/onnxruntime_options-v1.15.1.txt → onnxruntime_options-v1.16.3.txt
@@ -1,9 +1,9 @@
 -Donnxruntime_RUN_ONNX_TESTS=OFF
--Donnxruntime_GENERATE_TEST_REPORTS=OFF
+-Donnxruntime_GENERATE_TEST_REPORTS=ON
 -Donnxruntime_USE_MIMALLOC=OFF
 -Donnxruntime_ENABLE_PYTHON=OFF
 -Donnxruntime_BUILD_CSHARP=OFF
--Donnxruntime_BUILD_JAVA=OFF
+-Donnxruntime_BUILD_JAVA=ON
 -Donnxruntime_BUILD_NODEJS=OFF
 -Donnxruntime_BUILD_OBJC=OFF
 -Donnxruntime_BUILD_SHARED_LIB=ON
@@ -55,7 +55,6 @@
 -Donnxruntime_USE_MPI=OFF
 -Donnxruntime_ENABLE_MEMORY_PROFILE=OFF
 -Donnxruntime_ENABLE_CUDA_LINE_NUMBER_INFO=OFF
--Donnxruntime_BUILD_WEBASSEMBLY=OFF
 -Donnxruntime_BUILD_WEBASSEMBLY_STATIC_LIB=OFF
 -Donnxruntime_ENABLE_WEBASSEMBLY_EXCEPTION_CATCHING=ON
 -Donnxruntime_ENABLE_WEBASSEMBLY_API_EXCEPTION_CATCHING=OFF
@@ -69,9 +68,11 @@
 -Donnxruntime_ENABLE_CUDA_PROFILING=OFF
 -Donnxruntime_ENABLE_ROCM_PROFILING=OFF
 -Donnxruntime_USE_XNNPACK=OFF
+-Donnxruntime_USE_WEBNN=OFF
 -Donnxruntime_USE_CANN=OFF
+-Donnxruntime_USE_TRITON_KERNEL=OFF
+-Donnxruntime_DISABLE_FLOAT8_TYPES=OFF
 -Donnxruntime_BUILD_UNIT_TESTS=OFF
 -DCMAKE_TLS_VERIFY=ON
 -DFETCHCONTENT_QUIET=OFF
--Donnxruntime_PYBIND_EXPORT_OPSCHEMA=OFF
--Donnxruntime_ENABLE_MEMLEAK_CHECKER=OFF
+-Donnxruntime_ENABLE_MEMLEAK_CHECKER=OFF