24 files changed, 49 insertions, 34 deletions
diff --git a/packaging/ABSEIL.tar.gz b/packaging/ABSEIL.tar.gz
index 1d92825b5..862488b84 100644
--- a/packaging/ABSEIL.tar.gz
+++ b/packaging/ABSEIL.tar.gz
diff --git a/packaging/CPUINFO.tar.gz b/packaging/CPUINFO.tar.gz
index a74fe355a..637c20b27 100644
--- a/packaging/CPUINFO.tar.gz
+++ b/packaging/CPUINFO.tar.gz
diff --git a/packaging/EGL_HEADERS.tar.gz b/packaging/EGL_HEADERS.tar.gz
deleted file mode 100644
index 80222056c..000000000
--- a/packaging/EGL_HEADERS.tar.gz
+++ /dev/null
diff --git a/packaging/FARMHASH.tar.gz b/packaging/FARMHASH.tar.gz
index 4bf98d891..9a721574f 100644
--- a/packaging/FARMHASH.tar.gz
+++ b/packaging/FARMHASH.tar.gz
diff --git a/packaging/FLATBUFFERS-2.0.tar.gz b/packaging/FLATBUFFERS-2.0.tar.gz
deleted file mode 100644
index 809aca01a..000000000
--- a/packaging/FLATBUFFERS-2.0.tar.gz
+++ /dev/null
diff --git a/packaging/FLATBUFFERS-23.5.26.tar.gz b/packaging/FLATBUFFERS-23.5.26.tar.gz
new file mode 100644
index 000000000..2068195ec
--- /dev/null
+++ b/packaging/FLATBUFFERS-23.5.26.tar.gz
diff --git a/packaging/FP16.tar.gz b/packaging/FP16.tar.gz
index 78c787673..490d4c13a 100644
--- a/packaging/FP16.tar.gz
+++ b/packaging/FP16.tar.gz
diff --git a/packaging/FXDIV.tar.gz b/packaging/FXDIV.tar.gz
index 7c1b82526..016bc735b 100644
--- a/packaging/FXDIV.tar.gz
+++ b/packaging/FXDIV.tar.gz
diff --git a/packaging/MLDTYPES.tar.gz b/packaging/MLDTYPES.tar.gz
new file mode 100644
index 000000000..fca0667db
--- /dev/null
+++ b/packaging/MLDTYPES.tar.gz
diff --git a/packaging/NEON2SSE.tar.gz b/packaging/NEON2SSE.tar.gz
new file mode 100644
index 000000000..2370bbc62
--- /dev/null
+++ b/packaging/NEON2SSE.tar.gz
diff --git a/packaging/OPENCL_HEADERS.tar.gz b/packaging/OPENCL_HEADERS.tar.gz
deleted file mode 100644
index 7bc3656e8..000000000
--- a/packaging/OPENCL_HEADERS.tar.gz
+++ /dev/null
diff --git a/packaging/OPENGL_HEADERS.tar.gz b/packaging/OPENGL_HEADERS.tar.gz
deleted file mode 100644
index 53a395a94..000000000
--- a/packaging/OPENGL_HEADERS.tar.gz
+++ /dev/null
diff --git a/packaging/PTHREADPOOL.tar.gz b/packaging/PTHREADPOOL.tar.gz
index 6cf42c0be..254660ff7 100644
--- a/packaging/PTHREADPOOL.tar.gz
+++ b/packaging/PTHREADPOOL.tar.gz
diff --git a/packaging/TENSORFLOW-2.16.1-EIGEN.tar.gz b/packaging/TENSORFLOW-2.16.1-EIGEN.tar.gz
new file mode 100644
index 000000000..fd810cd28
--- /dev/null
+++ b/packaging/TENSORFLOW-2.16.1-EIGEN.tar.gz
diff --git a/packaging/TENSORFLOW-2.16.1-GEMMLOWP.tar.gz b/packaging/TENSORFLOW-2.16.1-GEMMLOWP.tar.gz
new file mode 100644
index 000000000..9ea656aa9
--- /dev/null
+++ b/packaging/TENSORFLOW-2.16.1-GEMMLOWP.tar.gz
diff --git a/packaging/TENSORFLOW-2.16.1-RUY.tar.gz b/packaging/TENSORFLOW-2.16.1-RUY.tar.gz
new file mode 100644
index 000000000..f1a448cfd
--- /dev/null
+++ b/packaging/TENSORFLOW-2.16.1-RUY.tar.gz
diff --git a/packaging/TENSORFLOW-2.16.1.tar.gz b/packaging/TENSORFLOW-2.16.1.tar.gz
new file mode 100644
index 000000000..d68fce287
--- /dev/null
+++ b/packaging/TENSORFLOW-2.16.1.tar.gz
diff --git a/packaging/TENSORFLOW-2.8.0-EIGEN.tar.gz b/packaging/TENSORFLOW-2.8.0-EIGEN.tar.gz
deleted file mode 100644
index 94a307f82..000000000
--- a/packaging/TENSORFLOW-2.8.0-EIGEN.tar.gz
+++ /dev/null
diff --git a/packaging/TENSORFLOW-2.8.0-GEMMLOWP.tar.gz b/packaging/TENSORFLOW-2.8.0-GEMMLOWP.tar.gz
deleted file mode 100644
index c76e088ac..000000000
--- a/packaging/TENSORFLOW-2.8.0-GEMMLOWP.tar.gz
+++ /dev/null
diff --git a/packaging/TENSORFLOW-2.8.0-RUY.tar.gz b/packaging/TENSORFLOW-2.8.0-RUY.tar.gz
deleted file mode 100644
index 8e6734718..000000000
--- a/packaging/TENSORFLOW-2.8.0-RUY.tar.gz
+++ /dev/null
diff --git a/packaging/TENSORFLOW-2.8.0.tar.gz b/packaging/TENSORFLOW-2.8.0.tar.gz
deleted file mode 100644
index f0f742511..000000000
--- a/packaging/TENSORFLOW-2.8.0.tar.gz
+++ /dev/null
diff --git a/packaging/VULKAN.tar.gz b/packaging/VULKAN.tar.gz
deleted file mode 100644
index 64ae0bdc4..000000000
--- a/packaging/VULKAN.tar.gz
+++ /dev/null
diff --git a/packaging/XNNPACK.tar.gz b/packaging/XNNPACK.tar.gz
index 2a1ce8e50..b62a3ff61 100644
--- a/packaging/XNNPACK.tar.gz
+++ b/packaging/XNNPACK.tar.gz
diff --git a/packaging/nnfw.spec b/packaging/nnfw.spec
index a972af30b..c25bdbe25 100644
--- a/packaging/nnfw.spec
+++ b/packaging/nnfw.spec
@@ -1,6 +1,6 @@
 Name:    nnfw
 Summary: nnfw
