[BUILD] Revise directories for libnpu-engine

This commit revises the whole directory such as
- merge each src folders into /src/
- merge common/host include files into /include/
- change packaging script to build libnpu-engine

Signed-off-by: Dongju Chae <dongju.chae@samsung.com>

diff --git a/common/npuhost.pc.in b/common/npuhost.pc.in
deleted file mode 100644 (file)
index 12624ac..0000000
--- a/common/npuhost.pc.in
+++ /dev/null
@@ -1,13 +0,0 @@
-# Pacakge Information for pkg-config, for host program developers
-
-prefix=@PREFIX@
-exec_prefix=@EXEC_PREFIX@
-libdir=@LIB_INSTALL_DIR@
-includedir=@INCLUDE_INSTALL_DIR@
-
-Name: npuhost
-Description: Host Dev Kit of Samsung Research NPU
-Version: @VERSION@
-Requires:
-Libs: -L${libdir} -lnpuhost
-Cflags: -I${includedir}/npuhost

diff --git a/core/libnpu-core/README.md b/core/libnpu-core/README.md
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/core/libnpu-core/include/README.md b/core/libnpu-core/include/README.md
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/core/libnpu-core/src/README.md b/core/libnpu-core/src/README.md
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/core/npu-engine.ini b/core/npu-engine.ini
deleted file mode 100644 (file)
index 2651276..0000000
--- a/core/npu-engine.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[main]
-resv_mem_size = 512M
-working_dir = /
-log_dir = /
-

diff --git a/core/npu-engine/README.md b/core/npu-engine/README.md
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/core/npu-engine/meson.build b/core/npu-engine/meson.build
deleted file mode 100644 (file)
index 9537275..0000000
--- a/core/npu-engine/meson.build
+++ /dev/null
@@ -1 +0,0 @@
-subdir('src')

diff --git a/core/npu-engine/src/usb/meson.build b/core/npu-engine/src/usb/meson.build
deleted file mode 100644 (file)
index 6607342..0000000
--- a/core/npu-engine/src/usb/meson.build
+++ /dev/null
@@ -1 +0,0 @@
-# DO NOTHING, YET

diff --git a/host/meson_options.txt b/host/meson_options.txt
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/common/include/NPUARMPlugin.h b/include/common/NPUARMPlugin.h
similarity index 100%
rename from common/include/NPUARMPlugin.h
rename to include/common/NPUARMPlugin.h

diff --git a/common/include/npubinfmt.h b/include/common/npubinfmt.h
similarity index 100%
rename from common/include/npubinfmt.h
rename to include/common/npubinfmt.h

diff --git a/common/include/typedef.h b/include/common/typedef.h
similarity index 100%
rename from common/include/typedef.h
rename to include/common/typedef.h

diff --git a/host/libnpuhost/include/libnpuhost.h b/include/host/libnpuhost.h
similarity index 100%
rename from host/libnpuhost/include/libnpuhost.h
rename to include/host/libnpuhost.h

diff --git a/meson.build b/meson.build
index 681405d..353e84d 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -36,9 +36,11 @@ endforeach
 ne_prefix = get_option('prefix')
 ne_libdir = join_paths(ne_prefix, get_option('libdir'))
 ne_bindir = join_paths(ne_prefix, get_option('bindir'))
+ne_includedir = join_paths(ne_prefix, get_option('includedir'))
 ne_inidir = get_option('sysconfdir')
 
-ne_common_inc = include_directories('../common/include')
+ne_common_inc = include_directories('include/common')
+ne_host_inc = include_directories('include/host')
 
 libdl_dep = cc.find_library('dl') # DL library
 libm_dep = cc.find_library('m') # math library
@@ -46,8 +48,7 @@ libdrm_dep = dependency('libdrm') # libdrm library
 thread_dep = dependency('threads') # pthread library
 iniparser_dep = dependency('iniparser') # iniparser library
 
-subdir('host')
-subdir('core')
+subdir('src')
 
 comm_opt = get_option('comm_opt')
 
@@ -59,5 +60,39 @@ if comm_opt == 'ip'
   # Build final exported so
   plugin_ip_executable = shared_library('npu-engine',
     dependencies: ne_dependencies,
-    install : false)
+    install : true,
+    install_dir: ne_libdir)
 endif
