From 4f85dba57ad2f21e863678277850d31316a591dd Mon Sep 17 00:00:00 2001 From: tanliwei Date: Thu, 12 Dec 2024 16:29:34 +0800 Subject: [PATCH] update for packaging --- pyproject.toml | 30 +++++++++++++++++++++++++++--- requirements.txt | 4 ++-- stereo/common.py | 2 +- 3 files changed, 30 insertions(+), 6 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index c3d0cc77..2dc3a50e 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -26,7 +26,7 @@ classifiers= [ dynamic = ["version", "dependencies"] [project.optional-dependencies] -image-cpu = [ +image = [ "cell-bin==1.3.4.1", "tensorflow==2.12.0", "torch==2.4.1+cpu", @@ -59,13 +59,37 @@ image-cu12 = [ "onnxruntime-gpu" ] singler-gpu = ["cusingler"] +spt = [ + "torch==2.4.1+cpu", + "pysal<=2.6.0", + "pygam>=0.8.0", + "nbformat", +] +spt-cu11 = [ + "torch==2.4.1+cu118", + "pysal<=2.6.0", + "pygam>=0.8.0", + "nbformat", +] +spt-cu12 = [ + "torch==2.4.1+cu124", + "pysal<=2.6.0", + "pygam>=0.8.0", + "nbformat", +] +all = [ + "stereopy[image]", + "stereopy[spt]" +] all-cu11 = [ "stereopy[image-cu11]", - "stereopy[singler-gpu]" + "stereopy[singler-gpu]", + "stereopy[spt-cu11]" ] all-cu12 = [ "stereopy[image-cu12]", - "stereopy[singler-gpu]" + "stereopy[singler-gpu]", + "stereopy[spt-cu12]" ] [tool.setuptools.dynamic] diff --git a/requirements.txt b/requirements.txt index 5685cfb0..d31a84da 100644 --- a/requirements.txt +++ b/requirements.txt @@ -69,5 +69,5 @@ plotly>=5.15.0 # cusingler # cell-bin==1.3.4.1 -pysal<=2.6.0 -pygam>=0.8.0 \ No newline at end of file +# pysal<=2.6.0 +# pygam>=0.8.0 \ No newline at end of file diff --git a/stereo/common.py b/stereo/common.py index 20802b9b..aeff8715 100644 --- a/stereo/common.py +++ b/stereo/common.py @@ -8,4 +8,4 @@ """ # version -version = '1.5.0' +version = '1.5.1a3'