spacr 0.0.61__tar.gz → 0.0.63__tar.gz

{spacr-0.0.61/spacr.egg-info → spacr-0.0.63}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: spacr
-Version: 0.0.61
+Version: 0.0.63
 Summary: Spatial phenotype analysis of crisp screens (SpaCr)
 Home-page: https://github.com/EinarOlafsson/spacr
 Author: Einar Birnir Olafsson
@@ -10,35 +10,35 @@ Classifier: License :: OSI Approved :: MIT License
 Classifier: Operating System :: OS Independent
 License-File: LICENSE
 Requires-Dist: dgl
-Requires-Dist: torch>=2.2.1
-Requires-Dist: torchvision>=0.17.1
-Requires-Dist: torch-geometric>=2.5.1
+Requires-Dist: torch<3.0,>=2.2.1
+Requires-Dist: torchvision<1.0,>=0.17.1
+Requires-Dist: torch-geometric<3.0,>=2.5.1
 Requires-Dist: numpy<2.0,>=1.26.4
-Requires-Dist: pandas>=2.2.1
-Requires-Dist: statsmodels>=0.14.1
-Requires-Dist: scikit-image>=0.22.0
-Requires-Dist: scikit-learn>=1.4.1
-Requires-Dist: seaborn>=0.13.2
-Requires-Dist: matplotlib>=3.8.3
-Requires-Dist: shap>=0.45.0
-Requires-Dist: pillow>=10.2.0
-Requires-Dist: imageio>=2.34.0
-Requires-Dist: scipy>=1.12.0
-Requires-Dist: ipywidgets>=8.1.2
-Requires-Dist: mahotas>=1.4.13
-Requires-Dist: btrack>=0.6.5
-Requires-Dist: trackpy>=0.6.2
-Requires-Dist: cellpose>=3.0.6
-Requires-Dist: IPython>=8.18.1
-Requires-Dist: opencv-python-headless>=4.9.0.80
-Requires-Dist: umap-learn>=0.5.6
-Requires-Dist: ttkthemes>=3.2.2
-Requires-Dist: xgboost>=2.0.3
-Requires-Dist: PyWavelets>=1.6.0
-Requires-Dist: torchcam>=0.4.0
+Requires-Dist: pandas<3.0,>=2.2.1
+Requires-Dist: statsmodels<1.0,>=0.14.1
+Requires-Dist: scikit-image<1.0,>=0.22.0
+Requires-Dist: scikit-learn<2.0,>=1.4.1
+Requires-Dist: seaborn<1.0,>=0.13.2
+Requires-Dist: matplotlib<4.0,>=3.8.3
+Requires-Dist: shap<1.0,>=0.45.0
+Requires-Dist: pillow<11.0,>=10.2.0
+Requires-Dist: imageio<3.0,>=2.34.0
+Requires-Dist: scipy<2.0,>=1.12.0
+Requires-Dist: ipywidgets<9.0,>=8.1.2
+Requires-Dist: mahotas<2.0,>=1.4.13
+Requires-Dist: btrack<1.0,>=0.6.5
+Requires-Dist: trackpy<1.0,>=0.6.2
+Requires-Dist: cellpose<4.0,>=3.0.6
+Requires-Dist: IPython<9.0,>=8.18.1
+Requires-Dist: opencv-python-headless<5.0,>=4.9.0.80
+Requires-Dist: umap-learn<1.0,>=0.5.6
+Requires-Dist: ttkthemes<4.0,>=3.2.2
+Requires-Dist: xgboost<3.0,>=2.0.3
+Requires-Dist: PyWavelets<2.0,>=1.6.0
+Requires-Dist: torchcam<1.0,>=0.4.0
 Requires-Dist: ttf_opensans>=2020.10.30
-Requires-Dist: customtkinter>=5.2.2
-Requires-Dist: lxml>=5.1.0
+Requires-Dist: customtkinter<6.0,>=5.2.2
+Requires-Dist: lxml<6.0,>=5.1.0
 Provides-Extra: dev
 Requires-Dist: pytest>=3.9; extra == "dev"
 Provides-Extra: headless

{spacr-0.0.61 → spacr-0.0.63}/setup.py

