Skip to content
Snippets Groups Projects
Commit 7b62019f authored by François  LAURENT's avatar François LAURENT
Browse files

Merge branch 'dev' into 'main'

Direct calls to predict_model with hdf5 larva_dataset files

See merge request !6
parents 87e36bbc 77200202
No related branches found
No related tags found
1 merge request!6Direct calls to predict_model with hdf5 larva_dataset files
[tool.poetry] [tool.poetry]
name = "MaggotUBA-adapter" name = "MaggotUBA-adapter"
version = "0.16.2" version = "0.16.3"
description = "Interface between MaggotUBA and the Nyx tagging UI" description = "Interface between MaggotUBA and the Nyx tagging UI"
authors = ["François Laurent"] authors = ["François Laurent"]
license = "MIT" license = "MIT"
...@@ -14,7 +14,7 @@ maggotuba-core = {git = "https://gitlab.pasteur.fr/nyx/MaggotUBA-core", tag = "v ...@@ -14,7 +14,7 @@ maggotuba-core = {git = "https://gitlab.pasteur.fr/nyx/MaggotUBA-core", tag = "v
torch = "^1.11.0" torch = "^1.11.0"
numpy = "^1.19.3" numpy = "^1.19.3"
protobuf = "3.9.2" protobuf = "3.9.2"
taggingbackends = {git = "https://gitlab.pasteur.fr/nyx/TaggingBackends", tag = "v0.15"} taggingbackends = {git = "https://gitlab.pasteur.fr/nyx/TaggingBackends", tag = "v0.15.2"}
[build-system] [build-system]
requires = ["poetry-core>=1.0.0"] requires = ["poetry-core>=1.0.0"]
......
...@@ -362,7 +362,7 @@ class MaggotClassifier(MaggotModule): ...@@ -362,7 +362,7 @@ class MaggotClassifier(MaggotModule):
if n_iterations is not None: if n_iterations is not None:
if isinstance(n_iterations, str): if isinstance(n_iterations, str):
n_iterations = map(int, n_iterations.split(',')) n_iterations = map(int, n_iterations.split(','))
if isinstance(n_iterations, int): if isinstance(n_iterations, (int, np.int64)):
n_pretraining_iter = n_iterations // 2 n_pretraining_iter = n_iterations // 2
n_finetuning_iter = n_iterations // 2 n_finetuning_iter = n_iterations // 2
else: else:
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment