adapt with the new version of ORT

breezedeus · Sep 23, 2023 · 1d5bc34 · 1d5bc34
1 parent c6b6003
commit 1d5bc34
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 4 deletions.
diff --git a/Makefile b/Makefile
@@ -21,7 +21,7 @@ package:
 	rm -rf build
 	python setup.py sdist bdist_wheel
 
-VERSION = 1.2.3.3
+VERSION = 1.2.3.4
 upload:
 	python -m twine upload  dist/cnstd-$(VERSION)* --verbose
 

diff --git a/RELEASE.md b/RELEASE.md
@@ -1,5 +1,13 @@
 # Release Notes
 
+# Update 2023.09.23：发布 V1.2.3.4
+
+主要变更：
+* 增加了对 `onnxruntine` (ORT) 新版的兼容：`InferenceSession` 中显式提供了 `providers` 参数。
+* `setup.py` 中去除对 `onnxruntime` 的依赖，改为在 `extras_require` 中按需指定：
+  * `cnstd[ort-cpu]`：`onnxruntime`；
+  * `cnstd[ort-gpu]`: `onnxruntime-gpu`。
+
 # Update 2023.09.21：发布 V1.2.3.3
 
 主要变更：

diff --git a/cnstd/__version__.py b/cnstd/__version__.py
@@ -17,4 +17,4 @@
 # specific language governing permissions and limitations
 # under the License.
 
-__version__ = '1.2.3.3'
+__version__ = '1.2.3.4'
diff --git a/cnstd/ppocr/utility.py b/cnstd/ppocr/utility.py
@@ -154,7 +154,7 @@ def create_predictor(model_fp, mode, logger):
     model_file_path = model_fp
     if not os.path.exists(model_file_path):
         raise ValueError("not find model file path {}".format(model_file_path))
-    sess = ort.InferenceSession(model_file_path)
+    sess = ort.InferenceSession(model_file_path, providers=['AzureExecutionProvider', 'CPUExecutionProvider'])
     return sess, sess.get_inputs()[0], None, None
 
 

diff --git a/setup.py b/setup.py
@@ -55,11 +55,12 @@
     'matplotlib',
     'seaborn',
     "onnx",
-    "onnxruntime",
     "huggingface_hub",
 ]
 
 extras_require = {
+    "ort-cpu": ["onnxruntime"],
+    "ort-gpu": ["onnxruntime-gpu"],
     "dev": ["pip-tools", "pytest"],
 }