Refactoring parallel artefacts

ddobric · Jan 17, 2021 · 1aebabb · 1aebabb
1 parent 4164e31
commit 1aebabb
Show file tree

Hide file tree

Showing 13 changed files with 42 additions and 39 deletions.
diff --git a/...edComputeLib/DistributedComputeLib.csproj → ...edComputeLib/NeoCortexApi.Parallel.csproj b/...edComputeLib/DistributedComputeLib.csproj → ...edComputeLib/NeoCortexApi.Parallel.csproj
diff --git a/NeoCortexApi/HtmAkkaHost/HtmAkkaHost.csproj b/NeoCortexApi/HtmAkkaHost/HtmAkkaHost.csproj
@@ -29,7 +29,7 @@
 
   <ItemGroup>
     <ProjectReference Include="..\AkkaSb.Net\AkkaSb.Net.csproj" />
-    <ProjectReference Include="..\DistributedComputeLib\DistributedComputeLib.csproj" />
+    <ProjectReference Include="..\DistributedComputeLib\NeoCortexApi.Parallel.csproj" />
     <ProjectReference Include="..\NeoCortexApi\NeoCortexApi.csproj" />
     <ProjectReference Include="..\NeoCortexUtils\NeoCortexUtils.csproj" />
   </ItemGroup>

diff --git a/NeoCortexApi/NeoCortexApi.Akka.sln b/NeoCortexApi/NeoCortexApi.Akka.sln
@@ -7,7 +7,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NeoCortexApi", "NeoCortexAp
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "UnitTestsProject", "UnitTestsProject\UnitTestsProject.csproj", "{A2B0776F-3650-4CE5-98BC-E2B7A2205A23}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DistributedComputeLib", "DistributedComputeLib\DistributedComputeLib.csproj", "{7F75D4D0-408B-4FFE-A450-1D7F647542B5}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NeoCortexApi.Parallel", "DistributedComputeLib\NeoCortexApi.Parallel.csproj", "{7F75D4D0-408B-4FFE-A450-1D7F647542B5}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NeoCortexUtils", "NeoCortexUtils\NeoCortexUtils.csproj", "{28395BF8-B719-4D93-806B-723A7AF0C56A}"
 EndProject

diff --git a/NeoCortexApi/NeoCortexApi/Entities/SparseObjectMatrix.cs b/NeoCortexApi/NeoCortexApi/Entities/SparseObjectMatrix.cs
@@ -4,7 +4,6 @@
 using System.Collections.Generic;
 using System.Text;
 using System.Linq;
