clean

Artelnics · Dec 4, 2024 · fabc02a · fabc02a
1 parent 57cc8f0
commit fabc02a
Show file tree

Hide file tree

Showing 15 changed files with 25 additions and 28 deletions.
diff --git a/opennn/addition_layer_3d.h b/opennn/addition_layer_3d.h
@@ -87,7 +87,7 @@ struct AdditionLayer3DBackPropagation : LayerBackPropagation
 
     vector<pair<type*, dimensions>> get_input_derivative_pairs() const override;
 
-    void set(const Index& = 0, Layer* = nullptr) override;
+    void set(const Index& = 0, Layer* = nullptr);
 
     void print() const override;
 

diff --git a/opennn/convolutional_layer.h b/opennn/convolutional_layer.h
@@ -222,7 +222,7 @@ struct ConvolutionalLayerBackPropagation : LayerBackPropagation
 
    vector<pair<type*, dimensions>> get_input_derivative_pairs() const override;
 
-   void set(const Index& = 0, Layer* = nullptr) override;
+   void set(const Index& = 0, Layer* = nullptr);
 
    void print() const override;
 

diff --git a/opennn/embedding_layer.h b/opennn/embedding_layer.h
@@ -120,7 +120,7 @@ struct EmbeddingLayerBackPropagation : LayerBackPropagation
 
     vector<pair<type*, dimensions>> get_input_derivative_pairs() const override;
 
-    void set(const Index& = 0, Layer* = nullptr) override;
+    void set(const Index& = 0, Layer* = nullptr);
 
     void print() const override;
 

diff --git a/opennn/flatten_layer.h b/opennn/flatten_layer.h
@@ -89,7 +89,7 @@ struct FlattenLayerBackPropagation : LayerBackPropagation
 
     vector<pair<type*, dimensions>> get_input_derivative_pairs() const override;
 
-    void set(const Index& = 0, Layer* = nullptr) override;
+    void set(const Index& = 0, Layer* = nullptr);
 
     void print() const override;
 

diff --git a/opennn/layer_back_propagation.h b/opennn/layer_back_propagation.h
@@ -14,8 +14,6 @@ struct LayerBackPropagation
 
     virtual vector<pair<type*, dimensions>> get_input_derivative_pairs() const = 0;
 
-    virtual void set(const Index& = 0, Layer* = nullptr) {}
-
     virtual void print() const {}
 
     Index batch_samples_number = 0;

diff --git a/opennn/long_short_term_memory_layer.h b/opennn/long_short_term_memory_layer.h
@@ -221,7 +221,7 @@ struct LongShortTermMemoryLayerBackPropagation : LayerBackPropagation
 
     vector<pair<type*, dimensions>> get_input_derivative_pairs() const override;
 
-    void set(const Index& = 0, Layer* = nullptr) override;
+    void set(const Index& = 0, Layer* = nullptr);
 
     void set_derivatives_zero();
 

diff --git a/opennn/multihead_attention_layer.h b/opennn/multihead_attention_layer.h
@@ -174,7 +174,7 @@ struct MultiheadAttentionLayerBackPropagation : LayerBackPropagation
 
     vector<pair<type*, dimensions>> get_input_derivative_pairs() const override;
 
-    void set(const Index& = 0, Layer* = nullptr) override;
+    void set(const Index& = 0, Layer* = nullptr);
 
     void print() const override;
 

