From 3ad689f0803519e343c36d5700646e86059df961 Mon Sep 17 00:00:00 2001
From: Chunseok Lee <chunseok.lee@samsung.com>
Date: Fri, 15 Apr 2022 19:15:11 +0900
Subject: Imported Upstream version 1.20.0

---
 infra/debian/compiler/control              | 4 ++--
 infra/debian/compiler/one-compiler.install | 4 +++-
 infra/debian/compiler/postinst             | 2 +-
 infra/debian/compiler/rules                | 2 +-
 4 files changed, 7 insertions(+), 5 deletions(-)

(limited to 'infra/debian/compiler')

diff --git a/infra/debian/compiler/control b/infra/debian/compiler/control
index 99fa479f2..b3a3c1bf7 100644
--- a/infra/debian/compiler/control
+++ b/infra/debian/compiler/control
@@ -2,14 +2,14 @@ Source: one
 Section: devel
 Priority: extra
 Maintainer: Neural Network Acceleration Solution Developers <nnfw@samsung.com>
-Build-Depends: cmake, debhelper (>=9), dh-python, python3-all
+Build-Depends: cmake, debhelper (>=9), dh-python, python3-all, python3.8, python3.8-venv
 Standards-Version: 3.9.8
 Homepage: https://github.com/Samsung/ONE
 
 Package: one-compiler
 Architecture: amd64
 Multi-Arch: foreign
-Depends: ${misc:Depends}, ${shlibs:Depends}, python3-venv, python3-pip
+Depends: ${misc:Depends}, ${shlibs:Depends}, python3-venv, python3-pip, python3.8, python3.8-venv
 Description: On-device Neural Engine compiler package
 
 Package: one-compiler-dev
diff --git a/infra/debian/compiler/one-compiler.install b/infra/debian/compiler/one-compiler.install
index cbca47802..805ba8677 100644
--- a/infra/debian/compiler/one-compiler.install
+++ b/infra/debian/compiler/one-compiler.install
@@ -1,7 +1,7 @@
 # {FILES_TO_INSTALL} {DEST_DIR}
 # bin
 usr/bin/circle2circle usr/share/one/bin/
-usr/bin/circle_partitioner usr/share/one/bin/
+usr/bin/circle-partitioner usr/share/one/bin/
 usr/bin/circle-quantizer usr/share/one/bin/
 usr/bin/generate_bcq_metadata.py usr/share/one/bin/
 usr/bin/generate_bcq_output_arrays.py usr/share/one/bin/
@@ -22,6 +22,8 @@ usr/bin/one-prepare-venv usr/share/one/bin/
 usr/bin/one-profile usr/share/one/bin/
 usr/bin/one-quantize usr/share/one/bin/
 usr/bin/one-version usr/share/one/bin/
+usr/bin/onelib/constant.py usr/share/one/bin/onelib/
+usr/bin/onelib/make_cmd.py usr/share/one/bin/onelib/
 usr/bin/rawdata2hdf5 usr/share/one/bin/
 usr/bin/record-minmax usr/share/one/bin/
 usr/bin/tf2nnpkg usr/share/one/bin/
diff --git a/infra/debian/compiler/postinst b/infra/debian/compiler/postinst
index a339d06c1..d84e8e042 100644
--- a/infra/debian/compiler/postinst
+++ b/infra/debian/compiler/postinst
@@ -9,4 +9,4 @@ set -e
 # which causes invalid permission problem.
 # e.g. When `pip` installs user packages, it proceeds based on $HOME.
 # To proper installation, $HOME should be root.
-su - $(whoami) -c '/usr/share/one/bin/one-prepare-venv' # $(whoami) = root
+su - $(whoami) -p -c '/usr/share/one/bin/one-prepare-venv' # $(whoami) = root
diff --git a/infra/debian/compiler/rules b/infra/debian/compiler/rules
index e42faae09..145634d03 100755
--- a/infra/debian/compiler/rules
+++ b/infra/debian/compiler/rules
@@ -1,7 +1,7 @@
 #!/usr/bin/make -f
 export DH_VERBOSE = 1
 export NNAS_BUILD_PREFIX = build
-export PRESET = 20210910
+export PRESET = 20220323
 export _DESTDIR = debian/tmp/usr
 
 %:
-- 
cgit v1.2.3