From 12580c3f7b45c9e3f979c10a31d1ab7d1f9ffd78 Mon Sep 17 00:00:00 2001 From: GearKite Date: Tue, 5 Mar 2024 12:30:39 +0200 Subject: [PATCH 1/3] Fix AttributeError: module 'src.blur' has no attribute 'blurPicture' #31 --- src/api.py | 2 +- src/{blur.py => blur_monolith.py} | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename src/{blur.py => blur_monolith.py} (100%) diff --git a/src/api.py b/src/api.py index f9ae1b8..330b496 100644 --- a/src/api.py +++ b/src/api.py @@ -1,6 +1,6 @@ from fastapi import FastAPI, UploadFile, Response import gc -from . import blur +from . import blur_monolith as blur import json app = FastAPI() diff --git a/src/blur.py b/src/blur_monolith.py similarity index 100% rename from src/blur.py rename to src/blur_monolith.py From 2de50c12c6887b960063231b276a4657eb24f456 Mon Sep 17 00:00:00 2001 From: GearKite Date: Tue, 5 Mar 2024 14:04:51 +0200 Subject: [PATCH 2/3] Change crop_save_dir to tmp directory --- src/blur/blur.py | 2 +- src/blur_monolith.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/blur/blur.py b/src/blur/blur.py index 5566bdf..0ab0f78 100755 --- a/src/blur/blur.py +++ b/src/blur/blur.py @@ -10,7 +10,7 @@ jpeg = turbojpeg.TurboJPEG() -crop_save_dir = '/data/crops' +crop_save_dir = '/tmp/sgblur/crops' def blurPicture(picture, keep): """Blurs a single picture by detecting faces and licence plates. diff --git a/src/blur_monolith.py b/src/blur_monolith.py index 42b5e87..4ed7771 100755 --- a/src/blur_monolith.py +++ b/src/blur_monolith.py @@ -14,7 +14,7 @@ model.names[1] = 'plate' model.names[2] = 'face' -crop_save_dir = '/data/crops' +crop_save_dir = '/tmp/sgblur/crops' def blurPicture(picture, keep): """Blurs a single picture by detecting faces and licence plates. From 71c34f80d4c0f875f567a92d0f1a973cfa210221 Mon Sep 17 00:00:00 2001 From: GearKite Date: Tue, 5 Mar 2024 13:03:14 +0200 Subject: [PATCH 3/3] Fix division by 0 when no Cuda devices are present --- src/blur_monolith.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/blur_monolith.py b/src/blur_monolith.py index 4ed7771..348d774 100755 --- a/src/blur_monolith.py +++ b/src/blur_monolith.py @@ -36,7 +36,10 @@ def blurPicture(picture, keep): if 'SGBLUR_GPUS' in os.environ: gpu = pid % int(os.environ['SGBLUR_GPUS']) else: - gpu = pid % torch.cuda.device_count() + if torch.cuda.device_count() > 0: + gpu = pid % torch.cuda.device_count() + else: + gpu = None # copy received JPEG picture to temporary file tmp = '/dev/shm/blur%s.jpg' % pid