From d908c9dc025b0f32a7af9bda1e74647f345d1430 Mon Sep 17 00:00:00 2001 From: Taha Date: Thu, 11 Aug 2022 11:48:47 +0200 Subject: [PATCH 1/5] fix: image load in Jetsonnx --- aloscene/io/image.py | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/aloscene/io/image.py b/aloscene/io/image.py index a437fccf..127f7f59 100644 --- a/aloscene/io/image.py +++ b/aloscene/io/image.py @@ -1,19 +1,19 @@ -import torchvision +from aloscene.io.utils.errors import InvalidSampleError + +import cv2 import torch +import torchvision +import numpy as np from torchvision.io.image import ImageReadMode -from aloscene.io.utils.errors import InvalidSampleError - def load_image(image_path): """ Load an image with pytorch in float32 format - Parameters ---------- image_path : str path of the image - Returns ------- image : torch.Tensor @@ -22,5 +22,10 @@ def load_image(image_path): try: image = torchvision.io.read_image(image_path, ImageReadMode.RGB).type(torch.float32) except RuntimeError as e: - raise InvalidSampleError(f"[Alodataset Warning] Invalid image: {image_path} error={e}") - return image + try: + image = cv2.imread(image_path) + image = np.moveaxis(image, 2, 0) + image = torch.Tensor(image).type(torch.float32) + except RuntimeError as e: + raise InvalidSampleError(f"[Alodataset Warning] Invalid image: {image_path} error={e}") + return image \ No newline at end of file From 6a3b8173beb84008cc4e2ed358f21d2416a5968e Mon Sep 17 00:00:00 2001 From: Taha Date: Thu, 11 Aug 2022 11:50:23 +0200 Subject: [PATCH 2/5] fix Jetsonnx error package : optim imports --- alonet/torch2trt/base_exporter.py | 1 - 1 file changed, 1 deletion(-) diff --git a/alonet/torch2trt/base_exporter.py b/alonet/torch2trt/base_exporter.py index a838f9ef..cfa4701c 100644 --- a/alonet/torch2trt/base_exporter.py +++ b/alonet/torch2trt/base_exporter.py @@ -13,7 +13,6 @@ import onnx_graphsurgeon as gs import tensorrt as trt import pycuda.driver as cuda - from pytorch_quantization import nn as quant_nn prod_package_error = None except Exception as e: prod_package_error = e From 41b720485d8b300a4ec7969f7049dc7ab71cea1c Mon Sep 17 00:00:00 2001 From: Taha Date: Thu, 11 Aug 2022 11:52:05 +0200 Subject: [PATCH 3/5] refactor: PEP end line --- aloscene/io/image.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/aloscene/io/image.py b/aloscene/io/image.py index 127f7f59..aa7b5e3e 100644 --- a/aloscene/io/image.py +++ b/aloscene/io/image.py @@ -28,4 +28,4 @@ def load_image(image_path): image = torch.Tensor(image).type(torch.float32) except RuntimeError as e: raise InvalidSampleError(f"[Alodataset Warning] Invalid image: {image_path} error={e}") - return image \ No newline at end of file + return image From f43ab6690cd1c6bffdbbcaf45c0600187170e323 Mon Sep 17 00:00:00 2001 From: Taha Date: Fri, 12 Aug 2022 11:02:58 +0200 Subject: [PATCH 4/5] refactor: docstring blank lines --- aloscene/io/image.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/aloscene/io/image.py b/aloscene/io/image.py index aa7b5e3e..8688505d 100644 --- a/aloscene/io/image.py +++ b/aloscene/io/image.py @@ -10,10 +10,12 @@ def load_image(image_path): """ Load an image with pytorch in float32 format + Parameters ---------- image_path : str path of the image + Returns ------- image : torch.Tensor From 5332b16871aedf73a354e8857c49db5b25a0f5f4 Mon Sep 17 00:00:00 2001 From: Taha Date: Tue, 16 Aug 2022 10:17:01 +0200 Subject: [PATCH 5/5] fix: convert from BRG to RGB --- aloscene/io/image.py | 1 + 1 file changed, 1 insertion(+) diff --git a/aloscene/io/image.py b/aloscene/io/image.py index 8688505d..f68106ae 100644 --- a/aloscene/io/image.py +++ b/aloscene/io/image.py @@ -26,6 +26,7 @@ def load_image(image_path): except RuntimeError as e: try: image = cv2.imread(image_path) + image = cv2.cvtColor(image, cv2.COLOR_BGR2RGB) image = np.moveaxis(image, 2, 0) image = torch.Tensor(image).type(torch.float32) except RuntimeError as e: