update msgpack, move enum to own file

curiosity-ai · Sep 18, 2020 · 86c2f64 · 86c2f64
1 parent 5953003
commit 86c2f64
Show file tree

Hide file tree

Showing 8 changed files with 34 additions and 28 deletions.
diff --git a/Src/HNSW.Net.Demo/HNSW.Net.Demo.csproj b/Src/HNSW.Net.Demo/HNSW.Net.Demo.csproj
@@ -1,11 +1,8 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.2</TargetFramework>
-    <ApplicationIcon />
+    <TargetFramework>netcoreapp3.1</TargetFramework>
     <OutputType>Exe</OutputType>
-    <StartupObject />
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/Src/HNSW.Net.Demo/MetricsEventListener.cs b/Src/HNSW.Net.Demo/MetricsEventListener.cs
@@ -36,7 +36,7 @@ protected override void OnEventWritten(EventWrittenEventArgs eventData)
                     return;
                 }
 
-                Console.WriteLine($"[{counterData["Name"]}]: Avg={counterData["Mean"]}; SD={counterData["StandardDeviation"]}; Count={counterData["Count"]}");
+                Console.WriteLine($"[{counterData["Name"]:n1}]: Avg={counterData["Mean"]:n1}; SD={counterData["StandardDeviation"]:n1}; Count={counterData["Count"]}");
             }
         }
     }