+
+# Set configuration to install .ini
+ne_install_conf = configuration_data()
+
+ne_install_conf.set('VERSION', meson.project_version())
+ne_install_conf.set('PREFIX', ne_prefix)
+ne_install_conf.set('EXEC_PREFIX', ne_bindir)
+ne_install_conf.set('LIB_INSTALL_DIR', ne_libdir)
+ne_install_conf.set('INCLUDE_INSTALL_DIR', ne_includedir)
+
+ne_install_conf.set('RESV_MEM_SIZE', get_option('resv_mem_size'))
+ne_install_conf.set('WORKING_DIR', get_option('working_dir'))
+ne_install_conf.set('LOG_DIR', get_option('log_dir'))
+ne_install_conf.set('TEST_MODE', get_option('enable_test_mode'))
+
+# Install .ini
+configure_file(input: 'npu-engine.ini.in', output: 'npu-engine.ini',
+  install_dir: ne_inidir,
+  configuration: ne_install_conf)
+
+# Install .pc
+configure_file(input: 'npu-engine.pc.in', output: 'npu-engine.pc',
+  install_dir: join_paths(ne_libdir, 'pkgconfig'),
+  configuration: ne_install_conf)
+
+# Install headers
+ne_install_headers = [
+  'include/common/npubinfmt.h',
+  'include/common/typedef.h',
+  'include/host/libnpuhost.h',
+]
+
+install_headers(ne_install_headers, subdir: 'npuengine')

diff --git a/meson_options.txt b/meson_options.txt
index 69e82b8..df19b21 100644 (file)
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -1 +1,5 @@
 option('comm_opt', type : 'combo', choices : ['ip', 'fm'], value : 'ip')
+option('resv_mem_size', type : 'string', value : '512M')
+option('working_dir', type : 'string', value : '/tmp/')
+option('log_dir', type : 'string', value : '/tmp')
+option('enable_test_mode', type : 'boolean', value : false)

diff --git a/npu-engine.ini.in b/npu-engine.ini.in
new file mode 100644 (file)
index 0000000..90661f8
--- /dev/null
+++ b/npu-engine.ini.in
@@ -0,0 +1,5 @@
+[main]
+resv_mem_size=@RESV_MEM_SIZE@
+working_dir=@WORKING_DIR@
+log_dir=@LOG_DIR@
+test_mode=@TEST_MODE@

diff --git a/npu-engine.pc.in b/npu-engine.pc.in
new file mode 100644 (file)
index 0000000..1a47f91
--- /dev/null
+++ b/npu-engine.pc.in
@@ -0,0 +1,13 @@
+# Package Information for pkg-config, for npu engine developers
+
+prefix=@PREFIX@
+exec_prefix=@EXEC_PREFIX@
+libdir=@LIB_INSTALL_DIR@
+includedir=@INCLUDE_INSTALL_DIR@
+
+Name: npuengine
+Description: NPU Engine Dev Kit of Samsung Research NPU
+Version: @VERSION@
+Requires:
+Libs: -L${libdir} -lnpuengine
+Cflags: -I${includedir}/npuengine

diff --git a/packaging/npu-engine.spec b/packaging/npu-engine.spec
index e50a9cd..36321d7 100644 (file)
--- a/packaging/npu-engine.spec
+++ b/packaging/npu-engine.spec
@@ -1,11 +1,13 @@
-Name:          npu-systemservice
+%define   neexampledir %{_libdir}/npu-engine/bin
+
+Name:          npu-engine
 Summary:       NPU Engine
 Version:       0.0.1
 Release:       1
 Group:         System Environment/Daemons
 Packager:      MyungJoo Ham <myungjoo.ham@samsung.com>
 License:       Proprietary
-Source0:       npu-systemservice-%{version}.tar.gz
+Source0:       npu-engine-%{version}.tar.gz
 
 BuildRequires: meson
 BuildRequires: ninja
@@ -43,51 +45,31 @@ CXXFLAGS="${CXXFLAGS} -fprofile-arcs -ftest-coverage"
 CFLAGS="${CFLAGS} -fprofile-arcs -ftest-coverage"
 %endif
 
-meson build
+meson build --prefix=%{_prefix} --sysconfdir=%{_sysconfdir} --libdir=%{_libdir} --includedir=%{_includedir} --bindir=%{neexampledir}
 ninja -C build %{?_smp_mflags}
 
 %install
 
