From cd9e1e6380cc4c57c4ffd48448b748213395bfb1 Mon Sep 17 00:00:00 2001 From: Milagros Marin Date: Fri, 3 Nov 2023 15:18:17 -0500 Subject: [PATCH 1/3] update setup to delete networkx dependency --- setup.py | 1 - 1 file changed, 1 deletion(-) diff --git a/setup.py b/setup.py index e501313..5ddda39 100644 --- a/setup.py +++ b/setup.py @@ -27,7 +27,6 @@ "datajoint>=0.13", "graphviz", "pydot", - "networkx==2.8.2", "ipykernel", "ipywidgets", ], From 3725c39ebbdccbf383d33292b6635a5549c7465e Mon Sep 17 00:00:00 2001 From: Milagros Marin Date: Fri, 3 Nov 2023 17:46:31 -0500 Subject: [PATCH 2/3] update setup to delete graphviz --- setup.py | 1 - 1 file changed, 1 deletion(-) diff --git a/setup.py b/setup.py index 5ddda39..dceaf6b 100644 --- a/setup.py +++ b/setup.py @@ -25,7 +25,6 @@ scripts=[], install_requires=[ "datajoint>=0.13", - "graphviz", "pydot", "ipykernel", "ipywidgets", From 83438d4a5dd8de99aa1d0a6b1d82c349de1be0ba Mon Sep 17 00:00:00 2001 From: Milagros Marin Date: Fri, 3 Nov 2023 18:02:10 -0500 Subject: [PATCH 3/3] activate model schema prior to `insert_new_model` --- element_deeplabcut/train.py | 26 +++++++++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) diff --git a/element_deeplabcut/train.py b/element_deeplabcut/train.py index cfb8f0b..679fac6 100644 --- a/element_deeplabcut/train.py +++ b/element_deeplabcut/train.py @@ -11,8 +11,11 @@ from pathlib import Path from element_interface.utils import find_full_path, dict_to_uuid from .readers import dlc_reader +from . import model schema = dj.schema() +model = dj.schema() + _linking_module = None @@ -53,9 +56,17 @@ def activate( global _linking_module _linking_module = linking_module + # activate + model.activate( + train_schema_name=model_schema_name, + create_schema=create_schema, + create_tables=create_tables, + add_objects=_linking_module.__dict__, + ) + # activate schema.activate( - train_schema_name, + train_schema_name=train_schema_name, create_schema=create_schema, create_tables=create_tables, add_objects=_linking_module.__dict__, @@ -321,3 +332,16 @@ def make(self, key): self.insert1( {**key, "latest_snapshot": latest_snapshot, "config_template": dlc_config} ) + + """ + model.insert_new_model(**key, + model_name=dlc_config['task'], + dlc_config=dlc_config, + shuffle: int, + trainingsetindex, + project_path=None, + model_description="", + model_prefix="", + paramset_idx: int = None, + ) + """