Unverified Commit 3a7f9a79 authored by narugo1992's avatar narugo1992 Committed by GitHub
Browse files

Merge pull request #15 from deepghs/dev/person

dev(narugo): use new model for person
parents 587dd8ca c6c93341
Loading
Loading
Loading
Loading
+2 −2
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ jobs:

    services:
      plantuml:
        image: plantuml/plantuml-server
        image: plantuml/plantuml-server:jetty-v1.2023.6
        ports:
          - 18080:8080

@@ -93,7 +93,7 @@ jobs:

    services:
      plantuml:
        image: plantuml/plantuml-server
        image: plantuml/plantuml-server:jetty-v1.2023.6
        ports:
          - 18080:8080

+502 −450

File changed.

Preview size limit exceeded, changes collapsed.

+11 −6
Original line number Diff line number Diff line
@@ -5,13 +5,14 @@ from imgutils.detect import detect_person


class PersonDetectBenchmark(BaseBenchmark):
    def __init__(self, level):
    def __init__(self, level, version):
        BaseBenchmark.__init__(self)
        self.level = level
        self.version = version

    def load(self):
        from imgutils.detect.person import _open_person_detect_model
        _ = _open_person_detect_model(level=self.level)
        _ = _open_person_detect_model(level=self.level, version=self.version)

    def unload(self):
        from imgutils.detect.person import _open_person_detect_model
@@ -19,15 +20,19 @@ class PersonDetectBenchmark(BaseBenchmark):

    def run(self):
        image_file = random.choice(self.all_images)
        _ = detect_person(image_file, level=self.level)
        _ = detect_person(image_file, level=self.level, version=self.version)


if __name__ == '__main__':
    create_plot_cli(
        [
            ('person (yolov8s)', PersonDetectBenchmark('s')),
            ('person (yolov8m)', PersonDetectBenchmark('m')),
            ('person (yolov8x)', PersonDetectBenchmark('x')),
            ('person v1.1 (yolov8m)', PersonDetectBenchmark('m', 'v1.1')),
            ('person v1.1 (yolov8s)', PersonDetectBenchmark('s', 'v1.1')),
            ('person v1.1 (yolov8n)', PersonDetectBenchmark('n', 'v1.1')),
            ('person v1 (yolov8m)', PersonDetectBenchmark('m', 'v1')),
            ('person v0 (yolov8s)', PersonDetectBenchmark('s', 'v0')),
            ('person v0 (yolov8m)', PersonDetectBenchmark('m', 'v0')),
            ('person v0 (yolov8x)', PersonDetectBenchmark('x', 'v0')),
        ],
        title='Benchmark for Anime Person Detections',
        run_times=10,
+955 −599

File changed.

Preview size limit exceeded, changes collapsed.

+5 −2
Original line number Diff line number Diff line
@@ -9,8 +9,11 @@ def _detect(img, **kwargs):

if __name__ == '__main__':
    image_plot(
        (_detect('genshin_post.jpg'), ''),
        (_detect('nian.png'), 'large scale'),
        (_detect('two_bikini_girls.png'), 'closed faces'),
        (_detect('genshin_post.jpg'), 'multiple'),
        (_detect('soldiers.jpg'), 'multiple++'),
        save_as='person_detect.dat.svg',
        columns=1,
        columns=2,
        figsize=(12, 9),
    )
Loading