tests

Author: Semyon1104

include/layers/FCLayer.hpp

@@ -113,10 +113,6 @@ FCLayerImpl<ValueType>::FCLayerImpl(const std::vector<ValueType>& input_weights,
   this->inputShape_[0] = input_weights_shape[0];
   this->outputShape_[0] = input_weights_shape[1];
 
-  if (this->inputShape_[0] == 0 || this->outputShape_[0] == 0) {
-    throw std::invalid_argument("Invalid weights/bias size for FCLayer");
-  }
-
   if (input_bias.size() != this->outputShape_[0]) {
     throw std::invalid_argument("Bias size doesn't match output size");
   }

test/single_layer/test_concatlayer.cpp

@@ -230,4 +230,44 @@ TEST(ConcatLayerTests, ConcatResNetStyle) {
   EXPECT_FLOAT_EQ(output[0].get<float>({0, 3, 0, 1}), 14.0f);
   EXPECT_FLOAT_EQ(output[0].get<float>({0, 3, 1, 0}), 15.0f);
   EXPECT_FLOAT_EQ(output[0].get<float>({0, 3, 1, 1}), 16.0f);
-}
+}
+
+TEST(ConcatLayerTests, ConcatSetOrderMultipleCalls) {
+  ConcatLayer layer(1);
+  std::vector<int> order1 = {0, 1, 2};
+  std::vector<int> order2 = {2, 1, 0};
+  std::vector<int> order3;
+
+  EXPECT_NO_THROW(layer.setInputOrder(order1));
+  EXPECT_NO_THROW(layer.setInputOrder(order2));
+  EXPECT_NO_THROW(layer.setInputOrder(order3));
+}
+
+TEST(ConcatLayerTests, ConcatSetOrderAfterRun) {
+  ConcatLayer layer(0);
+  Tensor input1 = make_tensor<int>({1, 2, 3, 4}, {2, 2});
+  Tensor input2 = make_tensor<int>({5, 6, 7, 8}, {2, 2});
+  Tensor output;
+  std::vector<Tensor> inputs{input1, input2};
+  std::vector<Tensor> outputs{output};
+  EXPECT_NO_THROW(layer.run(inputs, outputs));
+  std::vector<int> order = {1, 0};
+  EXPECT_NO_THROW(layer.setInputOrder(order));
+  EXPECT_NO_THROW(layer.run(inputs, outputs));
+}
+
+TEST(ConcatLayerTests, ReorderInputsWithInvalidOrderSize) {
+  ConcatLayer layer(0);
+  Tensor input1 = make_tensor<int>({1, 2}, {2});
+  Tensor input2 = make_tensor<int>({3, 4}, {2});
+  std::vector<int> order = {0};
+  EXPECT_NO_THROW(layer.setInputOrder(order));
+}
+
+TEST(ConcatLayerTests, ReorderInputsWithInvalidIndex) {
+  ConcatLayer layer(0);
+  Tensor input1 = make_tensor<int>({1, 2}, {2});
+  Tensor input2 = make_tensor<int>({3, 4}, {2});
+  std::vector<int> order = {0, 5};
+  EXPECT_NO_THROW(layer.setInputOrder(order););
+}

test/single_layer/test_fclayer.cpp

@@ -249,6 +249,7 @@ TEST(fclayer, new_fc_bias_and_weights_not_same) {
   std::vector<Tensor> out{output};
   EXPECT_THROW(layer.run(in, out), std::invalid_argument);
 }
+
 TEST(fclayer, VectorSizeNotDivisibleByMatrixRows) {
   std::vector<float> weightsvec = {1.0f, 2.0f, 3.0f, 4.0f, 5.0f, 6.0f};
   Shape weights_shape({3, 2});