Merge pull request #260 from WildMeOrg/whaleridgefindr-build

whaleridgefindr build

.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'
@@ -67,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

_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'),
 ]
 

devops/Dockerfile

@@ -137,6 +137,7 @@ 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 \
@@ -147,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 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 *" \

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 *"
 

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 \
@@ -132,6 +132,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-whaleridgefindr \
+ && 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 .'

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'), 'wbia_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 == '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:

wbia/control/docker_control.py

@@ -25,8 +25,10 @@
 DOCKER_CONFIG_REGISTRY = {}
 DOCKER_IMAGE_PREFIX = [
     'wildme',
+
     'haimeh'
 
+
 ]
 DOCKER_DEFAULT_RUN_ARGS = {'detach': True, 'restart_policy': {'Name': 'on-failure'}}
 

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',

wbia/viz/viz_matches.py

@@ -51,7 +51,8 @@ def get_query_annot_pair_info(
             'kaggleseven',
             'pie',
             'pietwo',
-            'miewid'
+            'miewid',
+            'whaleridgefindr'
         ]
     ) and getattr(qreq_, '_isnewreq', None):
         if (
@@ -100,7 +101,8 @@ def get_data_annot_pair_info(
             'kaggleseven',
             'pie',
             'pietwo',
-            'miewid'
+            'miewid',
+            'whaleridgefindr'
         ]
     ) and getattr(qreq_, '_isnewreq', None):
         if (

wbia/web/apis_query.py

@@ -455,7 +455,8 @@ def review_graph_match_html(
         'kaggleseven',
         'pie',
         'pietwo',
-        'miewid'
+        'miewid',
+        'whaleridgefindr'
     ):
         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)