-Version: 1.25.0
+Version: 1.28.0
 Release: 1
 Group:   Development
 License: Apache-2.0 and MIT and BSD-2-Clause and MPL-2.0
@@ -12,26 +12,23 @@ Source2001: nnfw.pc.in
 Source2002: nnfw-plugin.pc.in
 Source3001: ABSEIL.tar.gz
 Source3002: CPUINFO.tar.gz
-Source3003: EGL_HEADERS.tar.gz
-Source3004: FARMHASH.tar.gz
+Source3003: FARMHASH.tar.gz
+Source3004: FLATBUFFERS-23.5.26.tar.gz
 Source3005: FP16.tar.gz
 Source3006: FXDIV.tar.gz
-Source3007: GEMMLOWP.tar.gz
-Source3008: OOURAFFT.tar.gz
-Source3009: OPENCL_HEADERS.tar.gz
-Source3010: OPENGL_HEADERS.tar.gz
-Source3011: PSIMD.tar.gz
-Source3012: PTHREADPOOL.tar.gz
-Source3013: TENSORFLOW-2.8.0-EIGEN.tar.gz
-Source3014: TENSORFLOW-2.8.0-GEMMLOWP.tar.gz
-Source3015: TENSORFLOW-2.8.0-RUY.tar.gz
-Source3016: TENSORFLOW-2.8.0.tar.gz
-Source3017: VULKAN.tar.gz
-Source3018: XNNPACK.tar.gz
-Source3019: FLATBUFFERS-2.0.tar.gz
+Source3007: MLDTYPES.tar.gz
+Source3008: NEON2SSE.tar.gz
+Source3009: OOURAFFT.tar.gz
+Source3010: PSIMD.tar.gz
+Source3011: PTHREADPOOL.tar.gz
+Source3012: TENSORFLOW-2.16.1-EIGEN.tar.gz
+Source3013: TENSORFLOW-2.16.1-GEMMLOWP.tar.gz
+Source3014: TENSORFLOW-2.16.1-RUY.tar.gz
+Source3015: TENSORFLOW-2.16.1.tar.gz
+Source3016: XNNPACK.tar.gz
 
 %{!?build_type:     %define build_type      Release}
