diff --git a/data_management/count_images.py b/data_management/count_images.py index a64927d..5566231 100644 --- a/data_management/count_images.py +++ b/data_management/count_images.py @@ -59,22 +59,29 @@ def count_images_by_class(dataset_root: str, output_file: str = None): test_count = 0 # 统计train目录 + image_exts = {'.jpg', '.jpeg', '.png'} train_class_dir = train_dir / class_name if train_class_dir.exists(): - for ext in ['*.jpg', '*.jpeg', '*.png', '*.JPG', '*.JPEG', '*.PNG']: - train_count += len(list(train_class_dir.glob(ext))) + train_count = sum( + 1 for f in train_class_dir.iterdir() + if f.is_file() and f.suffix.lower() in image_exts + ) # 统计val目录 val_class_dir = val_dir / class_name if val_class_dir.exists(): - for ext in ['*.jpg', '*.jpeg', '*.png', '*.JPG', '*.JPEG', '*.PNG']: - val_count += len(list(val_class_dir.glob(ext))) + val_count = sum( + 1 for f in val_class_dir.iterdir() + if f.is_file() and f.suffix.lower() in image_exts + ) # 统计test目录 test_class_dir = test_dir / class_name if test_class_dir.exists(): - for ext in ['*.jpg', '*.jpeg', '*.png', '*.JPG', '*.JPEG', '*.PNG']: - test_count += len(list(test_class_dir.glob(ext))) + test_count = sum( + 1 for f in test_class_dir.iterdir() + if f.is_file() and f.suffix.lower() in image_exts + ) total = train_count + val_count + test_count class_counts[class_name] = total diff --git a/train/grid_search_cosface.py b/train/grid_search_cosface.py index 6099955..a85c6b4 100644 --- a/train/grid_search_cosface.py +++ b/train/grid_search_cosface.py @@ -57,7 +57,7 @@ GRID_PARAMS = { 'm': [0.32, 0.35, 0.38, 0.40,0.45,0.50], # margin参数 }, 'whole_ingredient': { - 's': [64.0, 68.0], + 's': [64.0], 'm': [0.40, 0.42, 0.43, 0.45], }, 'processed_ingredient': {