From 94d351d29b290a20a703979449f2559b73b1baf6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jordan=20Fr=C3=A9ry?= Date: Mon, 4 Apr 2022 17:18:02 +0200 Subject: [PATCH] chore: fix dependencies hummingbird --- deps_licenses/licenses_linux_user.txt | 3 +- deps_licenses/licenses_linux_user.txt.md5 | 2 +- deps_licenses/licenses_mac_user.txt | 3 +- deps_licenses/licenses_mac_user.txt.md5 | 2 +- poetry.lock | 82 ++++++++++++----------- pyproject.toml | 2 +- 6 files changed, 48 insertions(+), 46 deletions(-) diff --git a/deps_licenses/licenses_linux_user.txt b/deps_licenses/licenses_linux_user.txt index 9fdf8a267..d07382997 100644 --- a/deps_licenses/licenses_linux_user.txt +++ b/deps_licenses/licenses_linux_user.txt @@ -7,7 +7,6 @@ cycler, 0.11.0, BSD License dill, 0.3.4, BSD License flatbuffers, 2.0, Apache Software License fonttools, 4.31.2, MIT License -hummingbird-ml, 0.4.2.2, MIT License joblib, 1.1.0, BSD License kiwisolver, 1.4.2, BSD License loguru, 0.5.3, MIT License @@ -28,7 +27,7 @@ scikit-learn, 1.0.2, new BSD scipy, 1.8.0, BSD License setuptools-scm, 6.4.2, MIT License six, 1.16.0, MIT License -skl2onnx, 1.11, Apache Software License +skl2onnx, 1.11.1, Apache Software License skorch, 0.11.0, new BSD 3-Clause tabulate, 0.8.9, MIT License threadpoolctl, 3.1.0, BSD License diff --git a/deps_licenses/licenses_linux_user.txt.md5 b/deps_licenses/licenses_linux_user.txt.md5 index 1b9b22120..f7478eca2 100644 --- a/deps_licenses/licenses_linux_user.txt.md5 +++ b/deps_licenses/licenses_linux_user.txt.md5 @@ -1 +1 @@ -MD5(poetry.lock)= af3004f3a0e619197597c0851dde67ce +MD5(poetry.lock)= 0bc44ca814afe3e769f6011eedf83849 diff --git a/deps_licenses/licenses_mac_user.txt b/deps_licenses/licenses_mac_user.txt index 9fdf8a267..d07382997 100644 --- a/deps_licenses/licenses_mac_user.txt +++ b/deps_licenses/licenses_mac_user.txt @@ -7,7 +7,6 @@ cycler, 0.11.0, BSD License dill, 0.3.4, BSD License flatbuffers, 2.0, Apache Software License fonttools, 4.31.2, MIT License -hummingbird-ml, 0.4.2.2, MIT License joblib, 1.1.0, BSD License kiwisolver, 1.4.2, BSD License loguru, 0.5.3, MIT License @@ -28,7 +27,7 @@ scikit-learn, 1.0.2, new BSD scipy, 1.8.0, BSD License setuptools-scm, 6.4.2, MIT License six, 1.16.0, MIT License -skl2onnx, 1.11, Apache Software License +skl2onnx, 1.11.1, Apache Software License skorch, 0.11.0, new BSD 3-Clause tabulate, 0.8.9, MIT License threadpoolctl, 3.1.0, BSD License diff --git a/deps_licenses/licenses_mac_user.txt.md5 b/deps_licenses/licenses_mac_user.txt.md5 index 1b9b22120..f7478eca2 100644 --- a/deps_licenses/licenses_mac_user.txt.md5 +++ b/deps_licenses/licenses_mac_user.txt.md5 @@ -1 +1 @@ -MD5(poetry.lock)= af3004f3a0e619197597c0851dde67ce +MD5(poetry.lock)= 0bc44ca814afe3e769f6011eedf83849 diff --git a/poetry.lock b/poetry.lock index 7d3076868..8c7663d68 100644 --- a/poetry.lock +++ b/poetry.lock @@ -252,6 +252,33 @@ python-versions = "*" numpy = "*" PyYAML = "*" +[[package]] +name = "concrete-ml-extensions-hb" +version = "0.4.2.2" +description = "Convert trained traditional machine learning models into tensor computations" +category = "main" +optional = false +python-versions = ">=3.6" + +[package.dependencies] +dill = "*" +numpy = ">=1.15" +onnxconverter-common = ">=1.6.0" +onnxmltools = {version = ">=1.6.0", optional = true, markers = "extra == \"onnx\""} +onnxruntime = {version = ">=1.0.0", optional = true, markers = "extra == \"onnx\""} +psutil = "*" +scikit-learn = ">=0.21.3" +scipy = "*" +skl2onnx = {version = ">=1.7.0", optional = true, markers = "extra == \"onnx\""} +torch = ">=1.4" + +[package.extras] +benchmark = ["onnxruntime (>=1.0.0)", "onnxmltools (>=1.6.0)", "skl2onnx (>=1.7.0)", "xgboost (>=0.90)", "lightgbm (>=2.2)", "prophet (==1.0.1)", "memory-profiler", "psutil"] +extra = ["xgboost (>=0.90)", "lightgbm (>=2.2)", "prophet (==1.0.1)"] +onnx = ["onnxruntime (>=1.0.0)", "onnxmltools (>=1.6.0)", "skl2onnx (>=1.7.0)"] +sparkml = ["pyspark (>=2.4.4,<3.1.2)", "pyarrow (>1.0)"] +tests = ["flake8", "pytest", "coverage", "pre-commit"] + [[package]] name = "concrete-numpy" version = "0.3.0" @@ -515,40 +542,6 @@ chardet = ["chardet (>=2.2)"] genshi = ["genshi"] lxml = ["lxml"] -[[package]] -name = "hummingbird-ml" -version = "0.4.2.2" -description = "Convert trained traditional machine learning models into tensor computations" -category = "main" -optional = false -python-versions = ">=3.6" -develop = false - -[package.dependencies] -dill = "*" -numpy = ">=1.15" -onnxconverter-common = ">=1.6.0" -onnxmltools = {version = ">=1.6.0", optional = true, markers = "extra == \"onnx\""} -onnxruntime = {version = ">=1.0.0", optional = true, markers = "extra == \"onnx\""} -psutil = "*" -scikit-learn = ">=0.21.3" -scipy = "*" -skl2onnx = {version = ">=1.7.0", optional = true, markers = "extra == \"onnx\""} -torch = ">=1.4" - -[package.extras] -benchmark = ["onnxruntime (>=1.0.0)", "onnxmltools (>=1.6.0)", "skl2onnx (>=1.7.0)", "xgboost (>=0.90)", "lightgbm (>=2.2)", "prophet (==1.0.1)", "memory-profiler", "psutil"] -extra = ["xgboost (>=0.90)", "lightgbm (>=2.2)", "prophet (==1.0.1)"] -onnx = ["onnxruntime (>=1.0.0)", "onnxmltools (>=1.6.0)", "skl2onnx (>=1.7.0)"] -sparkml = ["pyspark (>=2.4.4,<3.1.2)", "pyarrow (>1.0)"] -tests = ["flake8", "pytest", "coverage", "pre-commit"] - -[package.source] -type = "git" -url = "https://github.com/zama-ai/hummingbird.git" -reference = "dev" -resolved_reference = "af7e9036d41dc97d05294437ea016e21ef10c7e8" - [[package]] name = "idna" version = "3.3" @@ -2173,7 +2166,7 @@ python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*" [[package]] name = "skl2onnx" -version = "1.11" +version = "1.11.1" description = "Convert scikit-learn models to ONNX" category = "main" optional = false @@ -2647,7 +2640,7 @@ testing = ["pytest (>=6)", "pytest-checkdocs (>=2.4)", "pytest-flake8", "pytest- [metadata] lock-version = "1.1" python-versions = ">=3.8,<3.10" -content-hash = "33ada65cc8eea8b701542cfc573f24921185d28f97fb98f2cf695f3f7e5f7132" +content-hash = "025913a62b85381b8a6444e0d9feb9453bf986ac8bfe39fa45ca518291a7bded" [metadata.files] alabaster = [ @@ -2826,6 +2819,9 @@ concrete-compiler = [ {file = "concrete_compiler-0.4.0-cp39-cp39-macosx_10_15_x86_64.whl", hash = "sha256:0ed0cd4355ef60710601ba7d7479e5bd3546764faeafc612e3e42f49d9c290bd"}, {file = "concrete_compiler-0.4.0-cp39-cp39-manylinux_2_24_x86_64.whl", hash = "sha256:e25c760d4f08a39c0f0af895497e8da457e9db0df9cf8752e3735150fc8d3227"}, ] +concrete-ml-extensions-hb = [ + {file = "concrete_ml_extensions_hb-0.4.2.2-py2.py3-none-any.whl", hash = "sha256:3c630a9cfed4edc987bf07af0711a148da5d54746b16cf1dcdbe0715e804f2ea"}, +] concrete-numpy = [ {file = "concrete_numpy-0.3.0-py3-none-any.whl", hash = "sha256:29895c48034887432c3930620c303632f158ed29b1706c5fbbd54f3cc0bdc676"}, ] @@ -2985,7 +2981,6 @@ html5lib = [ {file = "html5lib-1.1-py2.py3-none-any.whl", hash = "sha256:0d78f8fde1c230e99fe37986a60526d7049ed4bf8a9fadbad5f00e22e58e041d"}, {file = "html5lib-1.1.tar.gz", hash = "sha256:b2e5b40261e20f354d198eae92afc10d750afb487ed5e50f9c4eaf07c184146f"}, ] -hummingbird-ml = [] idna = [ {file = "idna-3.3-py3-none-any.whl", hash = "sha256:84d9dd047ffa80596e0f246e2eab0b391788b0503584e8945f2368256d2735ff"}, {file = "idna-3.3.tar.gz", hash = "sha256:9d643ff0a55b762d5cdb124b8eaa99c66322e2157b69160bc32796e824360e6d"}, @@ -3874,24 +3869,32 @@ pyzmq = [ {file = "pyzmq-22.3.0-cp310-cp310-manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:f89468059ebc519a7acde1ee50b779019535db8dcf9b8c162ef669257fef7a93"}, {file = "pyzmq-22.3.0-cp310-cp310-manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:ea12133df25e3a6918718fbb9a510c6ee5d3fdd5a346320421aac3882f4feeea"}, {file = "pyzmq-22.3.0-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:76c532fd68b93998aab92356be280deec5de8f8fe59cd28763d2cc8a58747b7f"}, + {file = "pyzmq-22.3.0-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:f907c7359ce8bf7f7e63c82f75ad0223384105f5126f313400b7e8004d9b33c3"}, + {file = "pyzmq-22.3.0-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:902319cfe23366595d3fa769b5b751e6ee6750a0a64c5d9f757d624b2ac3519e"}, {file = "pyzmq-22.3.0-cp310-cp310-win32.whl", hash = "sha256:67db33bea0a29d03e6eeec55a8190e033318cee3cbc732ba8fd939617cbf762d"}, {file = "pyzmq-22.3.0-cp310-cp310-win_amd64.whl", hash = "sha256:7661fc1d5cb73481cf710a1418a4e1e301ed7d5d924f91c67ba84b2a1b89defd"}, {file = "pyzmq-22.3.0-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:79244b9e97948eaf38695f4b8e6fc63b14b78cc37f403c6642ba555517ac1268"}, {file = "pyzmq-22.3.0-cp36-cp36m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:ab888624ed68930442a3f3b0b921ad7439c51ba122dbc8c386e6487a658e4a4e"}, {file = "pyzmq-22.3.0-cp36-cp36m-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:18cd854b423fce44951c3a4d3e686bac8f1243d954f579e120a1714096637cc0"}, {file = "pyzmq-22.3.0-cp36-cp36m-manylinux_2_5_x86_64.manylinux1_x86_64.whl", hash = "sha256:de8df0684398bd74ad160afdc2a118ca28384ac6f5e234eb0508858d8d2d9364"}, + {file = "pyzmq-22.3.0-cp36-cp36m-musllinux_1_1_i686.whl", hash = "sha256:62bcade20813796c426409a3e7423862d50ff0639f5a2a95be4b85b09a618666"}, + {file = "pyzmq-22.3.0-cp36-cp36m-musllinux_1_1_x86_64.whl", hash = "sha256:ea5a79e808baef98c48c884effce05c31a0698c1057de8fc1c688891043c1ce1"}, {file = "pyzmq-22.3.0-cp36-cp36m-win32.whl", hash = "sha256:3c1895c95be92600233e476fe283f042e71cf8f0b938aabf21b7aafa62a8dac9"}, {file = "pyzmq-22.3.0-cp36-cp36m-win_amd64.whl", hash = "sha256:851977788b9caa8ed011f5f643d3ee8653af02c5fc723fa350db5125abf2be7b"}, {file = "pyzmq-22.3.0-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:b4ebed0977f92320f6686c96e9e8dd29eed199eb8d066936bac991afc37cbb70"}, {file = "pyzmq-22.3.0-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:42abddebe2c6a35180ca549fadc7228d23c1e1f76167c5ebc8a936b5804ea2df"}, {file = "pyzmq-22.3.0-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:c1e41b32d6f7f9c26bc731a8b529ff592f31fc8b6ef2be9fa74abd05c8a342d7"}, {file = "pyzmq-22.3.0-cp37-cp37m-manylinux_2_5_x86_64.manylinux1_x86_64.whl", hash = "sha256:be4e0f229cf3a71f9ecd633566bd6f80d9fa6afaaff5489492be63fe459ef98c"}, + {file = "pyzmq-22.3.0-cp37-cp37m-musllinux_1_1_i686.whl", hash = "sha256:08c4e315a76ef26eb833511ebf3fa87d182152adf43dedee8d79f998a2162a0b"}, + {file = "pyzmq-22.3.0-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:badb868fff14cfd0e200eaa845887b1011146a7d26d579aaa7f966c203736b92"}, {file = "pyzmq-22.3.0-cp37-cp37m-win32.whl", hash = "sha256:7c58f598d9fcc52772b89a92d72bf8829c12d09746a6d2c724c5b30076c1f11d"}, {file = "pyzmq-22.3.0-cp37-cp37m-win_amd64.whl", hash = "sha256:2b97502c16a5ec611cd52410bdfaab264997c627a46b0f98d3f666227fd1ea2d"}, {file = "pyzmq-22.3.0-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:d728b08448e5ac3e4d886b165385a262883c34b84a7fe1166277fe675e1c197a"}, {file = "pyzmq-22.3.0-cp38-cp38-manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:480b9931bfb08bf8b094edd4836271d4d6b44150da051547d8c7113bf947a8b0"}, {file = "pyzmq-22.3.0-cp38-cp38-manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:7dc09198e4073e6015d9a8ea093fc348d4e59de49382476940c3dd9ae156fba8"}, {file = "pyzmq-22.3.0-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:0ca6cd58f62a2751728016d40082008d3b3412a7f28ddfb4a2f0d3c130f69e74"}, + {file = "pyzmq-22.3.0-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:468bd59a588e276961a918a3060948ae68f6ff5a7fa10bb2f9160c18fe341067"}, + {file = "pyzmq-22.3.0-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:c88fa7410e9fc471e0858638f403739ee869924dd8e4ae26748496466e27ac59"}, {file = "pyzmq-22.3.0-cp38-cp38-win32.whl", hash = "sha256:c0f84360dcca3481e8674393bdf931f9f10470988f87311b19d23cda869bb6b7"}, {file = "pyzmq-22.3.0-cp38-cp38-win_amd64.whl", hash = "sha256:f762442bab706fd874064ca218b33a1d8e40d4938e96c24dafd9b12e28017f45"}, {file = "pyzmq-22.3.0-cp39-cp39-macosx_10_15_universal2.whl", hash = "sha256:954e73c9cd4d6ae319f1c936ad159072b6d356a92dcbbabfd6e6204b9a79d356"}, @@ -3899,6 +3902,8 @@ pyzmq = [ {file = "pyzmq-22.3.0-cp39-cp39-manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:acebba1a23fb9d72b42471c3771b6f2f18dcd46df77482612054bd45c07dfa36"}, {file = "pyzmq-22.3.0-cp39-cp39-manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:cf98fd7a6c8aaa08dbc699ffae33fd71175696d78028281bc7b832b26f00ca57"}, {file = "pyzmq-22.3.0-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:d072f7dfbdb184f0786d63bda26e8a0882041b1e393fbe98940395f7fab4c5e2"}, + {file = "pyzmq-22.3.0-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:53f4fd13976789ffafedd4d46f954c7bb01146121812b72b4ddca286034df966"}, + {file = "pyzmq-22.3.0-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:d1b5d457acbadcf8b27561deeaa386b0217f47626b29672fa7bd31deb6e91e1b"}, {file = "pyzmq-22.3.0-cp39-cp39-win32.whl", hash = "sha256:e6a02cf7271ee94674a44f4e62aa061d2d049001c844657740e156596298b70b"}, {file = "pyzmq-22.3.0-cp39-cp39-win_amd64.whl", hash = "sha256:d3dcb5548ead4f1123851a5ced467791f6986d68c656bc63bfff1bf9e36671e2"}, {file = "pyzmq-22.3.0-pp37-pypy37_pp73-macosx_10_9_x86_64.whl", hash = "sha256:3a4c9886d61d386b2b493377d980f502186cd71d501fffdba52bd2a0880cef4f"}, @@ -4046,8 +4051,7 @@ six = [ {file = "six-1.16.0.tar.gz", hash = "sha256:1e61c37477a1626458e36f7b1d82aa5c9b094fa4802892072e49de9c60c4c926"}, ] skl2onnx = [ - {file = "skl2onnx-1.11-py2.py3-none-any.whl", hash = "sha256:3942a97f30fc0c8d2fb4d715332714a3f0571f33b8075f4aa3b2b234566165c4"}, - {file = "skl2onnx-1.11.tar.gz", hash = "sha256:7067deb0430c03d6843d113b760320a8fd13ba926ff0a5329c2081dfbce85ec5"}, + {file = "skl2onnx-1.11.1-py3-none-any.whl", hash = "sha256:fd02a4eb7eeaa713191bcc1296cee989ea526f0069b0d26aaeeef579bfe82394"}, ] skorch = [ {file = "skorch-0.11.0-py3-none-any.whl", hash = "sha256:a6a883a25121801c538af19149c2fc5fa73ed470fc969d60fe5dd864e2df92a1"}, diff --git a/pyproject.toml b/pyproject.toml index c04e36d9b..ccd8568ec 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -34,11 +34,11 @@ numpy = "^1.22.3" setuptools = "*" onnx = "^1.11.0" scipy = "^1.8.0" -hummingbird-ml = {git = "https://github.com/zama-ai/hummingbird.git", rev = "dev", extras = ["onnx"]} xgboost = "^1.5.2" skorch = "^0.11.0" scikit-learn = "^1.0.2" torch = "^1.11.0" +concrete-ml-extensions-hb = {extras = ["onnx"], version = "^0.4.2"} [tool.poetry.dev-dependencies] isort = "^5.10.1"