From 8ddc45f52d6ad92d3d9aae1bb5cb01d7f03d3244 Mon Sep 17 00:00:00 2001 From: leqiao-1 <61653207+leqiao-1@users.noreply.github.com> Date: Sat, 26 Mar 2022 07:23:17 +0800 Subject: [PATCH] Add linux and macos arm64 java aritifacts (#10981) --- cmake/onnxruntime_java.cmake | 2 ++ .../github/azure-pipelines/templates/c-api-cpu.yml | 14 ++++++++++++++ tools/ci_build/github/windows/jar_packaging.ps1 | 6 ++++++ 3 files changed, 22 insertions(+) diff --git a/cmake/onnxruntime_java.cmake b/cmake/onnxruntime_java.cmake index 722fb09ebf..d7b47f699a 100644 --- a/cmake/onnxruntime_java.cmake +++ b/cmake/onnxruntime_java.cmake @@ -94,6 +94,8 @@ if(APPLE) endif() if(JNI_ARCH STREQUAL "x86_64") set(JNI_ARCH x64) + elseif(JNI_ARCH STREQUAL "arm64") + set(JNI_ARCH aarch64) endif() elseif (CMAKE_SYSTEM_NAME STREQUAL "Android") set(JNI_ARCH ${ANDROID_ABI}) diff --git a/tools/ci_build/github/azure-pipelines/templates/c-api-cpu.yml b/tools/ci_build/github/azure-pipelines/templates/c-api-cpu.yml index 79f7030dc9..be2b610609 100644 --- a/tools/ci_build/github/azure-pipelines/templates/c-api-cpu.yml +++ b/tools/ci_build/github/azure-pipelines/templates/c-api-cpu.yml @@ -329,6 +329,13 @@ jobs: artifactName: 'drop-onnxruntime-java-linux-x64' targetPath: '$(Build.BinariesDirectory)\java-artifact\onnxruntime-java-linux-x64' + - task: DownloadPipelineArtifact@2 + displayName: 'Download Pipeline Artifact - Linux AARCH64' + inputs: + buildType: 'current' + artifactName: 'drop-onnxruntime-java-linux-aarch64' + targetPath: '$(Build.BinariesDirectory)\java-artifact\onnxruntime-java-linux-aarch64' + - task: DownloadPipelineArtifact@2 displayName: 'Download Pipeline Artifact - MacOS x64' inputs: @@ -336,6 +343,13 @@ jobs: artifactName: 'drop-onnxruntime-java-osx-x86_64' targetPath: '$(Build.BinariesDirectory)\java-artifact\onnxruntime-java-osx-x86_64' + - task: DownloadPipelineArtifact@2 + displayName: 'Download Pipeline Artifact - MacOS ARM64' + inputs: + buildType: 'current' + artifactName: 'drop-onnxruntime-java-osx-arm64' + targetPath: '$(Build.BinariesDirectory)\java-artifact\onnxruntime-java-osx-arm64' + - task: PowerShell@2 displayName: 'PowerShell Script' inputs: diff --git a/tools/ci_build/github/windows/jar_packaging.ps1 b/tools/ci_build/github/windows/jar_packaging.ps1 index 793443dd3a..679e27b459 100644 --- a/tools/ci_build/github/windows/jar_packaging.ps1 +++ b/tools/ci_build/github/windows/jar_packaging.ps1 @@ -15,3 +15,9 @@ pushd onnxruntime-java-osx-x86_64 Remove-Item -Path libcustom_op_library.dylib 7z a $Env:BUILD_BINARIESDIRECTORY\java-artifact\onnxruntime-java-win-x64\onnxruntime-$Env:ONNXRUNTIMEVERSION.jar . popd +pushd onnxruntime-java-linux-aarch64 +7z a $Env:BUILD_BINARIESDIRECTORY\java-artifact\onnxruntime-java-win-x64\onnxruntime-$Env:ONNXRUNTIMEVERSION.jar . +popd +pushd onnxruntime-java-osx-arm64 +7z a $Env:BUILD_BINARIESDIRECTORY\java-artifact\onnxruntime-java-win-x64\onnxruntime-$Env:ONNXRUNTIMEVERSION.jar . +popd