From 1dc6db2fecd7724fb0de377f5019b74b1f1751e3 Mon Sep 17 00:00:00 2001 From: previ Date: Sun, 17 Mar 2024 22:28:57 +0100 Subject: [PATCH 01/11] opencv 4.9 --- coderbot/cv/image.py | 2 +- requirements.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/coderbot/cv/image.py b/coderbot/cv/image.py index 3c602379..125383c3 100644 --- a/coderbot/cv/image.py +++ b/coderbot/cv/image.py @@ -36,7 +36,7 @@ class Image(): r_from = np.float32([[0, 0], [640, 0], [640, 480], [0, 480]]) r_dest = np.float32([[0, -120], [640, -120], [380, 480], [260, 480]]) - _aruco_dict = cv2.aruco.Dictionary_get(cv2.aruco.DICT_ARUCO_ORIGINAL) + _aruco_dict = cv2.aruco.getPredefinedDictionary(cv2.aruco.DICT_ARUCO_ORIGINAL) _aruco_parameters = cv2.aruco.DetectorParameters_create() _face_cascade = cv2.CascadeClassifier(cv2.data.haarcascades + 'haarcascade_frontalface_default.xml') diff --git a/requirements.txt b/requirements.txt index 139d980c..47877820 100644 --- a/requirements.txt +++ b/requirements.txt @@ -24,7 +24,7 @@ grpcio==1.62.1 numpy==1.26.4 Pillow==10.2.0 protobuf==4.25.2 -opencv-contrib-python==4.5.5.62 +opencv-contrib-python==4.9.0.80 tflite-runtime==2.11.0 pytesseract==0.3.10 picamera==1.13 From 55dcc69d6c35725fa693236961e2fbeda785d55c Mon Sep 17 00:00:00 2001 From: previ Date: Sun, 17 Mar 2024 22:37:26 +0100 Subject: [PATCH 02/11] tflite 2.14 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 47877820..047f1a7f 100644 --- a/requirements.txt +++ b/requirements.txt @@ -25,7 +25,7 @@ numpy==1.26.4 Pillow==10.2.0 protobuf==4.25.2 opencv-contrib-python==4.9.0.80 -tflite-runtime==2.11.0 +tflite-runtime==2.14.0 pytesseract==0.3.10 picamera==1.13 pyzbar==0.1.9 From 757524f5e918068c905582f3bb51634c35c26f50 Mon Sep 17 00:00:00 2001 From: previ Date: Sun, 17 Mar 2024 22:39:00 +0100 Subject: [PATCH 03/11] stub --- docker/stub/requirements.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docker/stub/requirements.txt b/docker/stub/requirements.txt index 70ff5c16..d119c6eb 100644 --- a/docker/stub/requirements.txt +++ b/docker/stub/requirements.txt @@ -20,7 +20,7 @@ grpcio==1.62.1 numpy==1.26.4 Pillow==10.2.0 protobuf==4.25.2 -opencv-contrib-python==4.5.5.62 -tflite-runtime==2.11.0 +opencv-contrib-python==4.9.0.80 +tflite-runtime==2.14.0 pytesseract==0.3.10 pyzbar==0.1.9 From 169119e76398439d75fe6b78c307cababb54300b Mon Sep 17 00:00:00 2001 From: previ Date: Sun, 17 Mar 2024 22:42:26 +0100 Subject: [PATCH 04/11] upgrade pip --- docker/Dockerfile | 3 ++- docker/stub/Dockerfile | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index 40a5fafa..ca2a9c85 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -46,7 +46,8 @@ RUN install_packages \ ENV READTHEDOCS=True ADD requirements.txt /tmp/. -RUN pip install --no-cache-dir -r /tmp/requirements.txt +RUN pip install --upgrade pip && \ + pip install --no-cache-dir -r /tmp/requirements.txt RUN mkdir -p /coderbot && \ mkdir -p /coderbot/data && \ diff --git a/docker/stub/Dockerfile b/docker/stub/Dockerfile index 66281565..2d841524 100644 --- a/docker/stub/Dockerfile +++ b/docker/stub/Dockerfile @@ -39,7 +39,8 @@ RUN apt-get update -y && apt-get install -y \ tesseract-ocr-deu ADD docker/stub/requirements.txt /tmp/. -RUN pip install --no-cache-dir -r /tmp/requirements.txt +RUN pip install --upgrade pip && \ + pip install --no-cache-dir -r /tmp/requirements.txt RUN mkdir -p /coderbot && \ mkdir -p /coderbot/data && \ From b6f78a7a617bd0e76b5fe5bb02a61c34bcf53287 Mon Sep 17 00:00:00 2001 From: previ Date: Sun, 17 Mar 2024 22:51:25 +0100 Subject: [PATCH 05/11] DetectorParameters --- coderbot/cv/image.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/coderbot/cv/image.py b/coderbot/cv/image.py index 125383c3..dc8688c7 100644 --- a/coderbot/cv/image.py +++ b/coderbot/cv/image.py @@ -36,8 +36,9 @@ class Image(): r_from = np.float32([[0, 0], [640, 0], [640, 480], [0, 480]]) r_dest = np.float32([[0, -120], [640, -120], [380, 480], [260, 480]]) - _aruco_dict = cv2.aruco.getPredefinedDictionary(cv2.aruco.DICT_ARUCO_ORIGINAL) - _aruco_parameters = cv2.aruco.DetectorParameters_create() + _aruco_detector = cv2.aruco.DetectorParameters( + cv2.aruco.getPredefinedDictionary(cv2.aruco.DICT_ARUCO_ORIGINAL), + cv2.aruco.DetectorParameters()) _face_cascade = cv2.CascadeClassifier(cv2.data.haarcascades + 'haarcascade_frontalface_default.xml') @@ -254,7 +255,7 @@ def find_qr_code(self): def find_ar_code(self): gray = cv2.cvtColor(self._data, cv2.COLOR_BGR2GRAY) - corners, ids, rejectedImgPoints = cv2.aruco.detectMarkers(gray, self._aruco_dict, parameters=self._aruco_parameters) + corners, ids, rejectedImgPoints = self._aruco_detector.detectMarkers(gray) codes = [] positions = [] if ids is not None: From e8d937c97631a36b06a47b24203698a52e0cf00c Mon Sep 17 00:00:00 2001 From: previ Date: Sun, 17 Mar 2024 22:56:10 +0100 Subject: [PATCH 06/11] ArucoDetector --- coderbot/cv/image.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/coderbot/cv/image.py b/coderbot/cv/image.py index dc8688c7..5e095cb0 100644 --- a/coderbot/cv/image.py +++ b/coderbot/cv/image.py @@ -36,7 +36,7 @@ class Image(): r_from = np.float32([[0, 0], [640, 0], [640, 480], [0, 480]]) r_dest = np.float32([[0, -120], [640, -120], [380, 480], [260, 480]]) - _aruco_detector = cv2.aruco.DetectorParameters( + _aruco_detector = cv2.aruco.ArucoDetector( cv2.aruco.getPredefinedDictionary(cv2.aruco.DICT_ARUCO_ORIGINAL), cv2.aruco.DetectorParameters()) From db73a52ebc2784945c74773790d3b65e52cf6d69 Mon Sep 17 00:00:00 2001 From: previ Date: Sun, 17 Mar 2024 23:11:04 +0100 Subject: [PATCH 07/11] tflite-runtime --- docker/stub/requirements.txt | 2 +- requirements.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docker/stub/requirements.txt b/docker/stub/requirements.txt index d119c6eb..419b1eaf 100644 --- a/docker/stub/requirements.txt +++ b/docker/stub/requirements.txt @@ -21,6 +21,6 @@ numpy==1.26.4 Pillow==10.2.0 protobuf==4.25.2 opencv-contrib-python==4.9.0.80 -tflite-runtime==2.14.0 +tflite-runtime pytesseract==0.3.10 pyzbar==0.1.9 diff --git a/requirements.txt b/requirements.txt index 047f1a7f..d5798a6d 100644 --- a/requirements.txt +++ b/requirements.txt @@ -25,7 +25,7 @@ numpy==1.26.4 Pillow==10.2.0 protobuf==4.25.2 opencv-contrib-python==4.9.0.80 -tflite-runtime==2.14.0 +tflite-runtime pytesseract==0.3.10 picamera==1.13 pyzbar==0.1.9 From 677a354af0a9eabce8dca900c3ae14c342681b36 Mon Sep 17 00:00:00 2001 From: previ Date: Sun, 17 Mar 2024 23:27:15 +0100 Subject: [PATCH 08/11] opencv 4.9 --- docker/Dockerfile | 1 + docker/stub/Dockerfile | 1 + 2 files changed, 2 insertions(+) diff --git a/docker/Dockerfile b/docker/Dockerfile index ca2a9c85..3af53917 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -4,6 +4,7 @@ ENV QEMU_CPU=max ENV DEBIAN_FRONTEND=noninteractive RUN install_packages \ + patch \ libraspberrypi0 \ procps \ sudo \ diff --git a/docker/stub/Dockerfile b/docker/stub/Dockerfile index 2d841524..b262df75 100644 --- a/docker/stub/Dockerfile +++ b/docker/stub/Dockerfile @@ -3,6 +3,7 @@ FROM debian:bullseye-slim ENV DEBIAN_FRONTEND=noninteractive RUN apt-get update -y && apt-get install -y \ + patch \ procps \ sudo \ wget \ From a8f5339fc3fbb252ce544797e5c66a7db21965cb Mon Sep 17 00:00:00 2001 From: previ Date: Sun, 17 Mar 2024 23:46:40 +0100 Subject: [PATCH 09/11] opencv 4.9 --- docker/Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/docker/Dockerfile b/docker/Dockerfile index 3af53917..fa754e14 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -5,6 +5,7 @@ ENV DEBIAN_FRONTEND=noninteractive RUN install_packages \ patch \ + gcc \ libraspberrypi0 \ procps \ sudo \ From 353de87cae49e468895558f3a16a33e8e1579157 Mon Sep 17 00:00:00 2001 From: Roberto Date: Mon, 18 Mar 2024 11:33:40 +0100 Subject: [PATCH 10/11] build-essential --- docker/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index fa754e14..e2317d1d 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -5,7 +5,7 @@ ENV DEBIAN_FRONTEND=noninteractive RUN install_packages \ patch \ - gcc \ + build-essential \ libraspberrypi0 \ procps \ sudo \ From dc7055f21dd78d7433d668b40484cf5ffcdd6a4c Mon Sep 17 00:00:00 2001 From: Roberto Date: Mon, 18 Mar 2024 16:53:32 +0100 Subject: [PATCH 11/11] python3-dev --- docker/Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/docker/Dockerfile b/docker/Dockerfile index e2317d1d..fd36371f 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -16,6 +16,7 @@ RUN install_packages \ portaudio19-dev \ python3 \ python3-pip \ + python3-dev \ libopenjp2-7-dev \ libtiff5 \ libatlas-base-dev \