From 454545d096089cdf051966e14a37a5eb648873cc Mon Sep 17 00:00:00 2001 From: Guillermo Rodriguez Date: Tue, 26 Sep 2023 12:42:57 -0300 Subject: [PATCH] Switch to using poetry package manager --- poetry.toml | 2 ++ pyproject.toml | 59 +++++++++++++++++++++++++++++++++++++++++ requirements.cuda.0.txt | 9 ------- requirements.cuda.1.txt | 1 - requirements.cuda.2.txt | 2 -- requirements.txt | 15 ----------- setup.py | 21 --------------- 7 files changed, 61 insertions(+), 48 deletions(-) create mode 100644 poetry.toml create mode 100644 pyproject.toml delete mode 100644 requirements.cuda.0.txt delete mode 100644 requirements.cuda.1.txt delete mode 100644 requirements.cuda.2.txt delete mode 100644 requirements.txt delete mode 100644 setup.py diff --git a/poetry.toml b/poetry.toml new file mode 100644 index 0000000..ab1033b --- /dev/null +++ b/poetry.toml @@ -0,0 +1,2 @@ +[virtualenvs] +in-project = true diff --git a/pyproject.toml b/pyproject.toml new file mode 100644 index 0000000..63ef24f --- /dev/null +++ b/pyproject.toml @@ -0,0 +1,59 @@ +[tool.poetry] +name = 'skynet' +version = '0.1a11' +description = 'Decentralized compute platform' +authors = ['Guillermo Rodriguez '] +license = 'AGPL' +readme = 'README.md' + +[tool.poetry.dependencies] +python = '>=3.10,<3.12' +pytz = '^2023.3.post1' +trio = '^0.22.2' +asks = '^3.0.0' +numpy = '^1.26.0' +Pillow = '^10.0.1' +docker = '^6.1.3' +py-leap = {git = 'https://github.com/guilledk/py-leap.git', rev = 'v0.1a14'} + +[tool.poetry.group.frontend] +optional = true + +[tool.poetry.group.frontend.dependencies] +triopg = {version = '^0.6.0'} +aiohttp = {version = '^3.8.5'} +psycopg2-binary = {version = '^2.9.7'} +pyTelegramBotAPI = {version = '^4.14.0'} +'discord.py' = {version = '^2.3.2'} + +[tool.poetry.group.dev] +optional = true + +[tool.poetry.group.dev.dependencies] +pdbpp = {version = '^0.10.3'} +pytest = {version = '^7.4.2'} + +[tool.poetry.group.cuda] +optional = true + +[tool.poetry.group.cuda.dependencies] +torch = {version = '1.13.0+cu117', source = 'torch'} +scipy = {version = '^1.11.2'} +triton = {version = '^2.1.0'} +basicsr = {version = '^1.4.2'} +diffusers = {version = '^0.21.2'} +realesrgan = {version = '^0.3.0'} +accelerate = {version = '^0.23.0'} +transformers = {version = '^4.33.2'} +huggingface-hub = {version = '^0.17.3'} +invisible-watermark = {version = '^0.2.0'} +# xformers = {git = 'https://github.com/facebookresearch/xformers.git', rev = 'v0.0.21'} + +[[tool.poetry.source]] +name = 'torch' +url = 'https://download.pytorch.org/whl/cu117' +priority = 'explicit' + +[build-system] +requires = ['poetry-core'] +build-backend = 'poetry.core.masonry.api' diff --git a/requirements.cuda.0.txt b/requirements.cuda.0.txt deleted file mode 100644 index f796537..0000000 --- a/requirements.cuda.0.txt +++ /dev/null @@ -1,9 +0,0 @@ -scipy -triton -accelerate -transformers -huggingface_hub -diffusers[torch]>=0.18.0 -invisible-watermark -torch==1.13.0+cu117 ---extra-index-url https://download.pytorch.org/whl/cu117 diff --git a/requirements.cuda.1.txt b/requirements.cuda.1.txt deleted file mode 100644 index b9f2703..0000000 --- a/requirements.cuda.1.txt +++ /dev/null @@ -1 +0,0 @@ -git+https://github.com/facebookresearch/xformers.git@main#egg=xformers diff --git a/requirements.cuda.2.txt b/requirements.cuda.2.txt deleted file mode 100644 index 4d3fee4..0000000 --- a/requirements.cuda.2.txt +++ /dev/null @@ -1,2 +0,0 @@ -basicsr -realesrgan diff --git a/requirements.txt b/requirements.txt deleted file mode 100644 index 6a1a32e..0000000 --- a/requirements.txt +++ /dev/null @@ -1,15 +0,0 @@ -pytz -trio -asks -numpy -pdbpp -Pillow -triopg -pytest -docker -aiohttp -psycopg2-binary -pyTelegramBotAPI -discord.py - -py-leap@git+https://github.com/guilledk/py-leap.git@v0.1a14 diff --git a/setup.py b/setup.py deleted file mode 100644 index b1866d9..0000000 --- a/setup.py +++ /dev/null @@ -1,21 +0,0 @@ -from setuptools import setup, find_packages - -from skynet.constants import VERSION - -setup( - name='skynet', - version=VERSION, - description='Decentralized compute platform', - author='Guillermo Rodriguez', - author_email='guillermo@telos.net', - packages=find_packages(), - entry_points={ - 'console_scripts': [ - 'skynet = skynet.cli:skynet', - 'txt2img = skynet.cli:txt2img', - 'img2img = skynet.cli:img2img', - 'upscale = skynet.cli:upscale' - ] - }, - install_requires=['click'] -)