Skip to content

Commit aa873cd

Browse files
authored
Homogenize and standardize names for images (#53)
As discussed with Vahe to improve clarity.
1 parent 41b1926 commit aa873cd

File tree

3 files changed

+19
-13
lines changed

3 files changed

+19
-13
lines changed

.github/workflows/build.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,12 +30,12 @@ jobs:
3030
file: Dockerfile.estimator
3131
load: true
3232
push: true
33-
tags: ghcr.io/opencv/bpc/estimator-example:latest
33+
tags: ghcr.io/opencv/bpc/bpc_pose_estimator:example
3434
-
3535
name: Build tester
3636
uses: docker/build-push-action@v6
3737
with:
3838
file: Dockerfile.tester
3939
load: true
4040
push: true
41-
tags: ghcr.io/opencv/bpc/estimator-tester:latest
41+
tags: ghcr.io/opencv/bpc/bpc_tester:latest

README.md

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,9 @@ source ~/bpc_ws/bpc_env/bin/activate
8787
**For any new shell interacting with the `bpc` command you will have to rerun this source command.**
8888

8989
#### Install bpc
90+
91+
Install the bpc command from the ibpc pypi package. (bpc was already taken :-( )
92+
9093
```
9194
pip install ibpc
9295
```
@@ -106,8 +109,8 @@ The test will validate your provided image against the test dataset.
106109
When you build a new image you rerun this test.
107110

108111
**At the moment the published tester is not available.
109-
You will have to build it locally see below in Development to build `ibpc:tester` and pass `--tester-image ibpc:tester` as additional arguments.
110-
The default is `ghcr.io/opencv/bpc/estimator-tester:latest` but that's currently unavailable.
112+
You will have to build it locally see below in Development to build `bpc_tester:latest` and pass `--tester-image bpc_tester:latest` as additional arguments.
113+
The default is `ghcr.io/opencv/bpc/bpc_tester:latest` but that's currently unavailable.
111114

112115
```
113116
bpc test <POSE_ESTIMATOR_DOCKER_TAG> ipd
@@ -116,10 +119,10 @@ bpc test <POSE_ESTIMATOR_DOCKER_TAG> ipd
116119
For example:
117120

118121
```
119-
bpc test ghcr.io/opencv/bpc/estimator-example:latest ipd
122+
bpc test ghcr.io/opencv/bpc/bpc_pose_estimator:example ipd
120123
```
121-
**Substitute your own estimator image for ghcr.io/opencv/bpc/estimator-example:latest it's not currently available.**
122-
If you follow the development build below the argument is `ibpc:pose_estimator`.
124+
**Substitute your own estimator image for ghcr.io/opencv/bpc/bpc_pose_estimator:example it's not currently available.**
125+
If you follow the development build below the argument is `bpc_pose_estimator:example`.
123126

124127
The console output will show the system getting started and then the output of the estimator.
125128

@@ -197,12 +200,12 @@ The above is enough to get you going.
197200
However we want to be open about what else were doing.
198201
You can see the source of the tester and build your own version as follows if you'd like.
199202

200-
### Build the ibpc_tester
203+
### Build the bpc_tester image
201204

202205
If you want to reproduce the tester image run the following command
203206

204207

205-
This is packaged and built via a github action to `ghcr.io/opencv/bpc/estimator-tester:latest` however this is how to reproduce it.
208+
This is packaged and built via a github action to `ghcr.io/opencv/bpc/bpc_tester:latest` however this is how to reproduce it.
206209

207210
```bash
208211
cd ~/ws_bpc/src/bpc
@@ -237,14 +240,14 @@ docker run --init --rm --net host eclipse/zenoh:1.2.1 --no-multicast-scouting
237240
### Run the pose estimator
238241
We use [rocker](https://github.com/osrf/rocker) to add GPU support to Docker containers. To install rocker, run `pip install rocker` on the host machine.
239242
```bash
240-
rocker --nvidia --cuda --network=host ibpc:pose_estimator
243+
rocker --nvidia --cuda --network=host bpc_pose_estimator:example
241244
```
242245

243246
### Run the tester
244247

245248
> Note: Substitute the <PATH_TO_DATASET> with the directory that contains the [ipd](https://huggingface.co/datasets/bop-benchmark/ipd/tree/main) dataset. Similarly, substitute <PATH_TO_OUTPUT_DIR> with the directory that should contain the results from the pose estimator. By default, the results will be saved as a `submission.csv` file but this filename can be updated by setting the `OUTPUT_FILENAME` environment variable.
246249
247250
```bash
248-
docker run --network=host -e BOP_PATH=/opt/ros/underlay/install/datasets -e SPLIT_TYPE=val -v<PATH_TO_DATASET>:/opt/ros/underlay/install/datasets -v<PATH_TO_OUTPUT_DIR>:/submission -it ibpc:tester
251+
docker run --network=host -e BOP_PATH=/opt/ros/underlay/install/datasets -e SPLIT_TYPE=val -v<PATH_TO_DATASET>:/opt/ros/underlay/install/datasets -v<PATH_TO_OUTPUT_DIR>:/submission -it bpc_tester:latest
249252
```
250253

ibpc_py/src/ibpc/ibpc.py

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -184,13 +184,16 @@ def main():
184184
sub_parsers = main_parser.add_subparsers(title="test", dest="subparser_name")
185185
test_parser = sub_parsers.add_parser("test")
186186

187-
test_parser.add_argument("estimator_image")
187+
test_parser.add_argument(
188+
"estimator_image",
189+
help="For example ghcr.io/opencv/bpc/bpc_pose_estimator:example or your own build",
190+
)
188191
test_parser.add_argument("dataset", choices=available_datasets.keys())
189192
test_parser.add_argument("--dataset_directory", action="store", default=".")
190193
test_parser.add_argument("--result_directory", action="store", default=".")
191194
test_parser.add_argument("--debug-inside", action="store_true")
192195
test_parser.add_argument(
193-
"--tester-image", default="ghcr.io/opencv/bpc/estimator-tester:latest"
196+
"--tester-image", default="ghcr.io/opencv/bpc/bpc_tester:latest"
194197
)
195198

196199
fetch_parser = sub_parsers.add_parser("fetch")

0 commit comments

Comments
 (0)