[Build] dependency to api

Code clean, fix cyclic dependency between nntrainer and ml-api.
Build dependency to ml-api on nntrainer is unnecessary.

Signed-off-by: Jaeyun Jung <jy1210.jung@samsung.com>

diff --git a/debian/control b/debian/control
index 64cbac418df38640e63c2b20a3fcf37c8ffcd25e..c4438e2efe7e610b16a956cb073ce0c060d1b973 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -74,7 +74,7 @@ Description: NNStreamer tensor filter for nntrainer
 Package: nnstreamer-nntrainer-dev
 Architecture: any
 Multi-Arch: same
-Depends: nnstreamer, nntrainer, ${shlibs:Depends}, ${misc:Depends}
+Depends: nnstreamer-nntrainer, ${shlibs:Depends}, ${misc:Depends}
 Description: Development package for nntrainer tensor filter
  This is a developement package of nntrainer's tensor filter.
 
@@ -88,7 +88,7 @@ Description: NNStreamer tensor trainer for nntrainer
 Package: nnstreamer-nntrainer-trainer-dev
 Architecture: any
 Multi-Arch: same
-Depends: nnstreamer, nntrainer, ${shlibs:Depends}, ${misc:Depends}
+Depends: nnstreamer-nntrainer-trainer, ${shlibs:Depends}, ${misc:Depends}
 Description: Development package for nntrainer tensor trainer
  This is a developement package of nntrainer's tensor trainer.
 

diff --git a/packaging/nntrainer.spec b/packaging/nntrainer.spec
index 7cf6cd14934df5ee31fe61fbff543cdeacad4090..36ba371d221afbb3bd55b3036bc85225fd1d8322 100644 (file)
--- a/packaging/nntrainer.spec
+++ b/packaging/nntrainer.spec
@@ -91,9 +91,6 @@ BuildRequires:        python3
 BuildRequires: python3-numpy
 BuildRequires: flatbuffers-devel
 
-BuildRequires: %{capi_machine_learning_common}-devel
-BuildRequires: %{capi_machine_learning_inference}-devel
-
 %if 0%{?unit_test}
 BuildRequires: ssat >= 1.1.0
 %endif
@@ -138,6 +135,7 @@ BuildRequires: tensorflow2-lite-devel
 %define enable_nnstreamer_tensor_trainer -Denable-nnstreamer-tensor-trainer=false
 
 %if  0%{?nnstreamer_filter}
+Requires:      nnstreamer-nntrainer = %{version}-%{release}
 BuildRequires: nnstreamer-devel
 %define enable_nnstreamer_tensor_filter -Denable-nnstreamer-tensor-filter=true
 
@@ -151,6 +149,7 @@ BuildRequires:      python
 %endif # nnstreamer_filter
 
 %if  0%{?nnstreamer_trainer}
+Requires:      nnstreamer-nntrainer = %{version}-%{release}
 BuildRequires: nnstreamer-devel
 %define enable_nnstreamer_tensor_trainer -Denable-nnstreamer-tensor-trainer=true
 %endif # nnstreamer_trainer
@@ -158,18 +157,6 @@ BuildRequires:     nnstreamer-devel
 
 Requires:      nntrainer-core = %{version}-%{release}
 
-%if 0%{?nnstreamer_filter}
-Requires:      nnstreamer-nntrainer = %{version}-%{release}
-%endif #nnstreamer_filter
-
-%if 0%{?nnstreamer_trainer}
-Requires:      nnstreamer-nntrainer = %{version}-%{release}
-%endif #nnstreamer_trainer
-
-%if %{with tizen}
-Requires:      capi-machine-learning-training = %{version}-%{release}
-%endif #tizen
-
 %description
 NNtrainer Meta package for tizen
 
@@ -185,7 +172,6 @@ NNtrainer is Software Framework for Training Neural Network Models on Devices.
 Summary:       Development package for custom nntrainer developers
 Requires:      nntrainer = %{version}-%{release}
 Requires:      openblas-devel
-Requires:      %{capi_machine_learning_common}-devel
 
 %description devel
 Development package for custom nntrainer developers.
@@ -200,6 +186,9 @@ Static library package of nntrainer-devel
 %package applications
 Summary:       NNTrainer Examples
 Requires:      nntrainer = %{version}-%{release}
+%if %{with tizen}
+Requires:      capi-machine-learning-training = %{version}-%{release}
+%endif #tizen
 Requires:      %{capi_machine_learning_inference}
 Requires:      nnstreamer-tensorflow2-lite
 %if 0%{tizen_version_major}%{tizen_version_minor} > 60
@@ -212,7 +201,7 @@ BuildRequires:      pkgconfig(libcurl)
 BuildRequires: pkgconfig(dlog)
 BuildRequires: %{capi_machine_learning_inference}-devel
 BuildRequires: glib2-devel
-BuildRequires:  gstreamer-devel
+BuildRequires: gstreamer-devel
 
 %description applications
 NNTrainer Examples for test purpose.
@@ -240,6 +229,7 @@ HTML pages of lcov results of NNTrainer generated during rpmbuild
 Summary:         Tizen Native API for NNTrainer
 Group:           Machine Learning/ML Framework
 Requires:        %{name} = %{version}-%{release}
+Requires:        %{capi_machine_learning_common}
 %description -n capi-machine-learning-training
 Tizen Native API wrapper for NNTrainer.
 You can train neural networks efficiently.
@@ -626,7 +616,6 @@ cp -r result %{buildroot}%{_datadir}/nntrainer/unittest/
 %defattr(-,root,root,-)
 %license LICENSE
 %{_libdir}/libnnstreamer_filter_nntrainer.a
-
 %endif #nnstreamer_filter
 
 %if 0%{?nnstreamer_trainer}
@@ -641,7 +630,6 @@ cp -r result %{buildroot}%{_datadir}/nntrainer/unittest/
 %defattr(-,root,root,-)
 %license LICENSE
 %{_libdir}/libnnstreamer_trainer_nntrainer.a
-
 %endif #nnstreamer_trainer
 
 %endif #tizen