pybaseutils 2.2.1__tar.gz → 2.2.2__tar.gz

{pybaseutils-2.2.1 → pybaseutils-2.2.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pybaseutils
-Version: 2.2.1
+Version: 2.2.2
 Summary: pybaseutils
 Home-page: https://github.com/PanJinquan/base-utils
 Author: PanJinquan

{pybaseutils-2.2.1 → pybaseutils-2.2.2}/pybaseutils/__init__.py

@@ -5,4 +5,4 @@
     @Date   : 2019-05-07 17:40:27
 """
 
-__version__ = '2.2.1'
+__version__ = '2.2.2'

{pybaseutils-2.2.1 → pybaseutils-2.2.2}/pybaseutils/dataloader/parser_labelme.py

@@ -115,9 +115,9 @@ class LabelMeDataset(Dataset):
             if not os.path.exists(image_file):
                 continue
             annotation, width, height = self.load_annotations(anno_file)
-            box, label, point, group = self.parser_annotation(annotation, self.class_dict,
-                                                              min_points=self.min_points,
-                                                              unique=self.unique)
+            box, label, point, group, names = self.parser_annotation(annotation, self.class_dict,
+                                                                     min_points=self.min_points,
+                                                                     unique=self.unique)
             if len(label) == 0:
                 continue
             dst_ids.append(image_id)
@@ -171,9 +171,9 @@ class LabelMeDataset(Dataset):
         annotation, width, height = self.load_annotations(anno_file)
         image = self.read_image(image_file, use_rgb=self.use_rgb)
         shape = image.shape
-        boxes, labels, points, groups = self.parser_annotation(annotation, self.class_dict, shape,
-                                                               min_points=self.min_points, unique=self.unique)
-        data = {"image": image, "points": points, "boxes": boxes, "labels": labels, "groups": groups,
+        boxes, labels, points, groups, names = self.parser_annotation(annotation, self.class_dict, shape,
+                                                                      min_points=self.min_points, unique=self.unique)
+        data = {"image": image, "points": points, "boxes": boxes, "labels": labels, "groups": groups, "names": names,
                 "image_file": image_file, "anno_file": anno_file, "size": [shape[1], shape[0]]}
         return data
 
@@ -186,14 +186,16 @@ class LabelMeDataset(Dataset):
         :param min_points: 当标注的轮廓点的个数小于等于min_points，会被剔除；负数不剔除
         :return:
         """
-        bboxes, labels, points, groups = [], [], [], []
+        bboxes, labels, points, groups, names = [], [], [], [], []
         for anno in annotation:
-            label = "unique" if unique else anno["label"]
+            name = "unique" if unique else anno["label"]
+            label = name
             if class_dict:
-                if not label in class_dict:
+                if not name in class_dict:
                     continue
                 if isinstance(class_dict, dict):
-                    label = class_dict[label]
+                    label = class_dict[name]
+                    if isinstance(label, str): name = label
             pts = np.asarray(anno["points"], dtype=np.int32)
             if min_points > 0 and len(pts) <= min_points:
                 continue
@@ -204,11 +206,12 @@ class LabelMeDataset(Dataset):
                 pts[:, 0] = np.clip(pts[:, 0], 0, w - 1)
                 pts[:, 1] = np.clip(pts[:, 1], 0, h - 1)
             box = image_utils.polygons2boxes([pts])[0]
+            names.append(name)
             labels.append(label)
             bboxes.append(box)
             points.append(pts)
             groups.append(group_id)
-        return bboxes, labels, points, groups
+        return bboxes, labels, points, groups, names
 
     def index2id(self, index):
         """
@@ -380,8 +383,8 @@ def parser_labelme(anno_file, class_dict={}, shape=None):
     :return:
     """
     annotation, width, height = LabelMeDataset.load_annotations(anno_file)
-    bboxes, labels, points, groups = LabelMeDataset.parser_annotation(annotation, class_dict, shape)
-    return bboxes, labels, points, groups
+    bboxes, labels, points, groups, names = LabelMeDataset.parser_annotation(annotation, class_dict, shape)
+    return bboxes, labels, points, groups, names
 
 
 def show_target_image(image, bboxes, labels, points, color=(), thickness=1):

{pybaseutils-2.2.1 → pybaseutils-2.2.2}/pybaseutils/dataloader/parser_voc.py

@@ -50,6 +50,7 @@ class VOCDataset(Dataset):
         self.class_name, self.class_dict = self.parser_classes(class_name)
         parser = self.parser_paths(filename, data_root, anno_dir, image_dir)
         self.data_root, self.anno_dir, self.image_dir, self.image_ids = parser
+        self.image_ids = self.add_image_postfix(self.image_dir, self.image_ids)
         self.seg_dir = seg_dir
         if check or (self.class_dict is None):
             self.image_ids = self.checking(self.image_ids, class_dict=self.class_dict)
@@ -70,12 +71,23 @@ class VOCDataset(Dataset):
         print("Dataset num_classes   :{}".format(self.num_classes))
         print("------" * 10)
 
+    def add_image_postfix(self, image_dir, image_ids):
+        """
+        获得图像文件后缀名
+        :param image_dir:
+        :return:
+        """
+        if "." not in image_ids[0]:
+            image_list = glob.glob(os.path.join(image_dir, "*"))
+            postfix = os.path.basename(image_list[0]).split(".")[1]
+            image_ids = [f"{image_id}.{postfix}" for image_id in image_ids]
+        return image_ids
+
     def __get_image_anno_file(self, image_dir, anno_dir, image_name: str):
         """
         :param image_dir:
         :param anno_dir:
         :param image_name:
-        :param img_postfix:
         :return:
         """
         img_postfix = image_name.split(".")[-1]
@@ -92,8 +104,6 @@ class VOCDataset(Dataset):
         """
         print("Please wait, it's in checking")
         dst_ids = []
-        # image_ids = image_ids[:100]
-        # image_ids = image_ids[100:]
         class_set = []
         for image_id in tqdm(image_ids):
             image_file, annotation_file = self.get_image_anno_file(image_id)

{pybaseutils-2.2.1 → pybaseutils-2.2.2}/pybaseutils/dataloader/parser_yolo.py

@@ -68,7 +68,7 @@ class YOLODataset(Dataset):
         self.class_name, self.class_dict = self.parser_classes(class_name)
         parser = self.parser_paths(filename, data_root, anno_dir, image_dir)
         self.data_root, self.anno_dir, self.image_dir, self.image_ids = parser
-        self.postfix = self.get_image_postfix(self.image_dir, self.image_ids)
+        self.image_ids = self.add_image_postfix(self.image_dir, self.image_ids)
         self.classes = list(self.class_dict.values()) if self.class_dict else None
         self.num_classes = max(list(self.class_dict.values())) + 1 if self.class_dict else None
         self.class_weights = None
@@ -114,18 +114,17 @@ class YOLODataset(Dataset):
             class_dict = None
         return class_name, class_dict
 
-    def get_image_postfix(self, image_dir, image_id):
+    def add_image_postfix(self, image_dir, image_ids):
         """
         获得图像文件后缀名
         :param image_dir:
         :return:
         """
-        if "." in image_id[0]:
-            postfix = ""
-        else:
+        if "." not in image_ids[0]:
             image_list = glob.glob(os.path.join(image_dir, "*"))
             postfix = os.path.basename(image_list[0]).split(".")[1]
-        return postfix
+            image_ids = [f"{image_id}.{postfix}" for image_id in image_ids]
+        return image_ids
 
     def get_image_anno_file(self, index):
         """
@@ -135,16 +134,14 @@ class YOLODataset(Dataset):
         image_id = self.index2id(index)
         image_file, annotation_file, image_id = self.__get_image_anno_file(self.image_dir,
                                                                            self.anno_dir,
-                                                                           image_id,
-                                                                           self.postfix)
+                                                                           image_id)
         return image_file, annotation_file, image_id
 
