Skip to content

Commit a54a431

Browse files
eerhardteerhardt
authored
Remove TensorFlow.Redist since we no longer use it. (dotnet#4338)
1 parent fd87d4f commit a54a431

File tree

12 files changed

+1
-234
lines changed

12 files changed

+1
-234
lines changed

‎Directory.Build.targets

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,6 @@
2121
</NativeAssemblyReference>
2222
</ItemGroup>
2323

24-
<ItemGroup>
25-
<NativeAssemblyReferenceWithMajorVersion>
26-
<!-- 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)%(NativeAssemblyReferenceWithMajorVersion.Identity)$(LibExtension).%(NativeAssemblyReferenceWithMajorVersion.MajorVersion)</AssemblyPathWithMajorVersion>
28-
<AssemblyPathWithMajorVersion Condition="$([MSBuild]::IsOSPlatform('osx'))">$(NativeOutputPath)$(LibPrefix)%(NativeAssemblyReferenceWithMajorVersion.Identity).%(NativeAssemblyReferenceWithMajorVersion.MajorVersion)$(LibExtension)</AssemblyPathWithMajorVersion>
29-
</NativeAssemblyReferenceWithMajorVersion>
30-
</ItemGroup>
31-
3224
<Copy SourceFiles = "@(NativeAssemblyReference->'%(FullAssemblyPath)')"
3325
DestinationFolder="$(OutputPath)"
3426
OverwriteReadOnlyFiles="$(OverwriteReadOnlyFiles)"
@@ -39,18 +31,6 @@
3931
<Output TaskParameter="DestinationFiles" ItemName="FileWrites"/>
4032
</Copy>
4133

42-
<!-- Optionally copy the native binaries that have a version number attended (Only tensorflow right now) -->
43-
<Copy Condition="'$(OS)' != 'Windows_NT'"
44-
SourceFiles = "@(NativeAssemblyReferenceWithMajorVersion->'%(AssemblyPathWithMajorVersion)')"
45-
DestinationFolder="$(OutputPath)"
46-
OverwriteReadOnlyFiles="$(OverwriteReadOnlyFiles)"
47-
Retries="$(CopyRetryCount)"
48-
RetryDelayMilliseconds="$(CopyRetryDelayMilliseconds)"
49-
UseHardlinksIfPossible="$(CreateHardLinksForPublishFilesIfPossible)"
50-
UseSymboliclinksIfPossible="$(CreateSymbolicLinksForPublishFilesIfPossible)">
51-
<Output TaskParameter="DestinationFiles" ItemName="FileWrites"/>
52-
</Copy>
53-
5434
</Target>
5535

5636
<Import Project="$(ToolsDir)/versioning.targets" Condition="Exists('$(ToolsDir)/versioning.targets')" />

‎Microsoft.ML.sln

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -179,11 +179,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Microsoft.ML.TensorFlow", "
179179
pkg\Microsoft.ML.TensorFlow\Microsoft.ML.TensorFlow.symbols.nupkgproj = pkg\Microsoft.ML.TensorFlow\Microsoft.ML.TensorFlow.symbols.nupkgproj
180180
EndProjectSection
181181
EndProject
182-
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Microsoft.ML.TensorFlow.Redist", "Microsoft.ML.TensorFlow.Redist", "{7F3D89CF-EAAD-4F21-AE83-F2EF9C97EC32}"
183-
ProjectSection(SolutionItems) = preProject
184-
pkg\Microsoft.ML.TensorFlow.Redist\Microsoft.ML.TensorFlow.Redist.nupkgproj = pkg\Microsoft.ML.TensorFlow.Redist\Microsoft.ML.TensorFlow.Redist.nupkgproj
185-
EndProjectSection
186-
EndProject
187182
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Microsoft.ML.TimeSeries", "Microsoft.ML.TimeSeries", "{B836F712-7FB6-4B75-A3EB-FB05F8E0D15E}"
188183
ProjectSection(SolutionItems) = preProject
189184
pkg\Microsoft.ML.TimeSeries\Microsoft.ML.TimeSeries.nupkgproj = pkg\Microsoft.ML.TimeSeries\Microsoft.ML.TimeSeries.nupkgproj
@@ -1700,7 +1695,6 @@ Global
17001695
{93FF16AA-635E-421D-96C1-008818C143A2} = {D3D38B03-B557-484D-8348-8BADEE4DF592}
17011696
{320AF46A-4809-486E-8F9E-A00C8AE47751} = {D3D38B03-B557-484D-8348-8BADEE4DF592}
17021697
{11894B4A-78B4-4523-A6DD-4495722E244F} = {D3D38B03-B557-484D-8348-8BADEE4DF592}
1703-
{7F3D89CF-EAAD-4F21-AE83-F2EF9C97EC32} = {D3D38B03-B557-484D-8348-8BADEE4DF592}
17041698
{B836F712-7FB6-4B75-A3EB-FB05F8E0D15E} = {D3D38B03-B557-484D-8348-8BADEE4DF592}
17051699
{B00098E4-771E-41DF-A3AA-A606AAB334B7} = {D3D38B03-B557-484D-8348-8BADEE4DF592}
17061700
{BD93C0F3-3CED-4BE8-9389-4234250FBFB1} = {D3D38B03-B557-484D-8348-8BADEE4DF592}

‎build/sign.proj

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,8 @@
3030

3131
<!-- If we are not signing nuget packages we default to sign binaries -->
3232
<ItemGroup Condition="'$(SignNugetPackages)' != 'true'">
33-
<!-- Don't sign tensorflow since we don't build it. -->
34-
<ExcludeFilesToSign Include="$(OutDir)**/tensorflow.dll" />
3533

