Add Requires for capi-ml-inference and Add aarch64 libraries

Change-Id: I0a8f4b5acbb5a34b1fcee548205b597a610c2f6e
Signed-off-by: sooyeon.kim <sooyeon.kim@samsung.com>

diff --git a/CMakeLists.txt b/CMakeLists.txt
index a20b0f7..5da1c1e 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -70,7 +70,59 @@ INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/engine_data/ DESTINATION ${TZ_SYS_
 ELSEIF("${ARCH}" MATCHES "^aarch64.*")
 SET(INSTALL_ARCH aarch64)
 INSTALL(PROGRAMS ${CMAKE_SOURCE_DIR}/bin/aarch64/org.tizen.vc-engine-default DESTINATION ${APP_INSTALL_PREFIX}/bin/)
-INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/engine_data/ DESTINATION ${TZ_SYS_RO_SHARE}/voice/vc/engine_data)
+INSTALL(FILES ${CMAKE_SOURCE_DIR}/lib/aarch64/libOnDeviceE2EASR.so DESTINATION ${APP_INSTALL_PREFIX}/lib/ COMPONENT RuntimeLibraries)
+INSTALL(FILES ${CMAKE_SOURCE_DIR}/lib/aarch64/libondeviceasr.so DESTINATION ${APP_INSTALL_PREFIX}/lib/ COMPONENT RuntimeLibraries)
+INSTALL(FILES ${CMAKE_SOURCE_DIR}/lib/aarch64/libvoiceactivity.so DESTINATION ${APP_INSTALL_PREFIX}/lib/ COMPONENT RuntimeLibraries)
+INSTALL(FILES ${CMAKE_SOURCE_DIR}/lib/aarch64/libfst.so DESTINATION ${APP_INSTALL_PREFIX}/lib/ COMPONENT RuntimeLibraries)
+INSTALL(FILES ${CMAKE_SOURCE_DIR}/lib/aarch64/libfst.so.8 DESTINATION ${APP_INSTALL_PREFIX}/lib/ COMPONENT RuntimeLibraries)
+INSTALL(FILES ${CMAKE_SOURCE_DIR}/lib/aarch64/libfst.so.8.0.0 DESTINATION ${APP_INSTALL_PREFIX}/lib/ COMPONENT RuntimeLibraries)
+
+INSTALL(FILES ${CMAKE_SOURCE_DIR}/res/OnDeviceE2EASR.en_US.conf DESTINATION ${APP_INSTALL_PREFIX}/shared/res/)
+INSTALL(FILES ${CMAKE_SOURCE_DIR}/res/OnDeviceE2EASR.ko_KR.conf DESTINATION ${APP_INSTALL_PREFIX}/shared/res/)
+
+SET( FILES_MODEL_KO_KR
+       ${CMAKE_SOURCE_DIR}/res/models/ko_KR/B_disambig.fst
+       ${CMAKE_SOURCE_DIR}/res/models/ko_KR/BG.fst
+       ${CMAKE_SOURCE_DIR}/res/models/ko_KR/e2e_asr_words.txt
+       ${CMAKE_SOURCE_DIR}/res/models/ko_KR/stats.mean.txt
+       ${CMAKE_SOURCE_DIR}/res/models/ko_KR/stats.std_dev.txt
+       ${CMAKE_SOURCE_DIR}/res/models/ko_KR/trans.bpe.vocab
+       ${CMAKE_SOURCE_DIR}/res/models/ko_KR/words.txt
+)
+
+SET( FILES_MODEL_EN_US
+       ${CMAKE_SOURCE_DIR}/res/models/en_US/B_disambig.fst
+       ${CMAKE_SOURCE_DIR}/res/models/en_US/BG.fst
+       ${CMAKE_SOURCE_DIR}/res/models/en_US/e2e_asr_words.txt
+       ${CMAKE_SOURCE_DIR}/res/models/en_US/stats.mean.txt
+       ${CMAKE_SOURCE_DIR}/res/models/en_US/stats.std_dev.txt
+       ${CMAKE_SOURCE_DIR}/res/models/en_US/trans.bpe.vocab
+       ${CMAKE_SOURCE_DIR}/res/models/en_US/words.txt
+)
+
+INSTALL(FILES ${FILES_MODEL_KO_KR} DESTINATION ${APP_INSTALL_PREFIX}/shared/res/models/ko_KR/)
+INSTALL(FILES ${CMAKE_SOURCE_DIR}/res/models/ko_KR/dec1/dec1.tflite DESTINATION ${APP_INSTALL_PREFIX}/shared/res/models/ko_KR/dec1/)
+INSTALL(FILES ${CMAKE_SOURCE_DIR}/res/models/ko_KR/dec1/metadata/MANIFEST DESTINATION ${APP_INSTALL_PREFIX}/shared/res/models/ko_KR/dec1/metadata/)
+INSTALL(FILES ${CMAKE_SOURCE_DIR}/res/models/ko_KR/dec2/dec2.tflite DESTINATION ${APP_INSTALL_PREFIX}/shared/res/models/ko_KR/dec2/)
+INSTALL(FILES ${CMAKE_SOURCE_DIR}/res/models/ko_KR/dec2/metadata/MANIFEST DESTINATION ${APP_INSTALL_PREFIX}/shared/res/models/ko_KR/dec2/metadata/)
+INSTALL(FILES ${CMAKE_SOURCE_DIR}/res/models/ko_KR/dec3/dec3.tflite DESTINATION ${APP_INSTALL_PREFIX}/shared/res/models/ko_KR/dec3/)
+INSTALL(FILES ${CMAKE_SOURCE_DIR}/res/models/ko_KR/dec3/metadata/MANIFEST DESTINATION ${APP_INSTALL_PREFIX}/shared/res/models/ko_KR/dec3/metadata/)
+INSTALL(FILES ${CMAKE_SOURCE_DIR}/res/models/ko_KR/enc1/enc1.tflite DESTINATION ${APP_INSTALL_PREFIX}/shared/res/models/ko_KR/enc1/)
+INSTALL(FILES ${CMAKE_SOURCE_DIR}/res/models/ko_KR/enc1/metadata/MANIFEST DESTINATION ${APP_INSTALL_PREFIX}/shared/res/models/ko_KR/enc1/metadata/)
+INSTALL(FILES ${CMAKE_SOURCE_DIR}/res/models/ko_KR/enc2/enc2.tflite DESTINATION ${APP_INSTALL_PREFIX}/shared/res/models/ko_KR/enc2/)
+INSTALL(FILES ${CMAKE_SOURCE_DIR}/res/models/ko_KR/enc2/metadata/MANIFEST DESTINATION ${APP_INSTALL_PREFIX}/shared/res/models/ko_KR/enc2/metadata/)
+INSTALL(FILES ${FILES_MODEL_EN_US} DESTINATION ${APP_INSTALL_PREFIX}/shared/res/models/en_US/)
+INSTALL(FILES ${CMAKE_SOURCE_DIR}/res/models/en_US/dec1/dec1.tflite DESTINATION ${APP_INSTALL_PREFIX}/shared/res/models/en_US/dec1/)
+INSTALL(FILES ${CMAKE_SOURCE_DIR}/res/models/en_US/dec1/metadata/MANIFEST DESTINATION ${APP_INSTALL_PREFIX}/shared/res/models/en_US/dec1/metadata/)
+INSTALL(FILES ${CMAKE_SOURCE_DIR}/res/models/en_US/dec2/dec2.tflite DESTINATION ${APP_INSTALL_PREFIX}/shared/res/models/en_US/dec2/)
+INSTALL(FILES ${CMAKE_SOURCE_DIR}/res/models/en_US/dec2/metadata/MANIFEST DESTINATION ${APP_INSTALL_PREFIX}/shared/res/models/en_US/dec2/metadata/)
+INSTALL(FILES ${CMAKE_SOURCE_DIR}/res/models/en_US/dec3/dec3.tflite DESTINATION ${APP_INSTALL_PREFIX}/shared/res/models/en_US/dec3/)
+INSTALL(FILES ${CMAKE_SOURCE_DIR}/res/models/en_US/dec3/metadata/MANIFEST DESTINATION ${APP_INSTALL_PREFIX}/shared/res/models/en_US/dec3/metadata/)
+INSTALL(FILES ${CMAKE_SOURCE_DIR}/res/models/en_US/enc1/enc1.tflite DESTINATION ${APP_INSTALL_PREFIX}/shared/res/models/en_US/enc1/)
+INSTALL(FILES ${CMAKE_SOURCE_DIR}/res/models/en_US/enc1/metadata/MANIFEST DESTINATION ${APP_INSTALL_PREFIX}/shared/res/models/en_US/enc1/metadata/)
+INSTALL(FILES ${CMAKE_SOURCE_DIR}/res/models/en_US/enc2/enc2.tflite DESTINATION ${APP_INSTALL_PREFIX}/shared/res/models/en_US/enc2/)
+INSTALL(FILES ${CMAKE_SOURCE_DIR}/res/models/en_US/enc2/metadata/MANIFEST DESTINATION ${APP_INSTALL_PREFIX}/shared/res/models/en_US/enc2/metadata/)
+
 ELSEIF("${ARCH}" MATCHES "^x86_64.*")
 SET(INSTALL_ARCH x86_64)
 INSTALL(PROGRAMS ${CMAKE_SOURCE_DIR}/bin/x86_64/org.tizen.vc-engine-default DESTINATION ${APP_INSTALL_PREFIX}/bin/)

