Skip to content

Commit c3bdaaa

Browse files
harishskharishsk
authored
TF package size fix (#3983)
* Reduced list of TF binaries to only the essential ones * Fixed formatting
1 parent e5d0546 commit c3bdaaa

File tree

6 files changed

+26
-36
lines changed

6 files changed

+26
-36
lines changed

‎Directory.Build.targets‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,10 @@
2222
</ItemGroup>
2323

2424
<ItemGroup>
25-
<NativeAssemblyReferenceWithMajorVersion Include="@(NativeAssemblyReference->HasMetadata('MajorVersion'))">
25+
<NativeAssemblyReferenceWithMajorVersion>
2626
<!-- Tensorflow has a different naming scheme for v1.14.0. Those binaries need to be copied along with the standard names -->
27-
<AssemblyPathWithMajorVersion Condition="'$(OS)' != 'Windows_NT'">$(NativeOutputPath)$(LibPrefix)%(NativeAssemblyReference.Identity)$(LibExtension).%(NativeAssemblyReference.MajorVersion)</AssemblyPathWithMajorVersion>
28-
<AssemblyPathWithMajorVersion Condition="$([MSBuild]::IsOSPlatform('osx'))">$(NativeOutputPath)$(LibPrefix)%(NativeAssemblyReference.Identity).%(NativeAssemblyReference.MajorVersion)$(LibExtension)</AssemblyPathWithMajorVersion>
27+
<AssemblyPathWithMajorVersion Condition="'$(OS)' != 'Windows_NT'">$(NativeOutputPath)$(LibPrefix)%(NativeAssemblyReferenceWithMajorVersion.Identity)$(LibExtension).%(NativeAssemblyReferenceWithMajorVersion.MajorVersion)</AssemblyPathWithMajorVersion>
28+
<AssemblyPathWithMajorVersion Condition="$([MSBuild]::IsOSPlatform('osx'))">$(NativeOutputPath)$(LibPrefix)%(NativeAssemblyReferenceWithMajorVersion.Identity).%(NativeAssemblyReferenceWithMajorVersion.MajorVersion)$(LibExtension)</AssemblyPathWithMajorVersion>
2929
</NativeAssemblyReferenceWithMajorVersion>
3030
</ItemGroup>
3131

‎src/Microsoft.ML.DnnAnalyzer/Microsoft.ML.DnnAnalyzer/Microsoft.ML.DnnAnalyzer.csproj‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,10 @@
1313

1414
<!-- TensorFlow is 64-bit only -->
1515
<ItemGroup Condition="'$(NativeTargetArchitecture)' == 'x64'">
16-
<NativeAssemblyReference Include="tensorflow">
16+
<NativeAssemblyReference Include="tensorflow" />
17+
<NativeAssemblyReferenceWithMajorVersion Condition="'$(OS)' != 'Windows_NT'" Include="tensorflow_framework">
1718
<MajorVersion>$(TensorFlowMajorVersion)</MajorVersion>
18-
</NativeAssemblyReference>
19-
<NativeAssemblyReference Condition="'$(OS)' != 'Windows_NT'" Include="tensorflow_framework">
20-
<MajorVersion>$(TensorFlowMajorVersion)</MajorVersion>
21-
</NativeAssemblyReference>
19+
</NativeAssemblyReferenceWithMajorVersion>
2220
</ItemGroup>
2321

2422
</Project>

‎src/Redist/Microsoft.ML.TensorFlow.Redist/Microsoft.ML.TensorFlow.Redist.proj‎

Lines changed: 11 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -6,25 +6,23 @@
66
</PropertyGroup>
77

88
<ItemGroup>
9-
<TensorFlowConfig Include="windows" FileExtension=".zip" FilesFromArchive="lib\tensorflow.dll;include\tensorflow\c\LICENSE" Runtime="win-x64"/>
10-
<TensorFlowConfig Include="linux" FileExtension=".tar.gz"
9+
<TensorFlowConfig Include="windows"
10+
FileExtension=".zip"
11+
FilesFromArchive="lib\tensorflow.dll;
12+
include\tensorflow\c\LICENSE"
13+
Runtime="win-x64"/>
14+
<TensorFlowConfig Include="linux"
15+
FileExtension=".tar.gz"
1116
FilesFromArchive="lib\libtensorflow.so;
12-
lib\libtensorflow.so.$(TensorFlowMajorVersion);
13-
lib\libtensorflow.so.$(TensorFlowVersion);
14-
lib\libtensorflow_framework.so;
1517
lib\libtensorflow_framework.so.$(TensorFlowMajorVersion);
16-
lib\libtensorflow_framework.so.$(TensorFlowVersion);
1718
include\tensorflow\c\LICENSE"
18-
Runtime="linux-x64" />
19-
<TensorFlowConfig Include="darwin" FileExtension=".tar.gz"
19+
Runtime="linux-x64" />
20+
<TensorFlowConfig Include="darwin"
21+
FileExtension=".tar.gz"
2022
FilesFromArchive="lib\libtensorflow.dylib;
21-
lib\libtensorflow.$(TensorFlowMajorVersion).dylib;
22-
lib\libtensorflow.$(TensorFlowVersion).dylib;
23-
lib\libtensorflow_framework.dylib;
2423
lib\libtensorflow_framework.$(TensorFlowMajorVersion).dylib;
25-
lib\libtensorflow_framework.$(TensorFlowVersion).dylib;
2624
include\tensorflow\c\LICENSE"
27-
Runtime="osx-x64" />
25+
Runtime="osx-x64" />
2826

2927

3028
<AdditionalDownloadFile Include="https://raw.githubusercontent.com/tensorflow/tensorflow/master/LICENSE" DownloadFile="$(IntermediateOutputPath)LICENSE" />

‎test/Microsoft.ML.Core.Tests/Microsoft.ML.Core.Tests.csproj‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -38,12 +38,10 @@
3838

3939
<!-- TensorFlow is 64-bit only -->
4040
<ItemGroup Condition="'$(NativeTargetArchitecture)' == 'x64'">
41-
<NativeAssemblyReference Include="tensorflow">
41+
<NativeAssemblyReference Include="tensorflow" />
42+
<NativeAssemblyReferenceWithMajorVersion Condition="'$(OS)' != 'Windows_NT'" Include="tensorflow_framework">
4243
<MajorVersion>$(TensorFlowMajorVersion)</MajorVersion>
43-
</NativeAssemblyReference>
44-
<NativeAssemblyReference Condition="'$(OS)' != 'Windows_NT'" Include="tensorflow_framework">
45-
<MajorVersion>$(TensorFlowMajorVersion)</MajorVersion>
46-
</NativeAssemblyReference>
44+
</NativeAssemblyReferenceWithMajorVersion>
4745
</ItemGroup>
4846

4947
</Project>

‎test/Microsoft.ML.Functional.Tests/Microsoft.ML.Functional.Tests.csproj‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -44,12 +44,10 @@
4444

4545
<!-- TensorFlow is 64-bit only -->
4646
<ItemGroup Condition="'$(NativeTargetArchitecture)' == 'x64'">
47-
<NativeAssemblyReference Include="tensorflow">
47+
<NativeAssemblyReference Include="tensorflow" />
48+
<NativeAssemblyReferenceWithMajorVersion Condition="'$(OS)' != 'Windows_NT'" Include="tensorflow_framework">
4849
<MajorVersion>$(TensorFlowMajorVersion)</MajorVersion>
49-
</NativeAssemblyReference>
50-
<NativeAssemblyReference Condition="'$(OS)' != 'Windows_NT'" Include="tensorflow_framework">
51-
<MajorVersion>$(TensorFlowMajorVersion)</MajorVersion>
52-
</NativeAssemblyReference>
50+
</NativeAssemblyReferenceWithMajorVersion>
5351
</ItemGroup>
5452
<ItemGroup>
5553
<PackageReference Include="Microsoft.ML.TensorFlow.TestModels" Version="$(MicrosoftMLTensorFlowTestModelsVersion)" />

‎test/Microsoft.ML.Tests/Microsoft.ML.Tests.csproj‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -45,12 +45,10 @@
4545

4646
<!-- TensorFlow is 64-bit only -->
4747
<ItemGroup Condition="'$(NativeTargetArchitecture)' == 'x64'">
48-
<NativeAssemblyReference Include="tensorflow">
48+
<NativeAssemblyReference Include="tensorflow" />
49+
<NativeAssemblyReferenceWithMajorVersion Condition="'$(OS)' != 'Windows_NT'" Include="tensorflow_framework">
4950
<MajorVersion>$(TensorFlowMajorVersion)</MajorVersion>
50-
</NativeAssemblyReference>
51-
<NativeAssemblyReference Condition="'$(OS)' != 'Windows_NT'" Include="tensorflow_framework">
52-
<MajorVersion>$(TensorFlowMajorVersion)</MajorVersion>
53-
</NativeAssemblyReference>
51+
</NativeAssemblyReferenceWithMajorVersion>
5452
</ItemGroup>
5553
<ItemGroup>
5654
<PackageReference Include="Microsoft.ML.TensorFlow.TestModels" Version="$(MicrosoftMLTensorFlowTestModelsVersion)" />

0 commit comments

Comments
 (0)