From 4148a668e2be7d578fd71435da9361e69e293b5a Mon Sep 17 00:00:00 2001 From: Roger Condori <114810545+R3gm@users.noreply.github.com> Date: Thu, 19 Oct 2023 20:01:32 +0000 Subject: [PATCH 1/2] update requirements --- poetry.lock | 157 +++++++++++++++++-------------------------------- pyproject.toml | 10 ++-- 2 files changed, 59 insertions(+), 108 deletions(-) diff --git a/poetry.lock b/poetry.lock index 3881be6..20b7bc8 100644 --- a/poetry.lock +++ b/poetry.lock @@ -595,35 +595,6 @@ files = [ {file = "charset_normalizer-3.3.0-py3-none-any.whl", hash = "sha256:e46cd37076971c1040fc8c41273a8b3e2c624ce4f2be3f5dfcb7a430c1d3acc2"}, ] -[[package]] -name = "cmake" -version = "3.27.6" -description = "CMake is an open-source, cross-platform family of tools designed to build, test and package software" -optional = false -python-versions = "*" -files = [ - {file = "cmake-3.27.6-py2.py3-none-macosx_10_10_universal2.macosx_10_10_x86_64.macosx_11_0_arm64.macosx_11_0_universal2.whl", hash = "sha256:f289e26bd483e189933d1ee70987976d3fb88ce1ab6a8081c8da9d4fa44acec8"}, - {file = "cmake-3.27.6-py2.py3-none-manylinux2010_i686.manylinux_2_12_i686.whl", hash = "sha256:ac9b9290f67f0e7d9ccfb45396d5c6ea50dd12b46bfeb770f5a3051066fdca4e"}, - {file = "cmake-3.27.6-py2.py3-none-manylinux2010_x86_64.manylinux_2_12_x86_64.whl", hash = "sha256:8ba53d322d5c84afd839138315d71ee9f892dcecb5e163e8d888f0d92cf43fe1"}, - {file = "cmake-3.27.6-py2.py3-none-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:1edd401cc9a48562b920d3d0387130ddba4c85935f1ea777c64ba0423cb5009b"}, - {file = "cmake-3.27.6-py2.py3-none-manylinux2014_i686.manylinux_2_17_i686.whl", hash = "sha256:0ec349e938a75244ac6fbf0c5e4451ea61383d4f70173e6b09157722f4d60dde"}, - {file = "cmake-3.27.6-py2.py3-none-manylinux2014_ppc64le.manylinux_2_17_ppc64le.whl", hash = "sha256:82f6b547eb92218bb73ea5b91d7a852375d33b57bfc47f7421266ead081408e9"}, - {file = "cmake-3.27.6-py2.py3-none-manylinux2014_s390x.manylinux_2_17_s390x.whl", hash = "sha256:94c22b97f230f4f13469215dafcf388595566a0075eaf12a527b6eb90c5c83f2"}, - {file = "cmake-3.27.6-py2.py3-none-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:8c0ad28706b76d6b7c7643222d833af44bdd03da4371e3a6f0eac68e3a1d6366"}, - {file = "cmake-3.27.6-py2.py3-none-musllinux_1_1_aarch64.whl", hash = "sha256:8a27928c8b387bd7df42083fe55d1490f964cb423d83861ec8d2170d2060d2c9"}, - {file = "cmake-3.27.6-py2.py3-none-musllinux_1_1_i686.whl", hash = "sha256:7e60dc95f78cf4ed538093d59a07744857ca344f4b1d0ef9e6508f47d0158a1d"}, - {file = "cmake-3.27.6-py2.py3-none-musllinux_1_1_ppc64le.whl", hash = "sha256:b4f120e60823e793cc7d8645e75dce4519f76ce7692f2ab4b745e6cbca8b5345"}, - {file = "cmake-3.27.6-py2.py3-none-musllinux_1_1_s390x.whl", hash = "sha256:41c2aa92ce0accb43544a16e1d6bceb7f8900ac07def4ea7ba92ee95ba49be96"}, - {file = "cmake-3.27.6-py2.py3-none-musllinux_1_1_x86_64.whl", hash = "sha256:149aaa0080f5fd1e180bed2486e602baafd8a7b1d5ac18219ff9e4378fba37e0"}, - {file = "cmake-3.27.6-py2.py3-none-win32.whl", hash = "sha256:4c4cb267d9863281222c1f442e09c558cfac3e3454c45753ee0617692062a940"}, - {file = "cmake-3.27.6-py2.py3-none-win_amd64.whl", hash = "sha256:fff9dac42647c288d6c65f175de5ef0f158d3bc04eb354d6920af2c63b6d7e88"}, - {file = "cmake-3.27.6-py2.py3-none-win_arm64.whl", hash = "sha256:83f49328d37e777e711098064399d2666b243ae95d01aa275f1ad7323e973ab2"}, - {file = "cmake-3.27.6.tar.gz", hash = "sha256:daaa867afeeafabb1544fb129e9fbc3c537a7261430b6f00605268530f75b948"}, -] - -[package.extras] -test = ["coverage (>=4.2)", "flake8 (>=3.0.4)", "path.py (>=11.5.0)", "pytest (>=3.0.3)", "pytest-cov (>=2.4.0)", "pytest-runner (>=2.9)", "pytest-virtualenv (>=1.7.0)", "scikit-build (>=0.10.0)", "setuptools (>=28.0.0)", "virtualenv (>=15.0.3)", "wheel"] - [[package]] name = "colorama" version = "0.4.6" @@ -1894,16 +1865,6 @@ cli = ["fire"] docs = ["requests (>=2.0.0)"] typing = ["mypy (>=1.0.0)"] -[[package]] -name = "lit" -version = "17.0.2" -description = "A Software Testing Tool" -optional = false -python-versions = "*" -files = [ - {file = "lit-17.0.2.tar.gz", hash = "sha256:d6a551eab550f81023c82a260cd484d63970d2be9fd7588111208e7d2ff62212"}, -] - [[package]] name = "markupsafe" version = "2.1.3" @@ -3994,30 +3955,32 @@ files = [ [[package]] name = "torch" -version = "2.0.1+cu118" +version = "2.1.0+cu118" description = "Tensors and Dynamic neural networks in Python with strong GPU acceleration" optional = false python-versions = ">=3.8.0" files = [ - {file = "torch-2.0.1+cu118-cp310-cp310-linux_x86_64.whl", hash = "sha256:a7a49d459bf4862f64f7bc1a68beccf8881c2fa9f3e0569608e16ba6f85ebf7b"}, - {file = "torch-2.0.1+cu118-cp310-cp310-win_amd64.whl", hash = "sha256:f58d75619bc96e4322343c030b893613701caa2d6db8017155da226c14171335"}, - {file = "torch-2.0.1+cu118-cp311-cp311-linux_x86_64.whl", hash = "sha256:143b6c658c17d43376e2dfbaa2c106d35639d615e5e8dec4429cf1e510dd8d61"}, - {file = "torch-2.0.1+cu118-cp311-cp311-win_amd64.whl", hash = "sha256:b663a4ee744d574095dbd612644de345944247c0605692309fd9f6c7ccdea022"}, - {file = "torch-2.0.1+cu118-cp38-cp38-linux_x86_64.whl", hash = "sha256:2ce38a6e4ea7c4b7f5baa51e65243a5f687f6e19ab7915ba5b2a431105f50bbe"}, - {file = "torch-2.0.1+cu118-cp38-cp38-win_amd64.whl", hash = "sha256:e58d26a11bd57ac19761c018c3151c15bc71d068afc8ec409bfd9b4cfcc63a52"}, - {file = "torch-2.0.1+cu118-cp39-cp39-linux_x86_64.whl", hash = "sha256:eb55f29db5744eda8a96f5594e637daed0d52278273005de759970e67cfa6a5a"}, - {file = "torch-2.0.1+cu118-cp39-cp39-win_amd64.whl", hash = "sha256:fa225b6f941ee0e78978ac85ed7744d3c19fff462473821f8060c14faa60043e"}, + {file = "torch-2.1.0+cu118-cp310-cp310-linux_x86_64.whl", hash = "sha256:a81b554184492005543ddc32e96469f9369d778dedd195d73bda9bed407d6589"}, + {file = "torch-2.1.0+cu118-cp310-cp310-win_amd64.whl", hash = "sha256:eb512249df3083bce7bd3d89d9d1289fa82fe807e714a02b754e66971d358da3"}, + {file = "torch-2.1.0+cu118-cp311-cp311-linux_x86_64.whl", hash = "sha256:bcb17e2de6ca634d326203694d0bfb552587335e536c1917be3f28c5664b5506"}, + {file = "torch-2.1.0+cu118-cp311-cp311-win_amd64.whl", hash = "sha256:e200aba94307b7a2926f36274b92d76391f36694a1c0ca0e2c341db1fa4eca99"}, + {file = "torch-2.1.0+cu118-cp38-cp38-linux_x86_64.whl", hash = "sha256:02cd2c312501ebd9faf65bedb48ffbff77312ffef04cf7125ed4caa1738fd8df"}, + {file = "torch-2.1.0+cu118-cp38-cp38-win_amd64.whl", hash = "sha256:92bbfcd15b6a34d3b404d4156629ba9ce9e1299924bac18ed6cfbab41c80eee1"}, + {file = "torch-2.1.0+cu118-cp39-cp39-linux_x86_64.whl", hash = "sha256:8ecf52ba49cfd3b7303d4e57e7b5c2106b77dbc9bdeaf880870162138bc70e18"}, + {file = "torch-2.1.0+cu118-cp39-cp39-win_amd64.whl", hash = "sha256:9ac895a48dfb3fd0fc0693fa9170d01631f5379706ef44843bd72b84dbfc3d33"}, ] [package.dependencies] filelock = "*" +fsspec = "*" jinja2 = "*" networkx = "*" sympy = "*" -triton = {version = "2.0.0", markers = "platform_system == \"Linux\" and platform_machine == \"x86_64\""} +triton = "2.1.0" typing-extensions = "*" [package.extras] +dynamo = ["jinja2"] opt-einsum = ["opt-einsum (>=3.3)"] [package.source] @@ -4027,23 +3990,23 @@ reference = "pytorch-gpu-src" [[package]] name = "torchaudio" -version = "2.0.2+cu118" +version = "2.1.0+cu118" description = "An audio package for PyTorch" optional = false python-versions = "*" files = [ - {file = "torchaudio-2.0.2+cu118-cp310-cp310-linux_x86_64.whl", hash = "sha256:26692645ea061a005c57ec581a2d0425210ac6ba9f923edf11cc9b0ef3a111e9"}, - {file = "torchaudio-2.0.2+cu118-cp310-cp310-win_amd64.whl", hash = "sha256:8ad0e93e39ce594a5cc53d46d972fde20b499e69d1e7f765adb33de13cfbab86"}, - {file = "torchaudio-2.0.2+cu118-cp311-cp311-linux_x86_64.whl", hash = "sha256:7bc0b50a0d83a24bdc3916270c23934345ac84351df76bd3bb08834bdb271df6"}, - {file = "torchaudio-2.0.2+cu118-cp311-cp311-win_amd64.whl", hash = "sha256:608af74eef9ea53f63673811e8eb5e9fc7d812e6122f498b301e2cc3f022349e"}, - {file = "torchaudio-2.0.2+cu118-cp38-cp38-linux_x86_64.whl", hash = "sha256:954de78e4f066fe96fa6f418b5f1d7d58d1b0fbcf6a2d3730f041a2fd796f772"}, - {file = "torchaudio-2.0.2+cu118-cp38-cp38-win_amd64.whl", hash = "sha256:97410a93d5eb81014cf3aa8c389a28e99c4b1b5d13b2838bffdac803eaed1ea5"}, - {file = "torchaudio-2.0.2+cu118-cp39-cp39-linux_x86_64.whl", hash = "sha256:322c41c36e8e62fd37ab35114a67921ae542bcd940d583cd13e0e15141c848f9"}, - {file = "torchaudio-2.0.2+cu118-cp39-cp39-win_amd64.whl", hash = "sha256:99595b4b239e5168131d8d016d55fde0b89fe7e0955649daf35f72fe1d3a79f7"}, + {file = "torchaudio-2.1.0+cu118-cp310-cp310-linux_x86_64.whl", hash = "sha256:cdfd0a129406155eee595f408cafbb92589652da4090d1d2040f5453d4cae71f"}, + {file = "torchaudio-2.1.0+cu118-cp310-cp310-win_amd64.whl", hash = "sha256:0537d813a600f9a6da9a5e9584390317ca288581e2b27a00e0382399b7a2e302"}, + {file = "torchaudio-2.1.0+cu118-cp311-cp311-linux_x86_64.whl", hash = "sha256:bf9b004974a28ea714f6dc5d03308dbd8384b921a2792cf88e498979faf5860d"}, + {file = "torchaudio-2.1.0+cu118-cp311-cp311-win_amd64.whl", hash = "sha256:d902ac1ffa963d1229de6de9461e990be575e76fe5d55e8af99e923bd30c303b"}, + {file = "torchaudio-2.1.0+cu118-cp38-cp38-linux_x86_64.whl", hash = "sha256:997366189afb6375296e26f5ca2254a47a1e43708a7b09414f77be93f61e9714"}, + {file = "torchaudio-2.1.0+cu118-cp38-cp38-win_amd64.whl", hash = "sha256:2d890551b20ab1024f6cda341dd755eae3c5752690249625da192fccd036b428"}, + {file = "torchaudio-2.1.0+cu118-cp39-cp39-linux_x86_64.whl", hash = "sha256:13183c1930da2cf1e73ef9214db1dded56d01b836a3ab0111da9356f1a10aa6b"}, + {file = "torchaudio-2.1.0+cu118-cp39-cp39-win_amd64.whl", hash = "sha256:154b9f759d31017847cb41572292b059c2189bdd6ae4d955164a4922511d3c95"}, ] [package.dependencies] -torch = "2.0.1" +torch = "2.1.0" [package.source] type = "legacy" @@ -4080,26 +4043,26 @@ visual = ["SciencePlots (>=2.0.0)", "matplotlib (>=3.2.0)"] [[package]] name = "torchvision" -version = "0.15.2+cu118" +version = "0.16.0+cu118" description = "image and video datasets and models for torch deep learning" optional = false python-versions = ">=3.8" files = [ - {file = "torchvision-0.15.2+cu118-cp310-cp310-linux_x86_64.whl", hash = "sha256:19ca4ab5d6179bbe53cff79df1a855ee6533c2861ddc7389f68349d8b9f8302a"}, - {file = "torchvision-0.15.2+cu118-cp310-cp310-win_amd64.whl", hash = "sha256:bfd2435d681418bea8dacde2b2cb6e5dd40a0e0243d3631e2b71c10bf9831f39"}, - {file = "torchvision-0.15.2+cu118-cp311-cp311-linux_x86_64.whl", hash = "sha256:def9af47ebc2cad55c5aa2dad1230dcf4261833ed6df8a73e839bc233764f09e"}, - {file = "torchvision-0.15.2+cu118-cp311-cp311-win_amd64.whl", hash = "sha256:ee36a68bb369d4173eb74ddf457751f6be1531d883f456eaf9b337a06f31c8fb"}, - {file = "torchvision-0.15.2+cu118-cp38-cp38-linux_x86_64.whl", hash = "sha256:af6807d5e599fe5381c916235a5581407e850eb77c3d43899f37a1511ff81cc0"}, - {file = "torchvision-0.15.2+cu118-cp38-cp38-win_amd64.whl", hash = "sha256:406ed3d8bc5b66a99b692d4c742de39a3a515a399e6bfd1c24fbb688fbb31968"}, - {file = "torchvision-0.15.2+cu118-cp39-cp39-linux_x86_64.whl", hash = "sha256:f2c6f5a100bcf9020b82f5d4c87cd7e26af0409cf33b90fb797b1127dcd42de6"}, - {file = "torchvision-0.15.2+cu118-cp39-cp39-win_amd64.whl", hash = "sha256:27be62ec887ab9a7b86612eac55ba80f8c23978c8afd5e4339669a1bbc4925ea"}, + {file = "torchvision-0.16.0+cu118-cp310-cp310-linux_x86_64.whl", hash = "sha256:033712f65d45afe806676c4129dfe601ad1321d9e092df62b15847c02d4061dc"}, + {file = "torchvision-0.16.0+cu118-cp310-cp310-win_amd64.whl", hash = "sha256:1042597e3ae225921099129cfc125c1d49e1f932b6fce02921fbe36653dac58c"}, + {file = "torchvision-0.16.0+cu118-cp311-cp311-linux_x86_64.whl", hash = "sha256:b168e55b1aff3e0270d9bd9af5d12a839093b15a9b0f8814265b7f1075a9a010"}, + {file = "torchvision-0.16.0+cu118-cp311-cp311-win_amd64.whl", hash = "sha256:6e5cfaa6c8c7b407403a625bb366fdcbadea9e64e55bedb55204983cb5e518b5"}, + {file = "torchvision-0.16.0+cu118-cp38-cp38-linux_x86_64.whl", hash = "sha256:682ae598fccef9cd1935e5d1546138b1a23c8d78adc8f96c899385dee7c7db90"}, + {file = "torchvision-0.16.0+cu118-cp38-cp38-win_amd64.whl", hash = "sha256:9030032fe4f68e27ea6ad0b844f78be04a88efea209f0515587e59f36dc57064"}, + {file = "torchvision-0.16.0+cu118-cp39-cp39-linux_x86_64.whl", hash = "sha256:e131aa4fa7f46a37f93a97c659b2b23292754274ff51bea757c7a41cddae8d03"}, + {file = "torchvision-0.16.0+cu118-cp39-cp39-win_amd64.whl", hash = "sha256:d1185fd2078183d6b4e00efcb89fa1b22cfca84f9495937811004b456a442d38"}, ] [package.dependencies] numpy = "*" pillow = ">=5.3.0,<8.3.dev0 || >=8.4.dev0" requests = "*" -torch = "2.0.1" +torch = "2.1.0" [package.extras] scipy = ["scipy"] @@ -4235,38 +4198,26 @@ vision = ["Pillow (<10.0.0)"] [[package]] name = "triton" -version = "2.0.0" +version = "2.1.0" description = "A language and compiler for custom Deep Learning operations" optional = false python-versions = "*" files = [ - {file = "triton-2.0.0-1-cp310-cp310-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:38806ee9663f4b0f7cd64790e96c579374089e58f49aac4a6608121aa55e2505"}, - {file = "triton-2.0.0-1-cp311-cp311-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:226941c7b8595219ddef59a1fdb821e8c744289a132415ddd584facedeb475b1"}, - {file = "triton-2.0.0-1-cp36-cp36m-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:4c9fc8c89874bc48eb7e7b2107a9b8d2c0bf139778637be5bfccb09191685cfd"}, - {file = "triton-2.0.0-1-cp37-cp37m-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:d2684b6a60b9f174f447f36f933e9a45f31db96cb723723ecd2dcfd1c57b778b"}, - {file = "triton-2.0.0-1-cp38-cp38-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:9d4978298b74fcf59a75fe71e535c092b023088933b2f1df933ec32615e4beef"}, - {file = "triton-2.0.0-1-cp39-cp39-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:74f118c12b437fb2ca25e1a04759173b517582fcf4c7be11913316c764213656"}, - {file = "triton-2.0.0-1-pp37-pypy37_pp73-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:9618815a8da1d9157514f08f855d9e9ff92e329cd81c0305003eb9ec25cc5add"}, - {file = "triton-2.0.0-1-pp38-pypy38_pp73-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:1aca3303629cd3136375b82cb9921727f804e47ebee27b2677fef23005c3851a"}, - {file = "triton-2.0.0-1-pp39-pypy39_pp73-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:e3e13aa8b527c9b642e3a9defcc0fbd8ffbe1c80d8ac8c15a01692478dc64d8a"}, - {file = "triton-2.0.0-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:8f05a7e64e4ca0565535e3d5d3405d7e49f9d308505bb7773d21fb26a4c008c2"}, - {file = "triton-2.0.0-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:bb4b99ca3c6844066e516658541d876c28a5f6e3a852286bbc97ad57134827fd"}, - {file = "triton-2.0.0-cp36-cp36m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:47b4d70dc92fb40af553b4460492c31dc7d3a114a979ffb7a5cdedb7eb546c08"}, - {file = "triton-2.0.0-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:fedce6a381901b1547e0e7e1f2546e4f65dca6d91e2d8a7305a2d1f5551895be"}, - {file = "triton-2.0.0-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:75834f27926eab6c7f00ce73aaf1ab5bfb9bec6eb57ab7c0bfc0a23fac803b4c"}, - {file = "triton-2.0.0-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:0117722f8c2b579cd429e0bee80f7731ae05f63fe8e9414acd9a679885fcbf42"}, - {file = "triton-2.0.0-pp37-pypy37_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:bcd9be5d0c2e45d2b7e6ddc6da20112b6862d69741576f9c3dbaf941d745ecae"}, - {file = "triton-2.0.0-pp38-pypy38_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:42a0d2c3fc2eab4ba71384f2e785fbfd47aa41ae05fa58bf12cb31dcbd0aeceb"}, - {file = "triton-2.0.0-pp39-pypy39_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:52c47b72c72693198163ece9d90a721299e4fb3b8e24fd13141e384ad952724f"}, + {file = "triton-2.1.0-0-cp310-cp310-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:66439923a30d5d48399b08a9eae10370f6c261a5ec864a64983bae63152d39d7"}, + {file = "triton-2.1.0-0-cp311-cp311-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:919b06453f0033ea52c13eaf7833de0e57db3178d23d4e04f9fc71c4f2c32bf8"}, + {file = "triton-2.1.0-0-cp37-cp37m-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:ae4bb8a91de790e1866405211c4d618379781188f40d5c4c399766914e84cd94"}, + {file = "triton-2.1.0-0-cp38-cp38-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:39f6fb6bdccb3e98f3152e3fbea724f1aeae7d749412bbb1fa9c441d474eba26"}, + {file = "triton-2.1.0-0-cp39-cp39-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:21544e522c02005a626c8ad63d39bdff2f31d41069592919ef281e964ed26446"}, + {file = "triton-2.1.0-0-pp37-pypy37_pp73-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:143582ca31dd89cd982bd3bf53666bab1c7527d41e185f9e3d8a3051ce1b663b"}, + {file = "triton-2.1.0-0-pp38-pypy38_pp73-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:82fc5aeeedf6e36be4e4530cbdcba81a09d65c18e02f52dc298696d45721f3bd"}, + {file = "triton-2.1.0-0-pp39-pypy39_pp73-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:81a96d110a738ff63339fc892ded095b31bd0d205e3aace262af8400d40b6fa8"}, ] [package.dependencies] -cmake = "*" filelock = "*" -lit = "*" -torch = "*" [package.extras] +build = ["cmake (>=3.18)", "lit"] tests = ["autopep8", "flake8", "isort", "numpy", "pytest", "scipy (>=1.7.1)"] tutorials = ["matplotlib", "pandas", "tabulate"] @@ -4435,25 +4386,25 @@ notebook = ">=4.4.1" [[package]] name = "xformers" -version = "0.0.22" +version = "0.0.22.post4" description = "XFormers: A collection of composable Transformer building blocks." optional = false python-versions = ">=3.7" files = [ - {file = "xformers-0.0.22-cp310-cp310-manylinux2014_x86_64.whl", hash = "sha256:57ccc686287ea80a786a7fe7bf456c963820bccb33701b76f29ff69538e3ddbb"}, - {file = "xformers-0.0.22-cp310-cp310-win_amd64.whl", hash = "sha256:1d3af4e8f6a36f2c7faa69caa02517e3ba9aff2360d6484bb54bd19d274f8110"}, - {file = "xformers-0.0.22-cp311-cp311-manylinux2014_x86_64.whl", hash = "sha256:bab75fdcf36250fdcc6b5aeee455e857cd86030b3b476799b938d7018f746571"}, - {file = "xformers-0.0.22-cp311-cp311-win_amd64.whl", hash = "sha256:d6f8cf506ea91b49a1f18e414e7945fe1cb312bcd8026cb8a72e494259f64a46"}, - {file = "xformers-0.0.22-cp38-cp38-manylinux2014_x86_64.whl", hash = "sha256:3d36bd8d0115b2eda2b401212655d98ec82b76c05c05114bec15273e3d73f1a0"}, - {file = "xformers-0.0.22-cp38-cp38-win_amd64.whl", hash = "sha256:7598c68bcde1e4ad0d9a2d0c17fd56556fbc4569ba64ca261d3eafbb7cd9c73f"}, - {file = "xformers-0.0.22-cp39-cp39-manylinux2014_x86_64.whl", hash = "sha256:d7e2109260e02abf68a7918b88568eeb92d2627c5943e4aeaed463e404182b45"}, - {file = "xformers-0.0.22-cp39-cp39-win_amd64.whl", hash = "sha256:9a5d97783e5b0e1e7a2ee0d88ff410bdcb4779a5ccd969f9960b41c86be72158"}, - {file = "xformers-0.0.22.tar.gz", hash = "sha256:2644f264c9870c308a0ee2c59652384d7a527ea932eafe12054817acd2faeb72"}, + {file = "xformers-0.0.22.post4-cp310-cp310-manylinux2014_x86_64.whl", hash = "sha256:7075114dbf698b609b599f0d35032c0b2f9a389751e8bbf4dd3c628376b0dd9c"}, + {file = "xformers-0.0.22.post4-cp310-cp310-win_amd64.whl", hash = "sha256:7901a41141348dd389f6cca759ebaa5480d98ecf40bb1c8c1a6cfe7b7d81413e"}, + {file = "xformers-0.0.22.post4-cp311-cp311-manylinux2014_x86_64.whl", hash = "sha256:b429475157d5043f4fcd17fd247801b6c96199b9d973aea3f22c0328216dcd14"}, + {file = "xformers-0.0.22.post4-cp311-cp311-win_amd64.whl", hash = "sha256:cee27b7e9ccc00d3d893cb293cab675624847ec022485c212c3ff85ddece15a6"}, + {file = "xformers-0.0.22.post4-cp38-cp38-manylinux2014_x86_64.whl", hash = "sha256:83e96c3999753fbf71c70afb002d3e8715b8a73efbd16f99810b7152222a730e"}, + {file = "xformers-0.0.22.post4-cp38-cp38-win_amd64.whl", hash = "sha256:b162a9a043bce9d27b715fe378f25c5756945976c430dea84a1de977ce0c0d09"}, + {file = "xformers-0.0.22.post4-cp39-cp39-manylinux2014_x86_64.whl", hash = "sha256:3c4c7bac62164cae75b64db0a4f6eab4aa65b8136ab65d04af3dfead1bf922e1"}, + {file = "xformers-0.0.22.post4-cp39-cp39-win_amd64.whl", hash = "sha256:242433f5eea7390779368e1d0d588c7dfb26cda6aa2d9743c64abda3884607eb"}, + {file = "xformers-0.0.22.post4.tar.gz", hash = "sha256:ed58b1529e9ad2a094dd4b41585c09d356951f94fc4c2ceb2df89e3191dea72d"}, ] [package.dependencies] numpy = "*" -torch = "2.0.1" +torch = "2.1.0" [[package]] name = "yarl" @@ -4560,4 +4511,4 @@ testing = ["big-O", "jaraco.functools", "jaraco.itertools", "more-itertools", "p [metadata] lock-version = "2.0" python-versions = "^3.10" -content-hash = "ccde1be8e8248d8dc1fcd6849c0d4e1acbc84b123ab2b4aa08ea4b21aedcd832" +content-hash = "57d74e59d3e16152af08a359ee89d6d25107dce77de26d58f492b1f33c397199" diff --git a/pyproject.toml b/pyproject.toml index ed80412..e8c6748 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -7,9 +7,9 @@ readme = "README.md" [tool.poetry.dependencies] python = "^3.10" -torch = {version = "2.0.1+cu118", source = "pytorch-gpu-src"} -torchvision = {version = "0.15.2+cu118", source = "pytorch-gpu-src"} -torchaudio = {version = "2.0.2+cu118", source = "pytorch-gpu-src"} +torch = {version = "2.1.0+cu118", source = "pytorch-gpu-src"} +torchvision = {version = "0.16.0+cu118", source = "pytorch-gpu-src"} +torchaudio = {version = "2.1.0+cu118", source = "pytorch-gpu-src"} omegaconf = "2.3.0" diffusers = {git = "https://github.com/huggingface/diffusers.git"} compel = {git = "https://github.com/damian0815/compel.git"} @@ -19,11 +19,11 @@ accelerate = "^0.23.0" safetensors = "0.3.3" mediapy = "^1.1.9" ipywidgets = "7.7.1" -controlnet-aux = "0.0.6" +controlnet-aux = "^0.0.6" mediapipe = "0.10.1" pytorch-lightning = "^2.0.9.post0" asdff = {git = "https://github.com/R3gm/asdff.git"} -xformers = "0.0.22" +xformers = "^0.0.22.post4" [[tool.poetry.source]] From 7f9e76fc12fcd837250c6da2d24f0a704a6b4d28 Mon Sep 17 00:00:00 2001 From: Roger Condori <114810545+R3gm@users.noreply.github.com> Date: Thu, 19 Oct 2023 20:27:50 +0000 Subject: [PATCH 2/2] xformers disbled --- poetry.lock | 24 +----------------------- pyproject.toml | 1 - stablepy/diffusers_vanilla/model.py | 9 +++++---- 3 files changed, 6 insertions(+), 28 deletions(-) diff --git a/poetry.lock b/poetry.lock index 20b7bc8..27afa74 100644 --- a/poetry.lock +++ b/poetry.lock @@ -4384,28 +4384,6 @@ files = [ [package.dependencies] notebook = ">=4.4.1" -[[package]] -name = "xformers" -version = "0.0.22.post4" -description = "XFormers: A collection of composable Transformer building blocks." -optional = false -python-versions = ">=3.7" -files = [ - {file = "xformers-0.0.22.post4-cp310-cp310-manylinux2014_x86_64.whl", hash = "sha256:7075114dbf698b609b599f0d35032c0b2f9a389751e8bbf4dd3c628376b0dd9c"}, - {file = "xformers-0.0.22.post4-cp310-cp310-win_amd64.whl", hash = "sha256:7901a41141348dd389f6cca759ebaa5480d98ecf40bb1c8c1a6cfe7b7d81413e"}, - {file = "xformers-0.0.22.post4-cp311-cp311-manylinux2014_x86_64.whl", hash = "sha256:b429475157d5043f4fcd17fd247801b6c96199b9d973aea3f22c0328216dcd14"}, - {file = "xformers-0.0.22.post4-cp311-cp311-win_amd64.whl", hash = "sha256:cee27b7e9ccc00d3d893cb293cab675624847ec022485c212c3ff85ddece15a6"}, - {file = "xformers-0.0.22.post4-cp38-cp38-manylinux2014_x86_64.whl", hash = "sha256:83e96c3999753fbf71c70afb002d3e8715b8a73efbd16f99810b7152222a730e"}, - {file = "xformers-0.0.22.post4-cp38-cp38-win_amd64.whl", hash = "sha256:b162a9a043bce9d27b715fe378f25c5756945976c430dea84a1de977ce0c0d09"}, - {file = "xformers-0.0.22.post4-cp39-cp39-manylinux2014_x86_64.whl", hash = "sha256:3c4c7bac62164cae75b64db0a4f6eab4aa65b8136ab65d04af3dfead1bf922e1"}, - {file = "xformers-0.0.22.post4-cp39-cp39-win_amd64.whl", hash = "sha256:242433f5eea7390779368e1d0d588c7dfb26cda6aa2d9743c64abda3884607eb"}, - {file = "xformers-0.0.22.post4.tar.gz", hash = "sha256:ed58b1529e9ad2a094dd4b41585c09d356951f94fc4c2ceb2df89e3191dea72d"}, -] - -[package.dependencies] -numpy = "*" -torch = "2.1.0" - [[package]] name = "yarl" version = "1.9.2" @@ -4511,4 +4489,4 @@ testing = ["big-O", "jaraco.functools", "jaraco.itertools", "more-itertools", "p [metadata] lock-version = "2.0" python-versions = "^3.10" -content-hash = "57d74e59d3e16152af08a359ee89d6d25107dce77de26d58f492b1f33c397199" +content-hash = "22837cebebc5a87de52bf20c656b197272e4d19d0efc78903c49ccbf6628c011" diff --git a/pyproject.toml b/pyproject.toml index e8c6748..8f6562b 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -23,7 +23,6 @@ controlnet-aux = "^0.0.6" mediapipe = "0.10.1" pytorch-lightning = "^2.0.9.post0" asdff = {git = "https://github.com/R3gm/asdff.git"} -xformers = "^0.0.22.post4" [[tool.poetry.source]] diff --git a/stablepy/diffusers_vanilla/model.py b/stablepy/diffusers_vanilla/model.py index 29a63d2..a1c36e7 100644 --- a/stablepy/diffusers_vanilla/model.py +++ b/stablepy/diffusers_vanilla/model.py @@ -348,8 +348,8 @@ def load_pipe( pipe.scheduler = UniPCMultistepScheduler.from_config(pipe.scheduler.config) - if self.device.type == "cuda": - pipe.enable_xformers_memory_efficient_attention() + # if self.device.type == "cuda": + # pipe.enable_xformers_memory_efficient_attention() pipe.to(self.device) torch.cuda.empty_cache() @@ -1117,6 +1117,7 @@ def __call__( # self.pipe = self.process_lora(lora_D, lora_scale_D) # self.pipe = self.process_lora(lora_E, lora_scale_E) + xformers_memory_efficient_attention=False # disabled if xformers_memory_efficient_attention and torch.cuda.is_available(): self.pipe.disable_xformers_memory_efficient_attention() self.pipe.to(self.device) @@ -1308,8 +1309,8 @@ def __call__( compel = None del compel - - if torch.cuda.is_available(): + + if torch.cuda.is_available() and xformers_memory_efficient_attention: if xformers_memory_efficient_attention: self.pipe.enable_xformers_memory_efficient_attention() else: