switch to 2.5-preview1

lostmsu · lostmsu · commit 3b8d568d787b · 2021-05-17T02:10:04.000-07:00
diff --git a/CSharpOrNot/TrainCommand.cs b/CSharpOrNot/TrainCommand.cs
@@ -9,7 +9,7 @@
     using numpy;
     using tensorflow;
     using tensorflow.keras.callbacks;
-    using tensorflow.optimizers;
+    using tensorflow.keras.optimizers;
     using tensorflow.python.keras.backend;
     using static CSharpOrNot;
 
diff --git a/FSharp/FashionMnistF/FashionMnist.fs b/FSharp/FashionMnistF/FashionMnist.fs
@@ -10,7 +10,7 @@ open numpy
 open tensorflow
 open tensorflow.keras
 open tensorflow.keras.layers
-open tensorflow.optimizers
+open tensorflow.keras.optimizers
 
 // this is no longer needed in most scenarios with 1.15, but we left it for example
 let inline (!>) (x:^a) : ^b = ((^a or ^b) : (static member op_Implicit : ^a -> ^b) x)
diff --git a/FSharp/FashionMnistF/FashionMnistF.fsproj b/FSharp/FashionMnistF/FashionMnistF.fsproj
@@ -12,6 +12,6 @@
   <ItemGroup>
     <PackageReference Include="FSharp.Interop.Dynamic" Version="5.0.1.268" />
     <PackageReference Include="LostTech.Gradient.FSharp" Version="0.1.0" />
-    <PackageReference Include="LostTech.TensorFlow" Version="2.4.1-preview1" />
+    <PackageReference Include="LostTech.TensorFlow" Version="2.5.0-preview1" />
   </ItemGroup>
 </Project>
diff --git a/FashionMnistClassification/FashionMnistClassification.cs b/FashionMnistClassification/FashionMnistClassification.cs
@@ -5,7 +5,7 @@
     using tensorflow;
     using tensorflow.keras;
     using tensorflow.keras.layers;
