🐛 Remove activation parameter for concat

Former-commit-id: 687b697
JDAI-CV · Dec 10, 2017 · 43d6f0a · 43d6f0a
1 parent 4d2a339
commit 43d6f0a
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/dnnlibrary/src/main/cpp/ModelBuilder.cpp b/dnnlibrary/src/main/cpp/ModelBuilder.cpp
@@ -303,8 +303,7 @@ ModelBuilder &ModelBuilder::readFromFile(std::string filename) {
                     inputs.push_back(layerToBlob[*intPt++]);
                 }
                 uint32_t axis = *intPt++;
-                uint32_t activation = *intPt++;
-                index = addConcat(inputs, axis, activation);
+                index = addConcat(inputs, axis);
                 layerToBlob.push_back(index);
                 while (*intPt++ != MF_TOP_NAME) ;
                 break;
@@ -511,7 +510,7 @@ uint32_t ModelBuilder::addReLU(uint32_t input) {
 }
 
 uint32_t
-ModelBuilder::addConcat(const vector<uint32_t> &inputs, uint32_t axis, uint32_t activation) {
+ModelBuilder::addConcat(const vector<uint32_t> &inputs, uint32_t axis) {
     vector<vector<uint32_t>> dimens;
     for (const auto &input : inputs) {
         vector<uint32_t> &dimen = dimensMap[input];
@@ -532,7 +531,7 @@ ModelBuilder::addConcat(const vector<uint32_t> &inputs, uint32_t axis, uint32_t
     }
 
     uint32_t axisOperandIndex = addInt32Operand(axis);
-    uint32_t activationOperandIndex = addInt32Operand(activation);
+    // uint32_t activationOperandIndex = addInt32Operand(activation);
 
     ANeuralNetworksOperandType type = getFloat32OperandTypeWithDims(outputDimen);
     uint32_t outputOperandIndex = addNewOperand(&type);

diff --git a/dnnlibrary/src/main/cpp/ModelBuilder.h b/dnnlibrary/src/main/cpp/ModelBuilder.h
@@ -145,7 +145,7 @@ class ModelBuilder {
     uint32_t addMulScalar(uint32_t input, float scalar);
     uint32_t addMulTensor(uint32_t input1, uint32_t input2);
     uint32_t addReLU(uint32_t input);
-    uint32_t addConcat(const std::vector<uint32_t> &inputs, uint32_t axis, uint32_t activation);
+    uint32_t addConcat(const std::vector<uint32_t> &inputs, uint32_t axis);
     void addIndexIntoOutput(uint32_t index);
     int compile(uint32_t preference);
     void prepareForExecution(Model &model);