-# @todo (NYI) install three times for the three different transport plugins for npu-engine
-
 # Install Core (NPU-Engine)
-ninja install -C build
-
-# Install common headers for devel package (need PR #29 and #3)
-# @todo headers to be exported should be maintained by meson script. This script is temporaily used until meson scripts are well maintained.
-mkdir -p %{buildroot}%{_includedir}/npuhost
-install -m 0644 common/include/typedef.h %{buildroot}%{_includedir}/npuhost/
-install -m 0644 common/include/npubinfmt.h %{buildroot}%{_includedir}/npuhost/
-
-# Process pkg-config for devel package
-cp common/npuhost.pc.in common/npuhost.pc
-sed -i "s|@PREFIX@|%{_prefix}|" common/npuhost.pc
-sed -i "s|@EXEC_PREFIX@|%{_bindir}|" common/npuhost.pc
-sed -i "s|@LIB_INSTALL_DIR@|%{_libdir}|" common/npuhost.pc
-sed -i "s|@INCLUDE_INSTALL_DIR@|%{_includedir}|" common/npuhost.pc
-sed -i "s|@VERSION@|%{version}-%{release}|" common/npuhost.pc
-
-# Install pkg-config for devel package
-mkdir -p %{buildroot}%{_libdir}/pkgconfig
-install -m 0644 common/npuhost.pc %{buildroot}%{_libdir}/pkgconfig/
+DESTDIR=%{buildroot} ninja install -C build %{?_smp_mflags}
 
 # Perform unit tests
 %check
 %if 0%{?unit_test}
-  pushd build/core
-  ./test/unittest_ne_mem
-  ./test/unittest_ne_utils
-  # add more unit tests...
+  pushd build/src/test
+  find . -maxdepth 1 -type f -perm 0755 -print0 | while IFS= read -r -d $'\0' unittest_exec; do
+    ./${unittest_exec}
+  done
   popd
 %endif
 # Analyze test coverage
 %if 0%{?test_coverage}
   # 'lcov' generates the date format with UTC time zone by default. Let's replace UTC with KST
   TZ='Asia/Seoul'; export TZ
-  $(pwd)/core/test/unittestcoverage.py module $(pwd)/core
+  $(pwd)/src/test/unittestcoverage.py module $(pwd)/core
 
    # Get commit info
-  VCS=`cat ${RPM_SOURCE_DIR}/nnstreamer.spec | grep "^VCS:" | sed "s|VCS:\\W*\\(.*\\)|\\1|"`
+  VCS=`cat ${RPM_SOURCE_DIR}/npu-engine.spec | grep "^VCS:" | sed "s|VCS:\\W*\\(.*\\)|\\1|"`
 
    # Create human readable unit test coverate report web page
 
@@ -104,56 +86,26 @@ install -m 0644 common/npuhost.pc %{buildroot}%{_libdir}/pkgconfig/
   cp -r result %{buildroot}%{_datadir}/unittest/
 %endif
 