-    using tensorflow.optimizers;
+    using tensorflow.keras.optimizers;
 
     static class FashionMnistClassification {
         static void Main() {
diff --git a/FashionMnistClassification/FashionMnistClassification.csproj b/FashionMnistClassification/FashionMnistClassification.csproj
@@ -9,7 +9,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="LostTech.TensorFlow" Version="2.4.1-preview1" />
+    <PackageReference Include="LostTech.TensorFlow" Version="2.5.0-preview1" />
   </ItemGroup>
 
 </Project>
diff --git a/ResNetBlock/ResNetBlock.csproj b/ResNetBlock/ResNetBlock.csproj
@@ -9,6 +9,6 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="LostTech.TensorFlow" Version="2.4.1-preview1" />
+    <PackageReference Include="LostTech.TensorFlow" Version="2.5.0-preview1" />
   </ItemGroup>
 </Project>
diff --git a/SimpleApproximation/SimpleApproximation.csproj b/SimpleApproximation/SimpleApproximation.csproj
@@ -9,7 +9,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="LostTech.TensorFlow" Version="2.4.1-preview1" />
+    <PackageReference Include="LostTech.TensorFlow" Version="2.5.0-preview1" />
   </ItemGroup>
 
 </Project>
diff --git a/SimpleApproximation/SimpleApproximationProgram.cs b/SimpleApproximation/SimpleApproximationProgram.cs
@@ -6,7 +6,7 @@
     using tensorflow;
     using tensorflow.keras;
     using tensorflow.keras.layers;
-    using tensorflow.optimizers;
+    using tensorflow.keras.optimizers;
 
     static class SimpleApproximationProgram {
         const int x0 = 10, x1 = 20;
diff --git a/VB/FashionMnistVB/FashionMnist.vb b/VB/FashionMnistVB/FashionMnist.vb
@@ -2,7 +2,7 @@ Imports System
 Imports tensorflow
 Imports tensorflow.keras
 Imports tensorflow.keras.layers
-Imports tensorflow.optimizers
+Imports tensorflow.keras.optimizers
 
 Module Program
     Sub Main()
diff --git a/VB/FashionMnistVB/FashionMnistVB.vbproj b/VB/FashionMnistVB/FashionMnistVB.vbproj
@@ -7,7 +7,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="LostTech.TensorFlow" Version="2.4.1-preview1" />
+    <PackageReference Include="LostTech.TensorFlow" Version="2.5.0-preview1" />
   </ItemGroup>
 
 </Project>
diff --git a/v1/BasicMath/BasicMath.csproj b/v1/BasicMath/BasicMath.csproj
@@ -8,7 +8,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="LostTech.TensorFlow" Version="2.4.1-preview1" />
+    <PackageReference Include="LostTech.TensorFlow" Version="2.5.0-preview1" />
   </ItemGroup>
 
 </Project>
diff --git a/v1/FSharp/BasicMathF/BasicMathF.fsproj b/v1/FSharp/BasicMathF/BasicMathF.fsproj
@@ -11,7 +11,7 @@
 
   <ItemGroup>
     <PackageReference Include="FSharp.Interop.Dynamic" Version="5.0.1.268" />
-    <PackageReference Include="LostTech.TensorFlow" Version="2.4.1-preview1" />
+    <PackageReference Include="LostTech.TensorFlow" Version="2.5.0-preview1" />
   </ItemGroup>
 
 </Project>
diff --git a/v1/GPT-2/GPT-2.csproj b/v1/GPT-2/GPT-2.csproj
@@ -22,7 +22,7 @@
 
   <ItemGroup>
     <PackageReference Include="CsvHelper" Version="12.1.2" />
-    <PackageReference Include="LostTech.TensorFlow" Version="2.4.1-preview1" />
+    <PackageReference Include="LostTech.TensorFlow" Version="2.5.0-preview1" />
     <PackageReference Include="ManyConsole.CommandLineUtils" Version="1.0.3-alpha" />
     <PackageReference Include="morelinq" Version="3.3.2" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
diff --git a/v1/GPT-2/Gpt2Sampler.cs b/v1/GPT-2/Gpt2Sampler.cs
@@ -69,7 +69,7 @@ Tensor[] Body(object past, dynamic prev, object output)
                     var nextOutputs = Step(hParams, prev[.., tf.newaxis], past: past);
                     Tensor logits = nextOutputs["logits"][.., ^1, ..] / tf.constant(temperature, dtypes.float32_ref);
                     logits = TopLogits(logits, topK: topK);
-                    var samples = v1.multinomial(logits, num_samples: 1, output_dtype: tf.int32);
+                    Tensor<int> samples = v1.multinomial_dyn(logits, num_samples: 1, output_dtype: tf.int32);
                     return new Tensor[]
                     {
                         tf.concat(new []{ past, nextOutputs["presents"]}, axis: -2),
diff --git a/v1/LinearSVM/LinearSVM.csproj b/v1/LinearSVM/LinearSVM.csproj
@@ -7,7 +7,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="LostTech.TensorFlow" Version="2.4.1-preview1" />
+    <PackageReference Include="LostTech.TensorFlow" Version="2.5.0-preview1" />
     <PackageReference Include="ManyConsole.CommandLineUtils" Version="1.0.3-alpha" />
   </ItemGroup>
 
diff --git a/v1/RL-MLAgents/RL-MLAgents.csproj b/v1/RL-MLAgents/RL-MLAgents.csproj
@@ -10,7 +10,7 @@
 
   <ItemGroup>
     <PackageReference Include="LostTech.MLAgents.Environments" Version="0.19.0" />
-    <PackageReference Include="LostTech.TensorFlow" Version="2.4.1-preview1" />
+    <PackageReference Include="LostTech.TensorFlow" Version="2.5.0-preview1" />
   </ItemGroup>
 
 </Project>
diff --git a/v1/VB/BasicMathVB/BasicMathVB.vbproj b/v1/VB/BasicMathVB/BasicMathVB.vbproj
@@ -7,7 +7,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="LostTech.TensorFlow" Version="2.4.1-preview1" />
+    <PackageReference Include="LostTech.TensorFlow" Version="2.5.0-preview1" />
   </ItemGroup>
 
 </Project>

Original file line number	Diff line number	Diff line change
`@@ -69,7 +69,7 @@ Tensor[] Body(object past, dynamic prev, object output)`
`69`	`69`	`var nextOutputs = Step(hParams, prev[.., tf.newaxis], past: past);`
`70`	`70`	`Tensor logits = nextOutputs["logits"][.., ^1, ..] / tf.constant(temperature, dtypes.float32_ref);`
`71`	`71`	`logits = TopLogits(logits, topK: topK);`
`72`		`- var samples = v1.multinomial(logits, num_samples: 1, output_dtype: tf.int32);`
	`72`	`+ Tensor<int> samples = v1.multinomial_dyn(logits, num_samples: 1, output_dtype: tf.int32);`
`73`	`73`	`return new Tensor[]`
`74`	`74`	`{`
`75`	`75`	`tf.concat(new []{ past, nextOutputs["presents"]}, axis: -2),`