rolling back c-api-cpu.yml

microsoft · Feb 27, 2025 · 24372a6 · 24372a6
1 parent e39f6c5
commit 24372a6
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 33 deletions.
diff --git a/tools/ci_build/github/azure-pipelines/c-api-noopenmp-packaging-pipelines.yml b/tools/ci_build/github/azure-pipelines/c-api-noopenmp-packaging-pipelines.yml
@@ -93,7 +93,7 @@ extends:
   template: v1/1ES.Official.PipelineTemplate.yml@1esPipelines
   parameters:
     sdl:
-      sourceAnalysisPool: 'Onnxruntime-Win-CPU-2022'
+      sourceAnalysisPool: "Onnxruntime-Win-CPU-2022"
       sourceRepositoriesToScan:
         exclude:
         - repository: onnxruntime-inference-examples
@@ -133,18 +133,18 @@ extends:
 
     - template: stages/nuget-combine-cuda-stage.yml
       parameters:
-          DoCompliance: ${{ parameters.DoCompliance }}
-          CudaVersion: 11.8
-          RunOnnxRuntimeTests: ${{ parameters.RunOnnxRuntimeTests }}
-          UseIncreasedTimeoutForTests: ${{ parameters.UseIncreasedTimeoutForTests }}
-          win_trt_home: ${{ variables.win_trt_home }}
-          win_cuda_home: ${{ variables.win_cuda_home }}
-          DoEsrp: ${{ parameters.DoEsrp }}
-          IsReleaseBuild: ${{ parameters.IsReleaseBuild }}
-          buildJava: true
-          buildNodejs: true
-          SpecificArtifact: ${{ parameters.SpecificArtifact }}
-          BuildId: ${{ parameters.BuildId }}
+        DoCompliance: ${{ parameters.DoCompliance }}
+        CudaVersion: 11.8
+        RunOnnxRuntimeTests: ${{ parameters.RunOnnxRuntimeTests }}
+        UseIncreasedTimeoutForTests: ${{ parameters.UseIncreasedTimeoutForTests }}
+        win_trt_home: ${{ variables.win_trt_home }}
+        win_cuda_home: ${{ variables.win_cuda_home }}
+        DoEsrp: ${{ parameters.DoEsrp }}
+        IsReleaseBuild: ${{ parameters.IsReleaseBuild }}
+        buildJava: true
+        buildNodejs: true
+        SpecificArtifact: ${{ parameters.SpecificArtifact }}
+        BuildId: ${{ parameters.BuildId }}
 
 
     - template: nuget/templates/dml-vs-2022.yml
@@ -162,11 +162,11 @@ extends:
         DoCompliance: 'false'
         DoEsrp: ${{ parameters.DoEsrp }}
         NuPackScript: |
-         msbuild $(Build.SourcesDirectory)\csharp\OnnxRuntime.CSharp.proj /p:Configuration=RelWithDebInfo /t:CreatePackage /p:OrtPackageId=Microsoft.ML.OnnxRuntime.DirectML /p:IsReleaseBuild=${{ parameters.IsReleaseBuild }} /p:CurrentData=$(BuildDate) /p:CurrentTime=$(BuildTime)
-         copy $(Build.SourcesDirectory)\csharp\src\Microsoft.ML.OnnxRuntime\bin\RelWithDebInfo\*.nupkg $(Build.ArtifactStagingDirectory)
-         copy $(Build.BinariesDirectory)\RelWithDebInfo\RelWithDebInfo\*.nupkg $(Build.ArtifactStagingDirectory)
-         mkdir $(Build.ArtifactStagingDirectory)\testdata
-         copy $(Build.BinariesDirectory)\RelWithDebInfo\RelWithDebInfo\custom_op_library.* $(Build.ArtifactStagingDirectory)\testdata
+          msbuild $(Build.SourcesDirectory)\csharp\OnnxRuntime.CSharp.proj /p:Configuration=RelWithDebInfo /t:CreatePackage /p:OrtPackageId=Microsoft.ML.OnnxRuntime.DirectML /p:IsReleaseBuild=${{ parameters.IsReleaseBuild }} /p:CurrentData=$(BuildDate) /p:CurrentTime=$(BuildTime)
+          copy $(Build.SourcesDirectory)\csharp\src\Microsoft.ML.OnnxRuntime\bin\RelWithDebInfo\*.nupkg $(Build.ArtifactStagingDirectory)
+          copy $(Build.BinariesDirectory)\RelWithDebInfo\RelWithDebInfo\*.nupkg $(Build.ArtifactStagingDirectory)
+          mkdir $(Build.ArtifactStagingDirectory)\testdata
+          copy $(Build.BinariesDirectory)\RelWithDebInfo\RelWithDebInfo\custom_op_library.* $(Build.ArtifactStagingDirectory)\testdata
 
     - template: nuget/templates/dml-vs-2022.yml
       parameters:
