Minor bug fix and update versions

zhongkaifu · Oct 19, 2024 · dd969e9 · dd969e9
1 parent 455fe5e
commit dd969e9
Show file tree

Hide file tree

Showing 17 changed files with 27 additions and 24 deletions.
diff --git a/AdvUtils/AdvUtils.csproj b/AdvUtils/AdvUtils.csproj
@@ -14,7 +14,7 @@
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
     <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
-    <Version>2.7.0</Version>
+    <Version>2.8.16</Version>
     <Authors>Zhongkai Fu</Authors>
     <Company />
     <Description>A utility for common alogrithms</Description>

diff --git a/Seq2SeqSharp/Networks/GPTDecoder.cs b/Seq2SeqSharp/Networks/GPTDecoder.cs
@@ -160,7 +160,7 @@ public void Reset(IWeightFactory weightFactory, int batchSize)
                 IWeightTensor selfMaskTensor = null;
                 if (tgtSelfMask != null)
                 {
-                    selfMaskTensor = subg.Expand(tgtSelfMask, dims: new long[] { tgtSelfMask.Sizes[0], m_multiHeadNum, tgtSelfMask.Sizes[2], tgtSelfMask.Sizes[3] });
+                    selfMaskTensor = subg.Expand(tgtSelfMask, dims: new long[] { batchSize, m_multiHeadNum, tgtSelfMask.Sizes[2], tgtSelfMask.Sizes[3] });
                 }
 
                 for (int k = 0; k < m_selfAttns.Count; k++)

diff --git a/Seq2SeqSharp/Seq2SeqSharp.csproj b/Seq2SeqSharp/Seq2SeqSharp.csproj
@@ -47,10 +47,10 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
-    <PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="8.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="8.0.1" />
     <PackageReference Include="System.Data.DataSetExtensions" Version="4.5.0" />
     <PackageReference Include="protobuf-net" Version="3.2.30" />
-    <PackageReference Include="System.Runtime.Caching" Version="8.0.0" />
+    <PackageReference Include="System.Runtime.Caching" Version="8.0.1" />
   </ItemGroup>
   <ItemGroup>
     <None Include="..\LICENSE">

diff --git a/Tests/Seq2SeqSharp.Tests/Seq2SeqSharp.Tests.csproj b/Tests/Seq2SeqSharp.Tests/Seq2SeqSharp.Tests.csproj
@@ -8,10 +8,13 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.11.0" />
-    <PackageReference Include="MSTest.TestAdapter" Version="2.2.7" />
-    <PackageReference Include="MSTest.TestFramework" Version="2.2.7" />
-    <PackageReference Include="coverlet.collector" Version="3.1.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
+    <PackageReference Include="MSTest.TestAdapter" Version="3.6.1" />
+    <PackageReference Include="MSTest.TestFramework" Version="3.6.1" />
+    <PackageReference Include="coverlet.collector" Version="6.0.2">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
   </ItemGroup>
 
   <ItemGroup>

diff --git a/Tools/GPTConsole/GPTConsole.csproj b/Tools/GPTConsole/GPTConsole.csproj
@@ -16,8 +16,8 @@
     <PackageTags>GPT;LLM;.NET;ML;deep learning;CUDA;C#;GPU;transformer</PackageTags>
     <PackageReleaseNotes>The console tool for GPT style model training and testing</PackageReleaseNotes>
     <PackAsTool>True</PackAsTool>
-    <AssemblyVersion>2.7.0</AssemblyVersion>
-    <FileVersion>2.7.0</FileVersion>
+    <AssemblyVersion>2.8.16</AssemblyVersion>
+    <FileVersion>2.8.16</FileVersion>
     <PackageLicenseFile>LICENSE</PackageLicenseFile>
   </PropertyGroup>
 
@@ -33,7 +33,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/Tools/GPTConsole/Program.cs b/Tools/GPTConsole/Program.cs
@@ -184,7 +184,7 @@ private static void ShowOptions(string[] args, Seq2SeqOptions opts)
             var commandLine = string.Join(" ", args);
             var strOpts = JsonConvert.SerializeObject(opts, Newtonsoft.Json.Formatting.Indented, new JsonSerializerSettings() { NullValueHandling = NullValueHandling.Ignore, Converters = new[] { new StringEnumConverter() }, });
 
-            Logger.WriteLine($"Seq2SeqSharp v2.7.0 written by Zhongkai Fu([email protected])");
+            Logger.WriteLine($"Seq2SeqSharp v2.8.16 written by Zhongkai Fu([email protected])");
             Logger.WriteLine($"Command Line = '{commandLine}'");
             Logger.WriteLine($"Configs: {strOpts}");
         }

diff --git a/Tools/ImgSeqConsole/ImgSeqConsole.csproj b/Tools/ImgSeqConsole/ImgSeqConsole.csproj
@@ -8,7 +8,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/Tools/ImgSeqConsole/Program.cs b/Tools/ImgSeqConsole/Program.cs
@@ -269,7 +269,7 @@ private static void ShowOptions(string[] args, Seq2SeqOptions opts)
             var commandLine = string.Join(" ", args);
             var strOpts = JsonConvert.SerializeObject(opts, Newtonsoft.Json.Formatting.Indented, new JsonSerializerSettings() { NullValueHandling = NullValueHandling.Ignore, Converters = new[] { new StringEnumConverter() }, });
 
-            Logger.WriteLine($"Seq2SeqSharp v2.7.0 written by Zhongkai Fu([email protected])");
+            Logger.WriteLine($"Seq2SeqSharp v2.8.16 written by Zhongkai Fu([email protected])");
             Logger.WriteLine($"Command Line = '{commandLine}'");
             Logger.WriteLine($"Configs: {strOpts}");
         }