diff --git a/Src/HNSW.Net.Demo/Program.cs b/Src/HNSW.Net.Demo/Program.cs
@@ -19,8 +19,8 @@ namespace HNSW.Net.Demo
 
     public static partial class Program
     {
-        private const int SampleSize = 5_000;
-        private const int SampleIncrSize = 1_000;
+        private const int SampleSize = 5_00;
+        private const int SampleIncrSize = 1_00;
         private const int TestSize = 10 * SampleSize;
         private const int Dimensionality = 128;
         private const string VectorsPathSuffix = "vectors.hnsw";
@@ -34,7 +34,7 @@ public static void Main()
 
         private static void BuildAndSave(string pathPrefix)
         {
-            var world = new SmallWorld<float[], float>(CosineDistance.SIMDForUnits, DefaultRandomGenerator.Instance, new Parameters() { EnableDistanceCacheForConstruction  = true, InitialDistanceCacheSize = SampleSize, NeighbourHeuristic = SmallWorld<float[], float>.NeighbourSelectionHeuristic.SelectHeuristic, KeepPrunedConnections = true, ExpandBestSelection = true});
+            var world = new SmallWorld<float[], float>(CosineDistance.SIMDForUnits, DefaultRandomGenerator.Instance, new Parameters() { EnableDistanceCacheForConstruction  = true, InitialDistanceCacheSize = SampleSize, NeighbourHeuristic = NeighbourSelectionHeuristic.SelectHeuristic, KeepPrunedConnections = true, ExpandBestSelection = true});
 
             Console.Write($"Generating {SampleSize} sample vectos... ");
             var clock = Stopwatch.StartNew();

diff --git a/Src/HNSW.Net.Tests/SmallWorldTests.cs b/Src/HNSW.Net.Tests/SmallWorldTests.cs
@@ -72,7 +72,7 @@ public void KNNSearchTest()
         [DataRow(true, true)]
         public void KNNSearchTestAlgorithm4(bool expandBestSelection, bool keepPrunedConnections )
         {
-            var parameters = new SmallWorld<float[], float>.Parameters() { NeighbourHeuristic = SmallWorld<float[], float>.NeighbourSelectionHeuristic.SelectHeuristic, ExpandBestSelection = expandBestSelection, KeepPrunedConnections = keepPrunedConnections };
+            var parameters = new SmallWorld<float[], float>.Parameters() { NeighbourHeuristic = NeighbourSelectionHeuristic.SelectHeuristic, ExpandBestSelection = expandBestSelection, KeepPrunedConnections = keepPrunedConnections };
             var graph = new SmallWorld<float[], float>(CosineDistance.NonOptimized, DefaultRandomGenerator.Instance, parameters);
             graph.AddItems(vectors);
 

diff --git a/Src/HNSW.Net/Graph.Core.cs b/Src/HNSW.Net/Graph.Core.cs
@@ -46,12 +46,12 @@ internal Core(Func<TItem, TItem, TDistance> distance, SmallWorld<TItem, TDistanc
 
                 switch (Parameters.NeighbourHeuristic)
                 {
-                    case SmallWorld<TItem, TDistance>.NeighbourSelectionHeuristic.SelectSimple:
+                    case NeighbourSelectionHeuristic.SelectSimple:
                     {
                         Algorithm = new Algorithms.Algorithm3<TItem, TDistance>(this);
                         break;
                     }
-                    case SmallWorld<TItem, TDistance>.NeighbourSelectionHeuristic.SelectHeuristic:
+                    case NeighbourSelectionHeuristic.SelectHeuristic:
                     {
                         Algorithm = new Algorithms.Algorithm4<TItem, TDistance>(this);
                         break;

diff --git a/Src/HNSW.Net/HNSW.Net.csproj b/Src/HNSW.Net/HNSW.Net.csproj
@@ -21,8 +21,8 @@ Fork from original at https://github.com/microsoft/HNSW.Net, adds support for in
 
 
   <ItemGroup>
-    <PackageReference Include="MessagePack" Version="2.0.270-rc" />
-    <PackageReference Include="System.Memory" Version="4.5.3" />
+    <PackageReference Include="MessagePack" Version="2.2.44-rc" />
+    <PackageReference Include="System.Memory" Version="4.5.4" />
     <PackageReference Include="System.Numerics.Vectors" Version="4.5.0" />
   </ItemGroup>
 </Project>
diff --git a/Src/HNSW.Net/SmallWorld.cs b/Src/HNSW.Net/SmallWorld.cs
@@ -69,21 +69,7 @@ public SmallWorld(Func<TItem, TItem, TDistance> distance, IProvideRandomValues g
             Generator = generator;
         }
 
-        /// <summary>
-        /// Type of heuristic to select best neighbours for a node.
-        /// </summary>
-        public enum NeighbourSelectionHeuristic
-        {
-            /// <summary>
-            /// Marker for the Algorithm 3 (SELECT-NEIGHBORS-SIMPLE) from the article. Implemented in <see cref="Algorithms.Algorithm3{TItem, TDistance}"/>
-            /// </summary>
-            SelectSimple,
 
-            /// <summary>
-            /// Marker for the Algorithm 4 (SELECT-NEIGHBORS-HEURISTIC) from the article. Implemented in <see cref="Algorithms.Algorithm4{TItem, TDistance}"/>
-            /// </summary>
-            SelectHeuristic
-        }
 
         /// <summary>
         /// Builds hnsw graph from the items.

diff --git a/src/HNSW.Net/NeighbourSelectionHeuristic.cs b/src/HNSW.Net/NeighbourSelectionHeuristic.cs
@@ -0,0 +1,23 @@
+// <copyright file="SmallWorld.cs" company="Microsoft">
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// </copyright>
+
+namespace HNSW.Net
+{
+    /// <summary>
+    /// Type of heuristic to select best neighbours for a node.
+    /// </summary>
+    public enum NeighbourSelectionHeuristic
+    {
+        /// <summary>
+        /// Marker for the Algorithm 3 (SELECT-NEIGHBORS-SIMPLE) from the article. Implemented in <see cref="Algorithms.Algorithm3{TItem, TDistance}"/>
+        /// </summary>
+        SelectSimple,
+
+        /// <summary>
+        /// Marker for the Algorithm 4 (SELECT-NEIGHBORS-HEURISTIC) from the article. Implemented in <see cref="Algorithms.Algorithm4{TItem, TDistance}"/>
+        /// </summary>
+        SelectHeuristic
+    }
+}
-Original file line number
+Diff line change
@@ Expand Up @@
                         return;
                     }
-                    Console.WriteLine($"[{counterData["Name"]}]: Avg={counterData["Mean"]}; SD={counterData["StandardDeviation"]}; Count={counterData["Count"]}");
+                    Console.WriteLine($"[{counterData["Name"]:n1}]: Avg={counterData["Mean"]:n1}; SD={counterData["StandardDeviation"]:n1}; Count={counterData["Count"]}");
                 }
             }
         }
@@ Expand Down @@