-    def __get_image_anno_file(self, image_dir, anno_dir, image_name: str, img_postfix):
+    def __get_image_anno_file(self, image_dir, anno_dir, image_name: str):
         """
         :param image_dir:
         :param anno_dir:
         :param image_id:
-        :param img_postfix:
         :return:
         """
         img_postfix = image_name.split(".")[-1]

{pybaseutils-2.2.1 → pybaseutils-2.2.2}/pybaseutils/heatmap_utils.py

@@ -9,6 +9,54 @@ import numpy as np
 import numpy.matlib
 
 
+def generate_heatmap(joints, input_size, heatmap_size, sigma=2):
+    """
+    :param joints:  [num_joints, 3]
+    :param joints_vis: [num_joints, 3]
+    :return: target, target_weight(1: visible, 0: invisible)
+    """
+    num_joints = int(len(joints))
+    target_weight = np.ones((num_joints), dtype=np.float32)
+    target_heatmap = []
+    tmp_size = sigma * 3
+    for joint_id in range(num_joints):
+        target = np.zeros((heatmap_size[1], heatmap_size[0]), dtype=np.float32)
+        y_r = input_size[1] / heatmap_size[1]
+        x_r = input_size[0] / heatmap_size[0]
+        # feat_stride = image_size / self.heatmap_size
+        mu_x = int(joints[joint_id][0] / x_r + 0.5)  # y
+        mu_y = int(joints[joint_id][1] / y_r + 0.5)  # x
+        x, y = joints[joint_id][0], joints[joint_id][1]
+        # Check that any part of the gaussian is in-bounds
+        ul = [int(mu_x - tmp_size), int(mu_y - tmp_size)]
+        br = [int(mu_x + tmp_size + 1), int(mu_y + tmp_size + 1)]
+        if ul[0] >= heatmap_size[0] or ul[1] >= heatmap_size[1] or br[0] < 0 or br[1] < 0:
+            target_weight[joint_id] = 0
+        elif x < 0 or x > input_size[0] or y < 0 or y > input_size[1]:
+            target_weight[joint_id] = 0
+        else:
+            target_weight[joint_id] = 1.0
+            # # Generate gaussian
+            size = 2 * tmp_size + 1
+            x = np.arange(0, size, 1, np.float32)
+            y = x[:, np.newaxis]
+            x0 = y0 = size // 2
+            # The gaussian is not normalized, we want the center value to equal 1
+            g = np.exp(- ((x - x0) ** 2 + (y - y0) ** 2) / (2 * sigma ** 2))
+            # Usable gaussian range
+            g_x = max(0, -ul[0]), min(br[0], heatmap_size[0]) - ul[0]
+            g_y = max(0, -ul[1]), min(br[1], heatmap_size[1]) - ul[1]
+            # Image range
+            img_x = max(0, ul[0]), min(br[0], heatmap_size[0])
+            img_y = max(0, ul[1]), min(br[1], heatmap_size[1])
+            target[img_y[0]:img_y[1], img_x[0]:img_x[1]] = np.maximum(
+                target[img_y[0]:img_y[1], img_x[0]:img_x[1]],
+                g[g_y[0]:g_y[1], g_x[0]:g_x[1]])
+        target_heatmap.append(target)
+    target_heatmap = np.asarray(target_heatmap)
+    return target_heatmap, target_weight
+
+
 def create_gaussian_mask(width, height, center, radius=5):
     """
     生成二维高斯分布蒙版，width, height很大时，速度很慢

{pybaseutils-2.2.1 → pybaseutils-2.2.2}/pybaseutils/transforms/augment_utils.py

@@ -1,7 +1,7 @@
 # -*-coding: utf-8 -*-
 """
     @Author : PKing
