From 7731b09275d18ed70ebf31734b1a36a8faecf237 Mon Sep 17 00:00:00 2001
From: Samuel Cozannet <samuel.cozannet@madeden.com>
Date: Wed, 12 Feb 2020 20:09:06 +0100
Subject: [PATCH] adding TF on py3 and some new libs for TFLite and Caffe
 models

---
 stage5/EXPORT_IMAGE                           |  4 ----
 stage5/EXPORT_NOOBS                           |  2 --
 stageX/04-ml-frameworks/00-packages           |  7 +++++--
 stageX/04-ml-frameworks/01-run.sh             | 12 ++++++++++--
 stageX/06-sys-tweaks/00-packages              |  6 ++++++
 stageX/06-sys-tweaks/{00-run.sh => 01-run.sh} |  0
 6 files changed, 21 insertions(+), 10 deletions(-)
 delete mode 100644 stage5/EXPORT_IMAGE
 delete mode 100644 stage5/EXPORT_NOOBS
 create mode 100644 stageX/06-sys-tweaks/00-packages
 rename stageX/06-sys-tweaks/{00-run.sh => 01-run.sh} (100%)

diff --git a/stage5/EXPORT_IMAGE b/stage5/EXPORT_IMAGE
deleted file mode 100644
index a81a844..0000000
--- a/stage5/EXPORT_IMAGE
+++ /dev/null
@@ -1,4 +0,0 @@
-IMG_SUFFIX="-full"
-if [ "${USE_QEMU}" = "1" ]; then
-	export IMG_SUFFIX="${IMG_SUFFIX}-qemu"
-fi
diff --git a/stage5/EXPORT_NOOBS b/stage5/EXPORT_NOOBS
deleted file mode 100644
index cb10203..0000000
--- a/stage5/EXPORT_NOOBS
+++ /dev/null
@@ -1,2 +0,0 @@
-NOOBS_NAME="Raspbian Full"
-NOOBS_DESCRIPTION="A port of Debian with desktop and recommended applications"
diff --git a/stageX/04-ml-frameworks/00-packages b/stageX/04-ml-frameworks/00-packages
index 648f75f..980dda2 100644
--- a/stageX/04-ml-frameworks/00-packages
+++ b/stageX/04-ml-frameworks/00-packages
@@ -3,10 +3,13 @@ python-nose
 python-pip
 zip
 gfortran
-python-setuptools
+python-setuptools python3-setuptools
 python-pandas python3-pandas
 python-scipy python3-scipy
 libhdf5-dev
 build-essential cmake pkg-config libx11-dev
 libgtk-3-dev libboost-python-dev
-python-markdown python3-markdown
\ No newline at end of file
+python-markdown python3-markdown
+libatlas-base-dev
+libjasper-dev
+libqtgui4 python3-pyqt5 libqt4-test
\ No newline at end of file
diff --git a/stageX/04-ml-frameworks/01-run.sh b/stageX/04-ml-frameworks/01-run.sh
index bcd9e3d..aed96a4 100755
--- a/stageX/04-ml-frameworks/01-run.sh
+++ b/stageX/04-ml-frameworks/01-run.sh
@@ -6,9 +6,12 @@ tar xvzf mxnet.tar.gz -C "${ROOTFS_DIR}/opt"
 rm -f mxnet.tar.gz
 
 on_chroot << EOF
-pip -vv install imutils h5py dlib pandas scipy
+pip -vv install imutils h5py dlib pandas scipy cython scikit-image
 pip install markdown==3.1.1
-pip3 -vv install imutils h5py dlib pandas scipy
+pip install numpy>=1.16.2
+pip3 -vv install imutils h5py dlib pandas scipy cython scikit-image
+pip3 install markdown>=3.1.1
+pip3 install numpy>=1.16.2
 EOF
 
 on_chroot << EOF
@@ -26,6 +29,11 @@ on_chroot << EOF
 cd /opt
 wget -c https://github.com/lhelontra/tensorflow-on-arm/releases/download/v1.14.0-buster/tensorflow-1.14.0-cp27-none-linux_armv7l.whl
 pip install -vv tensorflow-1.14.0-cp27-none-linux_armv7l.whl
+rm -f tensorflow-1.14.0-cp27-none-linux_armv7l.whl
+
+wget -c https://github.com/lhelontra/tensorflow-on-arm/releases/download/v1.14.0/tensorflow-1.14.0-cp35-none-linux_armv7l.whl
+pip3 install -vv tensorflow-1.14.0-cp35-none-linux_armv7l.whl
+rm -f tensorflow-1.14.0-cp35-none-linux_armv7l.whl
 EOF
 
 # Install DL Framework
diff --git a/stageX/06-sys-tweaks/00-packages b/stageX/06-sys-tweaks/00-packages
new file mode 100644
index 0000000..301e5a1
--- /dev/null
+++ b/stageX/06-sys-tweaks/00-packages
@@ -0,0 +1,6 @@
+usb-modeswitch
+ppp
+udhcpc
+libqmi-glib5 libqmi-proxy libqmi-utils
+modemmanager modem-manager-gui
+minicom
diff --git a/stageX/06-sys-tweaks/00-run.sh b/stageX/06-sys-tweaks/01-run.sh
similarity index 100%
rename from stageX/06-sys-tweaks/00-run.sh
rename to stageX/06-sys-tweaks/01-run.sh