[FP16] Include HalfTensor when enable_fp16

In this PR, HalfTensor is included only when FP16 is enabled.

**Self-evaluation:**
1. Build test: [X]Passed [ ]Failed [ ]Skipped
2. Run test:   [X]Passed [ ]Failed [ ]Skipped

Signed-off-by: Donghyeon Jeong <dhyeon.jeong@samsung.com>

diff --git a/debian/nntrainer-dev.install b/debian/nntrainer-dev.install
index b7fe9dc9abbb2044780af66a7a24b4b82019c5d8..c759cddf8d24b0ef7ab23ebcd4f5eab3b112a669 100644 (file)
--- a/debian/nntrainer-dev.install
+++ b/debian/nntrainer-dev.install
@@ -12,7 +12,6 @@
 /usr/include/nntrainer/tensor_v2.h
 /usr/include/nntrainer/tensor_base.h
 /usr/include/nntrainer/float_tensor.h
-/usr/include/nntrainer/half_tensor.h
 /usr/include/nntrainer/tensor_wrap_specs.h
 /usr/include/nntrainer/blas_interface.h
 /usr/include/nntrainer/var_grad.h

diff --git a/nntrainer/tensor/meson.build b/nntrainer/tensor/meson.build
index fa90788e66a515ce8cfe63e045c70ed34b30e9f4..22590b83ae9ce7d2e1916bcb71a43761380d2f74 100644 (file)
--- a/nntrainer/tensor/meson.build
+++ b/nntrainer/tensor/meson.build
@@ -28,7 +28,6 @@ tensor_headers = [
   'tensor_v2.h',
   'tensor_base.h',
   'float_tensor.h',
-  'half_tensor.h',
   'weight.h',
   'var_grad.h',    
   'tensor_wrap_specs.h',
@@ -42,6 +41,7 @@ if get_option('platform') == 'android' or arch == 'aarch64'
 endif
 
 if get_option('enable-fp16')
+  tensor_headers += 'half_tensor.h'
   tensor_sources += 'half_tensor.cpp'
 endif
 

diff --git a/nntrainer/tensor/tensor_v2.cpp b/nntrainer/tensor/tensor_v2.cpp
index a2007d21f8bcc3583a2eeb1174f90f3715f3eb1e..409d1c499a585f82de1625a970f24ad0b140900a 100644 (file)
--- a/nntrainer/tensor/tensor_v2.cpp
+++ b/nntrainer/tensor/tensor_v2.cpp
@@ -10,9 +10,12 @@
  */
 
 #include <float_tensor.h>
-#include <half_tensor.h>
 #include <tensor_v2.h>
 
+#ifdef ENABLE_FP16
+#include <half_tensor.h>
+#endif
+
 namespace nntrainer {
 
 TensorV2::TensorV2(std::string name_, Tformat fm, Tdatatype d_type) {

diff --git a/packaging/nntrainer.spec b/packaging/nntrainer.spec
index 588d91d7e8c632fa003f54cc99d59e5f26e9cbee..da49da732f1a82764ea5bdd20d3ebd647bf5748b 100644 (file)
--- a/packaging/nntrainer.spec
+++ b/packaging/nntrainer.spec
@@ -534,7 +534,9 @@ cp -r result %{buildroot}%{_datadir}/nntrainer/unittest/
 %{_includedir}/nntrainer/tensor_v2.h
 %{_includedir}/nntrainer/tensor_base.h
 %{_includedir}/nntrainer/float_tensor.h
+%if 0%{?enable_fp16}
 %{_includedir}/nntrainer/half_tensor.h
+%endif
 %{_includedir}/nntrainer/tensor_wrap_specs.h
 %{_includedir}/nntrainer/blas_interface.h
 %{_includedir}/nntrainer/var_grad.h