Unverified Commit bfea93e0 authored by André Araujo's avatar André Araujo Committed by GitHub
Browse files

Updating DELF version: 2.1 (#8473)

* Merged commit includes the following changes:
253126424  by Andre Araujo:

    Scripts to compute metrics for Google Landmarks dataset.

    Also, a small fix to metric in retrieval case: avoids duplicate predicted images.

--
253118971  by Andre Araujo:

    Metrics for Google Landmarks dataset.

--
253106953  by Andre Araujo:

    Library to read files from Google Landmarks challenges.

--
250700636  by Andre Araujo:

    Handle case of aggregation extraction with empty set of input features.

--
250516819  by Andre Araujo:

    Add minimum size for DELF extractor.

--
250435822  by Andre Araujo:

    Add max_image_size/min_image_size for open-source DELF proto / module.

--
250414606  by Andre Araujo:

    Refactor extract_aggregation to allow reuse with different datasets.

--
250356863  by Andre Araujo:

    Remove unnecessary cmd_args variable from boxes_and_features_extraction.

--
249783379  by Andre Araujo:

    Cre...
parent 989725bd
## Quick start: landmark detection ## Quick start: landmark detection
[![Paper](http://img.shields.io/badge/paper-arXiv.1812.01584-B3181B.svg)](https://arxiv.org/abs/1812.01584)
### Install DELF library ### Install DELF library
To be able to use this code, please follow To be able to use this code, please follow
......
## Quick start: DELF extraction and matching ## Quick start: DELF extraction and matching
[![Paper](http://img.shields.io/badge/paper-arXiv.1612.06321-B3181B.svg)](https://arxiv.org/abs/1612.06321)
### Install DELF library ### Install DELF library
To be able to use this code, please follow To be able to use this code, please follow
...@@ -76,12 +78,10 @@ $DISPLAY environment variable`. To fix this, one option is add the line ...@@ -76,12 +78,10 @@ $DISPLAY environment variable`. To fix this, one option is add the line
see the discussion see the discussion
[here](https://stackoverflow.com/questions/37604289/tkinter-tclerror-no-display-name-and-no-display-environment-variable). [here](https://stackoverflow.com/questions/37604289/tkinter-tclerror-no-display-name-and-no-display-environment-variable).
#### 'skimage' #### 'skimage'
By default, skimage 0.13.XX or 0.14.1 is installed if you followed the instructions. According to [https://github.com/scikit-image/scikit-image/issues/3649#issuecomment-455273659] By default, skimage 0.13.XX or 0.14.1 is installed if you followed the
If you have scikit-image related issues, upgrading to a version above 0.14.1 with instructions. According to
``` [https://github.com/scikit-image/scikit-image/issues/3649#issuecomment-455273659]
pip install -U scikit-image If you have scikit-image related issues, upgrading to a version above 0.14.1
``` with `pip install -U scikit-image` should fix the issue
should fix the issue
...@@ -2,6 +2,8 @@ ...@@ -2,6 +2,8 @@
### Tensorflow ### Tensorflow
[![TensorFlow 2.1](https://img.shields.io/badge/tensorflow-2.1-brightgreen)](https://github.com/tensorflow/tensorflow/releases/tag/v2.1.0)
For detailed steps to install Tensorflow, follow the For detailed steps to install Tensorflow, follow the
[Tensorflow installation instructions](https://www.tensorflow.org/install/). A [Tensorflow installation instructions](https://www.tensorflow.org/install/). A
typical user can install Tensorflow using one of the following commands: typical user can install Tensorflow using one of the following commands:
......
# DELF: DEep Local Features # DELF: DEep Local Features
[![TensorFlow 2.1](https://img.shields.io/badge/tensorflow-2.1-brightgreen)](https://github.com/tensorflow/tensorflow/releases/tag/v2.1.0)
This project presents code for extracting DELF features, which were introduced This project presents code for extracting DELF features, which were introduced
with the paper with the paper
["Large-Scale Image Retrieval with Attentive Deep Local Features"](https://arxiv.org/abs/1612.06321). ["Large-Scale Image Retrieval with Attentive Deep Local Features"](https://arxiv.org/abs/1612.06321).
...@@ -18,6 +20,8 @@ and [NEW] code for model training. ...@@ -18,6 +20,8 @@ and [NEW] code for model training.
If you make use of this code, please consider citing the following papers: If you make use of this code, please consider citing the following papers:
[![Paper](http://img.shields.io/badge/paper-arXiv.1612.06321-B3181B.svg)](https://arxiv.org/abs/1612.06321)
``` ```
"Large-Scale Image Retrieval with Attentive Deep Local Features", "Large-Scale Image Retrieval with Attentive Deep Local Features",
H. Noh, A. Araujo, J. Sim, T. Weyand and B. Han, H. Noh, A. Araujo, J. Sim, T. Weyand and B. Han,
...@@ -26,6 +30,8 @@ Proc. ICCV'17 ...@@ -26,6 +30,8 @@ Proc. ICCV'17
and/or and/or
[![Paper](http://img.shields.io/badge/paper-arXiv.1812.01584-B3181B.svg)](https://arxiv.org/abs/1812.01584)
``` ```
"Detect-to-Retrieve: Efficient Regional Aggregation for Image Search", "Detect-to-Retrieve: Efficient Regional Aggregation for Image Search",
M. Teichmann*, A. Araujo*, M. Zhu and J. Sim, M. Teichmann*, A. Araujo*, M. Zhu and J. Sim,
......
## Detect-to-Retrieve instructions ## Detect-to-Retrieve instructions
[![Paper](http://img.shields.io/badge/paper-arXiv.1812.01584-B3181B.svg)](https://arxiv.org/abs/1812.01584)
These instructions can be used to reproduce the results from the These instructions can be used to reproduce the results from the
[Detect-to-Retrieve paper](https://arxiv.org/abs/1812.01584) for the Revisited [Detect-to-Retrieve paper](https://arxiv.org/abs/1812.01584) for the Revisited
Oxford/Paris datasets. Oxford/Paris datasets.
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment