From b2cb59eef53602a41b47577f67a6218d92e5ff14 Mon Sep 17 00:00:00 2001 From: Changming Sun Date: Mon, 10 Feb 2020 15:40:34 -0800 Subject: [PATCH 1/5] Pin onnx version --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index bebc0e827519a..f5542278a1d18 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,3 +1,3 @@ numpy >= 1.16.6 -onnx >= 1.2.3 +onnx >= 1.2.3,<1.8.0 protobuf From 15171c792727014db1d99f813be7fded104122cc Mon Sep 17 00:00:00 2001 From: Changming Sun Date: Mon, 10 Feb 2020 21:43:42 -0800 Subject: [PATCH 2/5] update --- setup.py | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/setup.py b/setup.py index 080ac38585bb7..39a48a0e599f3 100644 --- a/setup.py +++ b/setup.py @@ -245,7 +245,14 @@ def run(self): 'onnxruntime': data + examples + extra, }, py_modules=python_modules_list, +<<<<<<< HEAD install_requires=install_requires, +======= + install_requires=[ + 'onnx>=1.6.0,<1.7.0', + 'numpy>=1.18.0,<2.0.0' + ], +>>>>>>> 61064c584... update entry_points= { 'console_scripts': [ 'onnxruntime_test = onnxruntime.tools.onnxruntime_test:main', From 79183a564787d781d612dcc9e8518342e5c6f6db Mon Sep 17 00:00:00 2001 From: Changming Sun Date: Tue, 11 Feb 2020 20:10:04 -0800 Subject: [PATCH 3/5] update --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 39a48a0e599f3..9152fb142987e 100644 --- a/setup.py +++ b/setup.py @@ -249,7 +249,7 @@ def run(self): install_requires=install_requires, ======= install_requires=[ - 'onnx>=1.6.0,<1.7.0', + 'onnx>=1.2.3,<1.7.0', 'numpy>=1.18.0,<2.0.0' ], >>>>>>> 61064c584... update From d0e278c498faf4ae578aae3ce914f32e82fd84cd Mon Sep 17 00:00:00 2001 From: Changming Sun Date: Wed, 22 Apr 2020 16:25:47 -0700 Subject: [PATCH 4/5] update --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index f5542278a1d18..ae29f5bf556cb 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,3 +1,3 @@ -numpy >= 1.16.6 +numpy >= 1.16.6,<2.0.0 onnx >= 1.2.3,<1.8.0 protobuf From d22dcae9eb397f471a4be4b460cabc097c975f89 Mon Sep 17 00:00:00 2001 From: Changming Sun Date: Wed, 22 Apr 2020 16:26:55 -0700 Subject: [PATCH 5/5] update --- setup.py | 7 ------- 1 file changed, 7 deletions(-) diff --git a/setup.py b/setup.py index 9152fb142987e..080ac38585bb7 100644 --- a/setup.py +++ b/setup.py @@ -245,14 +245,7 @@ def run(self): 'onnxruntime': data + examples + extra, }, py_modules=python_modules_list, -<<<<<<< HEAD install_requires=install_requires, -======= - install_requires=[ - 'onnx>=1.2.3,<1.7.0', - 'numpy>=1.18.0,<2.0.0' - ], ->>>>>>> 61064c584... update entry_points= { 'console_scripts': [ 'onnxruntime_test = onnxruntime.tools.onnxruntime_test:main',