Revert "Merge branch 'develop' into ljy67122"

This reverts commit b8c4dcc, reversing changes made to 18fdd60.
Capic2024 · May 2, 2024 · b3086a3 · b3086a3
1 parent b8c4dcc
commit b3086a3
Show file tree

Hide file tree

Showing 28 changed files with 1 addition and 203,594 deletions.
diff --git a/.DS_Store b/.DS_Store
diff --git a/.gitignore b/.gitignore
@@ -3,4 +3,3 @@ wider face.v3i.yolov5pytorch
 dist
 build
 myenv
-svm/**
diff --git a/.idea/.name b/.idea/.name
diff --git a/.idea/flask.iml b/.idea/flask.iml
diff --git a/__pycache__/app.cpython-311.pyc b/__pycache__/app.cpython-311.pyc
diff --git a/pytorch/__pycache__/mosaic_jiyeon.cpython-311.pyc b/pytorch/__pycache__/mosaic_jiyeon.cpython-311.pyc
diff --git a/pytorch/mosaic_jiyeon.py b/pytorch/mosaic_jiyeon.py
@@ -7,7 +7,7 @@
 def mosaic(video_path, image_paths):
     # YOLOv5 모델 로드
     # model = torch.hub.load('./pytorch/yolov5', 'custom', path='./pytorch/best.pt', source='local')
-    model = torch.hub.load('ultralytics/yolov5', 'custom', path='./pytorch/best.pt',source='local')
+    model = torch.hub.load('ultralytics/yolov5', 'custom', path='./pytorch/best.pt')
     output_video_path = os.path.join('tmp', video_path)
     # 특정 사람의 얼굴 이미지 로드
     # person_image = face_recognition.load_image_file("goognyoo.png")

diff --git a/svm/Gongyoo/image1.jpg b/svm/Gongyoo/image1.jpg
diff --git a/svm/Gongyoo/image2.png b/svm/Gongyoo/image2.png
diff --git a/svm/Gongyoo/image3.png b/svm/Gongyoo/image3.png
diff --git a/svm/Gongyoo/image4.png b/svm/Gongyoo/image4.png
diff --git a/svm/Gongyoo/image5.png b/svm/Gongyoo/image5.png
diff --git a/svm/Gongyoo/img.png b/svm/Gongyoo/img.png
diff --git a/svm/Gongyoo/img_1.png b/svm/Gongyoo/img_1.png
diff --git a/svm/cnn.py b/svm/cnn.py
diff --git a/svm/cnn2.py b/svm/cnn2.py
diff --git a/svm/cutVideo.mp4 b/svm/cutVideo.mp4
-Original file line number
+Diff line change
@@ Expand Up / @@ -3,4 +3,3 @@ wider face.v3i.yolov5pytorch @@
     dist
     build
     myenv
-    svm/**