Merge remote-tracking branch 'origin/main'

# Conflicts:
#	.gitignore
#	server/config.yml
#	server/data/observer.db
#	server/training/train_server.py
This commit is contained in:
2026-08-26 18:28:31 +08:00
3 changed files with 7 additions and 1 deletions
+6
View File
@@ -0,0 +1,6 @@
# 运行时数据(不提交 git
data/
workspace/
# 预训练权重资产(训练机部署用,不进 git)
training/yolov8n.pt
+1 -1
View File
@@ -40,7 +40,7 @@ imageGen:
# 训练通道(并发度 1:GPU 独占,同时仅一个 running 任务):
# mode=subprocess 训练机与服务器同机;mode=ssh 异机(训练脚本/数据集经 ssh 通道同步)
training:
mode: ssh # subprocess | ssh
mode: subprocess # subprocess | ssh
ssh:
host: "192.168.3.210" # 训练机地址(mode=ssh 必填)
user: "root"
Binary file not shown.