Attempt at fixing Tizen build

Added a define guard to stop function redefinition

Signed-off-by: p-debski2 <[email protected]>

Author: p-debski2

nntrainer/tensor/cpu_backend/ggml_interface/nntr_ggml_impl/nntr_ggml_impl_fp16_fp32.cpp

@@ -28,7 +28,7 @@
 // https://github.com/ggml-org/llama.cpp/pull/10616 for     MUSA compilers , we
 // use uint16_t: ref https://github.com/ggml-org/llama.cpp/pull/11843
 //
-#if defined(__ARM_NEON) &&                                                     \
+#if defined(__ARM_NEON) && defined(ENABLE_FP16) &&                             \
   !(defined(__CUDACC__) && __CUDACC_VER_MAJOR__ <= 11) && !defined(__MUSACC__)
 #define NNTR_COMPUTE_FP16_TO_FP32(x) nntr_compute_fp16_to_fp32_impl(x)
 #define NNTR_COMPUTE_FP32_TO_FP16(x) nntr_compute_fp32_to_fp16_impl(x)

nntrainer/tensor/cpu_backend/ggml_interface/nntr_ggml_impl/nntr_ggml_impl_utils.h

@@ -873,6 +873,8 @@ inline static int32_t vaddvq_s32(int32x4_t v) {
          vgetq_lane_s32(v, 3);
 }
 
+#if not(defined(ARMV7)) || !(ARMV7)
+
 inline static float vaddvq_f32(float32x4_t v) {
   return vgetq_lane_f32(v, 0) + vgetq_lane_f32(v, 1) + vgetq_lane_f32(v, 2) +
          vgetq_lane_f32(v, 3);
@@ -894,6 +896,8 @@ inline static int32x4_t vcvtnq_s32_f32(float32x4_t v) {
   return res;
 }
 
+#endif
+
 inline static uint8x8_t vzip1_u8(uint8x8_t a, uint8x8_t b) {
   uint8x8_t res;
 

packaging/nntrainer.spec

@@ -601,6 +601,8 @@ cp -r result %{buildroot}%{_datadir}/nntrainer/unittest/
 %if 0%{?enable_ggml}
 %{_includedir}/nntrainer/ggml_interface.h
 %{_includedir}/nntrainer/nntr_ggml_impl.h
+%{_includedir}/nntrainer/nntr_ggml_impl_common.h
+%{_includedir}/nntrainer/nntr_ggml_impl_utils.h
 %endif
 %{_includedir}/nntrainer/bs_thread_pool.h
 %{_includedir}/nntrainer/bs_thread_pool_manager.hpp