From 9043df8b66472c457764816441c8bbcf3f15a7e8 Mon Sep 17 00:00:00 2001 From: RandySheriffH <48490400+RandySheriffH@users.noreply.github.com> Date: Wed, 17 Feb 2021 00:03:44 -0800 Subject: [PATCH] Deprecate OMP from nuget pipeline (release:1.7) (#6671) * deprecate OMP from nuget * remove omp build * remove * add openmp build * add variants * rename package * move GPU to no omp pipeline * reset path * switch to abs path * reset path * add cpu package * remove obsolete name * set package name Co-authored-by: Randy Shuai --- .../c-api-packaging-pipelines.yml | 216 +----------------- .../nuget/cpu-esrp-noopenmp-pipeline.yml | 213 ++++++++++++++++- .../azure-pipelines/templates/c-api-cpu.yml | 24 +- .../nuget/generate_nuspec_for_native_nuget.py | 2 +- 4 files changed, 229 insertions(+), 226 deletions(-) diff --git a/tools/ci_build/github/azure-pipelines/c-api-packaging-pipelines.yml b/tools/ci_build/github/azure-pipelines/c-api-packaging-pipelines.yml index 92285cdacb..0dc6d6ee95 100644 --- a/tools/ci_build/github/azure-pipelines/c-api-packaging-pipelines.yml +++ b/tools/ci_build/github/azure-pipelines/c-api-packaging-pipelines.yml @@ -19,6 +19,9 @@ parameters: type: boolean default: false +variables: + PackageName: 'Microsoft.ML.OnnxRuntime.OpenMP' + jobs: - template: templates/c-api-cpu.yml parameters: @@ -26,215 +29,6 @@ jobs: DoCompliance: ${{ parameters.DoCompliance }} DoEsrp: ${{ parameters.DoEsrp }} IsReleaseBuild: ${{ parameters.IsReleaseBuild }} - OrtNugetPackageId: 'Microsoft.ML.OnnxRuntime' + OrtNugetPackageId: 'Microsoft.ML.OnnxRuntime.OpenMP' AdditionalBuildFlags: '--use_openmp' - AdditionalWinBuildFlags: '--enable_onnx_tests --enable_wcos' - -- job: Linux_C_API_Packaging_GPU_x64 - workspace: - clean: all - timeoutInMinutes: 120 - pool: 'Linux-GPU-CUDA10' - variables: - CUDA_VERSION: '11.0' - steps: - - template: templates/set-version-number-variables-step.yml - - template: templates/get-docker-image-steps.yml - parameters: - Dockerfile: tools/ci_build/github/linux/docker/Dockerfile.manylinux2014_cuda11 - Context: tools/ci_build/github/linux/docker - DockerBuildArgs: "--build-arg BUILD_UID=$( id -u )" - Repository: onnxruntimecuda11build - - task: CmdLine@2 - inputs: - script: | - mkdir -p $HOME/.onnx - docker run --gpus all -e CC=/opt/rh/devtoolset-8/root/usr/bin/cc -e CXX=/opt/rh/devtoolset-8/root/usr/bin/c++ -e CFLAGS="-g -O3" -e CXXFLAGS="-g -O3" -e NVIDIA_VISIBLE_DEVICES=all --rm --volume /data/onnx:/data/onnx:ro --volume $(Build.SourcesDirectory):/onnxruntime_src --volume $(Build.BinariesDirectory):/build \ - --volume /data/models:/build/models:ro --volume $HOME/.onnx:/home/onnxruntimedev/.onnx -e NIGHTLY_BUILD onnxruntimecuda11build \ - /opt/python/cp37-cp37m/bin/python3 /onnxruntime_src/tools/ci_build/build.py --build_java --build_dir /build --config Release \ - --skip_submodule_sync --parallel --build_shared_lib --use_cuda --cuda_version=$(CUDA_VERSION) --cuda_home=/usr/local/cuda-$(CUDA_VERSION) --cudnn_home=/usr/local/cuda-$(CUDA_VERSION) --cmake_extra_defines CMAKE_CUDA_HOST_COMPILER=/opt/rh/devtoolset-8/root/usr/bin/cc - workingDirectory: $(Build.SourcesDirectory) - - - template: templates/java-api-artifacts-package-and-publish-steps-posix.yml - parameters: - arch: 'linux-x64' - buildConfig: 'Release' - artifactName: 'onnxruntime-java-linux-gpu-x64' - version: '$(OnnxRuntimeVersion)' - libraryName: 'libonnxruntime.so' - nativeLibraryName: 'libonnxruntime4j_jni.so' - - - template: templates/c-api-artifacts-package-and-publish-steps-posix.yml - parameters: - buildConfig: 'Release' - artifactName: 'onnxruntime-linux-x64-gpu-$(OnnxRuntimeVersion)' - artifactNameNoVersionString: 'onnxruntime-linux-x64-gpu' - libraryName: 'libonnxruntime.so.$(OnnxRuntimeVersion)' - commitId: $(OnnxRuntimeGitCommitHash) - - - template: templates/component-governance-component-detection-steps.yml - parameters : - condition : 'succeeded' - - template: templates/clean-agent-build-directory-step.yml - - -- template: templates/win-ci.yml - parameters: - IsReleaseBuild: ${{ parameters.IsReleaseBuild }} - ort_build_pool_name: 'Win-GPU-2019' - DoCompliance: ${{ parameters.DoCompliance }} - DoEsrp: ${{ parameters.DoEsrp }} - OrtNugetPackageId: 'Microsoft.ML.OnnxRuntime.Gpu' - job_name_suffix: gpu - EnvSetupScript: setup_env_cuda_11.bat - buildArch: x64 - msbuildPlatform: x64 - packageName: gpu-x64 - buildparameter: --use_cuda --cuda_version=11.0 --cuda_home="C:\Program Files\NVIDIA GPU Computing Toolkit\CUDA\v11.0" --cudnn_home="C:\local\cudnn-11.0-windows-x64-v8.0.2.39\cuda" --enable_onnx_tests --enable_wcos --build_java - runTests: ${{ parameters.RunOnnxRuntimeTests }} - buildJava: true - -- job: Jar_Packaging_GPU - workspace: - clean: all - pool: 'Win-CPU-2021' - dependsOn: - - Linux_C_API_Packaging_GPU_x64 - - Windows_Packaging_CPU_gpu - condition: succeeded() - steps: - - checkout: self - submodules: false - - template: templates/set-version-number-variables-step.yml - - - task: DownloadPipelineArtifact@2 - displayName: 'Download Pipeline Artifact - Win x64' - inputs: - buildType: 'current' - artifactName: 'drop-onnxruntime-java-win-gpu-x64' - targetPath: '$(Build.BinariesDirectory)\java-artifact\onnxruntime-java-win-x64' - - - task: DownloadPipelineArtifact@2 - displayName: 'Download Pipeline Artifact - Linux x64' - inputs: - buildType: 'current' - artifactName: 'drop-onnxruntime-java-linux-gpu-x64' - targetPath: '$(Build.BinariesDirectory)\java-artifact\onnxruntime-java-linux-x64' - - - task: PowerShell@2 - displayName: 'PowerShell Script' - inputs: - targetType: filePath - filePath: $(Build.SourcesDirectory)\tools\ci_build\github\windows\jar_gpu_packaging.ps1 - failOnStderr: true - showWarnings: true - workingDirectory: '$(Build.BinariesDirectory)\java-artifact' - - - - - task: CopyFiles@2 - displayName: 'Copy Java Files to Artifact Staging Directory' - inputs: - SourceFolder: '$(Build.BinariesDirectory)\java-artifact\onnxruntime-java-win-x64' - TargetFolder: '$(Build.ArtifactStagingDirectory)' - - - task: PublishPipelineArtifact@1 - displayName: 'Publish Pipeline Artifact' - inputs: - targetPath: '$(Build.ArtifactStagingDirectory)' - artifact: 'onnxruntime-java-gpu' - - - template: templates/component-governance-component-detection-steps.yml - parameters : - condition : 'succeeded' - - task: mspremier.PostBuildCleanup.PostBuildCleanup-task.PostBuildCleanup@3 - displayName: 'Clean Agent Directories' - condition: always() - - -- job: Final_Jar_Testing_Windows_GPU - workspace: - clean: all - pool: 'Win-GPU-2019' - timeoutInMinutes: 60 - variables: - - name: runCodesignValidationInjection - value: false - dependsOn: - Jar_Packaging_GPU - steps: - - template: templates/set-version-number-variables-step.yml - - - task: BatchScript@1 - displayName: 'setup env' - inputs: - filename: '$(Build.SourcesDirectory)\tools\ci_build\github\windows\setup_env_cuda_11.bat' - modifyEnvironment: true - workingFolder: '$(Build.BinariesDirectory)' - - - task: DownloadPipelineArtifact@2 - displayName: 'Download Final Jar' - inputs: - buildType: 'current' - artifactName: 'onnxruntime-java-gpu' - targetPath: '$(Build.BinariesDirectory)\final-jar' - - - task: CmdLine@2 - inputs: - script: | - mkdir test - pushd test - jar xf $(Build.BinariesDirectory)\final-jar\testing.jar - popd - powershell -Command "Invoke-WebRequest https://oss.sonatype.org/service/local/repositories/releases/content/org/junit/platform/junit-platform-console-standalone/1.6.2/junit-platform-console-standalone-1.6.2.jar -OutFile junit-platform-console-standalone-1.6.2.jar" - powershell -Command "Invoke-WebRequest https://oss.sonatype.org/service/local/repositories/google-releases/content/com/google/protobuf/protobuf-java/3.9.2/protobuf-java-3.9.2.jar -OutFile protobuf-java-3.9.2.jar" - java -jar junit-platform-console-standalone-1.6.2.jar -cp .;.\test;protobuf-java-3.9.2.jar;onnxruntime-$(OnnxRuntimeVersion).jar --scan-class-path --fail-if-no-tests --disable-banner - workingDirectory: '$(Build.BinariesDirectory)\final-jar' - - - template: templates/component-governance-component-detection-steps.yml - parameters : - condition : 'succeeded' - - task: mspremier.PostBuildCleanup.PostBuildCleanup-task.PostBuildCleanup@3 - displayName: 'Clean Agent Directories' - condition: always() - -- job: Final_Jar_Testing_Linux_GPU - workspace: - clean: all - pool: 'Linux-GPU-CUDA10' - variables: - - name: runCodesignValidationInjection - value: false - timeoutInMinutes: 60 - dependsOn: - Jar_Packaging_GPU - steps: - - template: templates/set-version-number-variables-step.yml - - task: DownloadPipelineArtifact@2 - displayName: 'Download Final Jar' - inputs: - buildType: 'current' - artifactName: 'onnxruntime-java-gpu' - targetPath: '$(Build.BinariesDirectory)/final-jar' - - - task: CmdLine@2 - inputs: - script: | - echo "Java Version" - java -version - mkdir test - pushd test - jar xf $(Build.BinariesDirectory)/final-jar/testing.jar - popd - wget https://oss.sonatype.org/service/local/repositories/releases/content/org/junit/platform/junit-platform-console-standalone/1.6.2/junit-platform-console-standalone-1.6.2.jar -P ./ - wget https://oss.sonatype.org/service/local/repositories/google-releases/content/com/google/protobuf/protobuf-java/3.9.2/protobuf-java-3.9.2.jar -P ./ - LD_LIBRARY_PATH=./test:${LD_LIBRARY_PATH} - java -jar ./junit-platform-console-standalone-1.6.2.jar -cp .:./test:./protobuf-java-3.9.2.jar:./onnxruntime-$(OnnxRuntimeVersion).jar --scan-class-path --fail-if-no-tests --disable-banner - workingDirectory: '$(Build.BinariesDirectory)/final-jar' - - - template: templates/component-governance-component-detection-steps.yml - parameters : - condition : 'succeeded' - - task: mspremier.PostBuildCleanup.PostBuildCleanup-task.PostBuildCleanup@3 - displayName: 'Clean Agent Directories' - condition: always() + AdditionalWinBuildFlags: '--enable_onnx_tests --enable_wcos' \ No newline at end of file diff --git a/tools/ci_build/github/azure-pipelines/nuget/cpu-esrp-noopenmp-pipeline.yml b/tools/ci_build/github/azure-pipelines/nuget/cpu-esrp-noopenmp-pipeline.yml index 8e6c181865..058979579c 100644 --- a/tools/ci_build/github/azure-pipelines/nuget/cpu-esrp-noopenmp-pipeline.yml +++ b/tools/ci_build/github/azure-pipelines/nuget/cpu-esrp-noopenmp-pipeline.yml @@ -20,7 +20,7 @@ parameters: default: false variables: - PackageName: 'Microsoft.ML.OnnxRuntime.NoOpenMP' + PackageName: 'Microsoft.ML.OnnxRuntime' jobs: - template: ../templates/c-api-cpu.yml @@ -29,7 +29,216 @@ jobs: DoCompliance: ${{ parameters.DoCompliance }} DoEsrp: ${{ parameters.DoEsrp }} IsReleaseBuild: ${{ parameters.IsReleaseBuild }} - OrtNugetPackageId: 'Microsoft.ML.OnnxRuntime.NoOpenMP' + OrtNugetPackageId: 'Microsoft.ML.OnnxRuntime' AdditionalBuildFlags: '' AdditionalWinBuildFlags: '--enable_onnx_tests --enable_wcos' BuildVariant: 'default' + +- job: Linux_C_API_Packaging_GPU_x64 + workspace: + clean: all + timeoutInMinutes: 120 + pool: 'Linux-GPU-CUDA10' + variables: + CUDA_VERSION: '11.0' + steps: + - template: ../templates/set-version-number-variables-step.yml + - template: ../templates/get-docker-image-steps.yml + parameters: + Dockerfile: tools/ci_build/github/linux/docker/Dockerfile.manylinux2014_cuda11 + Context: tools/ci_build/github/linux/docker + DockerBuildArgs: "--build-arg BUILD_UID=$( id -u )" + Repository: onnxruntimecuda11build + - task: CmdLine@2 + inputs: + script: | + mkdir -p $HOME/.onnx + docker run --gpus all -e CC=/opt/rh/devtoolset-8/root/usr/bin/cc -e CXX=/opt/rh/devtoolset-8/root/usr/bin/c++ -e CFLAGS="-g -O3" -e CXXFLAGS="-g -O3" -e NVIDIA_VISIBLE_DEVICES=all --rm --volume /data/onnx:/data/onnx:ro --volume $(Build.SourcesDirectory):/onnxruntime_src --volume $(Build.BinariesDirectory):/build \ + --volume /data/models:/build/models:ro --volume $HOME/.onnx:/home/onnxruntimedev/.onnx -e NIGHTLY_BUILD onnxruntimecuda11build \ + /opt/python/cp37-cp37m/bin/python3 /onnxruntime_src/tools/ci_build/build.py --build_java --build_dir /build --config Release \ + --skip_submodule_sync --parallel --build_shared_lib --use_cuda --cuda_version=$(CUDA_VERSION) --cuda_home=/usr/local/cuda-$(CUDA_VERSION) --cudnn_home=/usr/local/cuda-$(CUDA_VERSION) --cmake_extra_defines CMAKE_CUDA_HOST_COMPILER=/opt/rh/devtoolset-8/root/usr/bin/cc + workingDirectory: $(Build.SourcesDirectory) + + - template: ../templates/java-api-artifacts-package-and-publish-steps-posix.yml + parameters: + arch: 'linux-x64' + buildConfig: 'Release' + artifactName: 'onnxruntime-java-linux-gpu-x64' + version: '$(OnnxRuntimeVersion)' + libraryName: 'libonnxruntime.so' + nativeLibraryName: 'libonnxruntime4j_jni.so' + + - template: ../templates/c-api-artifacts-package-and-publish-steps-posix.yml + parameters: + buildConfig: 'Release' + artifactName: 'onnxruntime-linux-x64-gpu-$(OnnxRuntimeVersion)' + artifactNameNoVersionString: 'onnxruntime-linux-x64-gpu' + libraryName: 'libonnxruntime.so.$(OnnxRuntimeVersion)' + commitId: $(OnnxRuntimeGitCommitHash) + + - template: ../templates/component-governance-component-detection-steps.yml + parameters : + condition : 'succeeded' + - template: ../templates/clean-agent-build-directory-step.yml + + +- template: ../templates/win-ci.yml + parameters: + IsReleaseBuild: ${{ parameters.IsReleaseBuild }} + ort_build_pool_name: 'Win-GPU-2019' + DoCompliance: ${{ parameters.DoCompliance }} + DoEsrp: ${{ parameters.DoEsrp }} + OrtNugetPackageId: 'Microsoft.ML.OnnxRuntime.Gpu' + job_name_suffix: gpu + EnvSetupScript: setup_env_cuda_11.bat + buildArch: x64 + msbuildPlatform: x64 + packageName: gpu-x64 + buildparameter: --use_cuda --cuda_version=11.0 --cuda_home="C:\Program Files\NVIDIA GPU Computing Toolkit\CUDA\v11.0" --cudnn_home="C:\local\cudnn-11.0-windows-x64-v8.0.2.39\cuda" --enable_onnx_tests --enable_wcos --build_java + runTests: ${{ parameters.RunOnnxRuntimeTests }} + buildJava: true + +- job: Jar_Packaging_GPU + workspace: + clean: all + pool: 'Win-CPU-2021' + dependsOn: + - Linux_C_API_Packaging_GPU_x64 + - Windows_Packaging_CPU_gpu + condition: succeeded() + steps: + - checkout: self + submodules: false + - template: ../templates/set-version-number-variables-step.yml + + - task: DownloadPipelineArtifact@2 + displayName: 'Download Pipeline Artifact - Win x64' + inputs: + buildType: 'current' + artifactName: 'drop-onnxruntime-java-win-gpu-x64' + targetPath: '$(Build.BinariesDirectory)\java-artifact\onnxruntime-java-win-x64' + + - task: DownloadPipelineArtifact@2 + displayName: 'Download Pipeline Artifact - Linux x64' + inputs: + buildType: 'current' + artifactName: 'drop-onnxruntime-java-linux-gpu-x64' + targetPath: '$(Build.BinariesDirectory)\java-artifact\onnxruntime-java-linux-x64' + + - task: PowerShell@2 + displayName: 'PowerShell Script' + inputs: + targetType: filePath + filePath: $(Build.SourcesDirectory)\tools\ci_build\github\windows\jar_gpu_packaging.ps1 + failOnStderr: true + showWarnings: true + workingDirectory: '$(Build.BinariesDirectory)\java-artifact' + + + + - task: CopyFiles@2 + displayName: 'Copy Java Files to Artifact Staging Directory' + inputs: + SourceFolder: '$(Build.BinariesDirectory)\java-artifact\onnxruntime-java-win-x64' + TargetFolder: '$(Build.ArtifactStagingDirectory)' + + - task: PublishPipelineArtifact@1 + displayName: 'Publish Pipeline Artifact' + inputs: + targetPath: '$(Build.ArtifactStagingDirectory)' + artifact: 'onnxruntime-java-gpu' + + - template: ../templates/component-governance-component-detection-steps.yml + parameters : + condition : 'succeeded' + - task: mspremier.PostBuildCleanup.PostBuildCleanup-task.PostBuildCleanup@3 + displayName: 'Clean Agent Directories' + condition: always() + + +- job: Final_Jar_Testing_Windows_GPU + workspace: + clean: all + pool: 'Win-GPU-2019' + timeoutInMinutes: 60 + variables: + - name: runCodesignValidationInjection + value: false + dependsOn: + Jar_Packaging_GPU + steps: + - template: ../templates/set-version-number-variables-step.yml + + - task: BatchScript@1 + displayName: 'setup env' + inputs: + filename: '$(Build.SourcesDirectory)\tools\ci_build\github\windows\setup_env_cuda_11.bat' + modifyEnvironment: true + workingFolder: '$(Build.BinariesDirectory)' + + - task: DownloadPipelineArtifact@2 + displayName: 'Download Final Jar' + inputs: + buildType: 'current' + artifactName: 'onnxruntime-java-gpu' + targetPath: '$(Build.BinariesDirectory)\final-jar' + + - task: CmdLine@2 + inputs: + script: | + mkdir test + pushd test + jar xf $(Build.BinariesDirectory)\final-jar\testing.jar + popd + powershell -Command "Invoke-WebRequest https://oss.sonatype.org/service/local/repositories/releases/content/org/junit/platform/junit-platform-console-standalone/1.6.2/junit-platform-console-standalone-1.6.2.jar -OutFile junit-platform-console-standalone-1.6.2.jar" + powershell -Command "Invoke-WebRequest https://oss.sonatype.org/service/local/repositories/google-releases/content/com/google/protobuf/protobuf-java/3.9.2/protobuf-java-3.9.2.jar -OutFile protobuf-java-3.9.2.jar" + java -jar junit-platform-console-standalone-1.6.2.jar -cp .;.\test;protobuf-java-3.9.2.jar;onnxruntime-$(OnnxRuntimeVersion).jar --scan-class-path --fail-if-no-tests --disable-banner + workingDirectory: '$(Build.BinariesDirectory)\final-jar' + + - template: ../templates/component-governance-component-detection-steps.yml + parameters : + condition : 'succeeded' + - task: mspremier.PostBuildCleanup.PostBuildCleanup-task.PostBuildCleanup@3 + displayName: 'Clean Agent Directories' + condition: always() + +- job: Final_Jar_Testing_Linux_GPU + workspace: + clean: all + pool: 'Linux-GPU-CUDA10' + variables: + - name: runCodesignValidationInjection + value: false + timeoutInMinutes: 60 + dependsOn: + Jar_Packaging_GPU + steps: + - template: ../templates/set-version-number-variables-step.yml + - task: DownloadPipelineArtifact@2 + displayName: 'Download Final Jar' + inputs: + buildType: 'current' + artifactName: 'onnxruntime-java-gpu' + targetPath: '$(Build.BinariesDirectory)/final-jar' + + - task: CmdLine@2 + inputs: + script: | + echo "Java Version" + java -version + mkdir test + pushd test + jar xf $(Build.BinariesDirectory)/final-jar/testing.jar + popd + wget https://oss.sonatype.org/service/local/repositories/releases/content/org/junit/platform/junit-platform-console-standalone/1.6.2/junit-platform-console-standalone-1.6.2.jar -P ./ + wget https://oss.sonatype.org/service/local/repositories/google-releases/content/com/google/protobuf/protobuf-java/3.9.2/protobuf-java-3.9.2.jar -P ./ + LD_LIBRARY_PATH=./test:${LD_LIBRARY_PATH} + java -jar ./junit-platform-console-standalone-1.6.2.jar -cp .:./test:./protobuf-java-3.9.2.jar:./onnxruntime-$(OnnxRuntimeVersion).jar --scan-class-path --fail-if-no-tests --disable-banner + workingDirectory: '$(Build.BinariesDirectory)/final-jar' + + - template: ../templates/component-governance-component-detection-steps.yml + parameters : + condition : 'succeeded' + - task: mspremier.PostBuildCleanup.PostBuildCleanup-task.PostBuildCleanup@3 + displayName: 'Clean Agent Directories' + condition: always() 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 ba73282101..dfb610a8c1 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 @@ -172,7 +172,7 @@ jobs: DoCompliance: ${{ parameters.DoCompliance }} DoEsrp: ${{ parameters.DoEsrp }} OrtNugetPackageId: ${{ parameters.OrtNugetPackageId }} - job_name_suffix: x86_openmp + job_name_suffix: x86_${{ parameters.BuildVariant }} EnvSetupScript: setup_env_x86.bat buildArch: x86 msbuildPlatform: Win32 @@ -187,7 +187,7 @@ jobs: DoCompliance: ${{ parameters.DoCompliance }} DoEsrp: ${{ parameters.DoEsrp }} OrtNugetPackageId: ${{ parameters.OrtNugetPackageId }} - job_name_suffix: arm_openmp + job_name_suffix: arm_${{ parameters.BuildVariant }} EnvSetupScript: setup_env.bat buildArch: x64 msbuildPlatform: arm @@ -202,7 +202,7 @@ jobs: DoCompliance: ${{ parameters.DoCompliance }} DoEsrp: ${{ parameters.DoEsrp }} OrtNugetPackageId: ${{ parameters.OrtNugetPackageId }} - job_name_suffix: arm64_openmp + job_name_suffix: arm64_${{ parameters.BuildVariant }} EnvSetupScript: setup_env.bat buildArch: x64 msbuildPlatform: arm64 @@ -217,7 +217,7 @@ jobs: DoCompliance: ${{ parameters.DoCompliance }} DoEsrp: ${{ parameters.DoEsrp }} OrtNugetPackageId: ${{ parameters.OrtNugetPackageId }} - job_name_suffix: x64_openmp + job_name_suffix: x64_${{ parameters.BuildVariant }} EnvSetupScript: setup_env.bat buildArch: x64 msbuildPlatform: x64 @@ -234,10 +234,10 @@ jobs: dependsOn: - Linux_C_API_Packaging_CPU_x64 - MacOS_C_API_Packaging_CPU_x64 - - Windows_Packaging_CPU_x86_openmp - - Windows_Packaging_CPU_x64_openmp - - Windows_Packaging_CPU_arm_openmp - - Windows_Packaging_CPU_arm64_openmp + - Windows_Packaging_CPU_x86_${{ parameters.BuildVariant }} + - Windows_Packaging_CPU_x64_${{ parameters.BuildVariant }} + - Windows_Packaging_CPU_arm_${{ parameters.BuildVariant }} + - Windows_Packaging_CPU_arm64_${{ parameters.BuildVariant }} condition: succeeded() steps: - checkout: self @@ -305,10 +305,10 @@ jobs: dependsOn: - Linux_C_API_Packaging_CPU_x64 - MacOS_C_API_Packaging_CPU_x64 - - Windows_Packaging_CPU_x86_openmp - - Windows_Packaging_CPU_x64_openmp - - Windows_Packaging_CPU_arm_openmp - - Windows_Packaging_CPU_arm64_openmp + - Windows_Packaging_CPU_x86_${{ parameters.BuildVariant }} + - Windows_Packaging_CPU_x64_${{ parameters.BuildVariant }} + - Windows_Packaging_CPU_arm_${{ parameters.BuildVariant }} + - Windows_Packaging_CPU_arm64_${{ parameters.BuildVariant }} condition: succeeded() steps: - checkout: self diff --git a/tools/nuget/generate_nuspec_for_native_nuget.py b/tools/nuget/generate_nuspec_for_native_nuget.py index 9e0e7375c5..8575f5cab1 100644 --- a/tools/nuget/generate_nuspec_for_native_nuget.py +++ b/tools/nuget/generate_nuspec_for_native_nuget.py @@ -171,7 +171,7 @@ def generate_metadata(list, args): def generate_files(list, args): files_list = [''] - is_cpu_package = args.package_name in ['Microsoft.ML.OnnxRuntime', 'Microsoft.ML.OnnxRuntime.NoOpenMP'] + is_cpu_package = args.package_name in ['Microsoft.ML.OnnxRuntime', 'Microsoft.ML.OnnxRuntime.OpenMP'] is_mklml_package = args.package_name == 'Microsoft.ML.OnnxRuntime.MKLML' is_cuda_gpu_package = args.package_name == 'Microsoft.ML.OnnxRuntime.Gpu' is_dml_package = args.package_name == 'Microsoft.ML.OnnxRuntime.DirectML'