diff --git a/opennn/neural_network.cpp b/opennn/neural_network.cpp
@@ -424,25 +424,24 @@ void NeuralNetwork::set_image_classification(const dimensions& input_dimensions,
         const dimensions convolution_stride_dimensions = { 1, 1 };
         const ConvolutionalLayer::ConvolutionType convolution_type = ConvolutionalLayer::ConvolutionType::Valid;
 
-        //add_layer(make_unique<ConvolutionalLayer>(get_output_dimensions(),
-        //                                          kernel_dimensions,
-        //                                          ConvolutionalLayer::ActivationFunction::RectifiedLinear,
-        //                                          convolution_stride_dimensions,
-        //                                          convolution_type,
-        //                                          "convolutional_layer_" + to_string(i+1)));
+        add_layer(make_unique<ConvolutionalLayer>(get_output_dimensions(),
+                                                  kernel_dimensions,
+                                                  ConvolutionalLayer::ActivationFunction::RectifiedLinear,
+                                                  convolution_stride_dimensions,
+                                                  convolution_type,
+                                                  "convolutional_layer_" + to_string(i+1)));
 
         const dimensions pool_dimensions = { 2, 2 };
         const dimensions pooling_stride_dimensions = { 2, 2 };
         const dimensions padding_dimensions = { 0, 0 };
         const PoolingLayer::PoolingMethod pooling_method = PoolingLayer::PoolingMethod::AveragePooling;
 
-        // add_layer(make_unique<PoolingLayer>(get_output_dimensions(),
-        //                                     pool_dimensions,
-        //                                     pooling_stride_dimensions,
-        //                                     padding_dimensions,
-        //                                     pooling_method,
-        //                                     "pooling_layer_" + to_string(i + 1)));
-
+        add_layer(make_unique<PoolingLayer>(get_output_dimensions(),
+                                            pool_dimensions,
+                                            pooling_stride_dimensions,
+                                            padding_dimensions,
+                                            pooling_method,
+                                            "pooling_layer_" + to_string(i + 1)));
     }
 
     add_layer(make_unique<FlattenLayer>(get_output_dimensions()));

diff --git a/opennn/normalization_layer_3d.h b/opennn/normalization_layer_3d.h
@@ -125,7 +125,7 @@ struct NormalizationLayer3DBackPropagation : LayerBackPropagation
 
     vector<pair<type*, dimensions>> get_input_derivative_pairs() const;
 
-    void set(const Index& = 0, Layer* = nullptr) override;
+    void set(const Index& = 0, Layer* = nullptr);
 
     void print() const;
 

diff --git a/opennn/perceptron_layer.h b/opennn/perceptron_layer.h
@@ -148,7 +148,7 @@ struct PerceptronLayerBackPropagation : LayerBackPropagation
 
     vector<pair<type*, dimensions>> get_input_derivative_pairs() const override;
 
-    void set(const Index& = 0, Layer* = nullptr) override;
+    void set(const Index& = 0, Layer* = nullptr);
 
     void print() const override;
 

diff --git a/opennn/perceptron_layer_3d.h b/opennn/perceptron_layer_3d.h
@@ -147,7 +147,7 @@ struct PerceptronLayer3DBackPropagation : LayerBackPropagation
 
     vector<pair<type*, dimensions>> get_input_derivative_pairs() const override;
 
-    void set(const Index& = 0, Layer* = nullptr) override;
+    void set(const Index& = 0, Layer* = nullptr);
 
     void print() const override;
 

diff --git a/opennn/pooling_layer.h b/opennn/pooling_layer.h
@@ -161,7 +161,7 @@ struct PoolingLayerBackPropagation : LayerBackPropagation
 
     vector<pair<type*, dimensions>> get_input_derivative_pairs() const override;
 
-    void set(const Index& = 0, Layer* = nullptr) override;
+    void set(const Index& = 0, Layer* = nullptr);
 
     void print() const override;
 

diff --git a/opennn/probabilistic_layer.h b/opennn/probabilistic_layer.h
@@ -41,7 +41,7 @@ struct ProbabilisticLayerBackPropagation : LayerBackPropagation
 
     vector<pair<type*, dimensions>> get_input_derivative_pairs() const override;
 
-    void set(const Index& = 0, Layer* = nullptr) override;
+    void set(const Index& = 0, Layer* = nullptr);
 
     void print() const override;
 

diff --git a/opennn/probabilistic_layer_3d.h b/opennn/probabilistic_layer_3d.h
@@ -151,7 +151,7 @@ struct ProbabilisticLayer3DBackPropagation : LayerBackPropagation
 
     vector<pair<type*, dimensions>> get_input_derivative_pairs() const override;
 
-    void set(const Index& = 0, Layer* = nullptr) override;
+    void set(const Index& = 0, Layer* = nullptr);
 
     void print() const override;
 

diff --git a/opennn/recurrent_layer.h b/opennn/recurrent_layer.h
@@ -136,7 +136,7 @@ struct RecurrentLayerBackPropagation : LayerBackPropagation
 
     vector<pair<type*, dimensions>> get_input_derivative_pairs() const override;
 
-    void set(const Index& = 0, Layer* = nullptr) override;
+    void set(const Index& = 0, Layer* = nullptr);
 
     void print() const override;