[ trivial ] clang format & revert some tmp codes & fix bug

- clang format is applied. - revert Android.mk - fix bug in registerClKernels Signed-off-by: Eunju Yang <[email protected]>
nnstreamer · Nov 21, 2024 · da83297 · da83297
1 parent da18596
commit da83297
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 8 deletions.
diff --git a/nntrainer/cl_context.cpp b/nntrainer/cl_context.cpp
@@ -44,9 +44,8 @@ static void add_default_object(ClContext &cc) {
   //                    ml::train::LayerType::LAYER_ADDITION);
 
   // @todo swiglulayercl also needs to be updated.
-  cc.registerFactory(nntrainer::createLayer<SwiGLULayerCl>,
-  SwiGLULayerCl::type,
-   ml::train::LayerType::LAYER_SWIGLU);
+  cc.registerFactory(nntrainer::createLayer<SwiGLULayerCl>, SwiGLULayerCl::type,
+                     ml::train::LayerType::LAYER_SWIGLU);
 
   if (ReshapeLayerCl::registerClKernels()) {
     cc.registerFactory(nntrainer::createLayer<ReshapeLayerCl>,
@@ -56,7 +55,7 @@ static void add_default_object(ClContext &cc) {
 
   // @todo rmsnormlayercl also needs to be updated.
   cc.registerFactory(nntrainer::createLayer<RMSNormLayerCl>,
-   RMSNormLayerCl::type, ml::train::LayerType::LAYER_RMSNORM);
+                     RMSNormLayerCl::type, ml::train::LayerType::LAYER_RMSNORM);
 
   if (ConcatLayerCl::registerClKernels()) {
     cc.registerFactory(nntrainer::createLayer<ConcatLayerCl>,

diff --git a/nntrainer/layers/cl_layers/concat_cl.cpp b/nntrainer/layers/cl_layers/concat_cl.cpp
@@ -242,8 +242,10 @@ static constexpr size_t INPUT_IDX_2 = 1;
 bool ConcatLayerCl::registerClKernels() {
 
   // check if already registered
-  if (!layer_kernel_ptrs.empty())
-    return true;
+  if (!layer_kernel_ptrs.empty()) {
+    ml_loge("kernels for concat layer are already registered");
+    return false;
+  }
 
   do {
 

diff --git a/nntrainer/layers/cl_layers/reshape_cl.cpp b/nntrainer/layers/cl_layers/reshape_cl.cpp
@@ -52,8 +52,10 @@ static constexpr size_t SINGLE_INOUT_IDX = 0;
 bool ReshapeLayerCl::registerClKernels() {
 
   // check if already registered
-  if (!layer_kernel_ptrs.empty())
-    return true;
+  if (!layer_kernel_ptrs.empty()) {
+    ml_loge("kernels for reshape layer are already registered");
+    return false;
+  }
 
   do {
     ClContext::SharedPtrClKernel kernel_copy_ptr = nullptr;

diff --git a/test/jni/Android.mk b/test/jni/Android.mk
@@ -444,11 +444,13 @@ LOCAL_SRC_FILES := \
 	 ../unittest/layers/unittest_layers_impl.cpp \
 	 ../unittest/layers/unittest_layers_transpose_cl.cpp \
 	 ../unittest/layers/unittest_layers_concat_cl.cpp \
+	 ../unittest/layers/unittest_layers_swiglu_cl.cpp \
 	 ../unittest/layers/unittest_layers_fully_connected_cl.cpp \
 	 ../unittest/layers/unittest_layers_input.cpp \
 	 ../unittest/layers/unittest_layers_loss.cpp \
 	 ../unittest/layers/unittest_layers_reshape_cl.cpp \
 	 ../unittest/layers/unittest_layers_fully_connected.cpp \
+	 ../unittest/layers/unittest_layers_rmsnorm_cl.cpp \
 	 ../unittest/layers/unittest_layers_batch_normalization.cpp \
 	 ../unittest/layers/unittest_layers_layer_normalization.cpp \
 	 ../unittest/layers/unittest_layers_convolution2d.cpp \