-%{!?npud_build:     %define npud_build      1}
+%{!?npud_build:     %define npud_build      0}
 %{!?trix_support:   %define trix_support    1}
 %{!?odc_build:      %define odc_build       1}
 %{!?coverage_build: %define coverage_build  0}
@@ -48,6 +45,12 @@ Source3019: FLATBUFFERS-2.0.tar.gz
 %define test_build 1
 %endif
 
+%ifarch riscv64
+# Disable npud on risc-v
+# TODO Enable on risc-v
+%define npud_build 0
+%endif
+
 BuildRequires:  cmake
 
 Requires(post): /sbin/ldconfig
@@ -56,7 +59,7 @@ Requires(postun): /sbin/ldconfig
 %if %{test_build} == 1
 BuildRequires:  pkgconfig(boost)
 BuildRequires:  pkgconfig(tensorflow2-lite)
-BuildRequires:  hdf5-devel
+BuildRequires:  hdf5-devel-static
 BuildRequires:  libaec-devel
 BuildRequires:  pkgconfig(zlib)
 BuildRequires:  pkgconfig(libjpeg)
@@ -136,6 +139,9 @@ NPU daemon for optimal management of NPU hardware
 %ifarch %ix86
 %define target_arch i686
 %endif
+%ifarch riscv64
+%define target_arch riscv64
+%endif
 
 %define install_dir %{_prefix}
 %define install_path %{buildroot}%{install_dir}
@@ -178,6 +184,11 @@ NPU daemon for optimal management of NPU hardware
         -DEXTERNALS_BUILD_THREAD=%{nproc} -DBUILD_MINIMAL_SAMPLE=ON -DNNFW_OVERLAY_DIR=$(pwd)/%{overlay_path} \\\
         %{option_test} %{option_coverage} %{option_config} %{extra_option}
 
+%define strip_options %{nil}
+%if %{build_type} == "Release"
+%define strip_options --strip
+%endif
+
 %prep
 %setup -q
 cp %{SOURCE1} .
@@ -199,33 +210,32 @@ tar -xf %{SOURCE3013} -C ./externals
 tar -xf %{SOURCE3014} -C ./externals
 tar -xf %{SOURCE3015} -C ./externals
 tar -xf %{SOURCE3016} -C ./externals
-tar -xf %{SOURCE3017} -C ./externals
-tar -xf %{SOURCE3018} -C ./externals
-tar -xf %{SOURCE3019} -C ./externals
 
 %build
-%ifarch arm armv7l armv7hl aarch64 x86_64 %ix86
+%ifarch arm armv7l armv7hl aarch64 x86_64 %ix86 riscv64
 # nncc build
 %if %{odc_build} == 1
-%{nncc_env} ./nncc configure -DBUILD_GTEST=OFF -DENABLE_TEST=OFF -DEXTERNALS_BUILD_THREADS=%{nproc} -DCMAKE_BUILD_TYPE=%{build_type} -DTARGET_OS=tizen \
+%{nncc_env} ./nncc configure -DBUILD_GTEST=OFF -DENABLE_TEST=OFF -DEXTERNALS_BUILD_THREADS=%{nproc} -DCMAKE_BUILD_TYPE=%{build_type} -DTARGET_ARCH=%{target_arch} -DTARGET_OS=tizen \
         -DCMAKE_INSTALL_PREFIX=$(pwd)/%{overlay_path} \
-	-DBUILD_WHITELIST="luci;foder;pepper-csv2vec;loco;locop;logo;logo-core;mio-circle06;luci-compute;oops;hermes;hermes-std;angkor;pp;pepper-strcast;pepper-str"
+	-DBUILD_WHITELIST="luci;foder;pepper-csv2vec;loco;locop;logo;logo-core;mio-circle08;luci-compute;oops;hermes;hermes-std;angkor;pp;pepper-strcast;pepper-str"
 %{nncc_env} ./nncc build %{build_jobs}
-cmake --install %{nncc_workspace}
+cmake --install %{nncc_workspace} %{strip_options}
 %endif # odc_build
 
 # install angkor TensorIndex and oops InternalExn header (TODO: Remove this)
 mkdir -p %{overlay_path}/include/nncc/core/ADT/tensor
 mkdir -p %{overlay_path}/include/oops
+mkdir -p %{overlay_path}/include/luci/IR
 cp compiler/angkor/include/nncc/core/ADT/tensor/Index.h %{overlay_path}/include/nncc/core/ADT/tensor
 cp compiler/oops/include/oops/InternalExn.h %{overlay_path}/include/oops
