Skip to content

Commit 18b88e4

Browse files
LittleLittleCloudLittleLittleCloud
authored
Merge branch 'main' into u/RevertBackToUbuntu18
2 parents fd5d71b + 0fa77db commit 18b88e4

File tree

2 files changed

+27
-24
lines changed

2 files changed

+27
-24
lines changed

‎azure-pipelines.yml

Lines changed: 25 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,12 @@ parameters:
1313
- name: PushPackagesToFeed
1414
type: boolean
1515
default: false
16+
# Set which source branch to build libtorch-* packages.
17+
# The build-libtorch jobs are only run if the source branch is the same as this value.
18+
# The default is 'main' branch.
19+
- name: SourceBranchName
20+
type: string
21+
default: 'main'
1622

1723
variables:
1824
MyRunNumber: $[counter('MyRunNumber', 52201)]
@@ -26,9 +32,6 @@ variables:
2632
sudo apt-get update; sudo apt-get install -y apt-transport-https && sudo apt-get update
2733
ldd --version && (/sbin/ldconfig -p | grep stdc++) && (strings /usr/lib/x86_64-linux-gnu/libstdc++.so.6 | grep LIBCXX)
2834
29-
# Install dotnet
30-
sudo apt-get install -y dotnet-sdk-6.0
31-
3235
resources:
3336
containers:
3437
# - container: CentosContainer
@@ -97,7 +100,7 @@ jobs:
97100
################################################################################
98101
- job: Linux_Native_Build_For_Packages
99102
################################################################################
100-
condition: and(ne(variables['system.pullrequest.isfork'], true), eq(variables['build.sourcebranchname'], 'main'))
103+
condition: and(ne(variables['system.pullrequest.isfork'], true), eq(variables['build.sourcebranchname'], '${{ parameters.SourceBranchName }}'))
101104
variables:
102105
BuildConfig: Release
103106
OfficialBuildId: $(BUILD.BUILDNUMBER)
@@ -113,17 +116,18 @@ jobs:
113116
displayName: 'Use .NET Core sdk'
114117
inputs:
115118
packageType: sdk
116-
version: 6.x
119+
version: 6.0.402
117120
installationPath: $(Agent.ToolsDirectory)/dotnet
121+
118122
- script: ${{ variables.LinuxPrepScript }}
119123
displayName: Install dependencies
120124

121125
- script: dotnet build -c $(BuildConfig) src/Redist/libtorch-cpu/libtorch-cpu.proj /p:UpdateSHA=true /p:SkipTests=true /p:TargetOS=linux /t:Build /p:IncludeLibTorchCpuPackages=true
122-
condition: eq(variables['BuildLibTorchPackages'], 'true')
126+
condition: eq('${{ parameters.BuildLibTorchPackages }}', true)
123127
displayName: Download libtorch native binaries
124128

125129
- script: dotnet build -c $(BuildConfig) src/Redist/libtorch-cuda-12.1/libtorch-cuda-12.1.proj /p:UpdateSHA=true /p:SkipTests=true /p:TargetOS=linux /t:Build /p:IncludeLibTorchCudaPackages=true
126-
condition: eq(variables['BuildLibTorchPackages'], 'true')
130+
condition: eq('${{ parameters.BuildLibTorchPackages }}', true)
127131
displayName: Download libtorch native CUDA binaries
128132

129133
- script: dotnet build -c $(BuildConfig) src/TorchSharp/TorchSharp.csproj /p:SkipCuda=true /p:SkipTests=true
@@ -141,7 +145,7 @@ jobs:
141145
################################################################################
142146
- job: Windows_Native_Build_For_Packages
143147
################################################################################
144-
condition: and(ne(variables['system.pullrequest.isfork'], true), eq(variables['build.sourcebranchname'], 'main'))
148+
condition: and(ne(variables['system.pullrequest.isfork'], true), eq(variables['build.sourcebranchname'], '${{ parameters.SourceBranchName }}'))
145149
variables:
146150
BuildConfig: Release
147151
OfficialBuildId: $(BUILD.BUILDNUMBER)
@@ -152,7 +156,6 @@ jobs:
152156
vmImage: 'windows-latest'
153157

154158
steps:
155-
156159
- task: UseDotNet@2
157160
displayName: 'Use .NET Core sdk'
158161
inputs:
@@ -161,15 +164,14 @@ jobs:
161164
installationPath: $(Agent.ToolsDirectory)/dotnet
162165

163166
- script: dotnet build -c $(BuildConfig) src/Redist/libtorch-cpu/libtorch-cpu.proj /p:UpdateSHA=true /p:SkipTests=true /p:TargetOS=windows /t:Build /p:IncludeLibTorchCpuPackages=true
164-
condition: eq(variables['BuildLibTorchPackages'], 'true')
165167
displayName: Download libtorch native binaries
166168