@@ -183,12 +183,12 @@ extends:
         DoEsrp: ${{ parameters.DoEsrp }}
         RunTests: 'false'
         NuPackScript: |
-         msbuild $(Build.SourcesDirectory)\csharp\OnnxRuntime.CSharp.proj /p:Configuration=RelWithDebInfo /p:TargetArchitecture=x86 /t:CreatePackage /p:OrtPackageId=Microsoft.ML.OnnxRuntime.DirectML /p:IsReleaseBuild=${{ parameters.IsReleaseBuild }}
-         cd $(Build.BinariesDirectory)\RelWithDebInfo\RelWithDebInfo\
-         ren Microsoft.ML.OnnxRuntime.DirectML.* win-dml-x86.zip
-         copy $(Build.BinariesDirectory)\RelWithDebInfo\RelWithDebInfo\win-dml-x86.zip $(Build.ArtifactStagingDirectory)
-         mkdir $(Build.ArtifactStagingDirectory)\testdata
-         copy $(Build.BinariesDirectory)\RelWithDebInfo\RelWithDebInfo\custom_op_library.* $(Build.ArtifactStagingDirectory)\testdata
+          msbuild $(Build.SourcesDirectory)\csharp\OnnxRuntime.CSharp.proj /p:Configuration=RelWithDebInfo /p:TargetArchitecture=x86 /t:CreatePackage /p:OrtPackageId=Microsoft.ML.OnnxRuntime.DirectML /p:IsReleaseBuild=${{ parameters.IsReleaseBuild }}
+          cd $(Build.BinariesDirectory)\RelWithDebInfo\RelWithDebInfo\
+          ren Microsoft.ML.OnnxRuntime.DirectML.* win-dml-x86.zip
+          copy $(Build.BinariesDirectory)\RelWithDebInfo\RelWithDebInfo\win-dml-x86.zip $(Build.ArtifactStagingDirectory)
+          mkdir $(Build.ArtifactStagingDirectory)\testdata
+          copy $(Build.BinariesDirectory)\RelWithDebInfo\RelWithDebInfo\custom_op_library.* $(Build.ArtifactStagingDirectory)\testdata
 
     - template: nuget/templates/dml-vs-2022.yml
       parameters:
@@ -205,14 +205,14 @@ extends:
         DoEsrp: ${{ parameters.DoEsrp }}
         RunTests: 'false'
         NuPackScript: |
-         msbuild $(Build.SourcesDirectory)\csharp\OnnxRuntime.CSharp.proj /p:Configuration=RelWithDebInfo /p:TargetArchitecture=arm64 /t:CreatePackage /p:OrtPackageId=Microsoft.ML.OnnxRuntime.DirectML /p:IsReleaseBuild=${{ parameters.IsReleaseBuild }}
-         cd $(Build.BinariesDirectory)\RelWithDebInfo\RelWithDebInfo\
-         ren Microsoft.ML.OnnxRuntime.DirectML.* win-dml-arm64.zip
-         copy $(Build.BinariesDirectory)\RelWithDebInfo\RelWithDebInfo\win-dml-arm64.zip $(Build.ArtifactStagingDirectory)
-         mkdir $(Build.ArtifactStagingDirectory)\testdata
-         copy $(Build.BinariesDirectory)\RelWithDebInfo\RelWithDebInfo\custom_op_library.* $(Build.ArtifactStagingDirectory)\testdata
-    
-      
+          msbuild $(Build.SourcesDirectory)\csharp\OnnxRuntime.CSharp.proj /p:Configuration=RelWithDebInfo /p:TargetArchitecture=arm64 /t:CreatePackage /p:OrtPackageId=Microsoft.ML.OnnxRuntime.DirectML /p:IsReleaseBuild=${{ parameters.IsReleaseBuild }}
+          cd $(Build.BinariesDirectory)\RelWithDebInfo\RelWithDebInfo\
+          ren Microsoft.ML.OnnxRuntime.DirectML.* win-dml-arm64.zip
+          copy $(Build.BinariesDirectory)\RelWithDebInfo\RelWithDebInfo\win-dml-arm64.zip $(Build.ArtifactStagingDirectory)
+          mkdir $(Build.ArtifactStagingDirectory)\testdata
+          copy $(Build.BinariesDirectory)\RelWithDebInfo\RelWithDebInfo\custom_op_library.* $(Build.ArtifactStagingDirectory)\testdata
+
+
 
     - template: stages/nuget_dml_packaging_stage.yml
       parameters:

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
@@ -94,7 +94,6 @@ stages:
     parameters:
       artifactName: 'onnxruntime-android-full-aar'
       ReleaseVersionSuffix: $(ReleaseVersionSuffix)
-      is1ES: ${{ parameters.is1ES }}
 
 - stage: Android_Java_API_AAR_Packaging_QNN
   dependsOn: Setup # Setup stage defined in set_packaging_variables_stage.yml creates the ReleaseVersionSuffix variable