From 2a4452dd5b51ee39314141ced5e53d07681da8ef Mon Sep 17 00:00:00 2001 From: Karla Saur <1703543+ksaur@users.noreply.github.com> Date: Fri, 23 Sep 2022 14:43:43 -0700 Subject: [PATCH 01/10] Security vuln update from Dependabot alerts --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index ebb49af5b..acb939936 100644 --- a/setup.py +++ b/setup.py @@ -29,7 +29,7 @@ "torch>1.7.0", "psutil", "dill", - "protobuf>=3.20.0,<=3.20.1", + 'protobuf>=3.20.2', ] onnx_requires = [ "onnxruntime>=1.0.0", From 4cd17d57fa45a85d1d474854d073cbfdc28d3822 Mon Sep 17 00:00:00 2001 From: Karla Saur <1703543+ksaur@users.noreply.github.com> Date: Fri, 23 Sep 2022 14:44:34 -0700 Subject: [PATCH 02/10] formatting --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index acb939936..c740b2887 100644 --- a/setup.py +++ b/setup.py @@ -29,7 +29,7 @@ "torch>1.7.0", "psutil", "dill", - 'protobuf>=3.20.2', + "protobuf>=3.20.2", ] onnx_requires = [ "onnxruntime>=1.0.0", From ec2a0d9863778570bb2acab9642df5a13c633c29 Mon Sep 17 00:00:00 2001 From: Karla Saur <1703543+ksaur@users.noreply.github.com> Date: Thu, 12 Jan 2023 10:56:50 -0800 Subject: [PATCH 03/10] pin onnx for now? --- setup.py | 1 + 1 file changed, 1 insertion(+) diff --git a/setup.py b/setup.py index a4abe3ae6..1c5683ade 100644 --- a/setup.py +++ b/setup.py @@ -33,6 +33,7 @@ "onnxruntime>=1.0.0", "onnxmltools>=1.6.0,<=1.11.0", "skl2onnx>=1.7.0,<=1.12.0", + "onnx>=1.7.0,<=1.12.0", ] extra_requires = [ # The need each for these depends on which libraries you plan to convert from From 4b040c8cbacf26f10618e6d87d6cecc5b77eebc7 Mon Sep 17 00:00:00 2001 From: Karla Saur <1703543+ksaur@users.noreply.github.com> Date: Thu, 12 Jan 2023 11:07:40 -0800 Subject: [PATCH 04/10] Update setup.py --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 1c5683ade..2ff98815e 100644 --- a/setup.py +++ b/setup.py @@ -27,13 +27,13 @@ "torch>1.7.0", "psutil", "dill", + "onnx>=1.7.0,<=1.12.0", "protobuf>=3.20.2", ] onnx_requires = [ "onnxruntime>=1.0.0", "onnxmltools>=1.6.0,<=1.11.0", "skl2onnx>=1.7.0,<=1.12.0", - "onnx>=1.7.0,<=1.12.0", ] extra_requires = [ # The need each for these depends on which libraries you plan to convert from From 546e6c00246ee6cf299cf1855c595efff0b8dd73 Mon Sep 17 00:00:00 2001 From: Karla Saur <1703543+ksaur@users.noreply.github.com> Date: Thu, 12 Jan 2023 11:46:39 -0800 Subject: [PATCH 05/10] ordering? --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 2ff98815e..ee685c173 100644 --- a/setup.py +++ b/setup.py @@ -27,8 +27,8 @@ "torch>1.7.0", "psutil", "dill", - "onnx>=1.7.0,<=1.12.0", "protobuf>=3.20.2", + "onnx>=1.7.0,<=1.12.0", ] onnx_requires = [ "onnxruntime>=1.0.0", From 4b274b7713fd2489b8972618ac22ecee7202a51f Mon Sep 17 00:00:00 2001 From: Karla Saur <1703543+ksaur@users.noreply.github.com> Date: Thu, 12 Jan 2023 11:53:57 -0800 Subject: [PATCH 06/10] reverting --- setup.py | 1 - 1 file changed, 1 deletion(-) diff --git a/setup.py b/setup.py index ee685c173..a4abe3ae6 100644 --- a/setup.py +++ b/setup.py @@ -28,7 +28,6 @@ "psutil", "dill", "protobuf>=3.20.2", - "onnx>=1.7.0,<=1.12.0", ] onnx_requires = [ "onnxruntime>=1.0.0", From 786f489ab235224499a27d49366724694e86f0de Mon Sep 17 00:00:00 2001 From: Karla Saur <1703543+ksaur@users.noreply.github.com> Date: Thu, 12 Jan 2023 11:56:34 -0800 Subject: [PATCH 07/10] putting onnx in pipeline for now to test --- .github/workflows/pythonapp.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/pythonapp.yml b/.github/workflows/pythonapp.yml index e463a9402..d3410d589 100644 --- a/.github/workflows/pythonapp.yml +++ b/.github/workflows/pythonapp.yml @@ -44,6 +44,7 @@ jobs: run: python -m pip install torch==1.13.0 - name: Install basic dependencies run: | + pip install onnx==1.12.0 pip install git+https://github.com/onnx/sklearn-onnx.git python -m pip install -e .[tests] -f https://download.pytorch.org/whl/torch_stable.html # Compile (but not push) documentation only for one of the runs (Linux py3.8). From cc58e1d118a3bbc44be2037dc4a76f85f7dfe07a Mon Sep 17 00:00:00 2001 From: Karla Saur <1703543+ksaur@users.noreply.github.com> Date: Thu, 12 Jan 2023 12:58:20 -0800 Subject: [PATCH 08/10] ordering --- .github/workflows/pythonapp.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pythonapp.yml b/.github/workflows/pythonapp.yml index d3410d589..1014861a7 100644 --- a/.github/workflows/pythonapp.yml +++ b/.github/workflows/pythonapp.yml @@ -44,7 +44,6 @@ jobs: run: python -m pip install torch==1.13.0 - name: Install basic dependencies run: | - pip install onnx==1.12.0 pip install git+https://github.com/onnx/sklearn-onnx.git python -m pip install -e .[tests] -f https://download.pytorch.org/whl/torch_stable.html # Compile (but not push) documentation only for one of the runs (Linux py3.8). @@ -78,6 +77,7 @@ jobs: python -m pip install .[extra,onnx,sparkml] pip install git+https://github.com/onnx/sklearn-onnx.git python -m pip install pandas + pip install onnx==1.12.0 - name: Install TVM from pypi if Ubuntu if: ${{ startsWith(matrix.os, 'ubuntu') }} run: python -m pip install apache-tvm==0.10.0 From a82c6adc809b497849664011193f0703172c184f Mon Sep 17 00:00:00 2001 From: Karla Saur Date: Fri, 13 Jan 2023 18:07:39 +0000 Subject: [PATCH 09/10] an experiment that will def fail --- .github/workflows/pythonapp.yml | 2 -- setup.py | 1 + 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/pythonapp.yml b/.github/workflows/pythonapp.yml index 1014861a7..eaa0da429 100644 --- a/.github/workflows/pythonapp.yml +++ b/.github/workflows/pythonapp.yml @@ -75,9 +75,7 @@ jobs: - name: Install extra dependencies run: | python -m pip install .[extra,onnx,sparkml] - pip install git+https://github.com/onnx/sklearn-onnx.git python -m pip install pandas - pip install onnx==1.12.0 - name: Install TVM from pypi if Ubuntu if: ${{ startsWith(matrix.os, 'ubuntu') }} run: python -m pip install apache-tvm==0.10.0 diff --git a/setup.py b/setup.py index a4abe3ae6..c8b27ebe7 100644 --- a/setup.py +++ b/setup.py @@ -33,6 +33,7 @@ "onnxruntime>=1.0.0", "onnxmltools>=1.6.0,<=1.11.0", "skl2onnx>=1.7.0,<=1.12.0", + "git+https://github.com/onnx/sklearn-onnx.git", ] extra_requires = [ # The need each for these depends on which libraries you plan to convert from From 32cd427bf3c212ed60265cf64f54ac276afc78e6 Mon Sep 17 00:00:00 2001 From: Karla Saur Date: Fri, 13 Jan 2023 18:34:00 +0000 Subject: [PATCH 10/10] reverting to the last working try --- .github/workflows/pythonapp.yml | 2 ++ setup.py | 1 - 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/pythonapp.yml b/.github/workflows/pythonapp.yml index eaa0da429..1014861a7 100644 --- a/.github/workflows/pythonapp.yml +++ b/.github/workflows/pythonapp.yml @@ -75,7 +75,9 @@ jobs: - name: Install extra dependencies run: | python -m pip install .[extra,onnx,sparkml] + pip install git+https://github.com/onnx/sklearn-onnx.git python -m pip install pandas + pip install onnx==1.12.0 - name: Install TVM from pypi if Ubuntu if: ${{ startsWith(matrix.os, 'ubuntu') }} run: python -m pip install apache-tvm==0.10.0 diff --git a/setup.py b/setup.py index c8b27ebe7..a4abe3ae6 100644 --- a/setup.py +++ b/setup.py @@ -33,7 +33,6 @@ "onnxruntime>=1.0.0", "onnxmltools>=1.6.0,<=1.11.0", "skl2onnx>=1.7.0,<=1.12.0", - "git+https://github.com/onnx/sklearn-onnx.git", ] extra_requires = [ # The need each for these depends on which libraries you plan to convert from