[Update] Removed SmartReply property and added nnlayergolden files

Addressed multiple review comments Removed unnecessary code Added nnlayer golden files Signed-off-by: Yash Singh <[email protected]>
nnstreamer · Dec 3, 2024 · 2d8c2e8 · 2d8c2e8
1 parent 3c37aa8
commit 2d8c2e8
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 74 deletions.
diff --git a/nntrainer/layers/cl_layers/custom_vocab_selection.cpp b/nntrainer/layers/cl_layers/custom_vocab_selection.cpp
@@ -1,6 +1,7 @@
 // SPDX-License-Identifier: Apache-2.0
 /**
- * Copyright (C) 2024 Yash Singh <[email protected]>>
+ * Copyright (C) 2024 Hyeonseok Lee <[email protected]>
+ * Copyright (C) 2024 Yash Singh <[email protected]>
  *
  * @file   custom_vocab_selection.cpp
  * @date   1 Oct 2024

diff --git a/nntrainer/layers/cl_layers/custom_vocab_selection.h b/nntrainer/layers/cl_layers/custom_vocab_selection.h
@@ -1,6 +1,7 @@
 // SPDX-License-Identifier: Apache-2.0
 /**
- * Copyright (C) 2024 Yash Singh <[email protected]>>
+ * Copyright (C) 2024 Hyeonseok Lee <[email protected]>
+ * Copyright (C) 2024 Yash Singh <[email protected]>
  *
  * @file   custom_vocab_selection.h
  * @date   1 Oct 2024

diff --git a/nntrainer/layers/cl_layers/lm_head_layer_cl.cpp b/nntrainer/layers/cl_layers/lm_head_layer_cl.cpp
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: Apache-2.0
 /**
- * Copyright (C) 2024 Yash Singh <[email protected]>>
+ * Copyright (C) 2024 Yash Singh <[email protected]>
  *
  * @file   lm_head_layer_cl.cpp
  * @date   1 Oct 2024
@@ -26,7 +26,7 @@ enum LMHeadParams { weight, bias, candidate_weight, candidate_hidden_step };
 CustomLMHeadLayerCl::CustomLMHeadLayerCl() :
   LayerImpl(),
   custom_lm_head_props(nntrainer::props::Unit(), props::UseVocabSelection(),
-                       props::LshChoices(), props::SmartReply()) {
+                       props::LshChoices()) {
   weight_idx.fill(std::numeric_limits<unsigned>::max());
 }
 
@@ -36,8 +36,6 @@ void CustomLMHeadLayerCl::finalize(nntrainer::InitLayerContext &context) {
   auto &weight_regularizer_constant =
     std::get<nntrainer::props::WeightRegularizerConstant>(*layer_impl_props);
   auto weight_initializer = nntrainer::props::InitializerInfo::Enum::ZEROS;
-  // auto &weight_initializer =
-  //   std::get<nntrainer::props::WeightInitializer>(*layer_impl_props);
   auto &weight_decay =
     std::get<nntrainer::props::WeightDecay>(*layer_impl_props);
   auto &bias_decay = std::get<nntrainer::props::BiasDecay>(*layer_impl_props);
@@ -170,14 +168,14 @@ void CustomLMHeadLayerCl::incremental_forwarding(
   hidden_step_dim.batch(1);
   hidden_step_dim.height(1);
 
-  bool smart_reply = std::get<props::SmartReply>(custom_lm_head_props).get();
+  // bool smart_reply = std::get<props::SmartReply>(custom_lm_head_props).get();
 
   unsigned int b_size = input_dim.batch();
   unsigned omp_num = 4;
-  if (smart_reply && !_from) {
-    b_size = 1;
-    omp_num = 1;
-  }
+  // if (smart_reply && !_from) {
+  //   b_size = 1;
+  //   omp_num = 1;
+  // }
 
   // #pragma omp parallel for num_threads(omp_num)
   for (unsigned int b = 0; b < b_size; ++b) {
@@ -228,7 +226,7 @@ void CustomLMHeadLayerCl::incremental_forwarding(
       nntrainer::Tensor &bias =
         context.getWeight(weight_idx[LMHeadParams::bias]);
 
-      add_i_cl(bias, hidden_step);
+      add_i_cl(hidden_step, bias);
     }
   }
 }
@@ -239,21 +237,4 @@ void CustomLMHeadLayerCl::setProperty(const std::vector<std::string> &values) {
   auto remain_props = loadProperties(values, custom_lm_head_props);
   LayerImpl::setProperty(remain_props);
 }
-
-#ifdef PLUGGABLE
-
-nntrainer::Layer *create_custom_lm_head_layer() {
-  auto layer = new CustomLMHeadLayerCl();
-  return layer;
-}
-
-void destroy_custom_lm_head_layer(nntrainer::Layer *layer) { delete layer; }
-
-extern "C" {
-nntrainer::LayerPluggable ml_train_layer_pluggable{
-  create_custom_lm_head_layer, destroy_custom_lm_head_layer};
-}
-
-#endif
-
 } // namespace nntrainer
diff --git a/nntrainer/layers/cl_layers/lm_head_layer_cl.h b/nntrainer/layers/cl_layers/lm_head_layer_cl.h
@@ -14,7 +14,6 @@
 #ifndef __CUSTOM_LM_HEAD_LAYER_H__
 #define __CUSTOM_LM_HEAD_LAYER_H__
 
-#include <custom_properties.h>
 #include <custom_vocab_selection.h>
 #include <layer_context.h>
 #include <layer_impl.h>
@@ -152,13 +151,12 @@ class CustomLMHeadLayerCl : public LayerImpl {
 
 private:
   std::tuple<nntrainer::props::Unit, props::UseVocabSelection,
-             props::LshChoices, props::SmartReply>
+             props::LshChoices>
     custom_lm_head_props;
   std::array<unsigned int, 4> weight_idx; /**< indices of the weights */
   std::unique_ptr<nntrainer::Tensor>
     weight_T; // temporary weight. will be removed
 };
-
 } // namespace nntrainer
 
 #endif /* __LM_HEAD_LAYER_CL_H__ */
diff --git a/nntrainer/utils/custom_properties.h b/nntrainer/utils/custom_properties.h
diff --git a/packaging/unittest_layers.tar.gz b/packaging/unittest_layers.tar.gz