diff --git a/README.md b/README.md index 7f55bcd..52dfe49 100644 --- a/README.md +++ b/README.md @@ -20,14 +20,14 @@ ## Quick start ```sh -mcpp new inference --template mcpplibs.mwrap.onnxruntime@1.25.1.1 +mcpp new inference --template mcpplibs.mwrap.onnxruntime@1.25.1 cd inference mcpp run ``` ```toml [dependencies] -mcpplibs.mwrap.onnxruntime = "1.25.1.1" +mcpplibs.mwrap.onnxruntime = "1.25.1" ``` ## Existing projects diff --git a/README.zh.md b/README.zh.md index ac8afdc..b5970f7 100644 --- a/README.zh.md +++ b/README.zh.md @@ -20,14 +20,14 @@ ## 快速开始 ```sh -mcpp new inference --template mcpplibs.mwrap.onnxruntime@1.25.1.1 +mcpp new inference --template mcpplibs.mwrap.onnxruntime@1.25.1 cd inference mcpp run ``` ```toml [dependencies] -mcpplibs.mwrap.onnxruntime = "1.25.1.1" +mcpplibs.mwrap.onnxruntime = "1.25.1" ``` ## 已有项目 diff --git a/docs/usage.md b/docs/usage.md index 5adc456..4c47eb2 100644 --- a/docs/usage.md +++ b/docs/usage.md @@ -8,7 +8,7 @@ the C API retain their original namespaces and types. ```toml [dependencies."mcpplibs.mwrap"] -onnxruntime = "1.25.1.1" +onnxruntime = "1.25.1" [target.x86_64-linux-gnu] cxx_runtime = "toolchain-coupled" @@ -31,7 +31,7 @@ SDK builds and are not supplied by this version. ## Quickstart template ```sh -mcpp new inference --template mcpplibs.mwrap.onnxruntime@1.25.1.1 +mcpp new inference --template mcpplibs.mwrap.onnxruntime@1.25.1 cd inference mcpp run ``` diff --git a/mcpp.toml b/mcpp.toml index 487c6f4..e6dfbf3 100644 --- a/mcpp.toml +++ b/mcpp.toml @@ -2,14 +2,14 @@ [package] namespace = "mcpplibs.mwrap" name = "onnxruntime" -version = "1.25.1.1" +version = "1.25.1" description = "ONNX Runtime 1.25.1 C/C++ APIs as C++ modules, with upstream names preserved" license = "Apache-2.0" authors = ["mcpp-community"] repo = "https://github.com/mcpplibs/onnxruntime-m" [package.metadata.mwrap] -wrapper-revision = 1 +wrapper-revision = 0 upstream-version = "1.25.1" upstream-repo = "https://github.com/microsoft/onnxruntime" @@ -30,11 +30,11 @@ cxx_runtime = "toolchain-coupled" [[runtime.deploy]] from = "LICENSE" -to = "licenses/onnxruntime" +to = "licenses/onnxruntime/wrapper" [[runtime.deploy]] from = "NOTICE" -to = "licenses/onnxruntime" +to = "licenses/onnxruntime/wrapper" [[runtime.deploy]] from = "upstream/onnxruntime/README.md" diff --git a/tools/check_mwrap_release.py b/tools/check_mwrap_release.py index 9bedddb..bf8a2d2 100644 --- a/tools/check_mwrap_release.py +++ b/tools/check_mwrap_release.py @@ -31,6 +31,12 @@ def main(): assert any(Path(d['path']).name.startswith(('LICENSE', 'COPYING')) for d in documents) deployed = {entry['from'] for entry in tomllib.loads((root / 'mcpp.toml').read_text(encoding='utf-8')).get('runtime', {}).get('deploy', [])} assert {'LICENSE', 'NOTICE'} <= deployed + destinations = {entry['from']: entry['to'] for entry in + tomllib.loads((root / 'mcpp.toml').read_text(encoding='utf-8'))['runtime']['deploy']} + # The SDK provider owns licenses/onnxruntime/LICENSE (MIT). + # Keep wrapper Apache-2.0 and NOTICE in their own directory. + assert destinations['LICENSE'] == destinations['NOTICE'] == 'licenses/onnxruntime/wrapper' + for document in documents: path = Path(document['path']) assert not path.is_absolute() and '..' not in path.parts and path.parts[0] == 'upstream'