Skip to content

Commit daaa5d6

Browse files
committed
refactor: 简化模型资产包的命名和项目结构
将 DeepSeek.OCR2.Assets.Model.DeepSeekOCR2 重命名为 DeepSeek.OCR2.Assets.Model,以保持与其他资产包命名的一致性。同时添加 buildTransitive 目标文件,确保模型文件在构建时正确复制到输出目录。
1 parent c0393b1 commit daaa5d6

8 files changed

Lines changed: 9 additions & 9 deletions

File tree

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ Console.WriteLine(result.Text);
4949
- `DeepSeek.OCR2`:meta 包 = Core + `DeepSeek.OCR2.Assets.*`(离线 Python / wheels / 模型)
5050
- `DeepSeek.OCR2.Assets.Python.win-x64`:Windows 便携 Python(可选)
5151
- `DeepSeek.OCR2.Assets.Wheels.win-x64`:离线 wheels/torch(可选)
52-
- `DeepSeek.OCR2.Assets.Model.DeepSeekOCR2`:模型快照(可选)
52+
- `DeepSeek.OCR2.Assets.Model`:模型快照(可选)
5353
- `DeepSeek.OCR2.Bundled`:单包内包含 python+wheels+模型的离线分发方案(包体非常大,通常建议私有源)
5454

5555
## 离线与 Bundled 资产(重要)
@@ -75,7 +75,7 @@ pwsh .\dotnet\pack.ps1 -PackBundled
7575

7676
为什么会很慢:
7777

78-
- `DeepSeek.OCR2.Assets.Model.DeepSeekOCR2` 会把整个模型快照(含 safetensors 权重)打进 nupkg,文件很大,打包时需要大量磁盘读写与压缩。
78+
- `DeepSeek.OCR2.Assets.Model` 会把整个模型快照(含 safetensors 权重)打进 nupkg,文件很大,打包时需要大量磁盘读写与压缩。
7979
- `DeepSeek.OCR2.Assets.Python.win-x64` / `DeepSeek.OCR2.Assets.Wheels.win-x64` 会包含成千上万个文件/whl,NuGet 打包需要枚举、哈希并写入 zip,也会显著耗时(并可能出现 Windows 路径过长警告)。
8080

8181
本地开发如果只想快速产物验证(不追求最小包体),可以用快速打包模式:

dotnet/DeepSeek.OCR2.ci.slnf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"src\\DeepSeek.OCR2.Bundled\\DeepSeek.OCR2.Bundled.csproj",
88
"src\\DeepSeek.OCR2.Assets.Python.win-x64\\DeepSeek.OCR2.Assets.Python.win-x64.csproj",
99
"src\\DeepSeek.OCR2.Assets.Wheels.win-x64\\DeepSeek.OCR2.Assets.Wheels.win-x64.csproj",
10-
"src\\DeepSeek.OCR2.Assets.Model.DeepSeekOCR2\\DeepSeek.OCR2.Assets.Model.DeepSeekOCR2.csproj",
10+
"src\\DeepSeek.OCR2.Assets.Model\\DeepSeek.OCR2.Assets.Model.csproj",
1111
"samples\\DeepSeek.OCR2.SampleConsole\\DeepSeek.OCR2.SampleConsole.csproj"
1212
]
1313
}

dotnet/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ DeepSeek.OCR2 提供一个“本地 Python 推理服务 + .NET 客户端”的
1919
- `DeepSeek.OCR2`:meta 包 = Core + `DeepSeek.OCR2.Assets.*`(离线 Python / wheels / 模型)
2020
- `DeepSeek.OCR2.Assets.Python.win-x64`:Windows 便携 Python(可选)
2121
- `DeepSeek.OCR2.Assets.Wheels.win-x64`:离线 wheels/torch(可选)
22-
- `DeepSeek.OCR2.Assets.Model.DeepSeekOCR2`:模型快照(可选)
22+
- `DeepSeek.OCR2.Assets.Model`:模型快照(可选)
2323
- `DeepSeek.OCR2.Bundled`:单包内包含 python+wheels+模型的离线分发方案(包体可能非常大,通常建议私有源)
2424
- `DeepSeek.OCR2.Full.win-x64`:历史等价包,已停止发布新版本
2525

