Skip to content

Commit

Permalink
bugfix when muultiple images are predicted
Browse files Browse the repository at this point in the history
  • Loading branch information
RRobert92 committed May 24, 2024
1 parent 9a881f2 commit 9df94c0
Show file tree
Hide file tree
Showing 5 changed files with 65 additions and 8 deletions.
52 changes: 52 additions & 0 deletions conda-build/meta-v0.2.5.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
package:
name: "tardis-em"
version: "0.2.5"

source:
# git_url: https://github.com/SMLC-NYSBC/TARDIS.git
# git_tag: v0.2.5
path: ../

build:
number: 0
# noarch: python
platform: osx-arm64
script: {{ PYTHON }} -m pip install . -vv

requirements:
host:
- pip
- python>=3.10,<3.12
build:
- python>=3.10,<3.12
- pip
- setuptools
run:
- python>=3.10, <3.12
- pytorch>=1.12.0
- numpy>=1.21.0
- pandas>1.3.0
- tifffile>2021.11.0
- imagecodecs
- scikit-learn>1.0.1
- scikit-image>0.19.2
- scipy>=1.8.1
- pillow
- open3d
- requests>2.28.0
- ipython>8.0.0
- click>8.0.4
- plyfile
- pyvista

extra:
recipe-maintainers:
- RRobert92
- tbepler

about:
doc_url: https://smlc-nysbc.github.io/TARDIS/
dev_url: https://github.com/SMLC-NYSBC/TARDIS
home: https://github.com/SMLC-NYSBC/TARDIS
license: MIT
license_file: LICENSE
6 changes: 3 additions & 3 deletions conda-build/meta.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package:
name: "tardis-em"
version: "0.2.5"
version: "0.2.6"

source:
# git_url: https://github.com/SMLC-NYSBC/TARDIS.git
Expand All @@ -9,8 +9,8 @@ source:

build:
number: 0
# noarch: python
platform: osx-arm64
noarch: python
# platform: osx-arm64
script: {{ PYTHON }} -m pip install . -vv

requirements:
Expand Down
7 changes: 4 additions & 3 deletions docs/HISTORY.md
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
# History
<details open>
<summary><b>0.2.5 (2024-05-22)</b></summary>
<summary><b>0.2.6 (2024-05-22)</b></summary>

* **General changes:**
* *General*:
* Added support for predicting Actin
* Predicting point clouds directly from cli
* Bugfix when multiple files are predicted in batch
* Added support for predicting Actin
* Predicting point clouds directly from cli

</details>

Expand Down
2 changes: 1 addition & 1 deletion tardis_em/_version.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@
# MIT License 2021 - 2024 #
# #####################################################################

version = "0.2.5"
version = "0.2.6"
6 changes: 5 additions & 1 deletion tardis_em/utils/predictor.py
Original file line number Diff line number Diff line change
Expand Up @@ -712,7 +712,11 @@ def log_tardis(self, id_: int, i: Union[str, np.ndarray], log_id: float):
"text_3": f"Image {id_ + 1}/{len(self.predict_list)}: {i}",
}

no_segments = np.max(self.segments[:, 0]) if len(self.segments) > 0 else 0
if log_id == 7:
no_segments = np.max(self.segments[:, 0]) if len(self.segments) > 0 else 0
else:
no_segments = 'None'

# Define text configurations for each log_id
text_configurations = {
0: {
Expand Down

0 comments on commit 9df94c0

Please sign in to comment.