diff --git a/cycle.sh b/cycle.sh index f701a2e..0b88ee0 100644 --- a/cycle.sh +++ b/cycle.sh @@ -1,15 +1,7 @@ -# 训练部分 -python3 -m minamo.train --epochs 30 --resume true -python3 -m minamo.train --epochs 10 --resume true --train "datasets/minamo-dataset-1.json" --validate "datasets/minamo-eval-1.json" -python3 -m minamo.train --epochs 10 --resume true -python3 -m ginka.train --epochs 10 --resume true -python3 -m ginka.validate -# 训练完毕,处理数据 -mv "minamo-dataset.json" "datasets/minamo-dataset-$1.json" -mv "minamo-eval.json" "datasets/minamo-eval-$1.json" -cd data -pnpm minamo "../minamo-dataset.json" "../result/ginka_val.json" "../../Apeiria/project" assigned -pnpm minamo "../minamo-eval.json" "../result/ginka_val.json" "../../Apeiria-eval/project" assigned:100:10 -pnpm merge "../datasets/minamo-dataset-merged.json" "../datasets/minamo-dataset-merged.json" "../datasets/minamo-dataset-$1.json" -pnpm merge "../datasets/minamo-eval-merged.json" "../datasets/minamo-eval-merged.json" "../datasets/minamo-eval-$1.json" -cd .. +i = $1 +while true +do + sh gan.sh "$i" + ((i++)) + echo "$1 次循环完成" +done diff --git a/gan.sh b/gan.sh new file mode 100644 index 0000000..f701a2e --- /dev/null +++ b/gan.sh @@ -0,0 +1,15 @@ +# 训练部分 +python3 -m minamo.train --epochs 30 --resume true +python3 -m minamo.train --epochs 10 --resume true --train "datasets/minamo-dataset-1.json" --validate "datasets/minamo-eval-1.json" +python3 -m minamo.train --epochs 10 --resume true +python3 -m ginka.train --epochs 10 --resume true +python3 -m ginka.validate +# 训练完毕,处理数据 +mv "minamo-dataset.json" "datasets/minamo-dataset-$1.json" +mv "minamo-eval.json" "datasets/minamo-eval-$1.json" +cd data +pnpm minamo "../minamo-dataset.json" "../result/ginka_val.json" "../../Apeiria/project" assigned +pnpm minamo "../minamo-eval.json" "../result/ginka_val.json" "../../Apeiria-eval/project" assigned:100:10 +pnpm merge "../datasets/minamo-dataset-merged.json" "../datasets/minamo-dataset-merged.json" "../datasets/minamo-dataset-$1.json" +pnpm merge "../datasets/minamo-eval-merged.json" "../datasets/minamo-eval-merged.json" "../datasets/minamo-eval-$1.json" +cd .. diff --git a/ginka/model/model.py b/ginka/model/model.py index 7df6911..b93a4fb 100644 --- a/ginka/model/model.py +++ b/ginka/model/model.py @@ -15,6 +15,7 @@ class GinkaModel(nn.Module): ) self.unet = GinkaUNet(base_ch, num_classes) self.down_sample = MapDownSample(num_classes, num_classes) + self.pool = nn.AdaptiveMaxPool2d((13, 13)) def forward(self, feat): """ @@ -26,6 +27,6 @@ class GinkaModel(nn.Module): x = self.fc(feat) x = x.view(-1, self.base_ch, 32, 32) x = self.unet(x) - x = F.interpolate(x, (13, 13), mode='bilinear') + x = self.pool(x) return x, F.softmax(x, dim=1) \ No newline at end of file