-%package -n npu-engine-fs
-Summary:       NPU Engine Daemon for NPU-Fast-Model (File System Transport)
-Provides:      npu-engine = %{version}-%{release}
-Conflicts:     npu-engine-ip
-Conflicts:     npu-engine-usb
-# Requires     some usb library
-%description -n npu-engine-fs
-This is the core daemon in the npu device with the Fast Model simulator.
-%files -n npu-engine-fs
-
-%package -n npu-engine-usb
-Summary:       NPU Engine Daemon for NPU-USB
-Provides:      npu-engine = %{version}-%{release}
-Conflicts:     npu-engine-ip
-Conflicts:     npu-engine-fs
-# Requires     some usb library
-%description -n npu-engine-usb
-This is the core daemon in the npu USB device.
-%files -n npu-engine-usb
-
-%package -n npu-engine-ip
-Summary:       NPU Engine Daemon for NPU-SOC-IP
-Provides:      npu-engine = %{version}-%{release}
-Conflicts:     npu-engine-usb
-Conflicts:     npu-engine-fs
-# Requires     some IPC and DMABUF library
-%description -n npu-engine-ip
-This is the core daemon in the npu SoC-IP device.
-%files -n npu-engine-ip
-
-%package -n libnpu-host
-Summary:       NPU Host Library
-%description -n libnpu-host
-Library for host machines to execute nerual network models with NPUs.
-%files -n libnpu-host
-
-%package -n libnpu-host-devel
-Summary:       Development Support for NPU Host Library
-Requires:      libnpu-host = %{version}-%{release}
-%description -n libnpu-host-devel
-Developmental packages to develop programs using libnpu-host.
-%files -n libnpu-host-devel
-%{_includedir}/npuhost/*.h
+%files
+%%defattr(-,root,root,-)
+%{_libdir}/libnpu-engine.so
+%{_sysconfdir}/npu-engine.ini
+
+%package devel
+Summary:       Development Support for NPU Engine Library
+Requires:      npu-engine = %{version}-%{release}
+%description devel
+Developmental packages to develop programs using npu-engine.
+This contains corresponding header files and .pc pkgconfig file.
+%files devel
+%{_includedir}/npuengine/*.h
 %{_libdir}/pkgconfig/*.pc
 
-%package -n unittest-coverage
+%package unittest-coverage
 Summary:  NPU Engine UnitTest Coverage Analysis Result
-%description -n unittest-coverage
-HTML pages of lcov results of NPU SystemService generated during rpmbuild
+%description unittest-coverage
+HTML pages of lcov results of NPU Engine generated during rpmbuild
 %if 0%{?test_coverage}
-%files -n unittest-coverage
+%files unittest-coverage
 %{_datadir}/unittest/*
 %endif

diff --git a/core/libgem-core/src/GEMdrvAPI.c b/src/core/libgem-core/GEMdrvAPI.c
similarity index 97%
rename from core/libgem-core/src/GEMdrvAPI.c
rename to src/core/libgem-core/GEMdrvAPI.c
index 4790156..6d048bd 100644 (file)
--- a/core/libgem-core/src/GEMdrvAPI.c
+++ b/src/core/libgem-core/GEMdrvAPI.c
@@ -149,12 +149,12 @@ __gem_destroy (int fd, uint32_t handle)
  * @param[in] size the buffer size
  * @param[in] prot prot
  * @param[in] dmabuf indicates whether it's for dmabuf
- * @return mapped vaddr if no error. otherwise NULL value
+ * @return mapped vaddr if no error. otherwise MAP_FAILED
  */
 static void *
 __gem_mmap (int fd, uint32_t handle, uint32_t size, int prot, bool dmabuf)
 {
-  void *ptr;
+  void *ptr = MAP_FAILED;
 
   if (!dmabuf) {
     struct drm_mode_map_dumb arg = {
@@ -170,9 +170,6 @@ __gem_mmap (int fd, uint32_t handle, uint32_t size, int prot, bool dmabuf)
   } else  /* dma-buf */
     ptr = mmap (0, size, prot, MAP_SHARED, fd, 0);
 
-  if (ptr == MAP_FAILED)
-    return NULL;
-
   return ptr;
 }
 
@@ -293,11 +290,15 @@ gem_destroy (int fd, uint32_t handle)
 void *
 gem_mmap (int fd, uint32_t handle, uint32_t size, int prot, bool dmabuf)
 {
+  void *ptr;
+
   assert (fd > 0);
   assert (handle > 0);
   assert (size > 0);
 
-  return __gem_mmap(fd, handle, size, prot, dmabuf);
+  ptr = __gem_mmap(fd, handle, size, prot, dmabuf);
+
+  return ptr != MAP_FAILED ? ptr : NULL;
 }
 
 /**

diff --git a/core/libgem-core/include/GEMdrvAPI.h b/src/core/libgem-core/GEMdrvAPI.h
similarity index 100%
rename from core/libgem-core/include/GEMdrvAPI.h
rename to src/core/libgem-core/GEMdrvAPI.h

diff --git a/host/libnpuhost/src/README.md b/src/core/libgem-core/README.md
similarity index 100%
rename from host/libnpuhost/src/README.md
rename to src/core/libgem-core/README.md

diff --git a/core/libgem-core/meson.build b/src/core/libgem-core/meson.build
similarity index 68%
rename from core/libgem-core/meson.build
rename to src/core/libgem-core/meson.build
index a38353c..14170e6 100644 (file)
--- a/core/libgem-core/meson.build
+++ b/src/core/libgem-core/meson.build
@@ -1,12 +1,11 @@
-libgem_inc = include_directories('include')
-libgem_sources = ['src/GEMdrvAPI.c']
+libgem_src = ['GEMdrvAPI.c']
+libgem_inc = include_directories('.')
 libgem_dependencies = [libdrm_dep]
 
 # Build library (static)
 libgem_build = static_library('gem-core',
-  libgem_sources,
+  libgem_src,
   dependencies: libgem_dependencies,
-  include_directories: libgem_inc,
   install: false
 )
 

diff --git a/core/libnpu-core/src/NPUdrvAPI.c b/src/core/libnpu-core/NPUdrvAPI.c
similarity index 99%
rename from core/libnpu-core/src/NPUdrvAPI.c
rename to src/core/libnpu-core/NPUdrvAPI.c
index d6365ea..be58c70 100644 (file)
--- a/core/libnpu-core/src/NPUdrvAPI.c
+++ b/src/core/libnpu-core/NPUdrvAPI.c
@@ -28,7 +28,7 @@
 #include <sys/fcntl.h>
 #include <sys/ioctl.h>
 
-#include <NPUdrvAPI.h>
+#include "NPUdrvAPI.h"
 
 /** Enables debugging without device */
 #define NO_DEV_DEBUG (1)

diff --git a/core/libnpu-core/include/NPUdrvAPI.h b/src/core/libnpu-core/NPUdrvAPI.h
similarity index 100%
rename from core/libnpu-core/include/NPUdrvAPI.h
rename to src/core/libnpu-core/NPUdrvAPI.h

diff --git a/host/libnpuhost/include/README.md b/src/core/libnpu-core/README.md
similarity index 100%
rename from host/libnpuhost/include/README.md
rename to src/core/libnpu-core/README.md

diff --git a/core/libnpu-core/meson.build b/src/core/libnpu-core/meson.build
similarity index 52%
rename from core/libnpu-core/meson.build
rename to src/core/libnpu-core/meson.build
index b1429e9..6958930 100644 (file)
--- a/core/libnpu-core/meson.build
+++ b/src/core/libnpu-core/meson.build
@@ -1,12 +1,12 @@
-libnpucore_src = ['src/NPUdrvAPI.c']
-libnpucore_inc = include_directories('./include')
+libnpucore_src = ['NPUdrvAPI.c']
+libnpucore_inc = include_directories('.')
 
 # Build library (static)
 libnpucore = static_library('npu-core',
   libnpucore_src,
-  include_directories: [ne_common_inc, libnpucore_inc],
+  include_directories: ne_common_inc,
   install : false)
 
 # Declare dependency for other modules
 libnpucore_dep = declare_dependency(link_with : libnpucore,
-  include_directories: libnpucore_inc)
+  include_directories: [ne_common_inc, libnpucore_inc])