diff --git a/lib/aarch64/libitn.so b/lib/aarch64/libitn.so
deleted file mode 100644 (file)
index ed36c5e..0000000
Binary files a/lib/aarch64/libitn.so and /dev/null differ

diff --git a/lib/aarch64/libitn4vt.so b/lib/aarch64/libitn4vt.so
deleted file mode 100644 (file)
index b1bc95f..0000000
Binary files a/lib/aarch64/libitn4vt.so and /dev/null differ

diff --git a/lib/aarch64/libitn_ko_KR.so b/lib/aarch64/libitn_ko_KR.so
deleted file mode 100644 (file)
index c9a3ab3..0000000
Binary files a/lib/aarch64/libitn_ko_KR.so and /dev/null differ

diff --git a/packaging/org.tizen.vc-engine-default.spec b/packaging/org.tizen.vc-engine-default.spec
index e0fd24d..b7786d0 100644 (file)
--- a/packaging/org.tizen.vc-engine-default.spec
+++ b/packaging/org.tizen.vc-engine-default.spec
@@ -8,7 +8,7 @@ Source0:    %{name}-%{version}.tar.gz
 Source1001: %{name}.manifest
 BuildRequires:  cmake
 BuildRequires:  pkgconfig(libtzplatform-config)
-
+Requires:  pkgconfig(capi-ml-inference)
 
 %description
 Description: Voice control default engine service app
@@ -47,7 +47,7 @@ exit 0
 %defattr(-,root,root,-)
 %{APP_PREFIX}/bin/*
 %{MANIFESTDIR}/org.tizen.vc-engine-default.xml
-%ifarch %{arm} # arm armv7l
+%ifarch %{arm} aarch64 # arm armv7l
 %{APP_PREFIX}/lib/*
 %{APP_PREFIX}/shared/res/*
 %else