36-
<FilesToSign Include="$(OutDir)**/*.dll" Exclude="@(ExcludeFilesToSign)">
34+
<FilesToSign Include="$(OutDir)**/*.dll">
3735
<Authenticode>Microsoft400</Authenticode>
3836
</FilesToSign>
3937
</ItemGroup>

‎pkg/Microsoft.ML.TensorFlow.Redist/Microsoft.ML.TensorFlow.Redist.nupkgproj

Lines changed: 0 additions & 25 deletions
This file was deleted.

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

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,4 @@
1111
<ProjectReference Include="..\..\Microsoft.ML.TensorFlow\Microsoft.ML.TensorFlow.csproj" />
1212
</ItemGroup>
1313

14-
<!-- TensorFlow is 64-bit only -->
15-
<ItemGroup Condition="'$(NativeTargetArchitecture)' == 'x64'">
16-
<NativeAssemblyReference Include="tensorflow" />
17-
<NativeAssemblyReferenceWithMajorVersion Condition="'$(OS)' != 'Windows_NT'" Include="tensorflow_framework">
18-
<MajorVersion>$(TensorFlowMajorVersion)</MajorVersion>
19-
</NativeAssemblyReferenceWithMajorVersion>
20-
</ItemGroup>
21-
2214
</Project>

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

Lines changed: 0 additions & 145 deletions
This file was deleted.

‎src/Redist/Microsoft.ML.TensorFlow.Redist/libtensorflow-cpu-darwin-x86_64-1.14.0.tar.gz.sha

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎src/Redist/Microsoft.ML.TensorFlow.Redist/libtensorflow-cpu-linux-x86_64-1.14.0.tar.gz.sha

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎src/Redist/Microsoft.ML.TensorFlow.Redist/libtensorflow-cpu-windows-x86_64-1.14.0.zip.sha

Lines changed: 0 additions & 1 deletion
This file was deleted.

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

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -37,12 +37,4 @@
3737
<NativeAssemblyReference Condition="'$(OS)' == 'Windows_NT'" Include="libiomp5md" />
3838
</ItemGroup>
3939

40-
<!-- TensorFlow is 64-bit only -->
41-
<ItemGroup Condition="'$(NativeTargetArchitecture)' == 'x64'">
42-
<NativeAssemblyReference Include="tensorflow" />
43-
<NativeAssemblyReferenceWithMajorVersion Condition="'$(OS)' != 'Windows_NT'" Include="tensorflow_framework">
44-
<MajorVersion>$(TensorFlowMajorVersion)</MajorVersion>
45-
</NativeAssemblyReferenceWithMajorVersion>
46-
</ItemGroup>
47-
4840
</Project>

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

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
<ProjectReference Include="..\..\src\Microsoft.ML.Recommender\Microsoft.ML.Recommender.csproj" />
2424
<ProjectReference Include="..\..\src\Microsoft.ML.StandardTrainers\Microsoft.ML.StandardTrainers.csproj" />
2525
<ProjectReference Include="..\..\src\Microsoft.ML.OnnxConverter\Microsoft.ML.OnnxConverter.csproj" />
26-
<ProjectReference Include="..\..\src\Microsoft.ML.TensorFlow\Microsoft.ML.TensorFlow.csproj" />
2726
<ProjectReference Include="..\..\src\Microsoft.ML.TimeSeries\Microsoft.ML.TimeSeries.csproj" />
2827
<ProjectReference Include="..\Microsoft.ML.TestFramework\Microsoft.ML.TestFramework.csproj" />
2928
</ItemGroup>
@@ -39,15 +38,7 @@
3938
<NativeAssemblyReference Condition="'$(OS)' == 'Windows_NT'" Include="libiomp5md" />
4039
</ItemGroup>
4140

42-
<!-- TensorFlow is 64-bit only -->
43-
<ItemGroup Condition="'$(NativeTargetArchitecture)' == 'x64'">
44-
<NativeAssemblyReference Include="tensorflow" />
45-
<NativeAssemblyReferenceWithMajorVersion Condition="'$(OS)' != 'Windows_NT'" Include="tensorflow_framework">
46-
<MajorVersion>$(TensorFlowMajorVersion)</MajorVersion>
47-
</NativeAssemblyReferenceWithMajorVersion>
48-
</ItemGroup>
4941
<ItemGroup>
50-
<PackageReference Include="Microsoft.ML.TensorFlow.TestModels" Version="$(MicrosoftMLTensorFlowTestModelsVersion)" />
5142
<PackageReference Include="Microsoft.ML.Onnx.TestModels" Version="$(MicrosoftMLOnnxTestModelsVersion)" />
5243
</ItemGroup>
5344
</Project>

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

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -40,13 +40,6 @@
4040
<NativeAssemblyReference Condition="'$(OS)' == 'Windows_NT'" Include="libiomp5md" />
4141
</ItemGroup>
4242

43-
<!-- TensorFlow is 64-bit only -->
44-
<ItemGroup Condition="'$(NativeTargetArchitecture)' == 'x64'">
45-
<NativeAssemblyReference Include="tensorflow" />
46-
<NativeAssemblyReferenceWithMajorVersion Condition="'$(OS)' != 'Windows_NT'" Include="tensorflow_framework">
47-
<MajorVersion>$(TensorFlowMajorVersion)</MajorVersion>
48-
</NativeAssemblyReferenceWithMajorVersion>
49-
</ItemGroup>
5043
<ItemGroup>
5144
<PackageReference Include="Microsoft.ML.TensorFlow.TestModels" Version="$(MicrosoftMLTensorFlowTestModelsVersion)" />
5245
<PackageReference Include="Microsoft.ML.Onnx.TestModels" Version="$(MicrosoftMLOnnxTestModelsVersion)" />

0 commit comments

Comments
 (0)