diff --git a/core/meson.build b/src/core/meson.build
similarity index 81%
rename from core/meson.build
rename to src/core/meson.build
index 5073779..ce5deec 100644 (file)
--- a/core/meson.build
+++ b/src/core/meson.build
@@ -1,4 +1,3 @@
 subdir('libgem-core')
 subdir('libnpu-core')
 subdir('npu-engine')
-subdir('test')

diff --git a/host/libnpuhost/README.md b/src/core/npu-engine/README.md
similarity index 100%
rename from host/libnpuhost/README.md
rename to src/core/npu-engine/README.md

diff --git a/core/npu-engine/src/fm/meson.build b/src/core/npu-engine/fm/meson.build
similarity index 100%
rename from core/npu-engine/src/fm/meson.build
rename to src/core/npu-engine/fm/meson.build

diff --git a/core/npu-engine/src/fm/plugin-fastmodel.c b/src/core/npu-engine/fm/plugin-fastmodel.c
similarity index 100%
rename from core/npu-engine/src/fm/plugin-fastmodel.c
rename to src/core/npu-engine/fm/plugin-fastmodel.c

diff --git a/core/npu-engine/src/ip/README.md b/src/core/npu-engine/ip/README.md
similarity index 100%
rename from core/npu-engine/src/ip/README.md
rename to src/core/npu-engine/ip/README.md

diff --git a/core/npu-engine/src/ip/meson.build b/src/core/npu-engine/ip/meson.build
similarity index 83%
rename from core/npu-engine/src/ip/meson.build
rename to src/core/npu-engine/ip/meson.build
index aaeb939..0acd947 100644 (file)
--- a/core/npu-engine/src/ip/meson.build
+++ b/src/core/npu-engine/ip/meson.build
@@ -8,6 +8,6 @@ endforeach
 # Declare dependency
 plugin_ip_src_dep = declare_dependency(
   sources : plugin_ip_sources,
-  include_directories: [ne_common_inc, libnpuhost_inc]
+  include_directories: [ne_common_inc, ne_host_inc]
 )
 

