[Tizen7.0] Tizen7.0 Backporting

- This commit adds some updates for Tizen7.0 backporting
- Type mismatch bug is fixed.
- Unused variable is removed.
- Missing header files are added in spec file.
- spec file is updated

Self evaluation:

Build test: [X]Passed [ ]Failed [ ]Skipped
Run test: [X]Passed [ ]Failed [ ]Skipped

Signed-off-by: Eunju Yang <ej.yang@samsung.com>

diff --git a/.github/workflows/ubuntu_clean_meson_build.yml b/.github/workflows/ubuntu_clean_meson_build.yml
index 8d845498bd84901f9ef36e264d4a0d4e9547bb80..ace8691db88166c5afb329b3b66747cf6233e59c 100644 (file)
--- a/.github/workflows/ubuntu_clean_meson_build.yml
+++ b/.github/workflows/ubuntu_clean_meson_build.yml
@@ -25,9 +25,6 @@ jobs:
       run: sudo apt-get update && sudo apt-get install -y gcc g++ pkg-config libopenblas-dev libiniparser-dev libjsoncpp-dev libcurl3-dev tensorflow2-lite-dev nnstreamer-dev libglib2.0-dev libgstreamer1.0-dev libgtest-dev ml-api-common-dev flatbuffers-compiler ml-inference-api-dev libunwind-dev
     - name: install additional packages for features
       run: sudo apt-get install -y python3-dev python3-numpy python3
-#    - name: add repo
-#      if: ${{matrix.os}} == 'ubuntu-22.04'
-#      run: sudo add-apt-repository ppa:ubuntu-toolchain-r/test
     - name: gcc version change
       run: |
         sudo add-apt-repository ppa:ubuntu-toolchain-r/test
@@ -38,8 +35,6 @@ jobs:
         sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-13 1000 
         sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-13 1000
         sudo update-alternatives --set gcc /usr/bin/gcc-13
-    - name: check gcc version
-      run: gcc --version
     - name: install build systems
       run: sudo apt install meson ninja-build
     - run: |

diff --git a/packaging/nntrainer.spec b/packaging/nntrainer.spec
index f7f5d1b4d8bfb55c7fc5e10dbff85421a739176a..bfdfb3b5c15941090475fb365775c5a6af9d6143 100644 (file)
--- a/packaging/nntrainer.spec
+++ b/packaging/nntrainer.spec
@@ -580,6 +580,9 @@ cp -r result %{buildroot}%{_datadir}/nntrainer/unittest/
 %{_includedir}/nntrainer/neuralnet.h
 
 
+%{_includedir}/nntrainer/acti_func.h
+
+
 %files devel-static
 %{_libdir}/libnntrainer*.a
 %exclude %{_libdir}/libcapi*.a