use Preview 6

lostmsu · lostmsu · commit aee179048c61 · 2019-09-12T17:13:35.000-07:00
diff --git a/BasicMath/BasicMath.csproj b/BasicMath/BasicMath.csproj
@@ -4,10 +4,11 @@
     <OutputType>Exe</OutputType>
     <TargetFramework>netcoreapp2.0</TargetFramework>
     <LangVersion>latest</LangVersion>
+    <RootNamespace>Gradient.Samples</RootNamespace>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Gradient" Version="0.1.10-tech-preview5.1.1" />
+    <PackageReference Include="Gradient" Version="0.1.10-tech-preview6" />
   </ItemGroup>
 
 </Project>
diff --git a/BasicMath/BasicMathProgram.cs b/BasicMath/BasicMathProgram.cs
@@ -1,4 +1,4 @@
-﻿namespace BasicMath {
+﻿namespace Gradient.Samples {
     using System;
     using Gradient;
     using tensorflow;
diff --git a/CharRNN/CharRNN.csproj b/CharRNN/CharRNN.csproj
@@ -15,7 +15,7 @@
 
   <ItemGroup>
     <PackageReference Include="CommandLineParser" Version="2.3.0" />
-    <PackageReference Include="Gradient" Version="0.1.10-tech-preview5.1.1" />
+    <PackageReference Include="Gradient" Version="0.1.10-tech-preview6" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.1" />
   </ItemGroup>
 
diff --git a/CharRNN/CharRNNModel.cs b/CharRNN/CharRNNModel.cs
@@ -16,7 +16,7 @@ class CharRNNModel {
         readonly Random random = new Random();
         readonly CharRNNModelParameters parameters;
         readonly Func<int, RNNCell> cellFactory;
-        readonly PythonList<RNNCell> cells = new PythonList<RNNCell>();
+        readonly List<RNNCell> cells = new List<RNNCell>();
         readonly RNNCell rnn;
         internal readonly dynamic inputData;
         internal readonly seq2seqState initialState;
@@ -65,8 +65,8 @@ public CharRNNModel(CharRNNModelParameters parameters, bool training = true) {
             if (training && parameters.KeepOutputProbability < 1)
                 input = tf.nn.dropout(input, parameters.KeepOutputProbability);
 
-            PythonList<Tensor> inputs = tf.split(input, parameters.SeqLength, axis: 1);
-            inputs = inputs.Select(i => (Tensor)tf.squeeze(i, axis: 1)).ToPythonList();
+            IList<Tensor> inputs = tf.split(input, parameters.SeqLength, axis: 1);
+            inputs = inputs.Select(i => (Tensor)tf.squeeze(i, axis: 1)).ToList();
 
             dynamic Loop(dynamic prev, dynamic _) {
                 prev = tf.matmul(prev, softmax_W) + softmax_b;
@@ -78,7 +78,7 @@ dynamic Loop(dynamic prev, dynamic _) {
                 initial_state: this.initialState.Items(),
                 cell: this.rnn,
                 loop_function: training ? null : PythonFunctionContainer.Of(new Func<dynamic, dynamic, dynamic>(Loop)), scope: "rnnlm");
-            var outputs = decoder.Item1;
+            IList<Tensor> outputs = decoder.Item1;
             var lastState = (seq2seqState)decoder.Item2;
             dynamic contatenatedOutputs = tf.concat(outputs, 1);
             var output = tensorflow.tf.reshape(contatenatedOutputs, new[] { -1, parameters.RNNSize });
diff --git a/CharRNN/CharRNNUtils.cs b/CharRNN/CharRNNUtils.cs
@@ -67,7 +67,7 @@ void CreateBatches() {
             if (this.batchCount == 0)
                 throw new ArgumentException();
 
-            this.tensor = this.tensor[..this.batchCount * this.batchSize * this.seqLength-1];
+            this.tensor = this.tensor[..(this.batchCount * this.batchSize * this.seqLength-1)];
             _ArrayLike xdata = this.tensor;
             _ArrayLike ydata = np.copy(this.tensor);
             ydata[..^1] = xdata[1..];
diff --git a/FSharp/BasicMathF/BasicMathF.fsproj b/FSharp/BasicMathF/BasicMathF.fsproj
@@ -11,7 +11,7 @@
 
   <ItemGroup>
     <PackageReference Include="FSharp.Interop.Dynamic" Version="4.0.3.130" />
-    <PackageReference Include="Gradient" Version="0.1.10-tech-preview5.1.1" />
+    <PackageReference Include="Gradient" Version="0.1.10-tech-preview6" />
   </ItemGroup>
 
 </Project>
diff --git a/FSharp/FashionMnistF/FashionMnistF.fsproj b/FSharp/FashionMnistF/FashionMnistF.fsproj
@@ -11,6 +11,6 @@
 
   <ItemGroup>
     <PackageReference Include="FSharp.Interop.Dynamic" Version="4.0.3.130" />
-    <PackageReference Include="Gradient" Version="0.1.10-tech-preview5.1.1" />
+    <PackageReference Include="Gradient" Version="0.1.10-tech-preview6" />
   </ItemGroup>
 </Project>
diff --git a/FashionMnistClassification/FashionMnistClassification.cs b/FashionMnistClassification/FashionMnistClassification.cs
@@ -1,4 +1,4 @@
-﻿namespace Gradient.Examples {
+﻿namespace Gradient.Samples {
     using System;
     using System.Diagnostics;
     using numpy;
diff --git a/FashionMnistClassification/FashionMnistClassification.csproj b/FashionMnistClassification/FashionMnistClassification.csproj
@@ -5,10 +5,11 @@
     <TargetFramework>netcoreapp2.0</TargetFramework>
     <LangVersion>latest</LangVersion>
     <CodeAnalysisRuleSet>FashionMnistClassification.ruleset</CodeAnalysisRuleSet>
+    <RootNamespace>Gradient.Samples</RootNamespace>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Gradient" Version="0.1.10-tech-preview5.1.1" />
+    <PackageReference Include="Gradient" Version="0.1.10-tech-preview6" />
   </ItemGroup>
 
 </Project>
diff --git a/GPT-2/GPT-2.csproj b/GPT-2/GPT-2.csproj
@@ -21,7 +21,7 @@
 
   <ItemGroup>
     <PackageReference Include="CsvHelper" Version="12.1.2" />
-    <PackageReference Include="Gradient" Version="0.1.10-tech-preview5.1.1" />
+    <PackageReference Include="Gradient" Version="0.1.10-tech-preview6" />
     <PackageReference Include="ManyConsole.CommandLineUtils" Version="1.0.3-alpha" />
     <PackageReference Include="morelinq" Version="3.1.0" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.1" />
diff --git a/GPT-2/Gpt2Trainer.cs b/GPT-2/Gpt2Trainer.cs
@@ -140,7 +140,7 @@ void GenerateSamples() {
                         .ToArray();
 
                     var placeholderValues = new PythonDict<object, object> {
-                        [context] = batch.ToPythonList(),
+                        [context] = batch,
                     };
                     var tuple = session.run_dyn((optimizer, loss), feed_dict: placeholderValues);
 
diff --git a/LinearSVM/LinearSVM.csproj b/LinearSVM/LinearSVM.csproj
@@ -7,7 +7,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Gradient" Version="0.1.10-tech-preview5.1.1" />
+    <PackageReference Include="Gradient" Version="0.1.10-tech-preview6" />
     <PackageReference Include="ManyConsole.CommandLineUtils" Version="1.0.3-alpha" />
   </ItemGroup>
 
diff --git a/SimpleApproximation/SimpleApproximation.csproj b/SimpleApproximation/SimpleApproximation.csproj
@@ -4,10 +4,12 @@
     <OutputType>Exe</OutputType>
     <TargetFramework>netcoreapp2.0</TargetFramework>
     <LangVersion>latest</LangVersion>
+    <AssemblyName>SimpleApproximation</AssemblyName>
+    <RootNamespace>Gradient.Samples</RootNamespace>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Gradient" Version="0.1.10-tech-preview5.1.1" />
+    <PackageReference Include="Gradient" Version="0.1.10-tech-preview6" />
   </ItemGroup>
 
 </Project>
diff --git a/SimpleApproximation/SimpleApproximationProgram.cs b/SimpleApproximation/SimpleApproximationProgram.cs
@@ -1,4 +1,4 @@
-﻿namespace Gradient.Examples.SimpleApproximation {
+﻿namespace Gradient.Samples {
     using System;
     using System.Linq;
     using SharPy.Runtime;
diff --git a/VB/BasicMathVB/BasicMathVB.vbproj b/VB/BasicMathVB/BasicMathVB.vbproj
@@ -2,12 +2,12 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <RootNamespace>BasicMathVB</RootNamespace>
+    <RootNamespace>Gradient.Samples</RootNamespace>
     <TargetFramework>netcoreapp2.2</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Gradient" Version="0.1.10-tech-preview5.1.1" />
+    <PackageReference Include="Gradient" Version="0.1.10-tech-preview6" />
   </ItemGroup>
 
 </Project>
diff --git a/VB/FashionMnistVB/FashionMnistVB.vbproj b/VB/FashionMnistVB/FashionMnistVB.vbproj
@@ -2,12 +2,12 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <RootNamespace>FashionMnistVB</RootNamespace>
+    <RootNamespace>Gradient.Samples</RootNamespace>
     <TargetFramework>netcoreapp2.2</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Gradient" Version="0.1.10-tech-preview5.1.1" />
+    <PackageReference Include="Gradient" Version="0.1.10-tech-preview6" />
   </ItemGroup>
 
 </Project>

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-namespace BasicMath {`
	`1`	`+namespace Gradient.Samples {`
`2`	`2`	`using System;`
`3`	`3`	`using Gradient;`
`4`	`4`	`using tensorflow;`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-namespace Gradient.Examples {`
	`1`	`+namespace Gradient.Samples {`
`2`	`2`	`using System;`
`3`	`3`	`using System.Diagnostics;`
`4`	`4`	`using numpy;`