Skip to content

Commit a3c0566

Browse files
authored
bump version to 1.0.0rc2 (#1754)
* bump version * update cmake
1 parent 40a66fb commit a3c0566

File tree

15 files changed

+72
-72
lines changed

15 files changed

+72
-72
lines changed

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ endif ()
55
message(STATUS "CMAKE_INSTALL_PREFIX: ${CMAKE_INSTALL_PREFIX}")
66

77
cmake_minimum_required(VERSION 3.14)
8-
project(MMDeploy VERSION 0.12.0)
8+
project(MMDeploy VERSION 0.13.0)
99

1010
set(CMAKE_CXX_STANDARD 17)
1111

csrc/mmdeploy/apis/csharp/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,10 @@ There are two methods to build the nuget package.
3333

3434
(*option 1*) Use the command.
3535

36-
If your environment is well prepared, you can just go to the `csrc\apis\csharp` folder, open a terminal and type the following command, the nupkg will be built in `csrc\apis\csharp\MMDeploy\bin\Release\MMDeployCSharp.1.0.0-rc1.nupkg`.
36+
If your environment is well prepared, you can just go to the `csrc\apis\csharp` folder, open a terminal and type the following command, the nupkg will be built in `csrc\apis\csharp\MMDeploy\bin\Release\MMDeployCSharp.1.0.0-rc2.nupkg`.
3737

3838
```shell
39-
dotnet build --configuration Release -p:Version=1.0.0-rc1
39+
dotnet build --configuration Release -p:Version=1.0.0-rc2
4040
```
4141

4242
(*option 2*) Open MMDeploy.sln && Build.

demo/csharp/image_classification/image_classification.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
</PropertyGroup>
1515

1616
<ItemGroup>
17-
<PackageReference Include="MMDeployCSharp" Version="1.0.0-rc1" />
17+
<PackageReference Include="MMDeployCSharp" Version="1.0.0-rc2" />
1818
<PackageReference Include="OpenCvSharp4" Version="4.5.5.20211231" />
1919
<PackageReference Include="OpenCvSharp4.Extensions" Version="4.5.5.20211231" />
2020
<PackageReference Include="OpenCvSharp4.runtime.win" Version="4.5.5.20211231" />

demo/csharp/image_restorer/image_restorer.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
</PropertyGroup>
1515

1616
<ItemGroup>
17-
<PackageReference Include="MMDeployCSharp" Version="1.0.0-rc1" />
17+
<PackageReference Include="MMDeployCSharp" Version="1.0.0-rc2" />
1818
<PackageReference Include="OpenCvSharp4" Version="4.5.5.20211231" />
1919
<PackageReference Include="OpenCvSharp4.runtime.win" Version="4.5.5.20211231" />
2020
</ItemGroup>

demo/csharp/image_segmentation/image_segmentation.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
</PropertyGroup>
1515

1616
<ItemGroup>
17-
<PackageReference Include="MMDeployCSharp" Version="1.0.0-rc1" />
17+
<PackageReference Include="MMDeployCSharp" Version="1.0.0-rc2" />
1818
<PackageReference Include="OpenCvSharp4" Version="4.5.5.20211231" />
1919
<PackageReference Include="OpenCvSharp4.runtime.win" Version="4.5.5.20211231" />
2020
</ItemGroup>

demo/csharp/object_detection/object_detection.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
</PropertyGroup>
1515

1616
<ItemGroup>
17-
<PackageReference Include="MMDeployCSharp" Version="1.0.0-rc1" />
17+
<PackageReference Include="MMDeployCSharp" Version="1.0.0-rc2" />
1818
<PackageReference Include="OpenCvSharp4" Version="4.5.5.20211231" />
1919
<PackageReference Include="OpenCvSharp4.runtime.win" Version="4.5.5.20211231" />
2020
</ItemGroup>

demo/csharp/ocr_detection/ocr_detection.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
</PropertyGroup>
1515

1616
<ItemGroup>
17-
<PackageReference Include="MMDeployCSharp" Version="1.0.0-rc1" />
17+
<PackageReference Include="MMDeployCSharp" Version="1.0.0-rc2" />
1818
<PackageReference Include="OpenCvSharp4" Version="4.5.5.20211231" />
1919
<PackageReference Include="OpenCvSharp4.runtime.win" Version="4.5.5.20211231" />
2020
</ItemGroup>

demo/csharp/ocr_recognition/ocr_recognition.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
</PropertyGroup>
1515

1616
<ItemGroup>
17-
<PackageReference Include="MMDeployCSharp" Version="1.0.0-rc1" />
17+
<PackageReference Include="MMDeployCSharp" Version="1.0.0-rc2" />
1818
<PackageReference Include="OpenCvSharp4" Version="4.5.5.20211231" />
1919
<PackageReference Include="OpenCvSharp4.runtime.win" Version="4.5.5.20211231" />
2020
</ItemGroup>

demo/csharp/pose_detection/pose_detection.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
</PropertyGroup>
1515

1616
<ItemGroup>
17-
<PackageReference Include="MMDeployCSharp" Version="1.0.0-rc1" />
17+
<PackageReference Include="MMDeployCSharp" Version="1.0.0-rc2" />
1818
<PackageReference Include="OpenCvSharp4" Version="4.5.5.20211231" />
1919
<PackageReference Include="OpenCvSharp4.runtime.win" Version="4.5.5.20211231" />
2020
</ItemGroup>

docs/en/02-how-to-run/prebuilt_package_windows.md

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121

2222
______________________________________________________________________
2323

24-
This tutorial takes `mmdeploy-1.0.0rc1-windows-amd64-onnxruntime1.8.1.zip` and `mmdeploy-1.0.0rc1-windows-amd64-cuda11.1-tensorrt8.2.3.0.zip` as examples to show how to use the prebuilt packages.
24+
This tutorial takes `mmdeploy-1.0.0rc2-windows-amd64-onnxruntime1.8.1.zip` and `mmdeploy-1.0.0rc2-windows-amd64-cuda11.1-tensorrt8.2.3.0.zip` as examples to show how to use the prebuilt packages.
2525

2626
The directory structure of the prebuilt package is as follows, where the `dist` folder is about model converter, and the `sdk` folder is related to model inference.
2727

@@ -80,9 +80,9 @@ In order to use `ONNX Runtime` backend, you should also do the following steps.
8080
5. Install `mmdeploy` (Model Converter) and `mmdeploy_python` (SDK Python API).
8181

8282
```bash
83-
# download mmdeploy-1.0.0rc1-windows-amd64-onnxruntime1.8.1.zip
84-
pip install .\mmdeploy-1.0.0rc1-windows-amd64-onnxruntime1.8.1\dist\mmdeploy-1.0.0rc1-py38-none-win_amd64.whl
85-
pip install .\mmdeploy-1.0.0rc1-windows-amd64-onnxruntime1.8.1\sdk\python\mmdeploy_python-1.0.0rc1-cp38-none-win_amd64.whl
83+
# download mmdeploy-1.0.0rc2-windows-amd64-onnxruntime1.8.1.zip
84+
pip install .\mmdeploy-1.0.0rc2-windows-amd64-onnxruntime1.8.1\dist\mmdeploy-1.0.0rc2-py38-none-win_amd64.whl
85+
pip install .\mmdeploy-1.0.0rc2-windows-amd64-onnxruntime1.8.1\sdk\python\mmdeploy_python-1.0.0rc2-cp38-none-win_amd64.whl
8686
```
8787

8888
:point_right: If you have installed it before, please uninstall it first.
@@ -107,9 +107,9 @@ In order to use `TensorRT` backend, you should also do the following steps.
107107
5. Install `mmdeploy` (Model Converter) and `mmdeploy_python` (SDK Python API).
108108

109109
```bash
110-
# download mmdeploy-1.0.0rc1-windows-amd64-cuda11.1-tensorrt8.2.3.0.zip
111-
pip install .\mmdeploy-1.0.0rc1-windows-amd64-cuda11.1-tensorrt8.2.3.0\dist\mmdeploy-1.0.0rc1-py38-none-win_amd64.whl
112-
pip install .\mmdeploy-1.0.0rc1-windows-amd64-cuda11.1-tensorrt8.2.3.0\sdk\python\mmdeploy_python-1.0.0rc1-cp38-none-win_amd64.whl
110+
# download mmdeploy-1.0.0rc2-windows-amd64-cuda11.1-tensorrt8.2.3.0.zip
111+
pip install .\mmdeploy-1.0.0rc2-windows-amd64-cuda11.1-tensorrt8.2.3.0\dist\mmdeploy-1.0.0rc2-py38-none-win_amd64.whl
112+
pip install .\mmdeploy-1.0.0rc2-windows-amd64-cuda11.1-tensorrt8.2.3.0\sdk\python\mmdeploy_python-1.0.0rc2-cp38-none-win_amd64.whl
113113
```
114114

115115
:point_right: If you have installed it before, please uninstall it first.
@@ -138,7 +138,7 @@ After preparation work, the structure of the current working directory should be
138138

139139
```
140140
..
141-
|-- mmdeploy-1.0.0rc1-windows-amd64-onnxruntime1.8.1
141+
|-- mmdeploy-1.0.0rc2-windows-amd64-onnxruntime1.8.1
142142
|-- mmclassification
143143
|-- mmdeploy
144144
`-- resnet18_8xb32_in1k_20210831-fbbb1da6.pth
@@ -186,7 +186,7 @@ After installation of mmdeploy-tensorrt prebuilt package, the structure of the c
186186

187187
```
188188
..
189-
|-- mmdeploy-1.0.0rc1-windows-amd64-cuda11.1-tensorrt8.2.3.0
189+
|-- mmdeploy-1.0.0rc2-windows-amd64-cuda11.1-tensorrt8.2.3.0
190190
|-- mmclassification
191191
|-- mmdeploy
192192
`-- resnet18_8xb32_in1k_20210831-fbbb1da6.pth
@@ -249,8 +249,8 @@ The structure of current working directory:
249249

250250
```
251251
.
252-
|-- mmdeploy-1.0.0rc1-windows-amd64-cuda11.1-tensorrt8.2.3.0
253-
|-- mmdeploy-1.0.0rc1-windows-amd64-onnxruntime1.8.1
252+
|-- mmdeploy-1.0.0rc2-windows-amd64-cuda11.1-tensorrt8.2.3.0
253+
|-- mmdeploy-1.0.0rc2-windows-amd64-onnxruntime1.8.1
254254
|-- mmclassification
255255
|-- mmdeploy
256256
|-- resnet18_8xb32_in1k_20210831-fbbb1da6.pth
@@ -311,15 +311,15 @@ The following describes how to use the SDK's C API for inference
311311

312312
1. Build examples
313313

314-
Under `mmdeploy-1.0.0rc1-windows-amd64-onnxruntime1.8.1\sdk\example` directory
314+
Under `mmdeploy-1.0.0rc2-windows-amd64-onnxruntime1.8.1\sdk\example` directory
315315

316316
```
317317
// Path should be modified according to the actual location
318318
mkdir build
319319
cd build
320320
cmake ..\cpp -A x64 -T v142 `
321321
-DOpenCV_DIR=C:\Deps\opencv\build\x64\vc15\lib `
322-
-DMMDeploy_DIR=C:\workspace\mmdeploy-1.0.0rc1-windows-amd64-onnxruntime1.8.1\sdk\lib\cmake\MMDeploy `
322+
-DMMDeploy_DIR=C:\workspace\mmdeploy-1.0.0rc2-windows-amd64-onnxruntime1.8.1\sdk\lib\cmake\MMDeploy `
323323
-DONNXRUNTIME_DIR=C:\Deps\onnxruntime\onnxruntime-win-gpu-x64-1.8.1
324324
325325
cmake --build . --config Release
@@ -329,15 +329,15 @@ The following describes how to use the SDK's C API for inference
329329

330330
:point_right: The purpose is to make the exe find the relevant dll
331331

332-
If choose to add environment variables, add the runtime libraries path of `mmdeploy` (`mmdeploy-1.0.0rc1-windows-amd64-onnxruntime1.8.1\sdk\bin`) to the `PATH`.
332+
If choose to add environment variables, add the runtime libraries path of `mmdeploy` (`mmdeploy-1.0.0rc2-windows-amd64-onnxruntime1.8.1\sdk\bin`) to the `PATH`.
333333

334334
If choose to copy the dynamic libraries, copy the dll in the bin directory to the same level directory of the just compiled exe (build/Release).
335335

336336
3. Inference:
337337

338338
It is recommended to use `CMD` here.
339339

340-
Under `mmdeploy-1.0.0rc1-windows-amd64-onnxruntime1.8.1\\sdk\\example\\build\\Release` directory:
340+
Under `mmdeploy-1.0.0rc2-windows-amd64-onnxruntime1.8.1\\sdk\\example\\build\\Release` directory:
341341

342342
```
343343
.\image_classification.exe cpu C:\workspace\work_dir\onnx\resnet\ C:\workspace\mmclassification\demo\demo.JPEG
@@ -347,15 +347,15 @@ The following describes how to use the SDK's C API for inference
347347

348348
1. Build examples
349349

350-
Under `mmdeploy-1.0.0rc1-windows-amd64-cuda11.1-tensorrt8.2.3.0\\sdk\\example` directory
350+
Under `mmdeploy-1.0.0rc2-windows-amd64-cuda11.1-tensorrt8.2.3.0\\sdk\\example` directory
351351

352352
```
353353
// Path should be modified according to the actual location
354354
mkdir build
355355
cd build
356356
cmake ..\cpp -A x64 -T v142 `
357357
-DOpenCV_DIR=C:\Deps\opencv\build\x64\vc15\lib `
358-
-DMMDeploy_DIR=C:\workspace\mmdeploy-1.0.0rc1-windows-amd64-cuda11.1-tensorrt8 2.3.0\sdk\lib\cmake\MMDeploy `
358+
-DMMDeploy_DIR=C:\workspace\mmdeploy-1.0.0rc2-windows-amd64-cuda11.1-tensorrt8 2.3.0\sdk\lib\cmake\MMDeploy `
359359
-DTENSORRT_DIR=C:\Deps\tensorrt\TensorRT-8.2.3.0 `
360360
-DCUDNN_DIR=C:\Deps\cudnn\8.2.1
361361
cmake --build . --config Release
@@ -365,15 +365,15 @@ The following describes how to use the SDK's C API for inference
365365

366366
:point_right: The purpose is to make the exe find the relevant dll
367367

368-
If choose to add environment variables, add the runtime libraries path of `mmdeploy` (`mmdeploy-1.0.0rc1-windows-amd64-cuda11.1-tensorrt8.2.3.0\sdk\bin`) to the `PATH`.
368+
If choose to add environment variables, add the runtime libraries path of `mmdeploy` (`mmdeploy-1.0.0rc2-windows-amd64-cuda11.1-tensorrt8.2.3.0\sdk\bin`) to the `PATH`.
369369

370370
If choose to copy the dynamic libraries, copy the dll in the bin directory to the same level directory of the just compiled exe (build/Release).
371371

372372
3. Inference
373373

374374
It is recommended to use `CMD` here.
375375

376-
Under `mmdeploy-1.0.0rc1-windows-amd64-cuda11.1-tensorrt8.2.3.0\\sdk\\example\\build\\Release` directory
376+
Under `mmdeploy-1.0.0rc2-windows-amd64-cuda11.1-tensorrt8.2.3.0\\sdk\\example\\build\\Release` directory
377377

378378
```
379379
.\image_classification.exe cuda C:\workspace\work_dir\trt\resnet C:\workspace\mmclassification\demo\demo.JPEG

0 commit comments

Comments
 (0)