-using NeoCortexApi.DistributedComputeLib;
 
 namespace NeoCortexApi.Entities
 {

diff --git a/NeoCortexApi/NeoCortexApi/Helpers.cs b/NeoCortexApi/NeoCortexApi/Helpers.cs
@@ -1,6 +1,6 @@
 // Copyright (c) Damir Dobric. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See LICENSE in the project root for license information.
-using AkkaSb.Net;
+
 using NeoCortexApi.Entities;
 using System;
 using System.Collections.Generic;
@@ -161,32 +161,6 @@ public static List<string> DefaultNodeList
         //    }
         //}
 
-        /// <summary>
-        /// Gets default sparse dictionary configuration.
-        /// </summary>
-        public static ActorSbConfig DefaultSbConfig
-        {
-            get
-            {
-                ActorSbConfig cfg = new ActorSbConfig
-                {
-                    SbConnStr = Environment.GetEnvironmentVariable("SbConnStr"),
-                    ReplyMsgQueue = "actorsystem/rcvlocal",
-                    RequestMsgTopic = "actorsystem/actortopic",
-                    NumOfElementsPerPartition = -1, // This means, number of partitions equals number of nodes.
-                    NumOfPartitions = 35,// Should be uniformly distributed across nodes.
-                    BatchSize = 1000,
-                    ConnectionTimeout = TimeSpan.FromMinutes(5),
-
-                    //Nodes = new List<string>() { "node1", "node2", "node3" }
-                    Nodes = new List<string>() { "node1"}
-                };
-
-                return cfg;
-            }
-        }
-
-
 
         public static void F1()
         {

diff --git a/NeoCortexApi/NeoCortexApi/NeoCortexApi.csproj b/NeoCortexApi/NeoCortexApi/NeoCortexApi.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <TargetFramework>netstandard2.1</TargetFramework>
     <PackageId>NeoCortexApi</PackageId>
-    <Version>1.0.11</Version>
+    <Version>1.0.12</Version>
     <Authors>Damir Dobric</Authors>
     <Company>daenet GmbH</Company>
     <Product>Hierarchical Temporal Framework in C#</Product>
@@ -70,7 +70,6 @@
   </ItemGroup>
 
   <ItemGroup>
-	  <ProjectReference Include="..\DistributedComputeLib\DistributedComputeLib.csproj" />
 	  <ProjectReference Include="..\NeoCortexArrayLib\NeoCortexArrayLib.csproj">
 		  <PrivateAssets>all</PrivateAssets>
 	  </ProjectReference>

diff --git a/NeoCortexApi/NeoCortexApi/SpatialPooler.cs b/NeoCortexApi/NeoCortexApi/SpatialPooler.cs
@@ -8,7 +8,6 @@
 using System.Threading.Tasks;
 using System.Linq;
 using System.Diagnostics;
-using NeoCortexApi.DistributedComputeLib;
 using System.Collections.Concurrent;
 using System.Threading;
 using System.IO;

diff --git a/NeoCortexApi/NeoCortexApi/SpatialPoolerParallel.cs b/NeoCortexApi/NeoCortexApi/SpatialPoolerParallel.cs
@@ -9,7 +9,7 @@
 using System.Linq;
 using System.Diagnostics;
 using NeoCortexApi.Utility;
-using NeoCortexApi.DistributedComputeLib;
+
 
 namespace NeoCortexApi
 {
@@ -60,7 +60,7 @@ public override void InitMatrices(Connections c, DistributedMemory distMem)
             if (distMem != null)
             {
                 //var distHtmCla = distMem.ColumnDictionary as HtmSparseIntDictionary<Column>;
-                var distHtmCla = distMem.ColumnDictionary as ActorSbDistributedDictionaryBase<Column>;
+                var distHtmCla = distMem.ColumnDictionary;// as ActorSbDistributedDictionaryBase<Column>;
 
                 distHtmCla.HtmConfig = c.HtmConfig;
             }

diff --git a/NeoCortexApi/NeoCortexEntities/IDistributedDictionary.cs b/NeoCortexApi/NeoCortexEntities/IDistributedDictionary.cs
@@ -8,6 +8,8 @@ namespace NeoCortexApi.Entities
 {
     public interface IDistributedDictionary<TKey, TValue> : IDictionary<TKey, TValue>, IEnumerator<KeyValuePair<TKey, TValue>>
     {
+        HtmConfig HtmConfig { get; set; }
+
         void AddOrUpdate(ICollection<KeyPair> keyValuePairs);
 
         /// <summary>

diff --git a/...mputeLib/InMemoryDistributedDictionary.cs → ...Entities/InMemoryDistributedDictionary.cs b/...mputeLib/InMemoryDistributedDictionary.cs → ...Entities/InMemoryDistributedDictionary.cs
@@ -7,7 +7,7 @@
 using System.Linq;
 using NeoCortexApi.Entities;
 
-namespace NeoCortexApi.DistributedComputeLib
+namespace NeoCortexApi.Entities
 {
     /// <summary>
     /// Distributes huge dictionary across mutliple dictionaries. Used mainly for testing purposes.
@@ -261,6 +261,10 @@ IEnumerator IEnumerable.GetEnumerator()
 
         KeyValuePair<TKey, TValue> IEnumerator<KeyValuePair<TKey, TValue>>.Current => this.dictList[this.currentDictIndex].ElementAt(currentIndex);
 
+        /// <summary>
+        /// Not used.
+        /// </summary>
+        public HtmConfig HtmConfig { get => throw new NotImplementedException(); set => throw new NotImplementedException(); }
 
         public IEnumerator<KeyValuePair<TKey, TValue>> GetEnumerator()
         {

diff --git a/NeoCortexApi/Samples/NeoCortexApiSample/NeoCortexApiSample.csproj b/NeoCortexApi/Samples/NeoCortexApiSample/NeoCortexApiSample.csproj
@@ -17,7 +17,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\DistributedComputeLib\DistributedComputeLib.csproj" />
+    <ProjectReference Include="..\..\DistributedComputeLib\NeoCortexApi.Parallel.csproj" />
     <ProjectReference Include="..\..\NeoCortexApi\NeoCortexApi.csproj" />
     <ProjectReference Include="..\..\NeoCortexEntities\NeoCortexEntities.csproj" />
     <ProjectReference Include="..\..\NeoCortexUtils\NeoCortexUtils.csproj" />

diff --git a/NeoCortexApi/UnitTestsProject/UnitTestHelpers.cs b/NeoCortexApi/UnitTestsProject/UnitTestHelpers.cs
@@ -1,5 +1,6 @@
 // Copyright (c) Damir Dobric. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See LICENSE in the project root for license information.
+using AkkaSb.Net;
 using LearningFoundation.ImageBinarizer;
 using Microsoft.Extensions.Logging;
 using NeoCortexApi;
@@ -39,9 +40,34 @@ public static ILogger GetLogger(string logger="UnitTest")
             return factory.CreateLogger(logger);
         }
 
+        /// <summary>
+        /// Gets default sparse dictionary configuration.
+        /// </summary>
+        public static ActorSbConfig DefaultSbConfig
+        {
+            get
+            {
+                ActorSbConfig cfg = new ActorSbConfig
+                {
+                    SbConnStr = Environment.GetEnvironmentVariable("SbConnStr"),
+                    ReplyMsgQueue = "actorsystem/rcvlocal",
+                    RequestMsgTopic = "actorsystem/actortopic",
+                    NumOfElementsPerPartition = -1, // This means, number of partitions equals number of nodes.
+                    NumOfPartitions = 35,// Should be uniformly distributed across nodes.
+                    BatchSize = 1000,
+                    ConnectionTimeout = TimeSpan.FromMinutes(5),
+
+                    //Nodes = new List<string>() { "node1", "node2", "node3" }
+                    Nodes = new List<string>() { "node1" }
+                };
+
+                return cfg;
+            }
+        }
+
         public static DistributedMemory GetDistributedDictionary(HtmConfig htmConfig)
         {
-            var cfg = Helpers.DefaultSbConfig;
+            var cfg = UnitTestHelpers.DefaultSbConfig;
 
             return new DistributedMemory()
             {

diff --git a/NeoCortexApi/UnitTestsProject/UnitTestsProject.csproj b/NeoCortexApi/UnitTestsProject/UnitTestsProject.csproj
@@ -50,7 +50,7 @@
 
   <ItemGroup>
     <ProjectReference Include="..\AkkaSb.Net\AkkaSb.Net.csproj" />
-    <ProjectReference Include="..\DistributedComputeLib\DistributedComputeLib.csproj" />
+    <ProjectReference Include="..\DistributedComputeLib\NeoCortexApi.Parallel.csproj" />
     <ProjectReference Include="..\NeoCortexApi\NeoCortexApi.csproj" />
     <ProjectReference Include="..\NeoCortexArrayLib\NeoCortexArrayLib.csproj" />
     <ProjectReference Include="..\NeoCortexEntities\NeoCortexEntities.csproj" />