From 86cbcb5610006028ab5e67029ee897c5efe3b636 Mon Sep 17 00:00:00 2001 From: tsubramanian Date: Sat, 26 Aug 2023 11:45:24 +0530 Subject: [PATCH 01/28] whaleridgefindr build --- devops/provision/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/devops/provision/Dockerfile b/devops/provision/Dockerfile index 720dd6fb8..9817ffc1c 100644 --- a/devops/provision/Dockerfile +++ b/devops/provision/Dockerfile @@ -40,8 +40,8 @@ RUN set -ex \ && git clone https://github.com/WildMeOrg/wbia-plugin-finfindr.git \ && git clone https://github.com/WildMeOrg/wbia-plugin-deepsense.git \ && git clone https://github.com/WildMeOrg/wbia-plugin-pie-v2.git \ - && git clone https://github.com/WildMeOrg/wbia-plugin-miew-id.git - + && git clone https://github.com/WildMeOrg/wbia-plugin-miew-id.git \ + && git clone https://github.com/WildMeOrg/wbia-plugin-whaleridgefindr.git RUN set -ex \ && cd /wbia \ From 20138c2dfcfdf9d8f30ac4259898334180e77ec4 Mon Sep 17 00:00:00 2001 From: tsubramanian Date: Sat, 26 Aug 2023 11:52:12 +0530 Subject: [PATCH 02/28] Update IBEISControl.py --- wbia/control/IBEISControl.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/wbia/control/IBEISControl.py b/wbia/control/IBEISControl.py index 38e9b9db6..a5eb734ec 100644 --- a/wbia/control/IBEISControl.py +++ b/wbia/control/IBEISControl.py @@ -170,6 +170,10 @@ (('--no-miew-id', '--nomiew-id'), 'wbia_miew_id._plugin'), ] +if ut.get_argflag('--whaleridgefindr'): + AUTOLOAD_PLUGIN_MODNAMES += [ + (('--no-whaleridgefindr', '--nowhaleridgefindr'), 'whaleridgefindr._plugin'), + ] if ut.get_argflag('--blend'): AUTOLOAD_PLUGIN_MODNAMES += [ @@ -215,6 +219,8 @@ # NOTE hack if modname == 'wbia_miew_id._plugin': ub.import_module_from_path('/wbia/wbia-plugin-miew-id/wbia_miew_id/__init__.py') + if modname == 'whaleridgefindr._plugin': + ub.import_module_from_path('/wbia/wbia-plugin-whaleridgefindr/wbia_finfindr/__init__.py') else: ub.import_module_from_name(modname) except ImportError: From 0f41b8104372a8139edd72cf26ecd540956e0d0a Mon Sep 17 00:00:00 2001 From: tsubramanian Date: Sat, 26 Aug 2023 12:01:55 +0530 Subject: [PATCH 03/28] Update apis_query.py --- wbia/web/apis_query.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wbia/web/apis_query.py b/wbia/web/apis_query.py index df9920f07..288de3b00 100644 --- a/wbia/web/apis_query.py +++ b/wbia/web/apis_query.py @@ -455,7 +455,8 @@ def review_graph_match_html( 'kaggleseven', 'pie', 'pietwo', - 'miewid' + 'miewid', + 'wbia_finfindr' ): cls = chip_match.AnnotMatch # ibs.depc_annot.requestclass_dict['BC_DTW'] else: @@ -592,6 +593,8 @@ def review_query_chips_test(**kwargs): query_config_dict = {'pipeline_root': 'PieTwo'} elif 'use_miew_id' in request.args: query_config_dict = {'pipeline_root': 'MiewId'} + elif 'use_whaleridgefindr' in request.args: + query_config_dict = {'pipeline_root': 'whaleridgefindr'} else: query_config_dict = {} result_dict = ibs.query_chips_test(query_config_dict=query_config_dict) From c7d29d84514369207354b38cd42aed971ac93708 Mon Sep 17 00:00:00 2001 From: tsubramanian Date: Sat, 26 Aug 2023 12:03:02 +0530 Subject: [PATCH 04/28] Update Dockerfile --- devops/Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/devops/Dockerfile b/devops/Dockerfile index 8283728fc..13b98a367 100644 --- a/devops/Dockerfile +++ b/devops/Dockerfile @@ -143,6 +143,7 @@ RUN set -ex \ && /virtualenv/env3/bin/python -c "import wbia; from wbia.__main__ import smoke_test; smoke_test()" \ && /virtualenv/env3/bin/python -c "import wbia_cnn; from wbia_cnn.__main__ import main; main()" \ && /virtualenv/env3/bin/python -c "import wbia_pie_v2; from wbia_pie_v2.__main__ import main; main()" \ + && /virtualenv/env3/bin/python -c "import wbia_finfindr; from wbia_finfindr.__main__ import main; main()" \ && /virtualenv/env3/bin/python -c "import wbia_blend; from wbia_blend._plugin import *" \ && /virtualenv/env3/bin/python -c "import wbia_orientation; from wbia_orientation.__main__ import main; main()" \ && /virtualenv/env3/bin/python -c "import wbia_curvrank_v2; from wbia_curvrank_v2._plugin import *" \ From aaa7c500ba3801a385cbf6e3f999b44ef31c60b2 Mon Sep 17 00:00:00 2001 From: tsubramanian Date: Sat, 26 Aug 2023 12:06:16 +0530 Subject: [PATCH 05/28] Update apis_query.py --- wbia/web/apis_query.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wbia/web/apis_query.py b/wbia/web/apis_query.py index 288de3b00..0bc2f73ab 100644 --- a/wbia/web/apis_query.py +++ b/wbia/web/apis_query.py @@ -456,7 +456,7 @@ def review_graph_match_html( 'pie', 'pietwo', 'miewid', - 'wbia_finfindr' + 'whaleridgefindr' ): cls = chip_match.AnnotMatch # ibs.depc_annot.requestclass_dict['BC_DTW'] else: From 4e976115f8408e9d285eea141e8118c4e57790b9 Mon Sep 17 00:00:00 2001 From: tsubramanian Date: Sat, 26 Aug 2023 12:08:33 +0530 Subject: [PATCH 06/28] Update apis_query.py --- wbia/web/apis_query.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wbia/web/apis_query.py b/wbia/web/apis_query.py index 0bc2f73ab..479e10d8e 100644 --- a/wbia/web/apis_query.py +++ b/wbia/web/apis_query.py @@ -594,7 +594,7 @@ def review_query_chips_test(**kwargs): elif 'use_miew_id' in request.args: query_config_dict = {'pipeline_root': 'MiewId'} elif 'use_whaleridgefindr' in request.args: - query_config_dict = {'pipeline_root': 'whaleridgefindr'} + query_config_dict = {'pipeline_root': 'whaleridgefindr'} else: query_config_dict = {} result_dict = ibs.query_chips_test(query_config_dict=query_config_dict) From 4887f7892c56097e617c77de5e479234f4d30bb8 Mon Sep 17 00:00:00 2001 From: tsubramanian Date: Sat, 26 Aug 2023 12:09:43 +0530 Subject: [PATCH 07/28] Update IBEISControl.py --- wbia/control/IBEISControl.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wbia/control/IBEISControl.py b/wbia/control/IBEISControl.py index a5eb734ec..f72d855fa 100644 --- a/wbia/control/IBEISControl.py +++ b/wbia/control/IBEISControl.py @@ -220,7 +220,7 @@ if modname == 'wbia_miew_id._plugin': ub.import_module_from_path('/wbia/wbia-plugin-miew-id/wbia_miew_id/__init__.py') if modname == 'whaleridgefindr._plugin': - ub.import_module_from_path('/wbia/wbia-plugin-whaleridgefindr/wbia_finfindr/__init__.py') + ub.import_module_from_path('/wbia/wbia-plugin-whaleridgefindr/wbia_finfindr/__init__.py') else: ub.import_module_from_name(modname) except ImportError: From 77c75d252693daa04d04c6cd1309fe3f16640301 Mon Sep 17 00:00:00 2001 From: tsubramanian Date: Sat, 26 Aug 2023 12:11:26 +0530 Subject: [PATCH 08/28] Update docker-publish.yaml --- .github/workflows/docker-publish.yaml | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/.github/workflows/docker-publish.yaml b/.github/workflows/docker-publish.yaml index 56b1296d4..37f46a620 100644 --- a/.github/workflows/docker-publish.yaml +++ b/.github/workflows/docker-publish.yaml @@ -3,11 +3,8 @@ name: Build and upload Docker on: push: branches: - - main - tags: - - v* - schedule: - - cron: '0 0 * * *' # Every day at midnight + - whaleridgefindr-build + jobs: devops: @@ -24,7 +21,7 @@ jobs: - uses: actions/checkout@v2 if: github.event_name == 'schedule' with: - ref: main + ref: whaleridgefindr-build - uses: actions/checkout@v2 if: github.event_name != 'schedule' From a85e2bcbf490ef9115eecf0f6c443e9befb98b5e Mon Sep 17 00:00:00 2001 From: tsubramanian Date: Sat, 26 Aug 2023 13:09:20 +0530 Subject: [PATCH 09/28] Update Dockerfile --- devops/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/devops/Dockerfile b/devops/Dockerfile index 13b98a367..dd668698b 100644 --- a/devops/Dockerfile +++ b/devops/Dockerfile @@ -137,13 +137,13 @@ RUN set -ex \ # Run smoke tests # && /virtualenv/env3/bin/python -c "import wbia; from wbia.__main__ import smoke_test; smoke_test()" \ # && /virtualenv/env3/bin/python -c "import wbia_flukematch; from wbia_flukematch.plugin import *" \ -- commented out due to Lasagne package dependency issues +# && /virtualenv/env3/bin/python -c "import wbia_finfindr; from wbia_finfindr.__main__ import main; main()" \ RUN set -ex \ && mkdir -p /data \ && /virtualenv/env3/bin/python -m wbia.dev --set-workdir /data --preload-exit \ && /virtualenv/env3/bin/python -c "import wbia; from wbia.__main__ import smoke_test; smoke_test()" \ && /virtualenv/env3/bin/python -c "import wbia_cnn; from wbia_cnn.__main__ import main; main()" \ && /virtualenv/env3/bin/python -c "import wbia_pie_v2; from wbia_pie_v2.__main__ import main; main()" \ - && /virtualenv/env3/bin/python -c "import wbia_finfindr; from wbia_finfindr.__main__ import main; main()" \ && /virtualenv/env3/bin/python -c "import wbia_blend; from wbia_blend._plugin import *" \ && /virtualenv/env3/bin/python -c "import wbia_orientation; from wbia_orientation.__main__ import main; main()" \ && /virtualenv/env3/bin/python -c "import wbia_curvrank_v2; from wbia_curvrank_v2._plugin import *" \ From 87278f2867dfc619f4b4de159c5555ab9ffb8e93 Mon Sep 17 00:00:00 2001 From: tsubramanian Date: Sun, 27 Aug 2023 08:25:23 +0530 Subject: [PATCH 10/28] Update Dockerfile --- devops/provision/Dockerfile | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/devops/provision/Dockerfile b/devops/provision/Dockerfile index 9817ffc1c..64386306d 100644 --- a/devops/provision/Dockerfile +++ b/devops/provision/Dockerfile @@ -124,6 +124,10 @@ RUN /bin/bash -xc '. /virtualenv/env3/bin/activate \ && cd /wbia/wbia-plugin-pie-v2 \ && /bin/bash run_developer_setup.sh' +RUN /bin/bash -xc '. /virtualenv/env3/bin/activate \ + && cd /wbia/wbia-plugin-whaleridgefindr \ + && /bin/bash run_developer_setup.sh' + RUN /bin/bash -xc '. /virtualenv/env3/bin/activate \ && cd /wbia/wbia-plugin-blend \ && pip install --no-cache-dir -e .' From e423386265fecd86374cb3cd4bf793a8ba4e3720 Mon Sep 17 00:00:00 2001 From: tsubramanian Date: Sun, 27 Aug 2023 08:29:36 +0530 Subject: [PATCH 11/28] Update Dockerfile --- devops/Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/devops/Dockerfile b/devops/Dockerfile index dd668698b..4b505455d 100644 --- a/devops/Dockerfile +++ b/devops/Dockerfile @@ -148,6 +148,7 @@ RUN set -ex \ && /virtualenv/env3/bin/python -c "import wbia_orientation; from wbia_orientation.__main__ import main; main()" \ && /virtualenv/env3/bin/python -c "import wbia_curvrank_v2; from wbia_curvrank_v2._plugin import *" \ && /virtualenv/env3/bin/python -c "import wbia_finfindr; from wbia_finfindr._plugin import *" \ + && /virtualenv/env3/bin/python -c "import whaleridgefindr.wbia_finfindr; from whaleridgefindr.wbia_finfindr.__main__ import main; main()" && /virtualenv/env3/bin/python -c "import wbia_kaggle7; from wbia_kaggle7._plugin import *" \ && /virtualenv/env3/bin/python -c "import wbia_lca; from wbia_lca._plugin import *" \ && /virtualenv/env3/bin/python -c "import wbia_deepsense; from wbia_deepsense._plugin import *" \ From b2bc72107e02531b4af4e56e9f748883bb1a7bfe Mon Sep 17 00:00:00 2001 From: tsubramanian Date: Sun, 27 Aug 2023 14:18:50 +0530 Subject: [PATCH 12/28] Update IBEISControl.py --- wbia/control/IBEISControl.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/wbia/control/IBEISControl.py b/wbia/control/IBEISControl.py index f72d855fa..50b03da9c 100644 --- a/wbia/control/IBEISControl.py +++ b/wbia/control/IBEISControl.py @@ -170,9 +170,9 @@ (('--no-miew-id', '--nomiew-id'), 'wbia_miew_id._plugin'), ] -if ut.get_argflag('--whaleridgefindr'): +if ut.get_argflag('--wbia_whaleridgefindr'): AUTOLOAD_PLUGIN_MODNAMES += [ - (('--no-whaleridgefindr', '--nowhaleridgefindr'), 'whaleridgefindr._plugin'), + (('--no-whaleridgefindr', '--nowhaleridgefindr'), 'wbia_whaleridgefindr._plugin'), ] if ut.get_argflag('--blend'): @@ -219,8 +219,8 @@ # NOTE hack if modname == 'wbia_miew_id._plugin': ub.import_module_from_path('/wbia/wbia-plugin-miew-id/wbia_miew_id/__init__.py') - if modname == 'whaleridgefindr._plugin': - ub.import_module_from_path('/wbia/wbia-plugin-whaleridgefindr/wbia_finfindr/__init__.py') + if modname == 'wbia_whaleridgefindr._plugin': + ub.import_module_from_path('/wbia/wbia-plugin-whaleridgefindr/wbia_whaleridgefindr/__init__.py') else: ub.import_module_from_name(modname) except ImportError: From f6818f82429cf6a97d67361abbe0945ba19f5529 Mon Sep 17 00:00:00 2001 From: tsubramanian Date: Sun, 27 Aug 2023 14:52:14 +0530 Subject: [PATCH 13/28] Update Dockerfile --- devops/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/devops/Dockerfile b/devops/Dockerfile index 4b505455d..52c09fc1c 100644 --- a/devops/Dockerfile +++ b/devops/Dockerfile @@ -148,7 +148,7 @@ RUN set -ex \ && /virtualenv/env3/bin/python -c "import wbia_orientation; from wbia_orientation.__main__ import main; main()" \ && /virtualenv/env3/bin/python -c "import wbia_curvrank_v2; from wbia_curvrank_v2._plugin import *" \ && /virtualenv/env3/bin/python -c "import wbia_finfindr; from wbia_finfindr._plugin import *" \ - && /virtualenv/env3/bin/python -c "import whaleridgefindr.wbia_finfindr; from whaleridgefindr.wbia_finfindr.__main__ import main; main()" + && /virtualenv/env3/bin/python -c "import wbia_whaleridgefindr; from wbia_whaleridgefindr._plugin import *" && /virtualenv/env3/bin/python -c "import wbia_kaggle7; from wbia_kaggle7._plugin import *" \ && /virtualenv/env3/bin/python -c "import wbia_lca; from wbia_lca._plugin import *" \ && /virtualenv/env3/bin/python -c "import wbia_deepsense; from wbia_deepsense._plugin import *" \ From bbde69843836ff63113267c78b58868c300c5c04 Mon Sep 17 00:00:00 2001 From: tsubramanian Date: Sun, 27 Aug 2023 15:03:12 +0530 Subject: [PATCH 14/28] Update Dockerfile --- devops/provision/Dockerfile | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/devops/provision/Dockerfile b/devops/provision/Dockerfile index 64386306d..a8b8e2883 100644 --- a/devops/provision/Dockerfile +++ b/devops/provision/Dockerfile @@ -126,7 +126,7 @@ RUN /bin/bash -xc '. /virtualenv/env3/bin/activate \ RUN /bin/bash -xc '. /virtualenv/env3/bin/activate \ && cd /wbia/wbia-plugin-whaleridgefindr \ - && /bin/bash run_developer_setup.sh' + && pip install --no-cache-dir -e .' RUN /bin/bash -xc '. /virtualenv/env3/bin/activate \ && cd /wbia/wbia-plugin-blend \ @@ -136,6 +136,10 @@ RUN /bin/bash -xc '. /virtualenv/env3/bin/activate \ && cd /wbia/wbia-plugin-finfindr \ && pip install --no-cache-dir -e .' +RUN /bin/bash -xc '. /virtualenv/env3/bin/activate \ + && cd /wbia/wbia-plugin-finfindr \ + && pip install --no-cache-dir -e .' + RUN /bin/bash -xc '. /virtualenv/env3/bin/activate \ && cd /wbia/wbia-plugin-deepsense \ && pip install --no-cache-dir -e .' From 02cb67c93231d7293ac0538aba6b8c7f993a833b Mon Sep 17 00:00:00 2001 From: tsubramanian Date: Sun, 27 Aug 2023 15:36:48 +0530 Subject: [PATCH 15/28] Update Dockerfile --- devops/provision/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/devops/provision/Dockerfile b/devops/provision/Dockerfile index a8b8e2883..73bcba497 100644 --- a/devops/provision/Dockerfile +++ b/devops/provision/Dockerfile @@ -41,8 +41,8 @@ RUN set -ex \ && git clone https://github.com/WildMeOrg/wbia-plugin-deepsense.git \ && git clone https://github.com/WildMeOrg/wbia-plugin-pie-v2.git \ && git clone https://github.com/WildMeOrg/wbia-plugin-miew-id.git \ - && git clone https://github.com/WildMeOrg/wbia-plugin-whaleridgefindr.git - + && git clone https://github.com/JasonWildMe/wbia-plugin-whaleridgefindr.git + RUN set -ex \ && cd /wbia \ && git clone --recursive https://github.com/WildMeOrg/wbia-plugin-blend.git \ From 554e4cd8ef64e425a2cf12d519e5a5576a77bb88 Mon Sep 17 00:00:00 2001 From: tsubramanian Date: Sun, 27 Aug 2023 19:25:07 +0530 Subject: [PATCH 16/28] Update docker_control.py --- wbia/control/docker_control.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/wbia/control/docker_control.py b/wbia/control/docker_control.py index 31132f792..1acf15d07 100644 --- a/wbia/control/docker_control.py +++ b/wbia/control/docker_control.py @@ -25,6 +25,8 @@ DOCKER_CONFIG_REGISTRY = {} DOCKER_IMAGE_PREFIX = [ 'wildme', + 'haimeh', + ] DOCKER_DEFAULT_RUN_ARGS = {'detach': True, 'restart_policy': {'Name': 'on-failure'}} From 486181d25f97aaa03561ff05a70419ee225ea65c Mon Sep 17 00:00:00 2001 From: tsubramanian Date: Sun, 27 Aug 2023 20:35:26 +0530 Subject: [PATCH 17/28] Update apis_query.py --- wbia/web/apis_query.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/wbia/web/apis_query.py b/wbia/web/apis_query.py index 479e10d8e..f9e35b5b0 100644 --- a/wbia/web/apis_query.py +++ b/wbia/web/apis_query.py @@ -456,7 +456,7 @@ def review_graph_match_html( 'pie', 'pietwo', 'miewid', - 'whaleridgefindr' + 'wbia_whaleridgefindr' ): cls = chip_match.AnnotMatch # ibs.depc_annot.requestclass_dict['BC_DTW'] else: @@ -594,7 +594,7 @@ def review_query_chips_test(**kwargs): elif 'use_miew_id' in request.args: query_config_dict = {'pipeline_root': 'MiewId'} elif 'use_whaleridgefindr' in request.args: - query_config_dict = {'pipeline_root': 'whaleridgefindr'} + query_config_dict = {'pipeline_root': 'wbia_whaleridgefindr'} else: query_config_dict = {} result_dict = ibs.query_chips_test(query_config_dict=query_config_dict) From 10709b99b1925545b8f2d1a69ca7f9cb52053ee3 Mon Sep 17 00:00:00 2001 From: tsubramanian Date: Sun, 27 Aug 2023 22:20:44 +0530 Subject: [PATCH 18/28] Update Dockerfile --- devops/provision/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/devops/provision/Dockerfile b/devops/provision/Dockerfile index 73bcba497..4d3b6798e 100644 --- a/devops/provision/Dockerfile +++ b/devops/provision/Dockerfile @@ -41,8 +41,8 @@ RUN set -ex \ && git clone https://github.com/WildMeOrg/wbia-plugin-deepsense.git \ && git clone https://github.com/WildMeOrg/wbia-plugin-pie-v2.git \ && git clone https://github.com/WildMeOrg/wbia-plugin-miew-id.git \ - && git clone https://github.com/JasonWildMe/wbia-plugin-whaleridgefindr.git - + && git clone https://github.com/WildMeOrg/wbia-plugin-whaleridgefindr.git + RUN set -ex \ && cd /wbia \ && git clone --recursive https://github.com/WildMeOrg/wbia-plugin-blend.git \ From d2ba139c7dede206832b41af9e2dcf7d5d52cc60 Mon Sep 17 00:00:00 2001 From: tsubramanian Date: Mon, 28 Aug 2023 12:14:34 +0530 Subject: [PATCH 19/28] Update Dockerfile --- devops/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/devops/Dockerfile b/devops/Dockerfile index 52c09fc1c..a8eb444b6 100644 --- a/devops/Dockerfile +++ b/devops/Dockerfile @@ -148,7 +148,7 @@ RUN set -ex \ && /virtualenv/env3/bin/python -c "import wbia_orientation; from wbia_orientation.__main__ import main; main()" \ && /virtualenv/env3/bin/python -c "import wbia_curvrank_v2; from wbia_curvrank_v2._plugin import *" \ && /virtualenv/env3/bin/python -c "import wbia_finfindr; from wbia_finfindr._plugin import *" \ - && /virtualenv/env3/bin/python -c "import wbia_whaleridgefindr; from wbia_whaleridgefindr._plugin import *" + && /virtualenv/env3/bin/python -c "import wbia_whaleridgefindr; from wbia_whaleridgefindr._plugin import *" \ && /virtualenv/env3/bin/python -c "import wbia_kaggle7; from wbia_kaggle7._plugin import *" \ && /virtualenv/env3/bin/python -c "import wbia_lca; from wbia_lca._plugin import *" \ && /virtualenv/env3/bin/python -c "import wbia_deepsense; from wbia_deepsense._plugin import *" \ From 88333fb717ccdc004e0f56303be863abc0f3ea9d Mon Sep 17 00:00:00 2001 From: tsubramanian Date: Mon, 28 Aug 2023 13:01:24 +0530 Subject: [PATCH 20/28] Update install.ubuntu.sh --- devops/install.ubuntu.sh | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/devops/install.ubuntu.sh b/devops/install.ubuntu.sh index 7ae69d9c2..2bd4872d6 100644 --- a/devops/install.ubuntu.sh +++ b/devops/install.ubuntu.sh @@ -194,6 +194,7 @@ git clone --recursive --branch develop https://github.com/WildMeOrg/wbia-plugin- git clone --branch develop https://github.com/WildMeOrg/wbia-plugin-flukematch.git git clone --branch develop https://github.com/WildMeOrg/wbia-plugin-finfindr.git git clone --branch develop https://github.com/WildMeOrg/wbia-plugin-deepsense.git +git clone --branch develop https://github.com/WildMeOrg/wbia-plugin-whaleridgefindr.git git clone --branch develop https://github.com/WildMeOrg/wbia-plugin-pie.git git clone https://github.com/WildMeOrg/wbia-plugin-blend.git @@ -252,6 +253,9 @@ pip install --no-cache-dir -e . cd ${CODE}/wbia-plugin-finfindr pip install --no-cache-dir -e . +cd ${CODE}/wbia-plugin-whaleridgefindr +pip install --no-cache-dir -e . + cd ${CODE}/wbia-plugin-deepsense pip install --no-cache-dir -e . @@ -314,6 +318,7 @@ python -c "import wbia_blend; from wbia_blend._plugin import *" python -c "import wbia_flukematch; from wbia_flukematch.plugin import *" python -c "import wbia_curvrank; from wbia_curvrank._plugin import *" python -c "import wbia_finfindr; from wbia_finfindr._plugin import *" +python -c "import wbia-whaleridgefindr; from wbia-whaleridgefindr._plugin import *" python -c "import wbia_kaggle7; from wbia_kaggle7._plugin import *" python -c "import wbia_deepsense; from wbia_deepsense._plugin import *" From 8289480f47b3772d26c538f5863f2b2ece20d036 Mon Sep 17 00:00:00 2001 From: tsubramanian Date: Mon, 28 Aug 2023 13:04:21 +0530 Subject: [PATCH 21/28] Update viz_matches.py --- wbia/viz/viz_matches.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/wbia/viz/viz_matches.py b/wbia/viz/viz_matches.py index 2493933f4..2844a0e26 100644 --- a/wbia/viz/viz_matches.py +++ b/wbia/viz/viz_matches.py @@ -51,7 +51,8 @@ def get_query_annot_pair_info( 'kaggleseven', 'pie', 'pietwo', - 'miewid' + 'miewid', + 'wbia-whaleridgefindr' ] ) and getattr(qreq_, '_isnewreq', None): if ( @@ -100,7 +101,8 @@ def get_data_annot_pair_info( 'kaggleseven', 'pie', 'pietwo', - 'miewid' + 'miewid', + 'wbia-whaleridgefindr' ] ) and getattr(qreq_, '_isnewreq', None): if ( From 7bce45f7b76ee8ab00e45739f2e8c4e419ed3c22 Mon Sep 17 00:00:00 2001 From: tsubramanian Date: Mon, 28 Aug 2023 13:09:29 +0530 Subject: [PATCH 22/28] Update Dockerfile --- devops/provision/Dockerfile | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/devops/provision/Dockerfile b/devops/provision/Dockerfile index 4d3b6798e..c39048252 100644 --- a/devops/provision/Dockerfile +++ b/devops/provision/Dockerfile @@ -42,7 +42,7 @@ RUN set -ex \ && git clone https://github.com/WildMeOrg/wbia-plugin-pie-v2.git \ && git clone https://github.com/WildMeOrg/wbia-plugin-miew-id.git \ && git clone https://github.com/WildMeOrg/wbia-plugin-whaleridgefindr.git - + RUN set -ex \ && cd /wbia \ && git clone --recursive https://github.com/WildMeOrg/wbia-plugin-blend.git \ @@ -124,10 +124,6 @@ RUN /bin/bash -xc '. /virtualenv/env3/bin/activate \ && cd /wbia/wbia-plugin-pie-v2 \ && /bin/bash run_developer_setup.sh' -RUN /bin/bash -xc '. /virtualenv/env3/bin/activate \ - && cd /wbia/wbia-plugin-whaleridgefindr \ - && pip install --no-cache-dir -e .' - RUN /bin/bash -xc '. /virtualenv/env3/bin/activate \ && cd /wbia/wbia-plugin-blend \ && pip install --no-cache-dir -e .' @@ -137,7 +133,7 @@ RUN /bin/bash -xc '. /virtualenv/env3/bin/activate \ && pip install --no-cache-dir -e .' RUN /bin/bash -xc '. /virtualenv/env3/bin/activate \ - && cd /wbia/wbia-plugin-finfindr \ + && cd /wbia/wbia-plugin-whaleridgefindr \ && pip install --no-cache-dir -e .' RUN /bin/bash -xc '. /virtualenv/env3/bin/activate \ From 083f101a4930b8676aec7b2a32c549f2867e0626 Mon Sep 17 00:00:00 2001 From: tsubramanian Date: Mon, 28 Aug 2023 13:11:47 +0530 Subject: [PATCH 23/28] Update super_setup.py --- _dev/super_setup.py | 1 + 1 file changed, 1 insertion(+) diff --git a/_dev/super_setup.py b/_dev/super_setup.py index 5da6b791c..c8955dcf1 100755 --- a/_dev/super_setup.py +++ b/_dev/super_setup.py @@ -37,6 +37,7 @@ ('WildMeOrg/wbia-plugin-pie-v2', 'wbia-plugin-pie-v2', 'develop'), ('WildMeOrg/wbia-plugin-lca', 'wbia-plugin-lca', 'develop'), ('WildMeOrg/wbia-plugin-miew-id', 'wbia-plugin-miew-id', 'develop'), + ('WildMeOrg/wbia-plugin-whaleridgefindr', 'wbia-plugin-whaleridgefindr', 'develop'), # ('WildMeOrg/wbia-plugin-2d-orientation', 'wbia-plugin-2d-orientation', 'develop'), ] From 34ce1cd67161bc730d29a54faa2706c63f249f2a Mon Sep 17 00:00:00 2001 From: tsubramanian Date: Mon, 28 Aug 2023 14:37:52 +0530 Subject: [PATCH 24/28] Update Dockerfile --- devops/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/devops/Dockerfile b/devops/Dockerfile index a8eb444b6..9cecf6d42 100644 --- a/devops/Dockerfile +++ b/devops/Dockerfile @@ -148,7 +148,7 @@ RUN set -ex \ && /virtualenv/env3/bin/python -c "import wbia_orientation; from wbia_orientation.__main__ import main; main()" \ && /virtualenv/env3/bin/python -c "import wbia_curvrank_v2; from wbia_curvrank_v2._plugin import *" \ && /virtualenv/env3/bin/python -c "import wbia_finfindr; from wbia_finfindr._plugin import *" \ - && /virtualenv/env3/bin/python -c "import wbia_whaleridgefindr; from wbia_whaleridgefindr._plugin import *" \ + && /virtualenv/env3/bin/python -c "import wbia-whaleridgefindr; from wbia-whaleridgefindr._plugin import *" \ && /virtualenv/env3/bin/python -c "import wbia_kaggle7; from wbia_kaggle7._plugin import *" \ && /virtualenv/env3/bin/python -c "import wbia_lca; from wbia_lca._plugin import *" \ && /virtualenv/env3/bin/python -c "import wbia_deepsense; from wbia_deepsense._plugin import *" \ From 1bc1cd14b786b6e31cc57e72b179e4828b874867 Mon Sep 17 00:00:00 2001 From: Tamil Date: Mon, 28 Aug 2023 16:20:51 +0530 Subject: [PATCH 25/28] whaleridgefindr plugin fix --- devops/Dockerfile | 2 +- devops/install.ubuntu.sh | 2 +- wbia/control/IBEISControl.py | 2 +- wbia/web/apis_query.py | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/devops/Dockerfile b/devops/Dockerfile index 9cecf6d42..a8eb444b6 100644 --- a/devops/Dockerfile +++ b/devops/Dockerfile @@ -148,7 +148,7 @@ RUN set -ex \ && /virtualenv/env3/bin/python -c "import wbia_orientation; from wbia_orientation.__main__ import main; main()" \ && /virtualenv/env3/bin/python -c "import wbia_curvrank_v2; from wbia_curvrank_v2._plugin import *" \ && /virtualenv/env3/bin/python -c "import wbia_finfindr; from wbia_finfindr._plugin import *" \ - && /virtualenv/env3/bin/python -c "import wbia-whaleridgefindr; from wbia-whaleridgefindr._plugin import *" \ + && /virtualenv/env3/bin/python -c "import wbia_whaleridgefindr; from wbia_whaleridgefindr._plugin import *" \ && /virtualenv/env3/bin/python -c "import wbia_kaggle7; from wbia_kaggle7._plugin import *" \ && /virtualenv/env3/bin/python -c "import wbia_lca; from wbia_lca._plugin import *" \ && /virtualenv/env3/bin/python -c "import wbia_deepsense; from wbia_deepsense._plugin import *" \ diff --git a/devops/install.ubuntu.sh b/devops/install.ubuntu.sh index 2bd4872d6..142acbf36 100644 --- a/devops/install.ubuntu.sh +++ b/devops/install.ubuntu.sh @@ -318,7 +318,7 @@ python -c "import wbia_blend; from wbia_blend._plugin import *" python -c "import wbia_flukematch; from wbia_flukematch.plugin import *" python -c "import wbia_curvrank; from wbia_curvrank._plugin import *" python -c "import wbia_finfindr; from wbia_finfindr._plugin import *" -python -c "import wbia-whaleridgefindr; from wbia-whaleridgefindr._plugin import *" +python -c "import wbia_whaleridgefindr; from wbia_whaleridgefindr._plugin import *" python -c "import wbia_kaggle7; from wbia_kaggle7._plugin import *" python -c "import wbia_deepsense; from wbia_deepsense._plugin import *" diff --git a/wbia/control/IBEISControl.py b/wbia/control/IBEISControl.py index 50b03da9c..6ab3f4f9d 100644 --- a/wbia/control/IBEISControl.py +++ b/wbia/control/IBEISControl.py @@ -170,7 +170,7 @@ (('--no-miew-id', '--nomiew-id'), 'wbia_miew_id._plugin'), ] -if ut.get_argflag('--wbia_whaleridgefindr'): +if ut.get_argflag('--wbia-whaleridgefindr'): AUTOLOAD_PLUGIN_MODNAMES += [ (('--no-whaleridgefindr', '--nowhaleridgefindr'), 'wbia_whaleridgefindr._plugin'), ] diff --git a/wbia/web/apis_query.py b/wbia/web/apis_query.py index f9e35b5b0..20fe0ce10 100644 --- a/wbia/web/apis_query.py +++ b/wbia/web/apis_query.py @@ -456,7 +456,7 @@ def review_graph_match_html( 'pie', 'pietwo', 'miewid', - 'wbia_whaleridgefindr' + 'wbia-whaleridgefindr' ): cls = chip_match.AnnotMatch # ibs.depc_annot.requestclass_dict['BC_DTW'] else: @@ -594,7 +594,7 @@ def review_query_chips_test(**kwargs): elif 'use_miew_id' in request.args: query_config_dict = {'pipeline_root': 'MiewId'} elif 'use_whaleridgefindr' in request.args: - query_config_dict = {'pipeline_root': 'wbia_whaleridgefindr'} + query_config_dict = {'pipeline_root': 'wbia-whaleridgefindr'} else: query_config_dict = {} result_dict = ibs.query_chips_test(query_config_dict=query_config_dict) From 67887a8ba9ba9a5f47edd4b9b9bbb8c12dae931d Mon Sep 17 00:00:00 2001 From: tsubramanian Date: Mon, 28 Aug 2023 20:43:15 +0530 Subject: [PATCH 26/28] Update docker-publish.yaml --- .github/workflows/docker-publish.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/docker-publish.yaml b/.github/workflows/docker-publish.yaml index 37f46a620..6dddf8873 100644 --- a/.github/workflows/docker-publish.yaml +++ b/.github/workflows/docker-publish.yaml @@ -64,13 +64,13 @@ jobs: password: ${{ secrets.GHCR_PAT }} - name: Push to Docker Hub (Nightly) - if: github.event_name == 'schedule' + if: github.event_name == 'push' run: bash devops/publish.sh -t nightly ${PUBLISH_IMAGES} env: PUBLISH_IMAGES: ${{ matrix.images }} wildbook-ia - name: Push to GitHub Packages (Nightly) - if: github.event_name == 'schedule' + if: github.event_name == 'push' run: bash devops/publish.sh -t nightly -r ghcr.io/wildmeorg/wildbook-ia ${PUBLISH_IMAGES} env: PUBLISH_IMAGES: ${{ matrix.images }} wildbook-ia From 650ca519b3ae1a8811c50126a79b042fec64f1c6 Mon Sep 17 00:00:00 2001 From: Tamil Date: Wed, 30 Aug 2023 21:46:53 +0530 Subject: [PATCH 27/28] whalridgefindr keyerror fix --- wbia/control/IBEISControl.py | 2 +- wbia/viz/viz_matches.py | 4 ++-- wbia/web/apis_query.py | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/wbia/control/IBEISControl.py b/wbia/control/IBEISControl.py index 6ab3f4f9d..fdcac5ac2 100644 --- a/wbia/control/IBEISControl.py +++ b/wbia/control/IBEISControl.py @@ -170,7 +170,7 @@ (('--no-miew-id', '--nomiew-id'), 'wbia_miew_id._plugin'), ] -if ut.get_argflag('--wbia-whaleridgefindr'): +if ut.get_argflag('--whaleridgefindr'): AUTOLOAD_PLUGIN_MODNAMES += [ (('--no-whaleridgefindr', '--nowhaleridgefindr'), 'wbia_whaleridgefindr._plugin'), ] diff --git a/wbia/viz/viz_matches.py b/wbia/viz/viz_matches.py index 2844a0e26..ab510ce0c 100644 --- a/wbia/viz/viz_matches.py +++ b/wbia/viz/viz_matches.py @@ -52,7 +52,7 @@ def get_query_annot_pair_info( 'pie', 'pietwo', 'miewid', - 'wbia-whaleridgefindr' + 'whaleridgefindr' ] ) and getattr(qreq_, '_isnewreq', None): if ( @@ -102,7 +102,7 @@ def get_data_annot_pair_info( 'pie', 'pietwo', 'miewid', - 'wbia-whaleridgefindr' + 'whaleridgefindr' ] ) and getattr(qreq_, '_isnewreq', None): if ( diff --git a/wbia/web/apis_query.py b/wbia/web/apis_query.py index 20fe0ce10..479e10d8e 100644 --- a/wbia/web/apis_query.py +++ b/wbia/web/apis_query.py @@ -456,7 +456,7 @@ def review_graph_match_html( 'pie', 'pietwo', 'miewid', - 'wbia-whaleridgefindr' + 'whaleridgefindr' ): cls = chip_match.AnnotMatch # ibs.depc_annot.requestclass_dict['BC_DTW'] else: @@ -594,7 +594,7 @@ def review_query_chips_test(**kwargs): elif 'use_miew_id' in request.args: query_config_dict = {'pipeline_root': 'MiewId'} elif 'use_whaleridgefindr' in request.args: - query_config_dict = {'pipeline_root': 'wbia-whaleridgefindr'} + query_config_dict = {'pipeline_root': 'whaleridgefindr'} else: query_config_dict = {} result_dict = ibs.query_chips_test(query_config_dict=query_config_dict) From d04bdd6c5f92e8374f98a67de7c7383140326f84 Mon Sep 17 00:00:00 2001 From: tsubramanian Date: Thu, 31 Aug 2023 13:51:11 +0530 Subject: [PATCH 28/28] Update specialdraw.py fix the distance for whaleridgefindr --- wbia/scripts/specialdraw.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/wbia/scripts/specialdraw.py b/wbia/scripts/specialdraw.py index a4df1f12e..b8837cc37 100644 --- a/wbia/scripts/specialdraw.py +++ b/wbia/scripts/specialdraw.py @@ -299,6 +299,7 @@ def double_depcache_graph(): 'PieTwo': 'Pie v2 Distance', 'MiewId': 'MiewId Distance', 'Finfindr': 'Finfindr Distance', + 'whaleridgefindr': 'whaleridgefindr Distance', 'Kaggle7': 'Kaggle7 Distance', 'KaggleSeven': 'Kaggle7 Distance', 'vsone': 'Hots vsone', @@ -331,6 +332,7 @@ def double_depcache_graph(): 'PieTwo': 'pie_v2_distance', 'MiewId': 'miew_id_distance', 'Finfindr': 'finfindr_distance', + 'whaleridgefindr': 'whaleridgefindr_distance', 'Kaggle7': 'kaggle7_distance', 'KaggleSeven': 'kaggle7_distance', 'Block_Curvature': 'curvature',