Got rid of some shared files. Made so projections structure is similar to populations structure: KasperskyLab#121

Author: DavidIkov

knp/backends/cpu/cpu-library/include/knp/backends/cpu-library/impl/populations/altai/impl.h

@@ -19,13 +19,20 @@
  */
 #pragma once
 
+#include <knp/core/population.h>
+
 #include <limits>
 
-#include "shared.h"
 
 namespace knp::backends::cpu::populations::impl::altai
 {
 
+/**
+ * @brief AltAI neuron shortcut.
+ */
+using AltaiNeuron = knp::neuron_traits::AltAILIF;
+
+
 inline void calculate_pre_impact_single_neuron_state_impl(knp::neuron_traits::neuron_parameters<AltaiNeuron> &neuron)
 {
     neuron.potential_ = std::round(neuron.potential_);
@@ -35,6 +42,7 @@ inline void calculate_pre_impact_single_neuron_state_impl(knp::neuron_traits::ne
     neuron.pre_impact_potential_ = neuron.potential_;
 }
 
+
 inline void impact_neuron_impl(
     knp::neuron_traits::neuron_parameters<knp::neuron_traits::AltAILIF> &neuron,
     const knp::core::messaging::SynapticImpact &impact, bool is_forcing)
@@ -67,20 +75,18 @@ inline void impact_neuron_impl(
 
 inline bool calculate_post_impact_single_neuron_state_impl(knp::neuron_traits::neuron_parameters<AltaiNeuron> &neuron)
 {
-    {  // Potential leak.
-        // -1 if leak_rev is true and potential < 0, 1 otherwise.
-        const int sign = (neuron.leak_rev_ && neuron.potential_ < 0) ? -1 : 1;
-        neuron.potential_ += neuron.potential_leak_ * sign;
-    }
+    // -1 if leak_rev is true and potential < 0, 1 otherwise.
+    const int sign = (neuron.leak_rev_ && neuron.potential_ < 0) ? -1 : 1;
+    neuron.potential_ += neuron.potential_leak_ * sign;
 
     bool spiked = false;
     if (neuron.activity_time_ > 0)
     {
-        neuron.activity_time_--;
+        --neuron.activity_time_;
     }
     else if (neuron.activity_time_ < 0)
     {
-        neuron.activity_time_++;
+        ++neuron.activity_time_;
     }
 
     if (neuron.activity_time_ == 0)

knp/backends/cpu/cpu-library/include/knp/backends/cpu-library/impl/populations/altai/interface.h

@@ -55,6 +55,7 @@ inline void impact_neuron_interface<altai::AltaiNeuron>(
     altai::impact_neuron_impl(neuron, impact, is_forcing);
 }
 
+
 /**
  * @brief Calculate post impact state of single neuron.
  * @param neuron Neuron.
@@ -67,6 +68,7 @@ inline bool calculate_post_impact_single_neuron_state_interface<altai::AltaiNeur
     return altai::calculate_post_impact_single_neuron_state_impl(neuron);
 }
 
+
 /**
  * @brief Teach population.
  * @param population Population.
@@ -75,13 +77,14 @@ inline bool calculate_post_impact_single_neuron_state_interface<altai::AltaiNeur
  * @param step Step.
  */
 template <>
-inline void teach_population_interface<altai::AltaiNeuron, knp::synapse_traits::DeltaSynapse>(
+inline void train_population_interface<altai::AltaiNeuron, knp::synapse_traits::DeltaSynapse>(
     knp::core::Population<altai::AltaiNeuron> &population,
     std::vector<knp::core::Projection<knp::synapse_traits::DeltaSynapse> *> const &projections,
     const knp::core::messaging::SpikeMessage &message, knp::core::Step step)
 {
 }
 
+
 /**
  * @brief Teach population.
  * @param population Population.
@@ -90,7 +93,7 @@ inline void teach_population_interface<altai::AltaiNeuron, knp::synapse_traits::
  * @param step Step.
  */
 template <>
-inline void teach_population_interface<altai::AltaiNeuron, knp::synapse_traits::SynapticResourceSTDPDeltaSynapse>(
+inline void train_population_interface<altai::AltaiNeuron, knp::synapse_traits::SynapticResourceSTDPDeltaSynapse>(
     knp::core::Population<altai::AltaiNeuron> &population,
     std::vector<knp::core::Projection<knp::synapse_traits::SynapticResourceSTDPDeltaSynapse> *> const &projections,
     const knp::core::messaging::SpikeMessage &message, knp::core::Step step)

knp/backends/cpu/cpu-library/include/knp/backends/cpu-library/impl/populations/altai/shared.h

@@ -23,6 +23,7 @@
 
 #include "stdp.h"
 
+
 namespace knp::backends::cpu::populations::impl::blifat
 {
 
@@ -44,6 +45,7 @@ inline void calculate_pre_impact_single_neuron_state_impl(knp::neuron_traits::ne
     neuron.pre_impact_potential_ = neuron.potential_;
 }
 
+
 inline void calculate_pre_impact_single_neuron_state_impl(
     knp::neuron_traits::neuron_parameters<STDPBlifatNeuron> &neuron)
 {
@@ -66,6 +68,7 @@ inline void calculate_pre_impact_single_neuron_state_impl(
     neuron.pre_impact_potential_ = neuron.potential_;
 }
 
+
 inline void impact_neuron_impl(
     knp::neuron_traits::neuron_parameters<BlifatNeuron> &neuron, const knp::core::messaging::SynapticImpact &impact,
     bool is_forcing)
@@ -87,8 +90,12 @@ inline void impact_neuron_impl(
         case knp::synapse_traits::OutputType::BLOCKING:
             neuron.total_blocking_period_ = static_cast<decltype(neuron.total_blocking_period_)>(impact.impact_value_);
             break;
+        default:
+            throw std::runtime_error("Unhandled synapse type.");
     }
 }
+
+
 inline void impact_neuron_impl(
     knp::neuron_traits::neuron_parameters<STDPBlifatNeuron> &neuron, const knp::core::messaging::SynapticImpact &impact,
     bool is_forcing)
@@ -100,6 +107,7 @@ inline void impact_neuron_impl(
     }
 }
 
+
 inline bool calculate_post_impact_single_neuron_state_impl(knp::neuron_traits::neuron_parameters<BlifatNeuron> &neuron)
 {
     bool spike = false;
@@ -111,9 +119,10 @@ inline bool calculate_post_impact_single_neuron_state_impl(knp::neuron_traits::n
         bool was_negative = neuron.total_blocking_period_ < 0;
         // If it is negative, increase by 1.
         neuron.total_blocking_period_ += was_negative;
-        // If it is now zero, but was negative before, increase it to max, else leave it as is.
-        neuron.total_blocking_period_ +=
-            std::numeric_limits<int64_t>::max() * ((neuron.total_blocking_period_ == 0) && was_negative);
+        if ((neuron.total_blocking_period_ == 0) && was_negative)
+        {
+            neuron.total_blocking_period_ = std::numeric_limits<int64_t>::max();
+        }
     }
     else
     {

knp/backends/cpu/cpu-library/include/knp/backends/cpu-library/impl/populations/blifat/impl.h

@@ -26,6 +26,7 @@
 
 #include "impl.h"
 
+
 namespace knp::backends::cpu::populations::impl
 {
 
@@ -40,6 +41,7 @@ inline void calculate_pre_impact_single_neuron_state_interface<blifat::BlifatNeu
     blifat::calculate_pre_impact_single_neuron_state_impl(neuron);
 }
 
+
 /**
  * @brief Calculate pre impact state of single neuron.
  * @param neuron Neuron.
@@ -51,6 +53,7 @@ inline void calculate_pre_impact_single_neuron_state_interface<blifat::STDPBlifa
     blifat::calculate_pre_impact_single_neuron_state_impl(neuron);
 }
 
+
 /**
  * @brief Impact neuron.
  * @param neuron Neuron.
@@ -65,6 +68,7 @@ inline void impact_neuron_interface<blifat::BlifatNeuron>(
     blifat::impact_neuron_impl(neuron, impact, is_forcing);
 }
 
+
 /**
  * @brief Impact neuron.
  * @param neuron Neuron.
@@ -79,6 +83,7 @@ inline void impact_neuron_interface<blifat::STDPBlifatNeuron>(
     blifat::impact_neuron_impl(neuron, impact, is_forcing);
 }
 
+
 /**
  * @brief Calculate post impact state of single neuron.
  * @param neuron Neuron.
@@ -91,6 +96,7 @@ inline bool calculate_post_impact_single_neuron_state_interface<blifat::BlifatNe
     return blifat::calculate_post_impact_single_neuron_state_impl(neuron);
 }
 
+
 /**
  * @brief Calculate post impact state of single neuron.
  * @param neuron Neuron.
@@ -103,6 +109,7 @@ inline bool calculate_post_impact_single_neuron_state_interface<blifat::STDPBlif
     return blifat::calculate_post_impact_single_neuron_state_impl(neuron);
 }
 
+
 /**
  * @brief Teach population.
  * @param population Population.
@@ -111,13 +118,14 @@ inline bool calculate_post_impact_single_neuron_state_interface<blifat::STDPBlif
  * @param step Step.
  */
 template <>
-inline void teach_population_interface<blifat::BlifatNeuron, knp::synapse_traits::DeltaSynapse>(
+inline void train_population_interface<blifat::BlifatNeuron, knp::synapse_traits::DeltaSynapse>(
     knp::core::Population<blifat::BlifatNeuron> &population,
     std::vector<knp::core::Projection<knp::synapse_traits::DeltaSynapse> *> const &projections,
     const knp::core::messaging::SpikeMessage &message, knp::core::Step step)
 {
 }
 
+
 /**
  * @brief Teach population.
  * @param population Population.
@@ -126,13 +134,14 @@ inline void teach_population_interface<blifat::BlifatNeuron, knp::synapse_traits
  * @param step Step.
  */
 template <>
-inline void teach_population_interface<blifat::BlifatNeuron, knp::synapse_traits::SynapticResourceSTDPDeltaSynapse>(
+inline void train_population_interface<blifat::BlifatNeuron, knp::synapse_traits::SynapticResourceSTDPDeltaSynapse>(
     knp::core::Population<blifat::BlifatNeuron> &population,
     std::vector<knp::core::Projection<knp::synapse_traits::SynapticResourceSTDPDeltaSynapse> *> const &projections,
     const knp::core::messaging::SpikeMessage &message, knp::core::Step step)
 {
 }
 
+
 /**
  * @brief Teach population.
  * @param population Population.
@@ -141,13 +150,12 @@ inline void teach_population_interface<blifat::BlifatNeuron, knp::synapse_traits
  * @param step Step.
  */
 template <>
-inline void teach_population_interface<blifat::STDPBlifatNeuron, knp::synapse_traits::SynapticResourceSTDPDeltaSynapse>(
+inline void train_population_interface<blifat::STDPBlifatNeuron, knp::synapse_traits::SynapticResourceSTDPDeltaSynapse>(
     knp::core::Population<blifat::STDPBlifatNeuron> &population,
     std::vector<knp::core::Projection<knp::synapse_traits::SynapticResourceSTDPDeltaSynapse> *> const &projections,
     const knp::core::messaging::SpikeMessage &message, knp::core::Step step)
 {
-    blifat::teach_population_impl(population, projections, message, step);
+    blifat::train_population_impl(population, projections, message, step);
 }
 
-
 }  //namespace knp::backends::cpu::populations::impl