diff --git a/core/npu-engine/src/ip/plugin-ip-comm.c b/src/core/npu-engine/ip/plugin-ip-comm.c
similarity index 100%
rename from core/npu-engine/src/ip/plugin-ip-comm.c
rename to src/core/npu-engine/ip/plugin-ip-comm.c

diff --git a/core/npu-engine/src/main.c b/src/core/npu-engine/main.c
similarity index 100%
rename from core/npu-engine/src/main.c
rename to src/core/npu-engine/main.c

diff --git a/core/npu-engine/src/meson.build b/src/core/npu-engine/meson.build
similarity index 100%
rename from core/npu-engine/src/meson.build
rename to src/core/npu-engine/meson.build

diff --git a/core/npu-engine/src/ne-armplugin.c b/src/core/npu-engine/ne-armplugin.c
similarity index 100%
rename from core/npu-engine/src/ne-armplugin.c
rename to src/core/npu-engine/ne-armplugin.c

diff --git a/core/npu-engine/src/ne-comm.h b/src/core/npu-engine/ne-comm.h
similarity index 100%
rename from core/npu-engine/src/ne-comm.h
rename to src/core/npu-engine/ne-comm.h

diff --git a/core/npu-engine/src/ne-common.h b/src/core/npu-engine/ne-common.h
similarity index 100%
rename from core/npu-engine/src/ne-common.h
rename to src/core/npu-engine/ne-common.h

diff --git a/core/npu-engine/src/ne-conf.c b/src/core/npu-engine/ne-conf.c
similarity index 100%
rename from core/npu-engine/src/ne-conf.c
rename to src/core/npu-engine/ne-conf.c

diff --git a/core/npu-engine/src/ne-conf.h b/src/core/npu-engine/ne-conf.h
similarity index 100%
rename from core/npu-engine/src/ne-conf.h
rename to src/core/npu-engine/ne-conf.h

diff --git a/core/npu-engine/src/ne-handler.c b/src/core/npu-engine/ne-handler.c
similarity index 100%
rename from core/npu-engine/src/ne-handler.c
rename to src/core/npu-engine/ne-handler.c

diff --git a/core/npu-engine/src/ne-handler.h b/src/core/npu-engine/ne-handler.h
similarity index 100%
rename from core/npu-engine/src/ne-handler.h
rename to src/core/npu-engine/ne-handler.h

diff --git a/core/npu-engine/src/ne-host-input-service.c b/src/core/npu-engine/ne-host-input-service.c
similarity index 100%
rename from core/npu-engine/src/ne-host-input-service.c
rename to src/core/npu-engine/ne-host-input-service.c

diff --git a/core/npu-engine/src/ne-inf.c b/src/core/npu-engine/ne-inf.c
similarity index 100%
rename from core/npu-engine/src/ne-inf.c
rename to src/core/npu-engine/ne-inf.c

diff --git a/core/npu-engine/src/ne-inf.h b/src/core/npu-engine/ne-inf.h
similarity index 100%
rename from core/npu-engine/src/ne-inf.h
rename to src/core/npu-engine/ne-inf.h

diff --git a/core/npu-engine/src/ne-inputservice.h b/src/core/npu-engine/ne-inputservice.h
similarity index 100%
rename from core/npu-engine/src/ne-inputservice.h
rename to src/core/npu-engine/ne-inputservice.h

diff --git a/core/npu-engine/src/ne-mem.c b/src/core/npu-engine/ne-mem.c
similarity index 100%
rename from core/npu-engine/src/ne-mem.c
rename to src/core/npu-engine/ne-mem.c

diff --git a/core/npu-engine/src/ne-mem.h b/src/core/npu-engine/ne-mem.h
similarity index 100%
rename from core/npu-engine/src/ne-mem.h
rename to src/core/npu-engine/ne-mem.h

diff --git a/core/npu-engine/src/ne-model.h b/src/core/npu-engine/ne-model.h
similarity index 100%
rename from core/npu-engine/src/ne-model.h
rename to src/core/npu-engine/ne-model.h