+cp compiler/luci/lang/include/luci/IR/CircleNodes.lst %{overlay_path}/include/luci/IR
 
 # runtime build
 %{build_env} ./nnfw configure %{build_options}
 %{build_env} ./nnfw build %{build_jobs}
 # install in workspace
 # TODO Set install path
-%{build_env} ./nnfw install
+%{build_env} ./nnfw install --prefix %{nnfw_workspace}/out %{strip_options}
 
 %if %{test_build} == 1
 %if %{coverage_build} == 1
@@ -236,12 +246,15 @@ tar -zcf test-suite.tar.gz infra/scripts
 %endif # arm armv7l armv7hl aarch64
 
 %install
-%ifarch arm armv7l armv7hl aarch64 x86_64 %ix86
+%ifarch arm armv7l armv7hl aarch64 x86_64 %ix86 riscv64
 
-mkdir -p %{buildroot}%{_libdir}
+mkdir -p %{buildroot}%{_libdir}/nnfw/backend
+mkdir -p %{buildroot}%{_libdir}/nnfw/loader
 mkdir -p %{buildroot}%{_bindir}
 mkdir -p %{buildroot}%{_includedir}
 install -m 644 build/out/lib/*.so %{buildroot}%{_libdir}
+install -m 644 build/out/lib/nnfw/backend/*.so %{buildroot}%{_libdir}/nnfw/backend
+install -m 644 build/out/lib/nnfw/loader/*.so %{buildroot}%{_libdir}/nnfw/loader
 install -m 755 build/out/bin/onert-minimal-app %{buildroot}%{_bindir}
 cp -r build/out/include/* %{buildroot}%{_includedir}/
 
@@ -310,15 +323,17 @@ install -m 755 build/out/npud-gtest/* %{test_install_path}/npud-gtest
 %files
 %manifest %{name}.manifest
 %defattr(-,root,root,-)
-%ifarch arm armv7l armv7hl aarch64 x86_64 %ix86
+%ifarch arm armv7l armv7hl aarch64 x86_64 %ix86 riscv64
 %{_libdir}/*.so
+%{_libdir}/nnfw/backend/*.so
+%{_libdir}/nnfw/loader/*.so
 %exclude %{_includedir}/CL/*
 %endif
 
 %files devel
 %manifest %{name}.manifest
 %defattr(-,root,root,-)
-%ifarch arm armv7l armv7hl aarch64 x86_64 %ix86
+%ifarch arm armv7l armv7hl aarch64 x86_64 %ix86 riscv64
 %dir %{_includedir}/nnfw
 %{_includedir}/nnfw/*
 %{_libdir}/pkgconfig/nnfw.pc
@@ -327,13 +342,13 @@ install -m 755 build/out/npud-gtest/* %{test_install_path}/npud-gtest
 %files plugin-devel
 %manifest %{name}.manifest
 %defattr(-,root,root,-)
-%ifarch arm armv7l armv7hl aarch64 x86_64 %ix86
+%ifarch arm armv7l armv7hl aarch64 x86_64 %ix86 riscv64
 %dir %{_includedir}/onert
 %{_includedir}/onert/*
 %{_libdir}/pkgconfig/nnfw-plugin.pc
 %endif
 
-%ifarch arm armv7l armv7hl aarch64 x86_64 %ix86
+%ifarch arm armv7l armv7hl aarch64 x86_64 %ix86 riscv64
 %files minimal-app
 %manifest %{name}.manifest
 %defattr(-,root,root,-)
@@ -354,7 +369,7 @@ install -m 755 build/out/npud-gtest/* %{test_install_path}/npud-gtest
 %files npud
 %manifest %{name}.manifest
 %defattr(-,root,root,-)
-%ifarch arm armv7l armv7hl aarch64 x86_64 %ix86
+%ifarch arm armv7l armv7hl aarch64 x86_64 %ix86 riscv64
 %{_bindir}/npud
 %endif # arm armv7l armv7hl aarch64 x86_64 %ix86
 %endif # npud_build
@@ -363,7 +378,7 @@ install -m 755 build/out/npud-gtest/* %{test_install_path}/npud-gtest
 %files odc
 %manifest %{name}.manifest
 %defattr(-,root,root,-)
-%ifarch arm armv7l armv7hl aarch64 x86_64 %ix86
+%ifarch arm armv7l armv7hl aarch64 x86_64 %ix86 riscv64
 %dir %{_libdir}/nnfw/odc
 %{_libdir}/nnfw/odc/*
 %endif # arm armv7l armv7hl aarch64 x86_64 %ix86