cellfinder 1.5.0__py3-none-any.whl → 1.6.0__py3-none-any.whl
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Potentially problematic release.
This version of cellfinder might be problematic. Click here for more details.
- cellfinder/core/classify/classify.py +1 -1
- cellfinder/core/main.py +1 -1
- cellfinder/napari/curation.py +1 -1
- cellfinder/napari/train/train.py +2 -2
- cellfinder/napari/train/train_containers.py +2 -2
- {cellfinder-1.5.0.dist-info → cellfinder-1.6.0.dist-info}/METADATA +4 -4
- {cellfinder-1.5.0.dist-info → cellfinder-1.6.0.dist-info}/RECORD +12 -12
- {cellfinder-1.5.0.dist-info → cellfinder-1.6.0.dist-info}/WHEEL +1 -1
- {cellfinder-1.5.0.dist-info → cellfinder-1.6.0.dist-info}/entry_points.txt +1 -1
- /cellfinder/core/train/{train_yml.py → train_yaml.py} +0 -0
- {cellfinder-1.5.0.dist-info → cellfinder-1.6.0.dist-info}/LICENSE +0 -0
- {cellfinder-1.5.0.dist-info → cellfinder-1.6.0.dist-info}/top_level.txt +0 -0
|
@@ -11,7 +11,7 @@ from brainglobe_utils.general.system import get_num_processes
|
|
|
11
11
|
from cellfinder.core import logger, types
|
|
12
12
|
from cellfinder.core.classify.cube_generator import CubeGeneratorFromFile
|
|
13
13
|
from cellfinder.core.classify.tools import get_model
|
|
14
|
-
from cellfinder.core.train.
|
|
14
|
+
from cellfinder.core.train.train_yaml import depth_type, models
|
|
15
15
|
|
|
16
16
|
|
|
17
17
|
def main(
|
cellfinder/core/main.py
CHANGED
|
@@ -6,7 +6,7 @@ from brainglobe_utils.cells.cells import Cell
|
|
|
6
6
|
|
|
7
7
|
from cellfinder.core import logger
|
|
8
8
|
from cellfinder.core.download.download import model_type
|
|
9
|
-
from cellfinder.core.train.
|
|
9
|
+
from cellfinder.core.train.train_yaml import depth_type
|
|
10
10
|
|
|
11
11
|
|
|
12
12
|
def main(
|
cellfinder/napari/curation.py
CHANGED
|
@@ -406,7 +406,7 @@ class CurationWidget(QWidget):
|
|
|
406
406
|
self.update_status_label("Ready")
|
|
407
407
|
|
|
408
408
|
def __prep_directories_for_save(self):
|
|
409
|
-
self.yaml_filename = self.output_directory / "training.
|
|
409
|
+
self.yaml_filename = self.output_directory / "training.yaml"
|
|
410
410
|
self.cell_cube_dir = self.output_directory / "cells"
|
|
411
411
|
self.no_cell_cube_dir = self.output_directory / "non_cells"
|
|
412
412
|
|
cellfinder/napari/train/train.py
CHANGED
|
@@ -7,7 +7,7 @@ from napari.qt.threading import thread_worker
|
|
|
7
7
|
from napari.utils.notifications import show_info
|
|
8
8
|
from qtpy.QtWidgets import QScrollArea
|
|
9
9
|
|
|
10
|
-
from cellfinder.core.train.
|
|
10
|
+
from cellfinder.core.train.train_yaml import run as train_yaml
|
|
11
11
|
from cellfinder.napari.utils import cellfinder_header, html_label_widget
|
|
12
12
|
|
|
13
13
|
from .train_containers import (
|
|
@@ -26,7 +26,7 @@ def run_training(
|
|
|
26
26
|
misc_training_inputs: MiscTrainingInputs,
|
|
27
27
|
):
|
|
28
28
|
print("Running training")
|
|
29
|
-
|
|
29
|
+
train_yaml(
|
|
30
30
|
**training_data_inputs.as_core_arguments(),
|
|
31
31
|
**optional_network_inputs.as_core_arguments(),
|
|
32
32
|
**optional_training_inputs.as_core_arguments(),
|
|
@@ -5,7 +5,7 @@ from typing import Optional
|
|
|
5
5
|
from magicgui.types import FileDialogMode
|
|
6
6
|
|
|
7
7
|
from cellfinder.core.download.download import model_filenames
|
|
8
|
-
from cellfinder.core.train.
|
|
8
|
+
from cellfinder.core.train.train_yaml import models
|
|
9
9
|
from cellfinder.napari.input_container import InputContainer
|
|
10
10
|
from cellfinder.napari.utils import html_label_widget
|
|
11
11
|
|
|
@@ -31,7 +31,7 @@ class TrainingDataInputs(InputContainer):
|
|
|
31
31
|
"yaml_files",
|
|
32
32
|
custom_label="YAML files",
|
|
33
33
|
mode=FileDialogMode.EXISTING_FILES,
|
|
34
|
-
filter="*.
|
|
34
|
+
filter="*.yaml",
|
|
35
35
|
),
|
|
36
36
|
output_directory=cls._custom_widget(
|
|
37
37
|
"output_directory", mode=FileDialogMode.EXISTING_DIRECTORY
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
Metadata-Version: 2.2
|
|
2
2
|
Name: cellfinder
|
|
3
|
-
Version: 1.
|
|
3
|
+
Version: 1.6.0
|
|
4
4
|
Summary: Automated 3D cell detection in large microscopy images
|
|
5
5
|
Author-email: "Adam Tyson, Christian Niedworok, Charly Rousseau" <code@adamltyson.com>
|
|
6
6
|
License: BSD-3-Clause
|
|
@@ -16,11 +16,11 @@ Classifier: Intended Audience :: Science/Research
|
|
|
16
16
|
Classifier: Operating System :: OS Independent
|
|
17
17
|
Classifier: Programming Language :: Python
|
|
18
18
|
Classifier: Programming Language :: Python :: 3
|
|
19
|
-
Classifier: Programming Language :: Python :: 3.10
|
|
20
19
|
Classifier: Programming Language :: Python :: 3.11
|
|
21
20
|
Classifier: Programming Language :: Python :: 3.12
|
|
21
|
+
Classifier: Programming Language :: Python :: 3.13
|
|
22
22
|
Classifier: Topic :: Scientific/Engineering :: Image Recognition
|
|
23
|
-
Requires-Python: >=3.
|
|
23
|
+
Requires-Python: >=3.11
|
|
24
24
|
Description-Content-Type: text/markdown
|
|
25
25
|
License-File: LICENSE
|
|
26
26
|
Requires-Dist: brainglobe-utils>=0.5.0
|
|
@@ -36,6 +36,7 @@ Requires-Dist: keras>=3.7.0
|
|
|
36
36
|
Requires-Dist: torch!=2.4,>=2.1.0
|
|
37
37
|
Requires-Dist: tifffile
|
|
38
38
|
Requires-Dist: tqdm
|
|
39
|
+
Requires-Dist: qt-niu
|
|
39
40
|
Provides-Extra: dev
|
|
40
41
|
Requires-Dist: black; extra == "dev"
|
|
41
42
|
Requires-Dist: pre-commit; extra == "dev"
|
|
@@ -47,7 +48,6 @@ Requires-Dist: pytest-timeout; extra == "dev"
|
|
|
47
48
|
Requires-Dist: pytest; extra == "dev"
|
|
48
49
|
Requires-Dist: tox; extra == "dev"
|
|
49
50
|
Requires-Dist: pooch>=1; extra == "dev"
|
|
50
|
-
Requires-Dist: qt-niu; extra == "dev"
|
|
51
51
|
Provides-Extra: napari
|
|
52
52
|
Requires-Dist: brainglobe-napari-io; extra == "napari"
|
|
53
53
|
Requires-Dist: magicgui; extra == "napari"
|
|
@@ -1,11 +1,11 @@
|
|
|
1
1
|
cellfinder/__init__.py,sha256=S5oQ3EORuyQTMYC4uUuzGKZ23J3Ya6q-1DOBib1KfiA,1166
|
|
2
2
|
cellfinder/cli_migration_warning.py,sha256=gPtNrtnXvWpl5q0k_EGAQZg0DwcpCmuBTgpg56n5NfA,1578
|
|
3
3
|
cellfinder/core/__init__.py,sha256=pRFuQsl78HEK0S6gvhJw70QLbjjSBzP-GFO0AtVaGtk,62
|
|
4
|
-
cellfinder/core/main.py,sha256=
|
|
4
|
+
cellfinder/core/main.py,sha256=6PdZxqrAYHauT_K6R4H_u8Eyc3kbrNormySDiWSgTRo,3837
|
|
5
5
|
cellfinder/core/types.py,sha256=lTqWE4v0SMM0qLAZJdyAzqV1nLgDtobEpglNJcXt160,106
|
|
6
6
|
cellfinder/core/classify/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
|
|
7
7
|
cellfinder/core/classify/augment.py,sha256=8dMbM7KhimM6NMgdMC53oHoCfYj1CIB-h3Yk8CZAxPw,6321
|
|
8
|
-
cellfinder/core/classify/classify.py,sha256=
|
|
8
|
+
cellfinder/core/classify/classify.py,sha256=UkZJa8DUnyaACx8hazHMi-JSSYosuzBWXkbVhgNo78g,3561
|
|
9
9
|
cellfinder/core/classify/cube_generator.py,sha256=jC5aogTVy213PHouViSR9CgKkuOks3yk6csQC5kRoOE,17125
|
|
10
10
|
cellfinder/core/classify/resnet.py,sha256=vGa85y_NcQnOXwAt5EtatLx5mrO8IoShCcNKtJ5-EFg,10034
|
|
11
11
|
cellfinder/core/classify/tools.py,sha256=s5PEKAsZVbVuoferZ_nqMUM0f2bV_8WEKsdKe3SXEuE,2560
|
|
@@ -39,9 +39,9 @@ cellfinder/core/tools/threading.py,sha256=EmDLF22ZvXJnsWg7g6sv4cZgNweC0YrVw2o7QX
|
|
|
39
39
|
cellfinder/core/tools/tiff.py,sha256=NzIz6wq2GzxmcIhawFMwZADe-uQO2rIG46H7xkpGKLs,2899
|
|
40
40
|
cellfinder/core/tools/tools.py,sha256=opMGC5GBBsId0dmL8V0KQrI4U70w_D_KtGQYpZNeHYQ,9390
|
|
41
41
|
cellfinder/core/train/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
|
|
42
|
-
cellfinder/core/train/
|
|
42
|
+
cellfinder/core/train/train_yaml.py,sha256=9QXv2wk24G8hYskMnBij7OngEELUWySK2fH4NFbYWw4,13260
|
|
43
43
|
cellfinder/napari/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
|
|
44
|
-
cellfinder/napari/curation.py,sha256
|
|
44
|
+
cellfinder/napari/curation.py,sha256=-m9w0SwjmCminZ6FPj_CKHzTeaxyFdI8DL_-s2KfA9c,21426
|
|
45
45
|
cellfinder/napari/input_container.py,sha256=tkm0dkPt7kSL8Xkvs1fh8M6vKWw57QLIt_wv74HFkGk,2150
|
|
46
46
|
cellfinder/napari/napari.yaml,sha256=WMR1CIAmYIVyQngbdbomTRZLvlDbb6LxsXsvTRClQnE,921
|
|
47
47
|
cellfinder/napari/sample_data.py,sha256=oUST23q09MM8dxHbUCmO0AjtXG6OlR_32LLqP0EU2UA,732
|
|
@@ -51,11 +51,11 @@ cellfinder/napari/detect/detect.py,sha256=EC71KN0AEr49hMjvS8yzvGvfRctqKqn_lNERyx
|
|
|
51
51
|
cellfinder/napari/detect/detect_containers.py,sha256=j9NTsIyyDNrhlI2dc7hvc7QlxvI1NRHlCe137v7fsPg,5467
|
|
52
52
|
cellfinder/napari/detect/thread_worker.py,sha256=PWM3OE-FpK-dpdhaE_Gi-2lD3u8sL-SJ13mp0pMhTyI,3078
|
|
53
53
|
cellfinder/napari/train/__init__.py,sha256=xo4CK-DvSecInGEc2ohcTgQYlH3iylFnGvKTCoq2WkI,35
|
|
54
|
-
cellfinder/napari/train/train.py,sha256=
|
|
55
|
-
cellfinder/napari/train/train_containers.py,sha256=
|
|
56
|
-
cellfinder-1.
|
|
57
|
-
cellfinder-1.
|
|
58
|
-
cellfinder-1.
|
|
59
|
-
cellfinder-1.
|
|
60
|
-
cellfinder-1.
|
|
61
|
-
cellfinder-1.
|
|
54
|
+
cellfinder/napari/train/train.py,sha256=5TwGiPkgAStjVuxv3LLzV3-gh_d2Ms7DjdShs0XC7aE,5944
|
|
55
|
+
cellfinder/napari/train/train_containers.py,sha256=ryx7g_wSdktB6UbdveM7-YfK5py4pFAcO4Ls8Kre1FA,4388
|
|
56
|
+
cellfinder-1.6.0.dist-info/LICENSE,sha256=Tw8iMytIDXLSmcIUsbQmRWojstl9yOWsPCx6ZT6dZLY,1564
|
|
57
|
+
cellfinder-1.6.0.dist-info/METADATA,sha256=TvB9qXprasFvS2tcWk6iPtECmqnFsC-0XhflNBLaFaI,7142
|
|
58
|
+
cellfinder-1.6.0.dist-info/WHEEL,sha256=52BFRY2Up02UkjOa29eZOS2VxUrpPORXg1pkohGGUS8,91
|
|
59
|
+
cellfinder-1.6.0.dist-info/entry_points.txt,sha256=n2n3muDgifENJtTRz1JqYStxvuprROCwmKLt-VxvEHk,248
|
|
60
|
+
cellfinder-1.6.0.dist-info/top_level.txt,sha256=jyTQzX-tDjbsMr6s-E71Oy0IKQzmHTXSk4ZhpG5EDSE,11
|
|
61
|
+
cellfinder-1.6.0.dist-info/RECORD,,
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
[console_scripts]
|
|
2
2
|
cellfinder = cellfinder.cli_migration_warning:cli_catch
|
|
3
3
|
cellfinder_download = cellfinder.core.download.cli:main
|
|
4
|
-
cellfinder_train = cellfinder.core.train.
|
|
4
|
+
cellfinder_train = cellfinder.core.train.train_yaml:cli
|
|
5
5
|
|
|
6
6
|
[napari.manifest]
|
|
7
7
|
cellfinder = cellfinder.napari:napari.yaml
|
|
File without changes
|
|
File without changes
|
|
File without changes
|