diff --git a/core/npu-engine/src/ne-scheduler.c b/src/core/npu-engine/ne-scheduler.c
similarity index 100%
rename from core/npu-engine/src/ne-scheduler.c
rename to src/core/npu-engine/ne-scheduler.c

diff --git a/core/npu-engine/src/ne-scheduler.h b/src/core/npu-engine/ne-scheduler.h
similarity index 100%
rename from core/npu-engine/src/ne-scheduler.h
rename to src/core/npu-engine/ne-scheduler.h

diff --git a/core/npu-engine/src/ne-utils.c b/src/core/npu-engine/ne-utils.c
similarity index 100%
rename from core/npu-engine/src/ne-utils.c
rename to src/core/npu-engine/ne-utils.c

diff --git a/core/npu-engine/src/ne-utils.h b/src/core/npu-engine/ne-utils.h
similarity index 100%
rename from core/npu-engine/src/ne-utils.h
rename to src/core/npu-engine/ne-utils.h

diff --git a/host/test/meson.build b/src/core/npu-engine/usb/meson.build
similarity index 100%
rename from host/test/meson.build
rename to src/core/npu-engine/usb/meson.build

diff --git a/core/npu-engine/src/README.md b/src/host/libnpuhost/README.md
similarity index 100%
rename from core/npu-engine/src/README.md
rename to src/host/libnpuhost/README.md

diff --git a/host/libnpuhost/meson.build b/src/host/libnpuhost/meson.build
similarity index 60%
rename from host/libnpuhost/meson.build
rename to src/host/libnpuhost/meson.build
index 30569de..2a5ddb4 100644 (file)
--- a/host/libnpuhost/meson.build
+++ b/src/host/libnpuhost/meson.build
@@ -1,2 +1,2 @@
-libnpuhost_inc = include_directories('include')
+libnpuhost_inc = include_directories('.')
 libnpuhost_dep = declare_dependency(include_directories: libnpuhost_inc)

diff --git a/host/meson.build b/src/host/meson.build
similarity index 58%
rename from host/meson.build
rename to src/host/meson.build
index 1f28b91..7a39a98 100644 (file)
--- a/host/meson.build
+++ b/src/host/meson.build
@@ -1,2 +1 @@
 subdir('libnpuhost')
-subdir('test')

diff --git a/src/meson.build b/src/meson.build
new file mode 100644 (file)
index 0000000..31c349f
--- /dev/null
+++ b/src/meson.build
@@ -0,0 +1,3 @@
+subdir('core')
+subdir('host')
+subdir('test')

diff --git a/core/test/README.md b/src/test/README.md
similarity index 100%
rename from core/test/README.md
rename to src/test/README.md

diff --git a/core/test/libgem-core/gem_test.cpp b/src/test/libgem_test.cpp
similarity index 89%
rename from core/test/libgem-core/gem_test.cpp
rename to src/test/libgem_test.cpp
index 3765d7f..83ad4b9 100644 (file)
--- a/core/test/libgem-core/gem_test.cpp
+++ b/src/test/libgem_test.cpp
@@ -1,3 +1,16 @@
+/**
+ * Proprietary
+ * Copyright (C) 2019 Samsung Electronics
+ * Copyright (C) 2019 Dongju Chae <dongju.chae@samsung.com>
+ */
+/**
+ * @file libgem_test.cpp
+ * @date 30 Jun 2019
+ * @brief UnitTests to test functions in libgem-core
+ * @author Dongju Chae <dongju.chae@samsung.com>
+ * @bug No known bugs except for NYI items
+ */
+
 #include <unistd.h>
 #include <sys/mman.h>
 #include <gtest/gtest.h>

diff --git a/core/test/meson.build b/src/test/meson.build
similarity index 65%
rename from core/test/meson.build
rename to src/test/meson.build
index b58cfbe..3b3f503 100644 (file)
--- a/core/test/meson.build
+++ b/src/test/meson.build
@@ -5,18 +5,20 @@ add_languages('cpp')
 
 gtest_dep = dependency('gtest', required: false)
 if gtest_dep.found()