-    @E-mail : 
+    @E-mail :
     @Date   : 2024-07-25 08:33:57
     @Brief  : https://imgaug.readthedocs.io/en/latest/index.html
 """
@@ -9,7 +9,10 @@ import os
 import cv2
 import numpy as np
 from typing import List, Tuple
+import torch
 from imgaug import augmenters as iaa
+from imgaug import parameters as iap
+import imgaug.augmenters.meta as meta
 from pybaseutils import file_utils, image_utils
 from imgaug.augmentables.segmaps import SegmentationMapsOnImage
 from imgaug.augmentables.kps import KeypointsOnImage
@@ -45,6 +48,49 @@ class Compose(object):
             return image
 
 
+class Transpose(meta.Augmenter):
+    def __init__(self, p=1, seed=None, name=None, random_state="deprecated", deterministic="deprecated"):
+        super(Transpose, self).__init__(
+            seed=seed, name=name,
+            random_state=random_state, deterministic=deterministic)
+        self.p = iap.handle_probability_param(p, "p")
+
+    def get_parameters(self):
+        """See :func:`~imgaug.augmenters.meta.Augmenter.get_parameters`."""
+        return [self.p]
+
+    def _augment_images(self, images, random_state, parents, hooks):
+        images = [self.task(img) for img in images]
+        return images
+
+    def task(self, image, **kwargs):
+        image = image.transpose(2, 0, 1)
+        return image
+
+
+class Normalize(meta.Augmenter):
+    def __init__(self, mean, std, p=1, seed=None, name=None, random_state="deprecated", deterministic="deprecated"):
+        self.mean = mean
+        self.std = std
+        super(Normalize, self).__init__(
+            seed=seed, name=name,
+            random_state=random_state, deterministic=deterministic)
+        self.p = iap.handle_probability_param(p, "p")
+
+    def get_parameters(self):
+        """See :func:`~imgaug.augmenters.meta.Augmenter.get_parameters`."""
+        return [self.p]
+
+    def _augment_images(self, images, random_state, parents, hooks):
+        images = [self.task(img) for img in images]
+        return images
+
+    def task(self, image, **kwargs):
+        image = np.asarray(image, dtype=np.float32) / 255.0
+        image = (image - self.mean) / self.std
+        return image
+
+
 def augment_example(input_size=(224, 224)):
     transforms = [
         iaa.Resize({"width": int(input_size[0] * 1.2), "height": "keep-aspect-ratio"}),
@@ -112,7 +158,7 @@ def demo_for_keypoint():
         image = image_utils.read_image("../../data/test.png")
         mask = image_utils.read_image("../../data/mask.png")
         mask = image_utils.get_image_mask(mask)
-        contours = image_utils.find_mask_contours(mask)
+        contours = image_utils.find_mask_contours(mask)  # [(N,2)]
         auimg, contours = augment(image=image, keypoints=contours)
         h, w = auimg.shape[:2]
         mask = image_utils.draw_mask_contours(contours, size=(w, h))

{pybaseutils-2.2.1 → pybaseutils-2.2.2}/pybaseutils.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pybaseutils
-Version: 2.2.1
+Version: 2.2.2
 Summary: pybaseutils
 Home-page: https://github.com/PanJinquan/base-utils
 Author: PanJinquan

pybaseutils-2.2.2/test_py/demo2.py

@@ -0,0 +1,37 @@
+# -*-coding: utf-8 -*-
+"""
+    @Author : PKing
+    @E-mail : 390737991@qq.com
+    @Date   : 2022-12-31 11:37:30
+    @Brief  : https://blog.csdn.net/qdPython/article/details/121381363
+"""
+import os
+import cv2
+import random
+import types
+import torch
+import numpy as np
+from typing import Callable
+from pybaseutils import image_utils, file_utils, text_utils
+from pybaseutils.cvutils import video_utils
+import cv2
+import re
+
+if __name__ == '__main__':
+    file = "/home/PKing/nasdata/dataset-dmai/AIJE/dataset/aije-action-cvlm-v2/action-names.txt"
+    files = file_utils.read_data(file, split=None)
+    names = []
+    for file in files:
+        name = os.path.basename(file)
+        names.append(name)
+    names = list(set(names))
+    names = text_utils.find_match_texts(texts=names, pattern=["手拿*"])
+    names = list(set(names))
+    print(names)
+    names = ['手拿钳形电流表', '手拿相序表', '手拿护目镜', '手拿万用表', '手拿尖嘴钳', '手拿螺丝刀', '手拿万能表', '手拿扳手',
+             '手拿安全帽', '手拿安全带', '手拿安全围网', '手拿安全绳', '手拿吊物绳', '手拿抹布', '手拿熔断器熔管', '手拿工具袋',
+             '手拿采集器', '手拿瓷横担绝缘子', '手拿玻璃绝缘子', '手拿棉纱手套', '手拿绝缘手套,手拿橡胶手套,手拿其他手套',
+             '手拿长筒靴', '手拿绝缘垫', '手拿垫子', '手拿熔断器', '手拿卡线器', '手拿紧线器', '手拿验电器', '手拿验电笔', '手拿遮拦杆',
+             '手拿核相器', '手拿钢丝绳', '手拿美工刀', '手拿脚扣', '手拿兆欧表', '手拿绝缘胶布', '手拿绝缘杆', '手拿绝缘棒',
+             '手拿绝缘挡板', '手拿从此进入指示牌,手拿从此进出标示牌,手拿止步高压危险指示牌,手拿止步高压危险表示牌,手拿止步高压危险标示牌,手拿在此工作标示牌,手拿禁止合闸线路有人工作标示牌']
+    print(len(names))

{pybaseutils-2.2.1 → pybaseutils-2.2.2}/test_py/demo_lableme_vis.py

@@ -25,7 +25,8 @@ if __name__ == "__main__":
     # anno_dir = "/home/PKing/nasdata/dataset-dmai/AIJE/dataset/aije-outdoor-det-fix/dataset-v23/json"
     anno_dir = "/home/PKing/nasdata/dataset-dmai/AIJE/dataset/aije-indoor-det/dataset-test/json"
     anno_dir = "/home/PKing/nasdata/dataset-dmai/AIJE/dataset/aije-v2-det/dataset-v25/json"
-    anno_dir = "/home/PKing/nasdata/dataset-dmai/AIJE/dataset/aije-v2-det/dataset-v29/json"
+    anno_dir = "/home/PKing/nasdata/dataset-dmai/AIJE/dataset/aije-negetive/dataset-v02/json"
+    anno_dir = "/home/PKing/Downloads/aije-negetive/dataset-v01/sample"
     names = None
     # names = ['身穿工作服,未穿工作服', '手,手穿绝缘手套,手穿棉纱手套,手穿其他手套']
     dataset = parser_labelme.LabelMeDatasets(filename=None,

pybaseutils-2.2.1/test_py/demo2.py

@@ -1,23 +0,0 @@
-# -*-coding: utf-8 -*-
-"""
-    @Author : PKing
-    @E-mail : 390737991@qq.com
-    @Date   : 2022-12-31 11:37:30
-    @Brief  : https://blog.csdn.net/qdPython/article/details/121381363
-"""
-import cv2
-import random
-import types
-import torch
-import numpy as np
-from typing import Callable
-from pybaseutils import image_utils, file_utils, text_utils
-from pybaseutils.cvutils import video_utils
-import cv2
-import re
-
-if __name__ == '__main__':
-    accs = np.asarray([0.6205, 0.5752, 0.9296, 0.9906, 0.4833, 0.0756, 0.000001, 0, 0, 0.8205, 0.9205])
-    print(accs,np.mean(accs))
-    accs = accs[accs > 0]
-    print(accs,np.mean(accs))