update build

microsoft · Apr 29, 2024 · a411b14 · a411b14
1 parent 75d0179
commit a411b14
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 8 deletions.
diff --git a/.pipelines/stages/jobs/steps/capi-linux-step.yml b/.pipelines/stages/jobs/steps/capi-linux-step.yml
@@ -58,6 +58,7 @@ steps:
             --target onnxruntime-genai"
     displayName: 'Build GenAi'
     workingDirectory: '$(Build.Repository.LocalPath)'
+
   - task: BinSkim@4
     displayName: 'Run BinSkim'
     inputs:
@@ -66,12 +67,22 @@ steps:
   - template: utils/capi-archive.yml
     parameters:
       archiveType: tar
+  - script: |
+      set -e -x
+      docker run \
+      --rm \
+      --volume $(Build.Repository.LocalPath):/ort_genai_src \
+      -w /ort_genai_src/ onnxruntime$(ep)build$(arch) \
+      bash -c " \
+          /usr/bin/cmake --build --preset linux_$(arch)_$(ep)_release --target package"
+    displayName: 'Package C/C++ API'
+    workingDirectory: '$(Build.Repository.LocalPath)'
 
   - task: PublishBuildArtifacts@1
     displayName: 'Publish Artifact: ONNXRuntime Genai capi'
     inputs:
       ArtifactName: $(artifactName)-capi
-      PathtoPublish: '$(Build.ArtifactStagingDirectory)/capi'
+      PathtoPublish: '$(Build.Repository.LocalPath)/build/$(ep)/package'
 
 - ${{ if eq(parameters.target, 'python') }}:
   - bash: |

diff --git a/.pipelines/stages/jobs/steps/capi-win-step.yml b/.pipelines/stages/jobs/steps/capi-win-step.yml
@@ -83,15 +83,16 @@ steps:
       AnalyzeTargetGlob: '$(Build.Repository.LocalPath)\**\*genai.dll'
     continueOnError: true
 
-  - template: utils/capi-archive.yml
-    parameters:
-      archiveType: zip
+  - powershell: |
+      cmake --build --preset windows_$(arch)_$(ep)_release --target package
+    displayName: 'Package C/C++ API'
+    workingDirectory: '$(Build.Repository.LocalPath)'
 
   - task: PublishBuildArtifacts@1
     displayName: 'Publish Artifact: ONNXRuntime Genai capi'
     inputs:
       ArtifactName: $(artifactName)-capi
-      PathtoPublish: '$(Build.ArtifactStagingDirectory)/capi'
+      PathtoPublish: '$(Build.Repository.LocalPath)\build\$(ep)\package'
 
 - ${{ if eq(parameters.target, 'python') }}:
   - task: BinSkim@4

diff --git a/cmake/package.cmake b/cmake/package.cmake
@@ -4,8 +4,6 @@ set_target_properties(
 )
 install(TARGETS
   onnxruntime-genai
-  onnxruntime-genai-static
-  ARCHIVE
   LIBRARY
   PUBLIC_HEADER
 )
@@ -14,7 +12,7 @@ set(CPACK_PACKAGE_NAME "onnxruntime-genai")
 set(CPACK_RESOURCE_FILE_LICENSE "${PROJECT_SOURCE_DIR}/LICENSE")
 set(CPACK_RESOURCE_FILE_README "${PROJECT_SOURCE_DIR}/README.md")
 set(CPACK_PACKAGE_HOMEPAGE_URL "https://github.com/microsoft/onnxruntime-genai")
-set(CPACK_OUTPUT_FILE_PREFIX "${CMAKE_CURRENT_BINARY_DIR}/packages")
+set(CPACK_OUTPUT_FILE_PREFIX "${CMAKE_CURRENT_BINARY_DIR}/package")
 set(CPACK_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}-${VERSION_INFO}-${CMAKE_SYSTEM_NAME}-${CMAKE_SYSTEM_PROCESSOR}")
 if (WIN32)
   set(CPACK_GENERATOR "ZIP")