167169
- script: dotnet build -c $(BuildConfig) src/Redist/libtorch-cuda-12.1/libtorch-cuda-12.1.proj /p:UpdateSHA=true /p:SkipTests=true /p:TargetOS=windows /t:Build /p:IncludeLibTorchCudaPackages=true
168-
condition: eq(variables['BuildLibTorchPackages'], 'true')
170+
condition: eq('${{ parameters.BuildLibTorchPackages }}', true)
169171
displayName: Download libtorch native CUDA binaries
170172

171-
172173
- script: dotnet build -c $(BuildConfig) src/TorchSharp/TorchSharp.csproj /p:SkipCuda=true /p:SkipTests=true
174+
condition: eq('${{ parameters.BuildLibTorchPackages }}', true)
173175
displayName: Build Windows
174176

175177
- script: dotnet build -c $(BuildConfig) src/TorchVision/TorchVision.csproj /p:SkipCuda=true /p:SkipTests=true
@@ -184,7 +186,7 @@ jobs:
184186
# ################################################################################
185187
- job: MacOS_x64_Native_Build_For_Packages
186188
# ################################################################################
187-
condition: and(ne(variables['system.pullrequest.isfork'], true), eq(variables['build.sourcebranchname'], 'main'))
189+
condition: and(ne(variables['system.pullrequest.isfork'], true), eq(variables['build.sourcebranchname'], '${{ parameters.SourceBranchName }}'))
188190
variables:
189191
BuildConfig: Release
190192
OfficialBuildId: $(BUILD.BUILDNUMBER)
@@ -195,7 +197,7 @@ jobs:
195197
vmImage: 'macos-latest'
196198
steps:
197199
- script: dotnet build -c $(BuildConfig) src/Redist/libtorch-cpu/libtorch-cpu.proj /p:UpdateSHA=true /p:SkipTests=true /p:TargetOS=mac /t:Build /p:IncludeLibTorchCpuPackages=true
198-
condition: eq(variables['BuildLibTorchPackages'], 'true')
200+
condition: eq('${{ parameters.BuildLibTorchPackages }}', true)
199201
displayName: Download libtorch native binaries
200202