dotnet/pack.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ if (-not $skipAssetsWheels) {
5050
}
5151

5252
if (-not $skipAssetsModel) {
53-
dotnet pack .\src\DeepSeek.OCR2.Assets.Model.DeepSeekOCR2\DeepSeek.OCR2.Assets.Model.DeepSeekOCR2.csproj @packCommonArgs @packFastArgs
53+
dotnet pack .\src\DeepSeek.OCR2.Assets.Model\DeepSeek.OCR2.Assets.Model.csproj @packCommonArgs @packFastArgs
5454
}
5555

5656
if (-not $SkipMeta) {

dotnet/publish-nuget.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ if ($UnlistInternal) {
7575
"DeepSeek.OCR2.Core",
7676
"DeepSeek.OCR2.Assets.Python.win-x64",
7777
"DeepSeek.OCR2.Assets.Wheels.win-x64",
78-
"DeepSeek.OCR2.Assets.Model.DeepSeekOCR2"
78+
"DeepSeek.OCR2.Assets.Model"
7979
)
8080
foreach ($id in $ids) {
8181
if ($DryRun) {

dotnet/src/DeepSeek.OCR2.Assets.Model.DeepSeekOCR2/DeepSeek.OCR2.Assets.Model.DeepSeekOCR2.csproj renamed to dotnet/src/DeepSeek.OCR2.Assets.Model/DeepSeek.OCR2.Assets.Model.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<IncludeBuildOutput>false</IncludeBuildOutput>
1010
<NoWarn>$(NoWarn);NU5128</NoWarn>
1111

12-
<PackageId>DeepSeek.OCR2.Assets.Model.DeepSeekOCR2</PackageId>
12+
<PackageId>DeepSeek.OCR2.Assets.Model</PackageId>
1313
<Version>0.3.4</Version>
1414
<Title>DeepSeek OCR2 Model Snapshot</Title>
1515
<Description>Bundled DeepSeek-OCR-2 model snapshot for DeepSeek.OCR2. Copy-to-output via buildTransitive.</Description>
@@ -37,7 +37,7 @@
3737
</ItemGroup>
3838

3939
<ItemGroup>
40-
<None Include="buildTransitive\DeepSeek.OCR2.Assets.Model.DeepSeekOCR2.targets"
40+
<None Include="buildTransitive\DeepSeek.OCR2.Assets.Model.targets"
4141
Pack="true"
4242
PackagePath="buildTransitive\" />
4343
</ItemGroup>

dotnet/src/DeepSeek.OCR2.Assets.Model.DeepSeekOCR2/buildTransitive/DeepSeek.OCR2.Assets.Model.DeepSeekOCR2.targets renamed to dotnet/src/DeepSeek.OCR2.Assets.Model/buildTransitive/DeepSeek.OCR2.Assets.Model.targets

File renamed without changes.

dotnet/src/DeepSeek.OCR2.Meta/DeepSeek.OCR2.Meta.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
<ProjectReference Include="..\DeepSeek.OCR2\DeepSeek.OCR2.csproj" />
3232
<ProjectReference Include="..\DeepSeek.OCR2.Assets.Python.win-x64\DeepSeek.OCR2.Assets.Python.win-x64.csproj" />
3333
<ProjectReference Include="..\DeepSeek.OCR2.Assets.Wheels.win-x64\DeepSeek.OCR2.Assets.Wheels.win-x64.csproj" />
34-
<ProjectReference Include="..\DeepSeek.OCR2.Assets.Model.DeepSeekOCR2\DeepSeek.OCR2.Assets.Model.DeepSeekOCR2.csproj" />
34+
<ProjectReference Include="..\DeepSeek.OCR2.Assets.Model\DeepSeek.OCR2.Assets.Model.csproj" />
3535
</ItemGroup>
3636

3737
<ItemGroup>

0 commit comments

Comments
 (0)