diff --git a/Tools/Seq2SeqConsole/Program.cs b/Tools/Seq2SeqConsole/Program.cs
@@ -284,7 +284,7 @@ private static void ShowOptions(string[] args, Seq2SeqOptions opts)
             var commandLine = string.Join(" ", args);
             var strOpts = JsonConvert.SerializeObject( opts, Formatting.Indented, new JsonSerializerSettings() { NullValueHandling = NullValueHandling.Ignore, Converters = new[] { new StringEnumConverter() }, } );
 
-            Logger.WriteLine($"Seq2SeqSharp v2.7.0 written by Zhongkai Fu([email protected])");
+            Logger.WriteLine($"Seq2SeqSharp v2.8.16 written by Zhongkai Fu([email protected])");
             Logger.WriteLine($"Command Line = '{commandLine}'");
             Logger.WriteLine($"Configs: {strOpts}");
         }

diff --git a/Tools/Seq2SeqConsole/Seq2SeqConsole.csproj b/Tools/Seq2SeqConsole/Seq2SeqConsole.csproj
@@ -13,7 +13,7 @@
   </PropertyGroup>
 
   <PropertyGroup>
-    <Version>2.7.0</Version>
+    <Version>2.8.16</Version>
     <Description>A command line tool for sequence-to-sequence task. It can be used for model training and inference. It supports both CPU and GPU(CUDA).</Description>
     <PackageReadmeFile>README.md</PackageReadmeFile>
     <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
@@ -30,7 +30,7 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
     <PackageReference Include="Newtonsoft.Json">
-      <Version>13.0.1</Version>
+      <Version>13.0.3</Version>
     </PackageReference>
     <PackageReference Include="System.Data.DataSetExtensions" Version="4.5.0" />
   </ItemGroup>

diff --git a/Tools/SeqClassificationConsole/Program.cs b/Tools/SeqClassificationConsole/Program.cs
@@ -45,7 +45,7 @@ private static void Ss_EvaluationWatcher(object sender, EventArgs e)
         private static void ShowOptions(string[] args, SeqClassificationOptions opts)
         {
             string commandLine = string.Join(" ", args);
-            Logger.WriteLine($"SeqClassificationConsole v2.7.0 written by Zhongkai Fu([email protected])");
+            Logger.WriteLine($"SeqClassificationConsole v2.8.16 written by Zhongkai Fu([email protected])");
             Logger.WriteLine($"Command Line = '{commandLine}'");
 
             string strOpts = JsonConvert.SerializeObject( opts, Formatting.Indented, new JsonSerializerSettings() { NullValueHandling = NullValueHandling.Ignore, Converters = new[] { new StringEnumConverter() }, } );

diff --git a/Tools/SeqClassificationConsole/SeqClassificationConsole.csproj b/Tools/SeqClassificationConsole/SeqClassificationConsole.csproj
@@ -8,7 +8,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/Tools/SeqLabelConsole/Program.cs b/Tools/SeqLabelConsole/Program.cs
@@ -197,7 +197,7 @@ public static List<List<string>> ConstructInputTokens(List<string> input)
         private static void ShowOptions(string[] args)
         {
             string commandLine = string.Join(" ", args);
-            Logger.WriteLine($"Seq2SeqSharp v2.7.0 written by Zhongkai Fu([email protected])");
+            Logger.WriteLine($"Seq2SeqSharp v2.8.16 written by Zhongkai Fu([email protected])");
             Logger.WriteLine($"Command Line = '{commandLine}'");
         }
     }

diff --git a/Tools/SeqLabelConsole/SeqLabelConsole.csproj b/Tools/SeqLabelConsole/SeqLabelConsole.csproj
@@ -12,7 +12,7 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
     <PackageReference Include="Newtonsoft.Json">
-      <Version>13.0.1</Version>
+      <Version>13.0.3</Version>
     </PackageReference>
     <PackageReference Include="System.Data.DataSetExtensions" Version="4.5.0" />
   </ItemGroup>

diff --git a/Tools/SeqWebAPIs/SeqWebAPIs.csproj b/Tools/SeqWebAPIs/SeqWebAPIs.csproj
@@ -8,7 +8,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Swashbuckle.AspNetCore" Version="6.2.3" />
+    <PackageReference Include="Swashbuckle.AspNetCore" Version="6.9.0" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/Tools/SeqWebApps/Program.cs b/Tools/SeqWebApps/Program.cs
@@ -18,7 +18,7 @@
 using TensorSharp.CUDA.ContextState;
 
 Logger.Initialize(Logger.Destination.Console | Logger.Destination.Logfile, Logger.Level.err | Logger.Level.warn | Logger.Level.info | Logger.Level.debug, $"{nameof(SeqWebApps)}_{Utils.GetTimeStamp(DateTime.Now)}.log");
-Logger.WriteLine($"SeqWebApps v2.7.0 written by Zhongkai Fu([email protected])");
+Logger.WriteLine($"SeqWebApps v2.8.16 written by Zhongkai Fu([email protected])");
 
 var Configuration = new ConfigurationBuilder().AddJsonFile("appsettings.json").Build();
 

diff --git a/Tools/SeqWebApps/SeqWebApps.csproj b/Tools/SeqWebApps/SeqWebApps.csproj
@@ -14,7 +14,7 @@
     <Company>Zhongkai Fu</Company>
     <Title>SeqWebApps</Title>
     <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
-    <Version>2.7.0</Version>
+    <Version>2.8.16</Version>
     <RepositoryUrl>https://github.com/zhongkaifu/Seq2SeqSharp</RepositoryUrl>
     <RepositoryType>git</RepositoryType>
     <PackAsTool>True</PackAsTool>