From aeb3f32077fc57ee5aa1b797135027147be11524 Mon Sep 17 00:00:00 2001 From: Ars Vladimirov Date: Tue, 23 May 2023 18:42:33 +0600 Subject: [PATCH 1/8] supervisely==6.72.12 --- requirements.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 87c8f31fd48a..0caaa6038e17 100755 --- a/requirements.txt +++ b/requirements.txt @@ -1,5 +1,6 @@ # pip install -r requirements.txt -git+https://github.com/supervisely/supervisely@tqdm-fixes +# git+https://github.com/supervisely/supervisely@tqdm-fixes +supervisely==6.72.12 opencv-python-headless==4.5.5.62 opencv-python==4.5.5.62 From e7fc1b4a53d272dbdfb24d65453ac05c6e5e1d83 Mon Sep 17 00:00:00 2001 From: Ars Vladimirov Date: Tue, 23 May 2023 19:32:46 +0600 Subject: [PATCH 2/8] add prints to datasets.py -> cache_labels --- supervisely/train/debug.env | 19 +++++++++---------- utils/datasets.py | 2 ++ 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/supervisely/train/debug.env b/supervisely/train/debug.env index f32ca184fde1..e186876ec94c 100644 --- a/supervisely/train/debug.env +++ b/supervisely/train/debug.env @@ -1,16 +1,15 @@ PYTHONUNBUFFERED=1 -DEBUG_APP_DIR="/app_debug_data" -DEBUG_CACHE_DIR="/app_cache" +DEBUG_APP_DIR="./app_debug_data" +DEBUG_CACHE_DIR="./app_cache" LOG_LEVEL="debug" -TASK_ID=4326 +TASK_ID=34562 -context.teamId=229 -context.workspaceId=287 -#modal.state.slyProjectId=3529 # lemons-annotated -modal.state.slyProjectId=3643 # lemons with ready train/val tags +context.teamId=449 +context.workspaceId=691 +modal.state.slyProjectId=21837 -SERVER_ADDRESS="put your value here" -API_TOKEN="put your value here" -AGENT_TOKEN="put your value here" \ No newline at end of file +SERVER_ADDRESS="https://dev.supervise.ly/" +API_TOKEN="l5ZuzVYNKY7MPt5vfk0tlynPe2yU2ReD07xxyONSGMotAQCokZJ4J93LK5ALDHt56eFGGuBzXd6TefC4MVOWcuMOsyG0fwTsbaKYxRwtiyUUdB6jRyP4oFekMS1ujDvF" +AGENT_TOKEN="MDOypRHIS1lqCskratTKyNMxnd8EqlcW" \ No newline at end of file diff --git a/utils/datasets.py b/utils/datasets.py index 3fcdddd7c013..a5d2d047f49f 100755 --- a/utils/datasets.py +++ b/utils/datasets.py @@ -456,6 +456,8 @@ def cache_labels(self, path=Path('./labels.cache'), prefix=''): x = {} # dict nm, nf, ne, nc = 0, 0, 0, 0 # number missing, found, empty, duplicate pbar = tqdm(zip(self.img_files, self.label_files), desc='Scanning images', total=len(self.img_files)) + print("################ pbar ###############",type(pbar)) + print("################ iterable ###############", pbar.iterable ) for i, (im_file, lb_file) in enumerate(pbar): try: # verify images From 8adaabddf8468b9ea43fe4b97c77e7ff872dd560 Mon Sep 17 00:00:00 2001 From: Ars Vladimirov Date: Tue, 23 May 2023 19:41:21 +0600 Subject: [PATCH 3/8] upd --- utils/datasets.py | 1 + 1 file changed, 1 insertion(+) diff --git a/utils/datasets.py b/utils/datasets.py index a5d2d047f49f..3d0a02b2b818 100755 --- a/utils/datasets.py +++ b/utils/datasets.py @@ -455,6 +455,7 @@ def cache_labels(self, path=Path('./labels.cache'), prefix=''): # Cache dataset labels, check images and read shapes x = {} # dict nm, nf, ne, nc = 0, 0, 0, 0 # number missing, found, empty, duplicate + print("################ pbar init ###############") pbar = tqdm(zip(self.img_files, self.label_files), desc='Scanning images', total=len(self.img_files)) print("################ pbar ###############",type(pbar)) print("################ iterable ###############", pbar.iterable ) From 8198054f3c458f0a94084c5a9baf73046c12e0e4 Mon Sep 17 00:00:00 2001 From: Ars Vladimirov Date: Tue, 23 May 2023 19:44:36 +0600 Subject: [PATCH 4/8] add logger --- utils/datasets.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/utils/datasets.py b/utils/datasets.py index 3d0a02b2b818..2dac2569d088 100755 --- a/utils/datasets.py +++ b/utils/datasets.py @@ -455,10 +455,11 @@ def cache_labels(self, path=Path('./labels.cache'), prefix=''): # Cache dataset labels, check images and read shapes x = {} # dict nm, nf, ne, nc = 0, 0, 0, 0 # number missing, found, empty, duplicate - print("################ pbar init ###############") + from supervisely import logger + logger("################ pbar init ###############") pbar = tqdm(zip(self.img_files, self.label_files), desc='Scanning images', total=len(self.img_files)) - print("################ pbar ###############",type(pbar)) - print("################ iterable ###############", pbar.iterable ) + logger("################ pbar ###############",type(pbar)) + logger("################ iterable ###############", pbar.iterable ) for i, (im_file, lb_file) in enumerate(pbar): try: # verify images From 8d8493f93ea788c9fceb24bbe3b78d05a47e7dd3 Mon Sep 17 00:00:00 2001 From: Ars Vladimirov Date: Tue, 23 May 2023 20:43:13 +0600 Subject: [PATCH 5/8] add dummy.txt --- dummy.txt | 1 + utils/datasets.py | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) create mode 100644 dummy.txt diff --git a/dummy.txt b/dummy.txt new file mode 100644 index 000000000000..2995a4d0e749 --- /dev/null +++ b/dummy.txt @@ -0,0 +1 @@ +dummy \ No newline at end of file diff --git a/utils/datasets.py b/utils/datasets.py index 2dac2569d088..47204726e32f 100755 --- a/utils/datasets.py +++ b/utils/datasets.py @@ -459,7 +459,7 @@ def cache_labels(self, path=Path('./labels.cache'), prefix=''): logger("################ pbar init ###############") pbar = tqdm(zip(self.img_files, self.label_files), desc='Scanning images', total=len(self.img_files)) logger("################ pbar ###############",type(pbar)) - logger("################ iterable ###############", pbar.iterable ) + logger("################ iterable ###############", pbar.iterable) for i, (im_file, lb_file) in enumerate(pbar): try: # verify images From 10f9bf25a147754251997cb7f984f92e56f50af6 Mon Sep 17 00:00:00 2001 From: Ars Vladimirov Date: Tue, 23 May 2023 21:33:43 +0600 Subject: [PATCH 6/8] _original_tqdm --- requirements.txt | 4 ++-- supervisely/train/src/sly_train.py | 4 ++++ utils/datasets.py | 5 ----- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/requirements.txt b/requirements.txt index 0caaa6038e17..e388c2ff1d0d 100755 --- a/requirements.txt +++ b/requirements.txt @@ -1,6 +1,6 @@ # pip install -r requirements.txt -# git+https://github.com/supervisely/supervisely@tqdm-fixes -supervisely==6.72.12 +git+https://github.com/supervisely/supervisely@_original-tqdm +# supervisely==6.72.12 opencv-python-headless==4.5.5.62 opencv-python==4.5.5.62 diff --git a/supervisely/train/src/sly_train.py b/supervisely/train/src/sly_train.py index 66e5b737721e..fbbab58f0bf5 100644 --- a/supervisely/train/src/sly_train.py +++ b/supervisely/train/src/sly_train.py @@ -1,5 +1,9 @@ import os import supervisely as sly +import tqdm + +from supervisely import _original_tqdm +tqdm.tqdm = _original_tqdm import sly_train_globals as g diff --git a/utils/datasets.py b/utils/datasets.py index 47204726e32f..7561699a2c2b 100755 --- a/utils/datasets.py +++ b/utils/datasets.py @@ -1,5 +1,4 @@ # Dataset utils and dataloaders - import glob import logging import math @@ -455,11 +454,7 @@ def cache_labels(self, path=Path('./labels.cache'), prefix=''): # Cache dataset labels, check images and read shapes x = {} # dict nm, nf, ne, nc = 0, 0, 0, 0 # number missing, found, empty, duplicate - from supervisely import logger - logger("################ pbar init ###############") pbar = tqdm(zip(self.img_files, self.label_files), desc='Scanning images', total=len(self.img_files)) - logger("################ pbar ###############",type(pbar)) - logger("################ iterable ###############", pbar.iterable) for i, (im_file, lb_file) in enumerate(pbar): try: # verify images From 1589839766ad328dce4e0e116950cd621646b238 Mon Sep 17 00:00:00 2001 From: Ars Vladimirov Date: Tue, 23 May 2023 21:34:58 +0600 Subject: [PATCH 7/8] remove dummy --- dummy.txt | 1 - 1 file changed, 1 deletion(-) delete mode 100644 dummy.txt diff --git a/dummy.txt b/dummy.txt deleted file mode 100644 index 2995a4d0e749..000000000000 --- a/dummy.txt +++ /dev/null @@ -1 +0,0 @@ -dummy \ No newline at end of file From 2e0dde51f6717a45f21177b4bdb6381a7f07b1f9 Mon Sep 17 00:00:00 2001 From: Ars Vladimirov Date: Tue, 23 May 2023 23:26:52 +0600 Subject: [PATCH 8/8] supervisely==6.72.14 --- requirements.txt | 3 +-- supervisely/train/debug.env | 13 +++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/requirements.txt b/requirements.txt index e388c2ff1d0d..f34e82132c4b 100755 --- a/requirements.txt +++ b/requirements.txt @@ -1,6 +1,5 @@ # pip install -r requirements.txt -git+https://github.com/supervisely/supervisely@_original-tqdm -# supervisely==6.72.12 +supervisely==6.72.14 opencv-python-headless==4.5.5.62 opencv-python==4.5.5.62 diff --git a/supervisely/train/debug.env b/supervisely/train/debug.env index e186876ec94c..5f18a3dce90c 100644 --- a/supervisely/train/debug.env +++ b/supervisely/train/debug.env @@ -6,10 +6,11 @@ LOG_LEVEL="debug" TASK_ID=34562 -context.teamId=449 -context.workspaceId=691 -modal.state.slyProjectId=21837 +context.teamId=229 +context.workspaceId=287 +#modal.state.slyProjectId=3529 # lemons-annotated +modal.state.slyProjectId=3643 # lemons with ready train/val tags -SERVER_ADDRESS="https://dev.supervise.ly/" -API_TOKEN="l5ZuzVYNKY7MPt5vfk0tlynPe2yU2ReD07xxyONSGMotAQCokZJ4J93LK5ALDHt56eFGGuBzXd6TefC4MVOWcuMOsyG0fwTsbaKYxRwtiyUUdB6jRyP4oFekMS1ujDvF" -AGENT_TOKEN="MDOypRHIS1lqCskratTKyNMxnd8EqlcW" \ No newline at end of file +SERVER_ADDRESS="put your value here" +API_TOKEN="put your value here" +AGENT_TOKEN="put your value here" \ No newline at end of file