Skip to content

Commit 9d798f1

Browse files
moving onedal nuget download from onedal to native where its needed for building. (#6527)
1 parent 0880a90 commit 9d798f1

File tree

2 files changed

+16
-17
lines changed

2 files changed

+16
-17
lines changed

src/Microsoft.ML.OneDal/Microsoft.ML.OneDal.csproj

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -30,20 +30,4 @@
3030
<ItemGroup>
3131
<Content Include="$(RepoRoot)eng\pkg\CommonPackage.props" Pack="true" PackagePath="build\netstandard2.0\$(MSBuildProjectName).props" />
3232
</ItemGroup>
33-
34-
<ItemGroup>
35-
<PackageDownload Include="inteldal.devel.win-x64" Version="[2023.0.0.23189]" />
36-
37-
<PackageDownload Condition="$([MSBuild]::IsOSPlatform('Linux'))" Include="inteldal.redist.linux-x64" Version="[2023.0.0.23046]" />
38-
<PackageDownload Condition="$([MSBuild]::IsOSPlatform('Linux'))" Include="inteltbb.devel.linux" Version="[2021.7.1.15005]" />
39-
40-
<PackageDownload Condition="$([MSBuild]::IsOSPlatform('osx'))" Include="inteldal.redist.osx-x64" Version="[2023.0.0.22995]" />
41-
<PackageDownload Condition="$([MSBuild]::IsOSPlatform('osx'))" Include="inteltbb.devel.osx" Version="[2021.7.1.14939]" />
42-
43-
<PackageDownload Condition="'$(OS)' == 'Windows_NT'" Include="inteldal.redist.win-x64" Version="[2023.0.0.23189]" />
44-
<PackageDownload Condition="'$(OS)' == 'Windows_NT'" Include="inteltbb.redist.win" Version="[2021.7.1.15305]" />
45-
<PackageDownload Condition="'$(OS)' == 'Windows_NT'" Include="inteltbb.devel.win" Version="[2021.7.1.15305]" />
46-
47-
48-
</ItemGroup>
4933
</Project>

src/Native/Native.proj

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,21 @@
88
-->
99
<Import Project="Sdk.targets" Sdk="Microsoft.Build.Traversal" />
1010

11+
<!-- Download Nugets for OneDal -->
12+
<ItemGroup>
13+
<PackageDownload Include="inteldal.devel.win-x64" Version="[2023.0.0.23189]" />
14+
15+
<PackageDownload Condition="$([MSBuild]::IsOSPlatform('Linux'))" Include="inteldal.redist.linux-x64" Version="[2023.0.0.23046]" />
16+
<PackageDownload Condition="$([MSBuild]::IsOSPlatform('Linux'))" Include="inteltbb.devel.linux" Version="[2021.7.1.15005]" />
17+
18+
<PackageDownload Condition="$([MSBuild]::IsOSPlatform('osx'))" Include="inteldal.redist.osx-x64" Version="[2023.0.0.22995]" />
19+
<PackageDownload Condition="$([MSBuild]::IsOSPlatform('osx'))" Include="inteltbb.devel.osx" Version="[2021.7.1.14939]" />
20+
21+
<PackageDownload Condition="'$(OS)' == 'Windows_NT'" Include="inteldal.redist.win-x64" Version="[2023.0.0.23189]" />
22+
<PackageDownload Condition="'$(OS)' == 'Windows_NT'" Include="inteltbb.redist.win" Version="[2021.7.1.15305]" />
23+
<PackageDownload Condition="'$(OS)' == 'Windows_NT'" Include="inteltbb.devel.win" Version="[2021.7.1.15305]" />
24+
</ItemGroup>
25+
1126
<PropertyGroup>
1227
<!-- versioning.targets will import this file, so don't import it again -->
1328
<DisableImportVersioningProps>true</DisableImportVersioningProps>
@@ -149,7 +164,7 @@
149164
<Copy Condition="'$(TargetArchitecture)' == 'x64'"
150165
SourceFiles="$(NuGetPackageRoot)inteldal.redist.$(PackageRid)\$(OneDalPkgVersion)\build\native\daal\latest\$(OneDalLibDir)\$(NativeLibPrefix)onedal_thread$(OneDalLibExtension)"
151166
DestinationFolder="$(PackageAssetsPath)\Microsoft.ML.OneDal\runtimes\$(PackageRid)\native" />
152-
167+
153168
<!-- Copy oneTBB (dependency of oneDAL) -->
154169
<Copy Condition="'$(TargetArchitecture)' == 'x64'"
155170
SourceFiles="$(NuGetPackageRoot)inteltbb.$(TbbPkgType).$(TbbSystem)\$(OneTbbPkgVersion)\runtimes\$(PackageRid)\native\$(TbbLibrary)"

0 commit comments

Comments
 (0)