Updated the redistributed version of Tensorflow to 1.14 (dotnet#3929)

* Fixed build errors resulting from upgrade to VS2019 compilers

* Added additional message describing the previous fix

* Updated Tensorflow to version 1.14

* Removed rename rules for Mac

* Updated names of files for Mac

* Attempting to fix test errors on Mac

* Attempting to fix Mac test errors

* Changed list of files to copy from archive for Linux and Mac

* Fixed CopyNativeAssemblies to copy the tensorflow binaries that have version number appended

* Fixed windows build

* Another attempt at fixing both Windows and Linux builds

* Changed copying version-suffixed binaries to occur only for non-Windows platforms

* Changed copying of versioned assemblies to use HasMetadata

Author: harishsk

Directory.Build.targets

@@ -21,6 +21,14 @@
       </NativeAssemblyReference>
     </ItemGroup>
 
+    <ItemGroup>
+      <NativeAssemblyReferenceWithMajorVersion Include="@(NativeAssemblyReference->HasMetadata('MajorVersion'))">
+          <!-- Tensorflow has a different naming scheme for v1.14.0. Those binaries need to be copied along with the standard names -->
+          <AssemblyPathWithMajorVersion Condition="'$(OS)' != 'Windows_NT'">$(NativeOutputPath)$(LibPrefix)%(NativeAssemblyReference.Identity)$(LibExtension).%(NativeAssemblyReference.MajorVersion)</AssemblyPathWithMajorVersion>
+          <AssemblyPathWithMajorVersion Condition="$([MSBuild]::IsOSPlatform('osx'))">$(NativeOutputPath)$(LibPrefix)%(NativeAssemblyReference.Identity).%(NativeAssemblyReference.MajorVersion)$(LibExtension)</AssemblyPathWithMajorVersion>
+      </NativeAssemblyReferenceWithMajorVersion>
+    </ItemGroup>
+      
     <Copy SourceFiles = "@(NativeAssemblyReference->'%(FullAssemblyPath)')"
           DestinationFolder="$(OutputPath)"
           OverwriteReadOnlyFiles="$(OverwriteReadOnlyFiles)"
@@ -30,7 +38,19 @@
           UseSymboliclinksIfPossible="$(CreateSymbolicLinksForPublishFilesIfPossible)">
       <Output TaskParameter="DestinationFiles" ItemName="FileWrites"/>
     </Copy>
-    
+
+    <!-- Optionally copy the native binaries that have a version number attended (Only tensorflow right now) -->
+    <Copy Condition="'$(OS)' != 'Windows_NT'"
+          SourceFiles = "@(NativeAssemblyReferenceWithMajorVersion->'%(AssemblyPathWithMajorVersion)')"
+          DestinationFolder="$(OutputPath)"
+          OverwriteReadOnlyFiles="$(OverwriteReadOnlyFiles)"
+          Retries="$(CopyRetryCount)"
+          RetryDelayMilliseconds="$(CopyRetryDelayMilliseconds)"
+          UseHardlinksIfPossible="$(CreateHardLinksForPublishFilesIfPossible)"
+          UseSymboliclinksIfPossible="$(CreateSymbolicLinksForPublishFilesIfPossible)">
+      <Output TaskParameter="DestinationFiles" ItemName="FileWrites"/>
+    </Copy>
+      
   </Target>
 
   <Import Project="$(ToolsDir)/versioning.targets" Condition="Exists('$(ToolsDir)/versioning.targets')" />

build/Dependencies.props

@@ -21,7 +21,8 @@
     <SystemDrawingCommonPackageVersion>4.5.0</SystemDrawingCommonPackageVersion>
     <SystemIOFileSystemAccessControl>4.5.0</SystemIOFileSystemAccessControl>
     <SystemSecurityPrincipalWindows>4.5.0</SystemSecurityPrincipalWindows>
-    <TensorFlowVersion>1.13.1</TensorFlowVersion>
+    <TensorFlowVersion>1.14.0</TensorFlowVersion>
+    <TensorFlowMajorVersion>1</TensorFlowMajorVersion>
   </PropertyGroup>
 
   <!-- Code Analyzer Dependencies -->

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

@@ -13,8 +13,12 @@
 
   <!-- TensorFlow is 64-bit only -->
   <ItemGroup Condition="'$(NativeTargetArchitecture)' == 'x64'">
-    <NativeAssemblyReference Include="tensorflow" />
-    <NativeAssemblyReference Condition="'$(OS)' != 'Windows_NT'" Include="tensorflow_framework" />
+    <NativeAssemblyReference Include="tensorflow">
+      <MajorVersion>$(TensorFlowMajorVersion)</MajorVersion>
+    </NativeAssemblyReference>
+    <NativeAssemblyReference Condition="'$(OS)' != 'Windows_NT'" Include="tensorflow_framework">
+      <MajorVersion>$(TensorFlowMajorVersion)</MajorVersion>
+    </NativeAssemblyReference>
   </ItemGroup>
 
 </Project>

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

@@ -7,10 +7,27 @@
 
   <ItemGroup>
     <TensorFlowConfig Include="windows" FileExtension=".zip" FilesFromArchive="lib\tensorflow.dll;include\tensorflow\c\LICENSE" Runtime="win-x64"/>
-    <TensorFlowConfig Include="linux" FileExtension=".tar.gz" FilesFromArchive="lib\libtensorflow.so;lib\libtensorflow_framework.so;include\tensorflow\c\LICENSE" Runtime="linux-x64" />
-    <TensorFlowConfig Include="darwin" FileExtension=".tar.gz" FilesFromArchive="lib\libtensorflow.so;lib\libtensorflow_framework.so;include\tensorflow\c\LICENSE" Runtime="osx-x64" />
-
-    <AdditionalDownloadFile Include="https://raw.githubusercontent.com/tensorflow/tensorflow/master/LICENSE" DownloadFile="$(IntermediateOutputPath)LICENSE" />
+    <TensorFlowConfig Include="linux" FileExtension=".tar.gz"
+                      FilesFromArchive="lib\libtensorflow.so;
+                                        lib\libtensorflow.so.$(TensorFlowMajorVersion);
+                                        lib\libtensorflow.so.$(TensorFlowVersion);
+                                        lib\libtensorflow_framework.so;
+                                        lib\libtensorflow_framework.so.$(TensorFlowMajorVersion);
+                                        lib\libtensorflow_framework.so.$(TensorFlowVersion);
+                                        include\tensorflow\c\LICENSE"
+                    Runtime="linux-x64" />
+    <TensorFlowConfig Include="darwin" FileExtension=".tar.gz"
+                      FilesFromArchive="lib\libtensorflow.dylib;
+                                        lib\libtensorflow.$(TensorFlowMajorVersion).dylib;
+                                        lib\libtensorflow.$(TensorFlowVersion).dylib;
+                                        lib\libtensorflow_framework.dylib;
+                                        lib\libtensorflow_framework.$(TensorFlowMajorVersion).dylib;
+                                        lib\libtensorflow_framework.$(TensorFlowVersion).dylib;
+                                        include\tensorflow\c\LICENSE"
+                        Runtime="osx-x64" />
+
+
+      <AdditionalDownloadFile Include="https://raw.githubusercontent.com/tensorflow/tensorflow/master/LICENSE" DownloadFile="$(IntermediateOutputPath)LICENSE" />
   </ItemGroup>
 
   <Target Name="PrepareArchives">
@@ -93,8 +110,6 @@
       <!-- batch rather than transform so that we can split FilesFromArchive metadata -->
       <_fileFromArchive Include="%(TensorFlowArchive.FilesFromArchive)" ExtractDirectory="%(TensorFlowArchive.ExtractDirectory)" Runtime="%(TensorFlowArchive.Runtime)" />
       <_fileFromArchive DestinationFile="%(FileName)%(Extension)"/>
-      <!-- rename the .so to .dylib since CORECLR's DLLImport convention requires dylib -->
-      <_fileFromArchive Condition="'%(Runtime)' == 'osx-x64' AND '%(Extension)' == '.so'" DestinationFile="%(FileName).dylib" />
       <_fileFromArchive PackagePath="runtimes\%(_fileFromArchive.Runtime)\native\%(_fileFromArchive.DestinationFile)" />
 
       <!-- LICENSE from the package is actually THIRD_PARTY_NOTICES-->
@@ -120,9 +135,6 @@
     <Copy SourceFiles="@(FilesFromArchive)"
           DestinationFiles="@(FilesFromArchive->'%(TargetPath)')" />
 
-    <!-- fix up the renamed libtensorflow, this can only run on mac -->
-    <Exec Condition="'%(FilesFromArchive.Runtime)' == 'osx-x64' AND '%(FilesFromArchive.FileName)' == 'libtensorflow'"
-          Command="install_name_tool -change @rpath/libtensorflow_framework.so @rpath/libtensorflow_framework.dylib &quot;%(FilesFromArchive.TargetPath)&quot;" />
   </Target>
 
   <!-- Define Build to do the work of downloading and copying assets -->

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

@@ -0,0 +1 @@
+7002EF701BD23C5EF5FF94192E935F0DDF960A21BE2531CEE158586830C00E0BA889900F7F6E8AB568BEE0ACF1F5A6A246BB43D11C4109E9DC782B46377D8142

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

@@ -0,0 +1 @@
+E3F6D0309117E9E45780ECF8BC4D0268B3FC9F12E3E38FFE58496789330A4ACD2DC8FF721F3B8900357F6155F8A54000E45B99495F823486B558E8B42532392D

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

@@ -0,0 +1 @@
+59A2B80B441439B851202358CE4A65BA0DDDB319A8A29E87B135DCD9954BC5B0628F2C0C8E72D6942EA3CDCE172805C2BD5421815B3D0210B62BC0936DC59A08