@@ -23,40 +23,40 @@ with open("README.md", "r", encoding="utf-8") as fh:
 
 dependencies = [
     dgl_dependency,
-    'torch>=2.2.1',
-    'torchvision>=0.17.1',
-    'torch-geometric>=2.5.1',
+    'torch>=2.2.1,<3.0',
+    'torchvision>=0.17.1,<1.0',
+    'torch-geometric>=2.5.1,<3.0',
     'numpy>=1.26.4,<2.0',
-    'pandas>=2.2.1',
-    'statsmodels>=0.14.1',
-    'scikit-image>=0.22.0',
-    'scikit-learn>=1.4.1',
-    'seaborn>=0.13.2',
-    'matplotlib>=3.8.3',
-    'shap>=0.45.0',
-    'pillow>=10.2.0',
-    'imageio>=2.34.0',
-    'scipy>=1.12.0',
-    'ipywidgets>=8.1.2',
-    'mahotas>=1.4.13',
-    'btrack>=0.6.5',
-    'trackpy>=0.6.2',
-    'cellpose>=3.0.6',
-    'IPython>=8.18.1',
-    'opencv-python-headless>=4.9.0.80',
-    'umap-learn>=0.5.6',
-    'ttkthemes>=3.2.2',
-    'xgboost>=2.0.3',
-    'PyWavelets>=1.6.0',
-    'torchcam>=0.4.0',
+    'pandas>=2.2.1,<3.0',
+    'statsmodels>=0.14.1,<1.0',
+    'scikit-image>=0.22.0,<1.0',
+    'scikit-learn>=1.4.1,<2.0',
+    'seaborn>=0.13.2,<1.0',
+    'matplotlib>=3.8.3,<4.0',
+    'shap>=0.45.0,<1.0',
+    'pillow>=10.2.0,<11.0',
+    'imageio>=2.34.0,<3.0',
+    'scipy>=1.12.0,<2.0',
+    'ipywidgets>=8.1.2,<9.0',
+    'mahotas>=1.4.13,<2.0',
+    'btrack>=0.6.5,<1.0',
+    'trackpy>=0.6.2,<1.0',
+    'cellpose>=3.0.6,<4.0',
+    'IPython>=8.18.1,<9.0',
+    'opencv-python-headless>=4.9.0.80,<5.0',
+    'umap-learn>=0.5.6,<1.0',
+    'ttkthemes>=3.2.2,<4.0',
+    'xgboost>=2.0.3,<3.0',
+    'PyWavelets>=1.6.0,<2.0',
+    'torchcam>=0.4.0,<1.0',
     'ttf_opensans>=2020.10.30',
-    'customtkinter>=5.2.2',  
-    'lxml>=5.1.0'
+    'customtkinter>=5.2.2,<6.0',  
+    'lxml>=5.1.0,<6.0'
 ]
 
 setup(
     name="spacr",
-    version="0.0.61",
+    version="0.0.63",
     author="Einar Birnir Olafsson",
     author_email="olafsson@med.umich.com",
     description="Spatial phenotype analysis of crisp screens (SpaCr)",

{spacr-0.0.61 → spacr-0.0.63}/spacr/__init__.py

@@ -1,5 +1,6 @@
 from spacr.version import version, version_str
 import logging
+import torch
 
 from . import core
 from . import io
@@ -11,7 +12,6 @@ from . import timelapse
 from . import deep_spacr
 from . import mask_app
 from . import annotate_app
-from . import graph_learning
 from . import gui_utils
 from . import gui_mask_app
 from . import gui_measure_app
@@ -28,7 +28,6 @@ __all__ = [
     "timelapse",
     "deep_spacr",
     "annotate_app",
-    "graph_learning",
     "gui_utils",
     "mask_app",
     "gui_mask_app",
@@ -37,5 +36,13 @@ __all__ = [
     "logger"
 ]
 
+# Check for CUDA GPU availability
+if torch.cuda.is_available():
+    from . import graph_learning
+    __all__.append("graph_learning")
+    logging.info("CUDA GPU detected. Graph learning module loaded.")
+else:
+    logging.info("No CUDA GPU detected. Graph learning module not loaded.")
+
 logging.basicConfig(filename='spacr.log', level=logging.INFO,
                     format='%(asctime)s:%(levelname)s:%(message)s')

{spacr-0.0.61 → spacr-0.0.63/spacr.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: spacr
-Version: 0.0.61
+Version: 0.0.63
 Summary: Spatial phenotype analysis of crisp screens (SpaCr)
 Home-page: https://github.com/EinarOlafsson/spacr
 Author: Einar Birnir Olafsson
@@ -10,35 +10,35 @@ Classifier: License :: OSI Approved :: MIT License
 Classifier: Operating System :: OS Independent
 License-File: LICENSE
 Requires-Dist: dgl
-Requires-Dist: torch>=2.2.1
-Requires-Dist: torchvision>=0.17.1
-Requires-Dist: torch-geometric>=2.5.1
+Requires-Dist: torch<3.0,>=2.2.1
+Requires-Dist: torchvision<1.0,>=0.17.1
+Requires-Dist: torch-geometric<3.0,>=2.5.1
 Requires-Dist: numpy<2.0,>=1.26.4
-Requires-Dist: pandas>=2.2.1
-Requires-Dist: statsmodels>=0.14.1
-Requires-Dist: scikit-image>=0.22.0
-Requires-Dist: scikit-learn>=1.4.1
-Requires-Dist: seaborn>=0.13.2
-Requires-Dist: matplotlib>=3.8.3
-Requires-Dist: shap>=0.45.0
-Requires-Dist: pillow>=10.2.0
-Requires-Dist: imageio>=2.34.0
-Requires-Dist: scipy>=1.12.0
-Requires-Dist: ipywidgets>=8.1.2
-Requires-Dist: mahotas>=1.4.13
-Requires-Dist: btrack>=0.6.5
-Requires-Dist: trackpy>=0.6.2
-Requires-Dist: cellpose>=3.0.6
-Requires-Dist: IPython>=8.18.1
-Requires-Dist: opencv-python-headless>=4.9.0.80
-Requires-Dist: umap-learn>=0.5.6
-Requires-Dist: ttkthemes>=3.2.2
-Requires-Dist: xgboost>=2.0.3
-Requires-Dist: PyWavelets>=1.6.0
-Requires-Dist: torchcam>=0.4.0
+Requires-Dist: pandas<3.0,>=2.2.1
+Requires-Dist: statsmodels<1.0,>=0.14.1
+Requires-Dist: scikit-image<1.0,>=0.22.0
+Requires-Dist: scikit-learn<2.0,>=1.4.1
+Requires-Dist: seaborn<1.0,>=0.13.2
+Requires-Dist: matplotlib<4.0,>=3.8.3
+Requires-Dist: shap<1.0,>=0.45.0
+Requires-Dist: pillow<11.0,>=10.2.0
+Requires-Dist: imageio<3.0,>=2.34.0
+Requires-Dist: scipy<2.0,>=1.12.0
+Requires-Dist: ipywidgets<9.0,>=8.1.2
+Requires-Dist: mahotas<2.0,>=1.4.13
+Requires-Dist: btrack<1.0,>=0.6.5
+Requires-Dist: trackpy<1.0,>=0.6.2
+Requires-Dist: cellpose<4.0,>=3.0.6
+Requires-Dist: IPython<9.0,>=8.18.1
+Requires-Dist: opencv-python-headless<5.0,>=4.9.0.80
+Requires-Dist: umap-learn<1.0,>=0.5.6
+Requires-Dist: ttkthemes<4.0,>=3.2.2
+Requires-Dist: xgboost<3.0,>=2.0.3
+Requires-Dist: PyWavelets<2.0,>=1.6.0
+Requires-Dist: torchcam<1.0,>=0.4.0
 Requires-Dist: ttf_opensans>=2020.10.30
-Requires-Dist: customtkinter>=5.2.2
-Requires-Dist: lxml>=5.1.0
+Requires-Dist: customtkinter<6.0,>=5.2.2
+Requires-Dist: lxml<6.0,>=5.1.0
 Provides-Extra: dev
 Requires-Dist: pytest>=3.9; extra == "dev"
 Provides-Extra: headless

spacr-0.0.63/spacr.egg-info/requires.txt

@@ -0,0 +1,39 @@
+dgl
+torch<3.0,>=2.2.1
+torchvision<1.0,>=0.17.1
+torch-geometric<3.0,>=2.5.1
+numpy<2.0,>=1.26.4
+pandas<3.0,>=2.2.1
+statsmodels<1.0,>=0.14.1
+scikit-image<1.0,>=0.22.0
+scikit-learn<2.0,>=1.4.1
+seaborn<1.0,>=0.13.2
+matplotlib<4.0,>=3.8.3
+shap<1.0,>=0.45.0
+pillow<11.0,>=10.2.0
+imageio<3.0,>=2.34.0
+scipy<2.0,>=1.12.0
+ipywidgets<9.0,>=8.1.2
+mahotas<2.0,>=1.4.13
+btrack<1.0,>=0.6.5
+trackpy<1.0,>=0.6.2
+cellpose<4.0,>=3.0.6
+IPython<9.0,>=8.18.1
+opencv-python-headless<5.0,>=4.9.0.80
+umap-learn<1.0,>=0.5.6
+ttkthemes<4.0,>=3.2.2
+xgboost<3.0,>=2.0.3
+PyWavelets<2.0,>=1.6.0
+torchcam<1.0,>=0.4.0
+ttf_opensans>=2020.10.30
+customtkinter<6.0,>=5.2.2
+lxml<6.0,>=5.1.0
+
+[dev]
+pytest>=3.9
+
+[full]
+opencv-python
+
+[headless]
+opencv-python-headless

spacr-0.0.61/spacr.egg-info/requires.txt

@@ -1,39 +0,0 @@
-dgl
-torch>=2.2.1
-torchvision>=0.17.1
-torch-geometric>=2.5.1
-numpy<2.0,>=1.26.4
-pandas>=2.2.1
-statsmodels>=0.14.1
-scikit-image>=0.22.0
-scikit-learn>=1.4.1
-seaborn>=0.13.2
-matplotlib>=3.8.3
-shap>=0.45.0
-pillow>=10.2.0
-imageio>=2.34.0
-scipy>=1.12.0
-ipywidgets>=8.1.2
-mahotas>=1.4.13
-btrack>=0.6.5
-trackpy>=0.6.2
-cellpose>=3.0.6
-IPython>=8.18.1
-opencv-python-headless>=4.9.0.80
-umap-learn>=0.5.6
-ttkthemes>=3.2.2
-xgboost>=2.0.3
-PyWavelets>=1.6.0
-torchcam>=0.4.0
-ttf_opensans>=2020.10.30
-customtkinter>=5.2.2
-lxml>=5.1.0
-
-[dev]
-pytest>=3.9
-
-[full]
-opencv-python
-
-[headless]
-opencv-python-headless