From bf9604ec29fd7e77e64a13bc9d7182e101d4fc88 Mon Sep 17 00:00:00 2001
From: lee <770918727@qq.com>
Date: Wed, 18 Jun 2025 11:30:55 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/CopilotChatHistory.xml | 12 ++++++++++++
 configs/compare.yml          |  2 +-
 configs/distill.yml          |  2 +-
 configs/test.yml             |  1 -
 configs/write_feature.yml    |  7 ++++---
 tools/write_feature_json.py  |  2 +-
 6 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/.idea/CopilotChatHistory.xml b/.idea/CopilotChatHistory.xml
index c1f8196..7c54bdc 100644
--- a/.idea/CopilotChatHistory.xml
+++ b/.idea/CopilotChatHistory.xml
@@ -3,6 +3,18 @@
   <component name="CopilotChatHistory">
     <option name="conversations">
       <list>
+        <Conversation>
+          <option name="createTime" value="1749793513436" />
+          <option name="id" value="019767d21fdc756ba782b33c8b14cdf1" />
+          <option name="title" value="新对话 2025年6月13日 13:45:13" />
+          <option name="updateTime" value="1749793513436" />
+        </Conversation>
+        <Conversation>
+          <option name="createTime" value="1749792408202" />
+          <option name="id" value="019767c1428a7aa28682039d57d19778" />
+          <option name="title" value="新对话 2025年6月13日 13:26:48" />
+          <option name="updateTime" value="1749792408202" />
+        </Conversation>
         <Conversation>
           <option name="createTime" value="1749718122230" />
           <option name="id" value="01976353bef6703884544447c919013c" />
diff --git a/configs/compare.yml b/configs/compare.yml
index 760fc7e..4312efa 100644
--- a/configs/compare.yml
+++ b/configs/compare.yml
@@ -62,7 +62,7 @@ transform:
 
 # 日志与监控
 logging:
-  logging_dir: "./logs"                  # 日志保存目录
+  logging_dir: "./logs/resnet50_log"                  # 日志保存目录
   tensorboard: true                   # 是否启用TensorBoard
   checkpoint_interval: 30             # 检查点保存间隔（epoch）
 
diff --git a/configs/distill.yml b/configs/distill.yml
index 8332c16..92c5180 100644
--- a/configs/distill.yml
+++ b/configs/distill.yml
@@ -51,7 +51,7 @@ data:
   dataset: "imagenet"                 # 数据集名称（示例用，可替换为实际数据集）
   train_batch_size: 128               # 训练批次大小
   val_batch_size: 100                 # 验证批次大小
-  num_workers: 4                      # 数据加载线程数
+  num_workers: 16                      # 数据加载线程数
   data_train_dir: "../data_center/contrast_learning/data_base/train"   # 训练数据集根目录
   data_val_dir: "../data_center/contrast_learning/data_base/val"   # 验证数据集根目录
 
diff --git a/configs/test.yml b/configs/test.yml
index 0d94973..eac07b1 100644
--- a/configs/test.yml
+++ b/configs/test.yml
@@ -19,7 +19,6 @@ models:
 
 # 数据配置
 data:
-  group_test: False                 # 数据集名称（示例用，可替换为实际数据集）
   test_batch_size: 128               # 训练批次大小
   num_workers: 32                      # 数据加载线程数
   test_dir: "../data_center/contrast_learning/contrast_test_data"   # 验证数据集根目录
diff --git a/configs/write_feature.yml b/configs/write_feature.yml
index fdf7d77..c01576a 100644
--- a/configs/write_feature.yml
+++ b/configs/write_feature.yml
@@ -22,7 +22,7 @@ data:
   test_batch_size: 128                 # 验证批次大小
   num_workers: 32                      # 数据加载线程数
   half:  true                         # 是否启用半精度数据
-  img_dirs_path: "/shareData/temp_data/comparison/Hangzhou_Yunhe/base_data/05-09"
+  img_dirs_path: "/personalDocument/lic/contrast_base"
 #  img_dirs_path: "/home/lc/contrast_nettest/data/feature_json"
   xlsx_pth: false  # 过滤商品， 默认None不进行过滤
 
@@ -42,6 +42,7 @@ logging:
 
 save:
   json_bin: "../search_library/yunhedian_05-09.json"       # 保存整个json文件
-  json_path: "../data/feature_json_compare/"    # 保存单个json文件
+  json_path: "../feature_json/"    # 保存单个json文件
   error_barcodes: "error_barcodes.txt"
-  barcodes_statistics: "../search_library/barcodes_statistics.txt"
\ No newline at end of file
+  barcodes_statistics: "../search_library/barcodes_statistics.txt"
+  create_single_json: true
\ No newline at end of file
diff --git a/tools/write_feature_json.py b/tools/write_feature_json.py
index cec3610..29444e1 100644
--- a/tools/write_feature_json.py
+++ b/tools/write_feature_json.py
@@ -407,5 +407,5 @@ if __name__ == "__main__":
     column_values = extractor.get_shop_barcodes(conf['data']['xlsx_pth'])
     imgs_dict = extractor.get_files(conf['data']['img_dirs_path'],
                                     filter=column_values,
-                                    create_single_json=False)  # False
+                                    create_single_json=conf['save']['create_single_json'])  # False
     extractor.statisticsBarcodes(conf['data']['img_dirs_path'], column_values)