201203
- script: dotnet build -c $(BuildConfig) src/TorchSharp/TorchSharp.csproj /p:SkipCuda=true /p:SkipTests=true
@@ -213,7 +215,7 @@ jobs:
213215
# ################################################################################
214216
- job: MacOS_arm64_Native_Build_For_Packages
215217
# ################################################################################
216-
condition: and(ne(variables['system.pullrequest.isfork'], true), eq(variables['build.sourcebranchname'], 'main'))
218+
condition: and(ne(variables['system.pullrequest.isfork'], true), eq(variables['build.sourcebranchname'], '${{ parameters.SourceBranchName }}'))
217219
variables:
218220
BuildConfig: Release
219221
OfficialBuildId: $(BUILD.BUILDNUMBER)
@@ -242,7 +244,7 @@ jobs:
242244
################################################################################
243245
- job: Build_TorchSharp_And_libtorch_cpu_Packages
244246
################################################################################
245-
condition: and(ne(variables['system.pullrequest.isfork'], true), eq(variables['build.sourcebranchname'], 'main'))
247+
condition: and(ne(variables['system.pullrequest.isfork'], true), eq(variables['build.sourcebranchname'], '${{ parameters.SourceBranchName }}'))
246248
dependsOn:
247249
- Linux_Native_Build_For_Packages
248250
- Windows_Native_Build_For_Packages
@@ -416,7 +418,7 @@ jobs:
416418
# Only run if BuildLibTorchPackages is true
417419
- job: Build_libtorch_cuda_win_Packages
418420
################################################################################
419-
condition: and(ne(variables['system.pullrequest.isfork'], true), eq(variables['build.sourcebranchname'], 'main'), eq(variables['BuildLibTorchPackages'], 'true'))
421+
condition: and(ne(variables['system.pullrequest.isfork'], true), eq(variables['build.sourcebranchname'], '${{ parameters.SourceBranchName }}'), eq('${{ parameters.BuildLibTorchPackages }}', true))
420422
dependsOn:
421423
- Windows_Native_Build_For_Packages
422424
variables:
@@ -471,7 +473,7 @@ jobs:
471473
################################################################################
472474
- job: Build_libtorch_cuda_linux_Packages
473475
################################################################################
474-
condition: and(ne(variables['system.pullrequest.isfork'], true), eq(variables['build.sourcebranchname'], 'main'), eq(variables['BuildLibTorchPackages'], 'true'))
476+
condition: and(ne(variables['system.pullrequest.isfork'], true), eq(variables['build.sourcebranchname'], '${{ parameters.SourceBranchName }}'), eq('${{ parameters.BuildLibTorchPackages }}', true))
475477
dependsOn:
476478
- Linux_Native_Build_For_Packages
477479
variables:
@@ -537,7 +539,7 @@ jobs:
537539
################################################################################
538540
- job: CodeSign_Core
539541
################################################################################
540-
condition: and(ne(variables['system.pullrequest.isfork'], true), eq(variables['build.sourcebranchname'], 'main'))
542+
condition: and(ne(variables['system.pullrequest.isfork'], true), eq(variables['build.sourcebranchname'], '${{ parameters.SourceBranchName }}'))
541543
dependsOn:
542544
- Build_TorchSharp_And_libtorch_cpu_Packages
543545
variables:
@@ -585,7 +587,7 @@ jobs:
585587
################################################################################
586588
- job: CodeSign_Extras
587589
################################################################################
588-
condition: and(ne(variables['system.pullrequest.isfork'], true), eq(variables['build.sourcebranchname'], 'main'), eq(variables['BuildLibTorchPackages'], 'true'))
590+
condition: and(ne(variables['system.pullrequest.isfork'], true), eq(variables['build.sourcebranchname'], '${{ parameters.SourceBranchName }}'), eq('${{ parameters.PushPackagesToFeed }}', true))
589591
dependsOn:
590592
- Build_libtorch_cuda_win_Packages
591593
- Build_libtorch_cuda_linux_Packages
@@ -659,8 +661,7 @@ jobs:
659661
################################################################################
660662
- job: Push_TorchSharp_And_libtorch_cpu_Packages
661663
################################################################################
662-
condition: and(ne(variables['system.pullrequest.isfork'], true), eq(variables['build.sourcebranchname'], 'main'), eq(variables['PushPackagesToFeed'], true))
663-
664+
condition: and(eq('${{ parameters.PushPackagesToFeed }}', true), ne(variables['system.pullrequest.isfork'], true), eq(variables['build.sourcebranchname'], '${{ parameters.SourceBranchName }}'))
664665
dependsOn:
665666
- Build_TorchSharp_And_libtorch_cpu_Packages
666667
- CodeSign_Core
@@ -761,7 +762,7 @@ jobs:
761762
# Only run if BuildLibTorchPackages is true
762763
- job: Push_libtorch_cuda_win_Packages
763764
################################################################################
764-
condition: and(ne(variables['system.pullrequest.isfork'], true), eq(variables['build.sourcebranchname'], 'main'), eq(variables['BuildLibTorchPackages'], 'true'), eq(variables['PushPackagesToFeed'], true))
765+
condition: and(eq('${{ parameters.BuildLibTorchPackages }}', true), eq('${{ parameters.PushPackagesToFeed }}', true), ne(variables['system.pullrequest.isfork'], true))
765766
dependsOn:
766767
- Build_libtorch_cuda_win_Packages
767768
- CodeSign_Extras
@@ -846,7 +847,7 @@ jobs:
846847
################################################################################
847848
- job: Push_libtorch_cuda_linux_Packages
848849
################################################################################
849-
condition: and(ne(variables['system.pullrequest.isfork'], true), eq(variables['build.sourcebranchname'], 'main'), eq(variables['BuildLibTorchPackages'], 'true'), eq(variables['PushPackagesToFeed'], true))
850+
condition: and(eq('${{ parameters.BuildLibTorchPackages }}', 'true'), eq('${{ parameters.PushPackagesToFeed }}', true), ne(variables['system.pullrequest.isfork'], true))
850851
dependsOn:
851852
- Build_libtorch_cuda_linux_Packages
852853
- CodeSign_Extras

‎pkg/pack.proj

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@
66
<PackProject Include="**\libtorch-cuda-$(CudaVersionDot)-linux-*.nupkgproj" Condition="'$(IncludeLibTorchCudaPackages)' == 'true' AND '$(TargetOS)' == 'linux'" />
77
<PackProject Include="**\libtorch-cuda-$(CudaVersionDot)-win-*.nupkgproj" Condition="'$(IncludeLibTorchCudaPackages)' == 'true' AND '$(TargetOS)' == 'windows'" />
88
<PackProject Include="**\libtorch-cuda-$(CudaVersionDot)-mac-*.nupkgproj" Condition="'$(IncludeLibTorchCudaPackages)' == 'true' AND '$(TargetOS)' == 'mac'" />
9+
</ItemGroup>
10+
<ItemGroup Condition="'$(IncludeTorchSharpPackage)' == 'true'">
911
<PackProject Include="**\TorchAudio.nupkgproj" />
1012
<PackProject Include="**\TorchSharp.nupkgproj" />
1113
<PackProject Include="**\TorchSharp-cpu.nupkgproj" />

0 commit comments

Comments
 (0)