Skip to content

Commit

Permalink
[Build/Pkg] Rename spec and manifest files
Browse files Browse the repository at this point in the history
This patch renames spec and manifest files to mlops-agent.spec and
mlops-agent.manifest. It also update the package name with the'mlops-agent'.
However, the name of D-Bus service is not changed since this channel is
also used as Service API.

Signed-off-by: Sangjung Woo <[email protected]>
  • Loading branch information
again4you committed Feb 8, 2024
1 parent d029510 commit 4f3e960
Show file tree
Hide file tree
Showing 9 changed files with 45 additions and 45 deletions.
2 changes: 1 addition & 1 deletion daemon/include/meson.build
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
ml_agent_headers = files('ml-agent-interface.h')

install_headers(ml_agent_headers,
subdir: 'ml-agent'
subdir: 'mlops-agent'
)
8 changes: 4 additions & 4 deletions daemon/meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ ml_agent_db_path_arg = '-DDB_PATH="' + serviceDBPath + '"'
serviceDBKeyPrefix = get_option('service-db-key-prefix')
ml_agent_db_key_prefix_arg = '-DDB_KEY_PREFIX="' + serviceDBKeyPrefix + '"'

ml_agent_shared_lib = shared_library ('ml-agent',
ml_agent_shared_lib = shared_library ('mlops-agent',
ml_agent_lib_srcs,
dependencies: ml_agent_deps,
include_directories: ml_agent_incs,
Expand All @@ -41,7 +41,7 @@ ml_agent_shared_lib = shared_library ('ml-agent',
version: ml_agent_version,
)

ml_agent_static_lib = static_library('ml-agent',
ml_agent_static_lib = static_library('mlops-agent',
ml_agent_lib_srcs,
dependencies: ml_agent_deps,
include_directories: ml_agent_incs,
Expand All @@ -63,7 +63,7 @@ ml_agent_dep = declare_dependency(
)

ml_agent_main_file = files('main.c')
ml_agent_executable = executable('machine-learning-agent',
ml_agent_executable = executable('mlops-agent',
ml_agent_main_file,
dependencies: ml_agent_dep,
install: true,
Expand All @@ -72,7 +72,7 @@ ml_agent_executable = executable('machine-learning-agent',
pie: true
)

configure_file(input: 'ml-agent.pc.in', output: 'ml-agent.pc',
configure_file(input: 'mlops-agent.pc.in', output: 'mlops-agent.pc',
install_dir: join_paths(ml_agent_install_libdir, 'pkgconfig'),
configuration: ml_agent_conf
)
Expand Down
8 changes: 4 additions & 4 deletions daemon/ml-agent.pc.in → daemon/mlops-agent.pc.in
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ exec_prefix=@EXEC_PREFIX@
libdir=@LIB_INSTALL_DIR@
includedir=@INCLUDE_INSTALL_DIR@

Name: ml-agent
Description: Development headers and libraries for interfaces provided by Machine Learning Agent
Name: mlops-agent
Description: Development headers and libraries for interfaces provided by MLOps Agent
Version: @VERSION@
Libs: -L${libdir} -lml-agent
Cflags: -I${includedir}/ml-agent
Libs: -L${libdir} -lmlops-agent
Cflags: -I${includedir}/mlops-agent
8 changes: 4 additions & 4 deletions dbus/meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@ gdbus_gen_header_dep = declare_dependency(
sources: [gdbus_gen_pipeline_src, gdbus_gen_model_src, gdbus_gen_resource_src])

# DBus Policy configuration
configure_file(input: 'machine-learning-agent.conf.in',
output: 'machine-learning-agent.conf',
configure_file(input: 'mlops-agent.conf.in',
output: 'mlops-agent.conf',
install_dir: dbus_policy_dir,
configuration: ml_agent_conf
)
Expand All @@ -46,8 +46,8 @@ configure_file(input: 'org.tizen.machinelearning.service.service.in',
)

# Systemd Service file
configure_file(input: 'machine-learning-agent.service.in',
output: 'machine-learning-agent.service',
configure_file(input: 'mlops-agent.service.in',
output: 'mlops-agent.service',
install_dir: systemd_service_dir,
configuration: ml_agent_conf
)
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
[Unit]
Description=Machine Learning Agent Daemon
Description=MLOps Agent Daemon

[Service]
Type=dbus
BusName=org.tizen.machinelearning.service
SmackProcessLabel=System
ExecStart=@EXEC_PREFIX@/machine-learning-agent
ExecStart=@EXEC_PREFIX@/mlops-agent
User=service_fw
Group=service_fw
4 changes: 2 additions & 2 deletions dbus/org.tizen.machinelearning.service.service.in
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
[D-BUS Service]
Name=org.tizen.machinelearning.service
Exec=@EXEC_PREFIX@/machine-learning-agent
SystemdService=machine-learning-agent.service
Exec=@EXEC_PREFIX@/mlops-agent
SystemdService=mlops-agent.service
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -43,21 +43,21 @@

###########################################################################
# Package / sub-package definitions
Name: machine-learning-agent
Summary: AI service agent for ML(Machine Learning) API and NNStreamer
Name: mlops-agent
Summary: AI service agent for MLOps and ML(Machine Learning) API
# Synchronize the version information for ML-Agent.
# 1. Tizen : ./packaging/machine-learning-agent.spec
# 1. Tizen : ./packaging/mlops-agent.spec
# 2. Meson : ./meson.build
Version: 1.8.5
Release: 0
Group: Machine Learning/ML Framework
Packager: Sangjung Woo <[email protected]>
License: Apache-2.0
Source0: machine-learning-agent-%{version}.tar
Source1001: machine-learning-agent.manifest
Source0: mlops-agent-%{version}.tar
Source1001: mlops-agent.manifest

## Define runtime requirements ##
Requires: libmachine-learning-agent = %{version}-%{release}
Requires: libmlops-agent = %{version}-%{release}
Requires: dbus-1

## Define build requirements ##
Expand Down Expand Up @@ -90,17 +90,17 @@ BuildRequires: lcov
%description
AI service agent for ML(Machine Learning) API and NNStreamer.

%package -n libmachine-learning-agent
%package -n libmlops-agent
Summary: Library that exports interfaces provided by Machine Learning Agent
Group: Machine Learning/ML Framework = %{version}-%{release}
%description -n libmachine-learning-agent
%description -n libmlops-agent
Shared library to export interfaces provided by the Machine Learning Agent.

%package -n libmachine-learning-agent-devel
%package -n libmlops-agent-devel
Summary: Development headers and static library for interfaces provided by Machine Learning Agent
Group: Machine Learning/ML Framework
Requires: libmachine-learning-agent = %{version}-%{release}
%description -n libmachine-learning-agent-devel
Requires: libmlops-agent = %{version}-%{release}
%description -n libmlops-agent-devel
Development headers and static library for interfaces provided by Machine Learning Agent.

%package test
Expand All @@ -116,7 +116,7 @@ require testing with the ML Agent service.
%package unittests
Summary: Unittests for Machine Learning Agent
Group: Machine Learning/ML Framework
Requires: machine-learning-agent = %{version}-%{release}
Requires: mlops-agent = %{version}-%{release}
%description unittests
Unittests for Machine Learning Agent.
%endif
Expand Down Expand Up @@ -194,7 +194,7 @@ meson install -C %{builddir} --destdir=%{buildroot}
TZ='Asia/Seoul'; export TZ

# Get commit info
VCS=`cat ${RPM_SOURCE_DIR}/machine-learning-agent.spec | grep "^VCS:" | sed "s|VCS:\\W*\\(.*\\)|\\1|"`
VCS=`cat ${RPM_SOURCE_DIR}/mlops-agent.spec | grep "^VCS:" | sed "s|VCS:\\W*\\(.*\\)|\\1|"`

# Create human readable coverage report web page.
# Create null gcda files if gcov didn't create it because there is completely no unit test for them.
Expand Down Expand Up @@ -234,27 +234,27 @@ install -m 0755 packaging/run-unittest.sh %{buildroot}%{_bindir}/tizen-unittests
%postun -p /sbin/ldconfig

%files
%manifest machine-learning-agent.manifest
%manifest mlops-agent.manifest
%license LICENSE
%attr(0755,root,root) %{_bindir}/machine-learning-agent
%attr(0644,root,root) %{_unitdir}/machine-learning-agent.service
%attr(0644,root,root) %config %{_sysconfdir}/dbus-1/system.d/machine-learning-agent.conf
%attr(0755,root,root) %{_bindir}/mlops-agent
%attr(0644,root,root) %{_unitdir}/mlops-agent.service
%attr(0644,root,root) %config %{_sysconfdir}/dbus-1/system.d/mlops-agent.conf
%attr(0644,root,root) %{_datadir}/dbus-1/system-services/org.tizen.machinelearning.service.service

%files -n libmachine-learning-agent
%manifest machine-learning-agent.manifest
%files -n libmlops-agent
%manifest mlops-agent.manifest
%license LICENSE
%{_libdir}/libml-agent.so.*
%{_libdir}/libmlops-agent.so.*

%files -n libmachine-learning-agent-devel
%manifest machine-learning-agent.manifest
%{_libdir}/libml-agent.so
%{_libdir}/libml-agent.a
%{_includedir}/ml-agent/ml-agent-interface.h
%{_libdir}/pkgconfig/ml-agent.pc
%files -n libmlops-agent-devel
%manifest mlops-agent.manifest
%{_libdir}/libmlops-agent.so
%{_libdir}/libmlops-agent.a
%{_includedir}/mlops-agent/ml-agent-interface.h
%{_libdir}/pkgconfig/mlops-agent.pc

%files test
%manifest machine-learning-agent.manifest
%manifest mlops-agent.manifest
%license LICENSE
%attr(0755,root,root) %{test_base_dir}/machine-learning-agent-test
%attr(0755,root,root) %{test_base_dir}/services/org.tizen.machinelearning.service.service
Expand All @@ -263,7 +263,7 @@ install -m 0755 packaging/run-unittest.sh %{buildroot}%{_bindir}/tizen-unittests
%if 0%{?unit_test}
%if 0%{?release_test}
%files unittests
%manifest machine-learning-agent.manifest
%manifest mlops-agent.manifest
%{test_base_dir}/unittests
%{_libdir}/libml-agent-test.a
%{_libdir}/libml-agent-test.so*
Expand Down

0 comments on commit 4f3e960

Please sign in to comment.