spacr 0.0.35__tar.gz → 0.0.61__tar.gz

spacr-0.0.61/MANIFEST.in

@@ -0,0 +1 @@
+include spacr/models/cp/*

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: spacr
-Version: 0.0.35
+Version: 0.0.61
 Summary: Spatial phenotype analysis of crisp screens (SpaCr)
 Home-page: https://github.com/EinarOlafsson/spacr
 Author: Einar Birnir Olafsson
@@ -9,10 +9,11 @@ Classifier: Programming Language :: Python :: 3
 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: numpy>=1.26.4
+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
@@ -30,10 +31,13 @@ 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>=0.1.1
+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: ttf_opensans>=2020.10.30
+Requires-Dist: customtkinter>=5.2.2
 Requires-Dist: lxml>=5.1.0
 Provides-Extra: dev
 Requires-Dist: pytest>=3.9; extra == "dev"
@@ -65,9 +69,9 @@ Spatial phenotype analysis of CRISPR-Cas9 screens (SpaCr). The spatial organizat
 
 ## Features
 
-- **Generate Masks:** Generate cellpose masks for cells, nuclei and pathogen images.
+- **Generate Masks:** Generate cellpose masks of cell, nuclei and pathogen objects.
 
-- **Object Measurements:** Measurements for each object including scikit-image-regionprops, intensity quantiles, shannon-entropy, pearsons and manders correlation, homogenicity and radial distribution. Measurements are saved to a sql database in object level tables.
+- **Object Measurements:** Measurements for each object including scikit-image-regionprops, intensity percentiles, shannon-entropy, pearsons and manders correlations, homogenicity and radial distribution. Measurements are saved to a sql database in object level tables.
 
 - **Crop Images:** Objects (e.g. cells) can be saved as PNGs from the object area or bounding box area of each object. Object paths are saved in an sql database that can be annotated and used to train CNNs/Transformer models for classefication tasks.
 
@@ -81,11 +85,13 @@ Spatial phenotype analysis of CRISPR-Cas9 screens (SpaCr). The spatial organizat
 
 - **Simulations:** Simulate spatial phenotype screens.
 
+- **Sequencing:** Map FASTQ reads to barecode and gRNA barecode metadata.
+
 - **Misc:** Analyze Ca oscillation, recruitment, infection rate, plaque size/count.
 
 ## Installation
 
-spacr requires Tkinter for its graphical user interface features.
+Requires Tkinter for graphical user interface features.
 
 ### Ubuntu
 
@@ -105,29 +111,8 @@ install spacr with pip
 pip install spacr
 ```
 
-To run spacr GUIs after installing spacr:
+Run spacr GUI:
 
-To generate masks:
-```
-gui_mask
-```
-To generate measurements and cropped images:
-```
-gui_measure
-```
-To curate masks for finetuning cellpose models:
-```
-gui_make_masks
-```
-To annotate paths to images in sql database created in gui_measure:
-```
-gui_annotate
-```
-Train torch CNNs/Transformers to classify single object images.
-```
-gui_classify
-```
-Simulate spatial phenotype screens.
 ```
-gui_sim
+gui
 ```

{spacr-0.0.35 → spacr-0.0.61}/README.md

@@ -21,9 +21,9 @@ Spatial phenotype analysis of CRISPR-Cas9 screens (SpaCr). The spatial organizat
 
 ## Features
 
-- **Generate Masks:** Generate cellpose masks for cells, nuclei and pathogen images.
+- **Generate Masks:** Generate cellpose masks of cell, nuclei and pathogen objects.
 
-- **Object Measurements:** Measurements for each object including scikit-image-regionprops, intensity quantiles, shannon-entropy, pearsons and manders correlation, homogenicity and radial distribution. Measurements are saved to a sql database in object level tables.
+- **Object Measurements:** Measurements for each object including scikit-image-regionprops, intensity percentiles, shannon-entropy, pearsons and manders correlations, homogenicity and radial distribution. Measurements are saved to a sql database in object level tables.
 
 - **Crop Images:** Objects (e.g. cells) can be saved as PNGs from the object area or bounding box area of each object. Object paths are saved in an sql database that can be annotated and used to train CNNs/Transformer models for classefication tasks.
 
@@ -37,11 +37,13 @@ Spatial phenotype analysis of CRISPR-Cas9 screens (SpaCr). The spatial organizat
 
 - **Simulations:** Simulate spatial phenotype screens.
 
+- **Sequencing:** Map FASTQ reads to barecode and gRNA barecode metadata.
+
 - **Misc:** Analyze Ca oscillation, recruitment, infection rate, plaque size/count.
 
 ## Installation
 
-spacr requires Tkinter for its graphical user interface features.
+Requires Tkinter for graphical user interface features.
 
 ### Ubuntu
 
@@ -61,29 +63,8 @@ install spacr with pip
 pip install spacr
 ```
 
-To run spacr GUIs after installing spacr:
+Run spacr GUI:
 
-To generate masks:
-```
-gui_mask
-```
-To generate measurements and cropped images:
-```
-gui_measure
-```
-To curate masks for finetuning cellpose models:
-```
-gui_make_masks
-```
-To annotate paths to images in sql database created in gui_measure:
-```
-gui_annotate
-```
-Train torch CNNs/Transformers to classify single object images.
-```
-gui_classify
-```
-Simulate spatial phenotype screens.
-```
-gui_sim
 ```
+gui
+```

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

@@ -1,14 +1,32 @@
 from setuptools import setup, find_packages
+import subprocess
+
+# Function to determine the CUDA version
+def get_cuda_version():
+    try:
+        output = subprocess.check_output(['nvcc', '--version'], stderr=subprocess.STDOUT).decode('utf-8')
+        if 'release' in output:
+            return output.split('release ')[1].split(',')[0].replace('.', '')
+    except (subprocess.CalledProcessError, FileNotFoundError):
+        return None
+
+cuda_version = get_cuda_version()
+
+if cuda_version:
+    dgl_dependency = f'dgl-cu{cuda_version}'
+else:
+    dgl_dependency = 'dgl'  # Fallback to CPU version if no CUDA is detected
 
 # Ensure you have read the README.md content into a variable, e.g., `long_description`
 with open("README.md", "r", encoding="utf-8") as fh:
     long_description = fh.read()
 
 dependencies = [
+    dgl_dependency,
     'torch>=2.2.1',
     'torchvision>=0.17.1',
     'torch-geometric>=2.5.1',
-    'numpy>=1.26.4',
+    'numpy>=1.26.4,<2.0',
     'pandas>=2.2.1',
     'statsmodels>=0.14.1',
     'scikit-image>=0.22.0',
@@ -26,22 +44,27 @@ dependencies = [
     'cellpose>=3.0.6',
     'IPython>=8.18.1',
     'opencv-python-headless>=4.9.0.80',
-    'umap>=0.1.1',
+    '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'
 ]
 
 setup(
     name="spacr",
-    version="0.0.35",
+    version="0.0.61",
     author="Einar Birnir Olafsson",
     author_email="olafsson@med.umich.com",
     description="Spatial phenotype analysis of crisp screens (SpaCr)",
     long_description=long_description,
     url="https://github.com/EinarOlafsson/spacr",
     packages=find_packages(exclude=["tests.*", "tests"]),
+    include_package_data=True,
+    package_data={'spacr': ['models/cp/*'],},
     install_requires=dependencies,
     entry_points={
         'console_scripts': [
@@ -52,6 +75,7 @@ setup(
             'classify=spacr.gui_classify_app:gui_classify',
             'sim=spacr.gui_sim_app:gui_sim',
             'gui=spacr.gui:gui_app',
+            'gui2=spacr.gui_2:gui_app',
         ],
     },
     extras_require={

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

@@ -8,7 +8,7 @@ from . import plot
 from . import measure
 from . import sim
 from . import timelapse
-from . import train
+from . import deep_spacr
 from . import mask_app
 from . import annotate_app
 from . import graph_learning
@@ -26,7 +26,7 @@ __all__ = [
     "measure",
     "sim",
     "timelapse",
-    "train",
+    "deep_spacr",
     "annotate_app",
     "graph_learning",
     "gui_utils",

{spacr-0.0.35 → spacr-0.0.61}/spacr/__main__.py

@@ -9,7 +9,5 @@ from tqdm import tqdm
 #from spacr import utils, io, version, timelapse, plot, core, mask_app, annotate_app
 import logging
 
-
-
 if __name__ == "__main__":
     main()