Added wheel testing

.github/workflows/python-publish.yml

@@ -61,11 +61,35 @@ jobs:
         with:
           path: ./dist/*.tar.gz
 
-  upload_pypi:
+  test_wheel:
     needs: [build_wheels, build_sdist]
     runs-on: ubuntu-latest
     # upload to PyPI on every tag starting with 'v'
     if: github.event_name == 'push'  # && startsWith(github.event.ref, 'refs/tags/v')
+    steps:
+      - uses: actions/setup-python@v2
+        name: Install Python
+        with:
+          python-version: '3.8'
+
+      - uses: actions/download-artifact@v2
+        with:
+          name: artifact
+          path: dist
+
+      - name: Install wheel
+        run: |
+          pip install --upgrade pip
+          pip install wheel
+          pip install dist/*.whl
+          ls -al dist/
+          python -c "import scoutbot; scoutbot.fetch();"
+
+  upload_pypi:
+    needs: [test_wheel]
+    runs-on: ubuntu-latest
+    # upload to PyPI on every tag starting with 'v'
+    if: github.event_name == 'push'  # && startsWith(github.event.ref, 'refs/tags/v')
     steps:
       - uses: actions/download-artifact@v2
         with:

MANIFEST.in

@@ -9,3 +9,8 @@ include LICENSE
 # Include ONNX files (disabled, too large for PyPI)
 # include scoutbot/loc/models/onnx/scout.loc.5fbfff26.0.onnx
 # include scoutbot/wic/models/onnx/scout.wic.5fbfff26.3.0.onnx
+
+# Include examples files for testing
+include examples/1be4d40a-6fd0-42ce-da6c-294e45781f41.jpg
+include examples/0d01a14e-311d-e153-356f-8431b6996b84.true.jpg
+include examples/1e8372e4-357d-26e6-d7fd-0e0ae402463a.true.jpg

scoutbot/__init__.py

@@ -44,7 +44,12 @@ how the entire pipeline can be run on tiles or images, respectively.
         nms_thresh=agg_nms_thresh,
     )
 '''
-from scoutbot import agg, loc, tile, wic
+from scoutbot import utils
+
+log = utils.init_logging()
+
+
+from scoutbot import agg, loc, tile, wic  # NOQA
 
 VERSION = '0.1.6'
 version = VERSION

scoutbot/agg/__init__.py

@@ -9,6 +9,8 @@ on the combined results.
 import numpy as np
 import utool as ut
 
+from scoutbot import log
+
 MARGIN = 32.0
 AGG_THRESH = 0.4
 NMS_THRESH = 0.2
@@ -141,6 +143,8 @@ def compute(
     """
     from scoutbot.agg.py_cpu_nms import py_cpu_nms
 
+    log.info(f'Aggregating {len(tile_grids)} tiles onto {img_shape} canvas')
+
     # Demosaic tile detection results and aggregate across the image
     detects = demosaic(img_shape, tile_grids, loc_outputs)
 
@@ -165,4 +169,6 @@ def compute(
     final = ut.take(detects, keeps)
     final.sort(key=lambda val: val['c'], reverse=True)
 
+    log.info(f'Found {len(final)} detections')
+
     return final

scoutbot/loc/__init__.py

@@ -18,6 +18,7 @@ import torch
 import torchvision
 import utool as ut
 
+from scoutbot import log
 from scoutbot.loc.transforms import (
     Compose,
     GetBoundingBoxes,
@@ -77,6 +78,7 @@ def fetch(pull=False):
             progressbar=True,
         )
         assert exists(onnx_model)
+    log.info(f'LOC Model: {onnx_model}')
 
     return onnx_model
 
@@ -130,6 +132,8 @@ def predict(data, fill=True):
     """
     onnx_model = fetch()
 
+    log.info(f'Running WIC inference on {len(data)} tiles')
+
     ort_session = ort.InferenceSession(
         onnx_model, providers=['CUDAExecutionProvider', 'CPUExecutionProvider']
     )

scoutbot/loc/transforms/__init__.py

@@ -15,3 +15,4 @@ from scoutbot.loc.transforms._postprocess import (  # NOQA
     TensorToBrambox,
 )
 from scoutbot.loc.transforms._preprocess import Letterbox  # NOQA
+from scoutbot.loc.transforms.util import Compose  # NOQA

scoutbot/scoutbot.py

@@ -1,32 +1,116 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 """
-Coming Soon
+CLI for ScoutBot
 """
+import json
+from os.path import exists
+
 import click
+import utool as ut
+
+import scoutbot
+from scoutbot import agg, loc, log, wic
 
-from scoutbot import utils
 
-log = utils.init_logging()
+def pipeline_filepath_validator(ctx, param, value):
+    if not exists(value):
+        log.error(f'Input filepath does not exist: {value}')
+        ctx.exit()
+    return value
 
 
 @click.command()
 @click.option(
-    '--config', help='Path to config file', default='configs/mnist_resnet18.yaml'
+    '--filepath',
+    help='Path to image',
+    required=True,
+    type=str,
+    callback=pipeline_filepath_validator,
+)
+@click.option(
+    '--output',
+    help='Path to output JSON (if unspecified, results are printed to screen)',
+    default=None,
+    type=click.IntRange(0, 100, clamp=True),
+)
+@click.option(
+    '--wic_thresh',
+    help='Whole Image Classifier (WIC) confidence threshold',
+    default=wic.WIC_THRESH,
+    type=click.IntRange(0, 100, clamp=True),
+)
+@click.option(
+    '--loc_thresh',
+    help='Localizer (LOC) confidence threshold',
+    default=loc.LOC_THRESH,
+    type=click.IntRange(0, 100, clamp=True),
 )
-def wic(config):
-    """ """
-    pass
-
-
-@click.command()
 @click.option(
-    '--config', help='Path to config file', default='configs/mnist_resnet18.yaml'
+    '--loc_nms_thresh',
+    help='Localizer (LOC) non-maximum suppression (NMS) threshold',
+    default=loc.NMS_THRESH,
+    type=click.IntRange(0, 100, clamp=True),
 )
-def main(config):
-    """ """
+@click.option(
+    '--agg_thresh',
+    help='Aggregation (AGG) confidence threshold',
+    default=agg.AGG_THRESH,
+    type=click.IntRange(0, 100, clamp=True),
+)
+@click.option(
+    '--agg_nms_thresh',
+    help='Aggregation (AGG) non-maximum suppression (NMS) threshold',
+    default=agg.NMS_THRESH,
+    type=click.IntRange(0, 100, clamp=True),
+)
+def pipeline(
+    filepath, output, wic_thresh, loc_thresh, loc_nms_thresh, agg_thresh, agg_nms_thresh
+):
+    """
+    Run the ScoutBot pipeline on an input image filepath
+    """
+    wic_thresh /= 100.0
+    loc_thresh /= 100.0
+    loc_nms_thresh /= 100.0
+    agg_thresh /= 100.0
+    agg_nms_thresh /= 100.0
+
+    detects = scoutbot.pipeline(
+        filepath,
+        wic_thresh=wic_thresh,
+        loc_thresh=loc_thresh,
+        loc_nms_thresh=loc_nms_thresh,
+        agg_thresh=agg_thresh,
+        agg_nms_thresh=agg_nms_thresh,
+    )
+
+    if output:
+        with open(output, 'w') as outfile:
+            json.dump(detects, outfile)
+    else:
+        log.info(ut.repr3(detects))
+
+
+@click.command('fetch')
+def fetch():
+    """
+    Fetch the required machine learning ONNX models for the WIC and LOC
+    """
+    scoutbot.fetch()
+
+
+@click.group()
+def cli():
+    """
+    ScoutBot CLI
+    """
     pass
 
 
+cli.add_command(fetch)
+cli.add_command(pipeline)
+
+
 if __name__ == '__main__':
-    main()
+    cli()

scoutbot/tile/__init__.py

@@ -7,6 +7,8 @@ from os.path import abspath, exists, join, split, splitext
 import cv2
 import numpy as np
 
+from scoutbot import log
+
 TILE_WIDTH = 256
 TILE_HEIGHT = 256
 TILE_SIZE = (TILE_WIDTH, TILE_HEIGHT)
@@ -42,6 +44,8 @@ def compute(img_filepath, grid1=True, grid2=True, ext=None, **kwargs):
     img = cv2.imread(img_filepath)
     shape = img.shape
 
+    log.info(f'Computing tiles (grid1={grid1}, grid2={grid2}) on {img_filepath}')
+
     grids = []
     if grid1:
         grids += tile_grid(shape, **kwargs)
@@ -52,6 +56,8 @@ def compute(img_filepath, grid1=True, grid2=True, ext=None, **kwargs):
     for grid, filepath in zip(grids, filepaths):
         assert tile_write(img, grid, filepath)
 
+    log.info(f'Rendered {len(filepaths)} tiles')
+
     return shape, grids, filepaths
 
 

scoutbot/wic/__init__.py

@@ -15,6 +15,7 @@ import pooch
 import torch
 import utool as ut
 
+from scoutbot import log
 from scoutbot.wic.dataloader import (
     BATCH_SIZE,
     INPUT_SIZE,
@@ -59,6 +60,8 @@ def fetch(pull=False):
         )
         assert exists(onnx_model)
 
+    log.info(f'WIC Model: {onnx_model}')
+
     return onnx_model
 
 
@@ -104,6 +107,8 @@ def predict(data, fill=False):
     """
     onnx_model = fetch()
 
+    log.info(f'Running WIC inference on {len(data)} tiles')
+
     ort_session = ort.InferenceSession(
         onnx_model, providers=['CUDAExecutionProvider', 'CPUExecutionProvider']
     )