-  libgem_unittest_deps = [
-    libgem_dep,
-    gtest_dep
-  ]
-
-  unittest_libgem = executable('unittest_libgem',
-    join_paths('libgem-core', 'gem_test.cpp'),
-    dependencies: [libgem_unittest_deps],
-    cpp_args : '-std=c++11'
-  )
-
-  test('unittest_libgem', unittest_libgem)
+#### TODO libgem unittest is not working on gbs because cgem driver is not installed
+#### Therefore, we skip the build this UnitTest temporally.
+#  libgem_unittest_deps = [
+#    libgem_dep,
+#    gtest_dep
+#  ]
+#
+#  unittest_libgem = executable('unittest_libgem',
+#    ['libgem_test.cpp'],
+#    dependencies: [libgem_unittest_deps],
+#    cpp_args : '-std=c++11'
+#  )
+#
+#  test('unittest_libgem', unittest_libgem)
 
   libnpu_unittest_deps = [
     libnpucore_dep,
@@ -24,8 +26,7 @@ if gtest_dep.found()
   ]
 
   unittest_libnpu = executable('unittest_libnpu',
-    join_paths('libnpu-core', 'npu_api_test.cpp'),
-    include_directories: ne_common_inc,
+    ['npu_api_test.cpp'],
     dependencies: [libnpu_unittest_deps],
     cpp_args : '-std=c++11'
   )
@@ -38,7 +39,7 @@ if gtest_dep.found()
   ]
 
   unittest_ne_mem = executable('unittest_ne_mem',
-    join_paths('npu-engine', 'ne_mem_test.cpp'),
+    ['ne_mem_test.cpp'],
     dependencies: [npu_engine_unittest_deps],
     cpp_args : '-std=c++11'
   )
@@ -46,7 +47,7 @@ if gtest_dep.found()
   test('unittest_ne_mem', unittest_ne_mem)
 
   unittest_ne_utils = executable('unittest_ne_utils',
-    join_paths('npu-engine', 'ne_utils_test.cpp'),
+    ['ne_utils_test.cpp'],
     dependencies: [npu_engine_unittest_deps],
     cpp_args : '-std=c++11'
   )

diff --git a/core/test/npu-engine/ne_mem_test.cpp b/src/test/ne_mem_test.cpp
similarity index 96%
rename from core/test/npu-engine/ne_mem_test.cpp
rename to src/test/ne_mem_test.cpp
index 2437748..e3cabe7 100644 (file)
--- a/core/test/npu-engine/ne_mem_test.cpp
+++ b/src/test/ne_mem_test.cpp
@@ -1,3 +1,16 @@
+/**
+ * Proprietary
+ * Copyright (C) 2019 Samsung Electronics
+ * Copyright (C) 2019 Dongju Chae <dongju.chae@samsung.com>
+ */
+/**
+ * @file ne_mem_tests.cpp
+ * @date 30 Jun 2019
+ * @brief UnitTests to test functions in memory allocator for NPU Engine
+ * @author Dongju Chae <dongju.chae@samsung.com>
+ * @bug No known bugs except for NYI items
+ */
+
 #include <unistd.h>
 #include <sys/mman.h>
 #include <gtest/gtest.h>

diff --git a/core/test/npu-engine/ne_utils_test.cpp b/src/test/ne_utils_test.cpp
similarity index 86%
rename from core/test/npu-engine/ne_utils_test.cpp
rename to src/test/ne_utils_test.cpp
index 7642aa0..fc89df1 100644 (file)
--- a/core/test/npu-engine/ne_utils_test.cpp
+++ b/src/test/ne_utils_test.cpp
@@ -1,3 +1,16 @@
+/**
+ * Proprietary
+ * Copyright (C) 2019 Samsung Electronics
+ * Copyright (C) 2019 Dongju Chae <dongju.chae@samsung.com>
+ */
+/**
+ * @file ne_utils_tests.cpp
+ * @date 30 Jun 2019
+ * @brief UnitTests to test functions in utility for NPU Engine
+ * @author Dongju Chae <dongju.chae@samsung.com>
+ * @bug No known bugs except for NYI items
+ */
+
 #include <unistd.h>
 #include <sys/mman.h>
 #include <gtest/gtest.h>

diff --git a/core/test/libnpu-core/npu_api_test.cpp b/src/test/npu_api_test.cpp
similarity index 100%
rename from core/test/libnpu-core/npu_api_test.cpp
rename to src/test/npu_api_test.cpp

diff --git a/core/test/unittestcoverage.py b/src/test/unittestcoverage.py
similarity index 100%
rename from core/test/unittestcoverage.py
rename to src/test/unittestcoverage.py