1. 06 Jul, 2020 1 commit
  2. 01 Jul, 2020 2 commits
    • André Araujo's avatar
      DELF documentation updates (#8767) · 8a19350e
      André Araujo authored
      * 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:
      
          Create directory for writing mapping file if it does not exist.
      
      --
      249581591  by Andre Araujo:
      
          Refactor scripts to extract boxes and features from images in Revisited datasets.
          Also, change tf.logging.info --> print for easier logging in open source code.
      
      --
      249511821  by Andre Araujo:
      
          Small change to function for file/directory handling.
      
      --
      249289499  by Andre Araujo:
      
          Internal change.
      
      --
      
      PiperOrigin-RevId: 253126424
      
      * Updating DELF init to adjust to latest changes
      
      * Editing init files for python packages
      
      * Edit D2R dataset reader to work with py3.
      
      PiperOrigin-RevId: 253135576
      
      * DELF package: fix import ordering
      
      * Adding new requirements to setup.py
      
      * Adding init file for training dir
      
      * Merged commit includes the following changes:
      
      FolderOrigin-RevId: /google/src/cloud/andrearaujo/delf_oss/google3/..
      
      * Adding init file for training subdirs
      
      * Working version of DELF training
      
      * Internal change.
      
      PiperOrigin-RevId: 253248648
      
      * Fix variance loading in open-source code.
      
      PiperOrigin-RevId: 260619120
      
      * Separate image re-ranking as a standalone library, and add metric writing to dataset library.
      
      PiperOrigin-RevId: 260998608
      
      * Tool to read written D2R Revisited datasets metrics file. Test is added.
      
      Also adds a unit test for previously-existing SaveMetricsFile function.
      
      PiperOrigin-RevId: 263361410
      
      * Add optional resize factor for feature extraction.
      
      PiperOrigin-RevId: 264437080
      
      * Fix NumPy's new version spacing changes.
      
      PiperOrigin-RevId: 265127245
      
      * Maker image matching function visible, and add support for RANSAC seed.
      
      PiperOrigin-RevId: 277177468
      
      * Avoid matplotlib failure due to missing display backend.
      
      PiperOrigin-RevId: 287316435
      
      * Removes tf.contrib dependency.
      
      PiperOrigin-RevId: 288842237
      
      * Fix tf contrib removal for feature_aggregation_extractor.
      
      PiperOrigin-RevId: 289487669
      
      * Merged commit includes the following changes:
      309118395  by Andre Araujo:
      
          Make DELF open-source code compatible with TF2.
      
      --
      309067582  by Andre Araujo:
      
          Handle image resizing rounding properly for python extraction.
      
          New behavior is tested with unit tests.
      
      --
      308690144  by Andre Araujo:
      
          Several changes to improve DELF model/training code and make it work in TF 2.1.0:
          - Rename some files for better clarity
          - Using compat.v1 versions of functions
          - Formatting changes
          - Using more appropriate TF function names
      
      --
      308689397  by Andre Araujo:
      
          Internal change.
      
      --
      308341315  by Andre Araujo:
      
          Remove old slim dependency in DELF open-source model.
      
          This avoids issues with requiring old TF-v1, making it compatible with latest TF.
      
      --
      306777559  by Andre Araujo:
      
          Internal change
      
      --
      304505811  by Andre Araujo:
      
          Raise error during geometric verification if local features have different dimensionalities.
      
      --
      301739992  by Andre Araujo:
      
          Transform some geometric verification constants into arguments, to allow custom matching.
      
      --
      301300324  by Andre Araujo:
      
          Apply name change(experimental_run_v2 -> run) for all callers in Tensorflow.
      
      --
      299919057  by Andre Araujo:
      
          Automated refactoring to make code Python 3 compatible.
      
      --
      297953698  by Andre Araujo:
      
          Explicitly replace "import tensorflow" with "tensorflow.compat.v1" for TF2.x migration
      
      --
      297521242  by Andre Araujo:
      
          Explicitly replace "import tensorflow" with "tensorflow.compat.v1" for TF2.x migration
      
      --
      297278247  by Andre Araujo:
      
          Explicitly replace "import tensorflow" with "tensorflow.compat.v1" for TF2.x migration
      
      --
      297270405  by Andre Araujo:
      
          Explicitly replace "import tensorflow" with "tensorflow.compat.v1" for TF2.x migration
      
      --
      297238741  by Andre Araujo:
      
          Explicitly replace "import tensorflow" with "tensorflow.compat.v1" for TF2.x migration
      
      --
      297108605  by Andre Araujo:
      
          Explicitly replace "import tensorflow" with "tensorflow.compat.v1" for TF2.x migration
      
      --
      294676131  by Andre Araujo:
      
          Add option to resize images to square resolutions without aspect ratio preservation.
      
      --
      293849641  by Andre Araujo:
      
          Internal change.
      
      --
      293840896  by Andre Araujo:
      
          Changing Slim import to tf_slim codebase.
      
      --
      293661660  by Andre Araujo:
      
          Allow the delf training script to read from TFRecords dataset.
      
      --
      291755295  by Andre Araujo:
      
          Internal change.
      
      --
      291448508  by Andre Araujo:
      
          Internal change.
      
      --
      291414459  by Andre Araujo:
      
          Adding train script.
      
      --
      291384336  by Andre Araujo:
      
          Adding model export script and test.
      
      --
      291260565  by Andre Araujo:
      
          Adding placeholder for Google Landmarks dataset.
      
      --
      291205548  by Andre Araujo:
      
          Definition of DELF model using Keras ResNet50 as backbone.
      
      --
      289500793  by Andre Araujo:
      
          Add TFRecord building script for delf.
      
      --
      
      PiperOrigin-RevId: 309118395
      
      * Updating README, dependency versions
      
      * Updating training README
      
      * Fixing init import of export_model
      
      * Fixing init import of export_model_utils
      
      * tkinter in INSTALL_INSTRUCTIONS
      
      * Merged commit includes the following changes:
      
      FolderOrigin-RevId: /google/src/cloud/andrearaujo/delf_oss/google3/..
      
      * INSTALL_INSTRUCTIONS mentioning different cloning options
      
      * Updating required TF version, since 2.1 is not available in pip
      
      * Internal change.
      
      PiperOrigin-RevId: 309136003
      
      * Fix missing string_input_producer and start_queue_runners in TF2.
      
      PiperOrigin-RevId: 309437512
      
      * Handle RANSAC from skimage's latest versions.
      
      PiperOrigin-RevId: 310170897
      
      * DELF 2.1 version: badge and setup.py updated
      
      * Add TF version badge in INSTALL_INSTRUCTIONS and paper badges in README
      
      * Add paper badges in paper instructions
      
      * Add paper badge to landmark detection instructions
      
      * Small update to DELF training README
      
      * Merged commit includes the following changes:
      312614961  by Andre Araujo:
      
          Instructions/code to reproduce DELG paper results.
      
      --
      312523414  by Andre Araujo:
      
          Fix a minor bug when post-process extracted features, format config.delf_global_config.image_scales_ind to a list.
      
      --
      312340276  by Andre Araujo:
      
          Add support for global feature extraction in DELF open-source codebase.
      
      --
      311031367  by Andre Araujo:
      
          Add use_square_images as an option in DELF config. The default value is false. if it is set, then images are resized to square resolution before feature extraction (e.g. Starburst use case. ) Thought for a while, whether to have two constructor of DescriptorToImageTemplate, but in the end, decide to only keep one, may be less confusing.
      
      --
      310658638  by Andre Araujo:
      
          Option for producing local feature-based image match visualization.
      
      --
      
      PiperOrigin-RevId: 312614961
      
      * DELF README update / DELG instructions
      
      * DELF README update
      
      * DELG instructions update
      
      * Merged commit includes the following changes:
      
      PiperOrigin-RevId: 312695597
      
      * Merged commit includes the following changes:
      312754894  by Andre Araujo:
      
          Code edits / instructions to reproduce GLDv2 results.
      
      --
      
      PiperOrigin-RevId: 312754894
      
      * Markdown updates after adding GLDv2 stuff
      
      * Small updates to DELF README
      
      * Clarify that library must be installed before reproducing results
      
      * Merged commit includes the following changes:
      319114828  by Andre Araujo:
      
          Upgrade global feature model exporting to TF2.
      
      --
      
      PiperOrigin-RevId: 319114828
      
      * Properly merging README
      
      * small edits to README
      
      * small edits to README
      
      * small edits to README
      
      * global feature exporting in training README
      
      * Update to DELF README, install instructions
      
      * Centralizing installation instructions
      
      * Small readme update
      
      * Fixing commas
      8a19350e
    • André Araujo's avatar
      TF2 version for global feature model exporting (#8760) · 30bac445
      André Araujo authored
      * 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:
      
          Create directory for writing mapping file if it does not exist.
      
      --
      249581591  by Andre Araujo:
      
          Refactor scripts to extract boxes and features from images in Revisited datasets.
          Also, change tf.logging.info --> print for easier logging in open source code.
      
      --
      249511821  by Andre Araujo:
      
          Small change to function for file/directory handling.
      
      --
      249289499  by Andre Araujo:
      
          Internal change.
      
      --
      
      PiperOrigin-RevId: 253126424
      
      * Updating DELF init to adjust to latest changes
      
      * Editing init files for python packages
      
      * Edit D2R dataset reader to work with py3.
      
      PiperOrigin-RevId: 253135576
      
      * DELF package: fix import ordering
      
      * Adding new requirements to setup.py
      
      * Adding init file for training dir
      
      * Merged commit includes the following changes:
      
      FolderOrigin-RevId: /google/src/cloud/andrearaujo/delf_oss/google3/..
      
      * Adding init file for training subdirs
      
      * Working version of DELF training
      
      * Internal change.
      
      PiperOrigin-RevId: 253248648
      
      * Fix variance loading in open-source code.
      
      PiperOrigin-RevId: 260619120
      
      * Separate image re-ranking as a standalone library, and add metric writing to dataset library.
      
      PiperOrigin-RevId: 260998608
      
      * Tool to read written D2R Revisited datasets metrics file. Test is added.
      
      Also adds a unit test for previously-existing SaveMetricsFile function.
      
      PiperOrigin-RevId: 263361410
      
      * Add optional resize factor for feature extraction.
      
      PiperOrigin-RevId: 264437080
      
      * Fix NumPy's new version spacing changes.
      
      PiperOrigin-RevId: 265127245
      
      * Maker image matching function visible, and add support for RANSAC seed.
      
      PiperOrigin-RevId: 277177468
      
      * Avoid matplotlib failure due to missing display backend.
      
      PiperOrigin-RevId: 287316435
      
      * Removes tf.contrib dependency.
      
      PiperOrigin-RevId: 288842237
      
      * Fix tf contrib removal for feature_aggregation_extractor.
      
      PiperOrigin-RevId: 289487669
      
      * Merged commit includes the following changes:
      309118395  by Andre Araujo:
      
          Make DELF open-source code compatible with TF2.
      
      --
      309067582  by Andre Araujo:
      
          Handle image resizing rounding properly for python extraction.
      
          New behavior is tested with unit tests.
      
      --
      308690144  by Andre Araujo:
      
          Several changes to improve DELF model/training code and make it work in TF 2.1.0:
          - Rename some files for better clarity
          - Using compat.v1 versions of functions
          - Formatting changes
          - Using more appropriate TF function names
      
      --
      308689397  by Andre Araujo:
      
          Internal change.
      
      --
      308341315  by Andre Araujo:
      
          Remove old slim dependency in DELF open-source model.
      
          This avoids issues with requiring old TF-v1, making it compatible with latest TF.
      
      --
      306777559  by Andre Araujo:
      
          Internal change
      
      --
      304505811  by Andre Araujo:
      
          Raise error during geometric verification if local features have different dimensionalities.
      
      --
      301739992  by Andre Araujo:
      
          Transform some geometric verification constants into arguments, to allow custom matching.
      
      --
      301300324  by Andre Araujo:
      
          Apply name change(experimental_run_v2 -> run) for all callers in Tensorflow.
      
      --
      299919057  by Andre Araujo:
      
          Automated refactoring to make code Python 3 compatible.
      
      --
      297953698  by Andre Araujo:
      
          Explicitly replace "import tensorflow" with "tensorflow.compat.v1" for TF2.x migration
      
      --
      297521242  by Andre Araujo:
      
          Explicitly replace "import tensorflow" with "tensorflow.compat.v1" for TF2.x migration
      
      --
      297278247  by Andre Araujo:
      
          Explicitly replace "import tensorflow" with "tensorflow.compat.v1" for TF2.x migration
      
      --
      297270405  by Andre Araujo:
      
          Explicitly replace "import tensorflow" with "tensorflow.compat.v1" for TF2.x migration
      
      --
      297238741  by Andre Araujo:
      
          Explicitly replace "import tensorflow" with "tensorflow.compat.v1" for TF2.x migration
      
      --
      297108605  by Andre Araujo:
      
          Explicitly replace "import tensorflow" with "tensorflow.compat.v1" for TF2.x migration
      
      --
      294676131  by Andre Araujo:
      
          Add option to resize images to square resolutions without aspect ratio preservation.
      
      --
      293849641  by Andre Araujo:
      
          Internal change.
      
      --
      293840896  by Andre Araujo:
      
          Changing Slim import to tf_slim codebase.
      
      --
      293661660  by Andre Araujo:
      
          Allow the delf training script to read from TFRecords dataset.
      
      --
      291755295  by Andre Araujo:
      
          Internal change.
      
      --
      291448508  by Andre Araujo:
      
          Internal change.
      
      --
      291414459  by Andre Araujo:
      
          Adding train script.
      
      --
      291384336  by Andre Araujo:
      
          Adding model export script and test.
      
      --
      291260565  by Andre Araujo:
      
          Adding placeholder for Google Landmarks dataset.
      
      --
      291205548  by Andre Araujo:
      
          Definition of DELF model using Keras ResNet50 as backbone.
      
      --
      289500793  by Andre Araujo:
      
          Add TFRecord building script for delf.
      
      --
      
      PiperOrigin-RevId: 309118395
      
      * Updating README, dependency versions
      
      * Updating training README
      
      * Fixing init import of export_model
      
      * Fixing init import of export_model_utils
      
      * tkinter in INSTALL_INSTRUCTIONS
      
      * Merged commit includes the following changes:
      
      FolderOrigin-RevId: /google/src/cloud/andrearaujo/delf_oss/google3/..
      
      * INSTALL_INSTRUCTIONS mentioning different cloning options
      
      * Updating required TF version, since 2.1 is not available in pip
      
      * Internal change.
      
      PiperOrigin-RevId: 309136003
      
      * Fix missing string_input_producer and start_queue_runners in TF2.
      
      PiperOrigin-RevId: 309437512
      
      * Handle RANSAC from skimage's latest versions.
      
      PiperOrigin-RevId: 310170897
      
      * DELF 2.1 version: badge and setup.py updated
      
      * Add TF version badge in INSTALL_INSTRUCTIONS and paper badges in README
      
      * Add paper badges in paper instructions
      
      * Add paper badge to landmark detection instructions
      
      * Small update to DELF training README
      
      * Merged commit includes the following changes:
      312614961  by Andre Araujo:
      
          Instructions/code to reproduce DELG paper results.
      
      --
      312523414  by Andre Araujo:
      
          Fix a minor bug when post-process extracted features, format config.delf_global_config.image_scales_ind to a list.
      
      --
      312340276  by Andre Araujo:
      
          Add support for global feature extraction in DELF open-source codebase.
      
      --
      311031367  by Andre Araujo:
      
          Add use_square_images as an option in DELF config. The default value is false. if it is set, then images are resized to square resolution before feature extraction (e.g. Starburst use case. ) Thought for a while, whether to have two constructor of DescriptorToImageTemplate, but in the end, decide to only keep one, may be less confusing.
      
      --
      310658638  by Andre Araujo:
      
          Option for producing local feature-based image match visualization.
      
      --
      
      PiperOrigin-RevId: 312614961
      
      * DELF README update / DELG instructions
      
      * DELF README update
      
      * DELG instructions update
      
      * Merged commit includes the following changes:
      
      PiperOrigin-RevId: 312695597
      
      * Merged commit includes the following changes:
      312754894  by Andre Araujo:
      
          Code edits / instructions to reproduce GLDv2 results.
      
      --
      
      PiperOrigin-RevId: 312754894
      
      * Markdown updates after adding GLDv2 stuff
      
      * Small updates to DELF README
      
      * Clarify that library must be installed before reproducing results
      
      * Merged commit includes the following changes:
      319114828  by Andre Araujo:
      
          Upgrade global feature model exporting to TF2.
      
      --
      
      PiperOrigin-RevId: 319114828
      
      * Properly merging README
      
      * small edits to README
      
      * small edits to README
      
      * small edits to README
      
      * global feature exporting in training README
      30bac445
  3. 30 Jun, 2020 2 commits
    • Dan Anghel's avatar
      Update to the DELF training README (#8759) · 04c0409c
      Dan Anghel authored
      
      
      * First version of working script to download the GLDv2 dataset
      
      * First version of the DEFL package installation script
      
      * First working version of the DELF package installation script
      
      * Fixed feedback from PR review
      
      * Push to Github of changes to the TFRecord data generation script for DELF.
      
      * Merged commit includes the following changes:
      315363544  by Andre Araujo:
      
          Added the generation of TRAIN and VALIDATE splits from the train dataset.
      
      --
      314676530  by Andre Araujo:
      
          Updated script to download GLDv2 images for DELF training.
      
      --
      314101235  by Andre Araujo:
      
          Added newly created module 'utils' to the copybara script.
      
      --
      313677085  by Andre Araujo:
      
          Code migration from TF1 to TF2 for:
          - logging (replaced usage of tf.compat.v1.logging.info)
          - testing directories (replaced usage of tf.compat.v1.test.get_temp_dir())
          - feature/object extraction scripts (replaced usage of tf.compat.v1.train.string_input_producer and tf.compat.v1.train.start_queue_runners with PIL)
      
      --
      312770828  by Andre Araujo:
      
          Internal change.
      
      --
      
      PiperOrigin-RevId: 315363544
      
      * First version of the updated README of the DELF training instructions
      
      * Added to the README the section describing the generation of the training data
      
      * Added warning about the TFRecord generation time
      
      * Updated the launch of the training
      
      * Minor README update
      
      * Integrated review feedback
      
      * Merged commit includes the following changes:
      315971979  by Andre Araujo:
      
          Performance optimization in generating the TRAIN and VALIDATION splits per label.
      
      --
      315578370  by Andre Araujo:
      
          Tiny fix to char limit in extractor.py.
      
      --
      315546242  by Andre Araujo:
      
          Script to measure DELG latency.
      
      --
      315545801  by Andre Araujo:
      
          Pre-load PCA parameters, if using them when extracting DELF/G features.
      
      --
      315450392  by Andre Araujo:
      
          Code migration from TF1 to TF2 for:
          - loading the models using  in extractor.py and detector.py using tf.saved_model.load
          - removed tf.compat.v1.Session for the extractor and detector model usage
      
      --
      315406342  by Andre Araujo:
      
          Internal change.
      
      --
      
      PiperOrigin-RevId: 315971979
      
      * Merged commit includes the following changes:
      316538447  by Andre Araujo:
      
          Read the number of classes from the GLDv2 dataset metadata.
      
      --
      316416973  by Andre Araujo:
      
          Migration of DELF code to TF2:
          - removed tf.compat.v1.test.get_temp_dir() with FLAGS.test_tmpdir
          - removed delf_v1.py and its dependencies
          - removed tf.compat.v1, Session, Graph dependencies from feature_extractor.py, feature_aggregation_extractor.py and aggregation_extraction.py
      
      --
      
      PiperOrigin-RevId: 316538447
      
      * Removed reference to delf_v1
      
      * Merged commit includes the following changes:
      318168500  by Andre Araujo:
      
          Several small changes to DELF open-source training code:
          - Replace "make_dataset_iterator" call which was deprecated by a more recent suitable version.
          - Add image summary, allowing visualization of the augmented images during training
          - Normalize images before feeding them to the model
      
      --
      316888714  by Andre Araujo:
      
          - Removed unnecessary cast from feature_aggregation_extraction.py
          - Fixed clustering script
      
      --
      
      PiperOrigin-RevId: 318168500
      
      * Merged commit includes the following changes:
      318401984  by Andre Araujo:
      
          Add attention visualization to DELF training script.
      
      --
      
      PiperOrigin-RevId: 318401984
      
      * README update with training and model validation steps
      
      * Minor fixes to the DEFL training README
      
      * Integrated review feedback
      
      * Changed passing of boolean parameter to script
      Co-authored-by: default avatarAndre Araujo <andrearaujo@google.com>
      04c0409c
    • BasiaFusinska's avatar
      Merged commit includes the following changes: (#8753) · df89d3e0
      BasiaFusinska authored
      318938278  by Andre Araujo:
      
          Loading pretrained ImageNet weights to initialize the ResNet backbone. Changed the defaults of the batch size and initial learning rate to increase convergence on the GLDv2 dataset. Made the evaluation batch size dynamic depending on the global batch size.
      
      --
      318911740  by Andre Araujo:
      
          Introduced additional shuffling of the TRAIN and VALIDATION datasets to ensure label variance across batches.
      
      --
      318908335  by Andre Araujo:
      
          Export model migration to TF2.
      
      --
      318489123  by Andre Araujo:
      
          Model exporting script for global feature trained with DELF codebase.
          Additionally, makes a small change to replace back_prop=False in the tf.while_loop call (see deprecation notice in https://www.tensorflow.org/api_docs/python/tf/while_loop
      
      ).
      
      --
      318401984  by Andre Araujo:
      
          Add attention visualization to DELF training script.
      
      --
      318168500  by Andre Araujo:
      
          Several small changes to DELF open-source training code:
          - Replace "make_dataset_iterator" call which was deprecated by a more recent suitable version.
          - Add image summary, allowing visualization of the augmented images during training
          - Normalize images before feeding them to the model
      
      --
      316888714  by Andre Araujo:
      
          - Removed unnecessary cast from feature_aggregation_extraction.py
          - Fixed clustering script
      
      --
      
      PiperOrigin-RevId: 318938278
      Co-authored-by: default avatarAndre Araujo <andrearaujo@google.com>
      df89d3e0
  4. 16 Jun, 2020 1 commit
    • Dan Anghel's avatar
      Fix to DELF package (#8679) · cabb22cd
      Dan Anghel authored
      
      
      * First version of working script to download the GLDv2 dataset
      
      * First version of the DEFL package installation script
      
      * First working version of the DELF package installation script
      
      * Fixed feedback from PR review
      
      * Push to Github of changes to the TFRecord data generation script for DELF.
      
      * Merged commit includes the following changes:
      315363544  by Andre Araujo:
      
          Added the generation of TRAIN and VALIDATE splits from the train dataset.
      
      --
      314676530  by Andre Araujo:
      
          Updated script to download GLDv2 images for DELF training.
      
      --
      314101235  by Andre Araujo:
      
          Added newly created module 'utils' to the copybara script.
      
      --
      313677085  by Andre Araujo:
      
          Code migration from TF1 to TF2 for:
          - logging (replaced usage of tf.compat.v1.logging.info)
          - testing directories (replaced usage of tf.compat.v1.test.get_temp_dir())
          - feature/object extraction scripts (replaced usage of tf.compat.v1.train.string_input_producer and tf.compat.v1.train.start_queue_runners with PIL)
      
      --
      312770828  by Andre Araujo:
      
          Internal change.
      
      --
      
      PiperOrigin-RevId: 315363544
      
      * First version of the updated README of the DELF training instructions
      
      * Added to the README the section describing the generation of the training data
      
      * Added warning about the TFRecord generation time
      
      * Updated the launch of the training
      
      * Minor README update
      
      * Integrated review feedback
      
      * Merged commit includes the following changes:
      315971979  by Andre Araujo:
      
          Performance optimization in generating the TRAIN and VALIDATION splits per label.
      
      --
      315578370  by Andre Araujo:
      
          Tiny fix to char limit in extractor.py.
      
      --
      315546242  by Andre Araujo:
      
          Script to measure DELG latency.
      
      --
      315545801  by Andre Araujo:
      
          Pre-load PCA parameters, if using them when extracting DELF/G features.
      
      --
      315450392  by Andre Araujo:
      
          Code migration from TF1 to TF2 for:
          - loading the models using  in extractor.py and detector.py using tf.saved_model.load
          - removed tf.compat.v1.Session for the extractor and detector model usage
      
      --
      315406342  by Andre Araujo:
      
          Internal change.
      
      --
      
      PiperOrigin-RevId: 315971979
      
      * Merged commit includes the following changes:
      316538447  by Andre Araujo:
      
          Read the number of classes from the GLDv2 dataset metadata.
      
      --
      316416973  by Andre Araujo:
      
          Migration of DELF code to TF2:
          - removed tf.compat.v1.test.get_temp_dir() with FLAGS.test_tmpdir
          - removed delf_v1.py and its dependencies
          - removed tf.compat.v1, Session, Graph dependencies from feature_extractor.py, feature_aggregation_extractor.py and aggregation_extraction.py
      
      --
      
      PiperOrigin-RevId: 316538447
      
      * Removed reference to delf_v1
      Co-authored-by: default avatarAndre Araujo <andrearaujo@google.com>
      cabb22cd
  5. 15 Jun, 2020 1 commit
    • Dan Anghel's avatar
      Push to Github of TF2 changes to DELF package (#8678) · 48b6d1d1
      Dan Anghel authored
      
      
      * First version of working script to download the GLDv2 dataset
      
      * First version of the DEFL package installation script
      
      * First working version of the DELF package installation script
      
      * Fixed feedback from PR review
      
      * Push to Github of changes to the TFRecord data generation script for DELF.
      
      * Merged commit includes the following changes:
      315363544  by Andre Araujo:
      
          Added the generation of TRAIN and VALIDATE splits from the train dataset.
      
      --
      314676530  by Andre Araujo:
      
          Updated script to download GLDv2 images for DELF training.
      
      --
      314101235  by Andre Araujo:
      
          Added newly created module 'utils' to the copybara script.
      
      --
      313677085  by Andre Araujo:
      
          Code migration from TF1 to TF2 for:
          - logging (replaced usage of tf.compat.v1.logging.info)
          - testing directories (replaced usage of tf.compat.v1.test.get_temp_dir())
          - feature/object extraction scripts (replaced usage of tf.compat.v1.train.string_input_producer and tf.compat.v1.train.start_queue_runners with PIL)
      
      --
      312770828  by Andre Araujo:
      
          Internal change.
      
      --
      
      PiperOrigin-RevId: 315363544
      
      * First version of the updated README of the DELF training instructions
      
      * Added to the README the section describing the generation of the training data
      
      * Added warning about the TFRecord generation time
      
      * Updated the launch of the training
      
      * Minor README update
      
      * Integrated review feedback
      
      * Merged commit includes the following changes:
      315971979  by Andre Araujo:
      
          Performance optimization in generating the TRAIN and VALIDATION splits per label.
      
      --
      315578370  by Andre Araujo:
      
          Tiny fix to char limit in extractor.py.
      
      --
      315546242  by Andre Araujo:
      
          Script to measure DELG latency.
      
      --
      315545801  by Andre Araujo:
      
          Pre-load PCA parameters, if using them when extracting DELF/G features.
      
      --
      315450392  by Andre Araujo:
      
          Code migration from TF1 to TF2 for:
          - loading the models using  in extractor.py and detector.py using tf.saved_model.load
          - removed tf.compat.v1.Session for the extractor and detector model usage
      
      --
      315406342  by Andre Araujo:
      
          Internal change.
      
      --
      
      PiperOrigin-RevId: 315971979
      
      * Merged commit includes the following changes:
      316538447  by Andre Araujo:
      
          Read the number of classes from the GLDv2 dataset metadata.
      
      --
      316416973  by Andre Araujo:
      
          Migration of DELF code to TF2:
          - removed tf.compat.v1.test.get_temp_dir() with FLAGS.test_tmpdir
          - removed delf_v1.py and its dependencies
          - removed tf.compat.v1, Session, Graph dependencies from feature_extractor.py, feature_aggregation_extractor.py and aggregation_extraction.py
      
      --
      
      PiperOrigin-RevId: 316538447
      Co-authored-by: default avatarAndre Araujo <andrearaujo@google.com>
      48b6d1d1
  6. 12 Jun, 2020 2 commits
    • Dan Anghel's avatar
      Push to Github of changes to DELF package (#8670) · b3ef7ae9
      Dan Anghel authored
      
      
      * First version of working script to download the GLDv2 dataset
      
      * First version of the DEFL package installation script
      
      * First working version of the DELF package installation script
      
      * Fixed feedback from PR review
      
      * Push to Github of changes to the TFRecord data generation script for DELF.
      
      * Merged commit includes the following changes:
      315363544  by Andre Araujo:
      
          Added the generation of TRAIN and VALIDATE splits from the train dataset.
      
      --
      314676530  by Andre Araujo:
      
          Updated script to download GLDv2 images for DELF training.
      
      --
      314101235  by Andre Araujo:
      
          Added newly created module 'utils' to the copybara script.
      
      --
      313677085  by Andre Araujo:
      
          Code migration from TF1 to TF2 for:
          - logging (replaced usage of tf.compat.v1.logging.info)
          - testing directories (replaced usage of tf.compat.v1.test.get_temp_dir())
          - feature/object extraction scripts (replaced usage of tf.compat.v1.train.string_input_producer and tf.compat.v1.train.start_queue_runners with PIL)
      
      --
      312770828  by Andre Araujo:
      
          Internal change.
      
      --
      
      PiperOrigin-RevId: 315363544
      
      * First version of the updated README of the DELF training instructions
      
      * Added to the README the section describing the generation of the training data
      
      * Added warning about the TFRecord generation time
      
      * Updated the launch of the training
      
      * Minor README update
      
      * Integrated review feedback
      
      * Merged commit includes the following changes:
      315971979  by Andre Araujo:
      
          Performance optimization in generating the TRAIN and VALIDATION splits per label.
      
      --
      315578370  by Andre Araujo:
      
          Tiny fix to char limit in extractor.py.
      
      --
      315546242  by Andre Araujo:
      
          Script to measure DELG latency.
      
      --
      315545801  by Andre Araujo:
      
          Pre-load PCA parameters, if using them when extracting DELF/G features.
      
      --
      315450392  by Andre Araujo:
      
          Code migration from TF1 to TF2 for:
          - loading the models using  in extractor.py and detector.py using tf.saved_model.load
          - removed tf.compat.v1.Session for the extractor and detector model usage
      
      --
      315406342  by Andre Araujo:
      
          Internal change.
      
      --
      
      PiperOrigin-RevId: 315971979
      Co-authored-by: default avatarAndre Araujo <andrearaujo@google.com>
      b3ef7ae9
    • Dan Anghel's avatar
      DELF Training Documentation Update (#8663) · 41613994
      Dan Anghel authored
      
      
      * First version of working script to download the GLDv2 dataset
      
      * First version of the DEFL package installation script
      
      * First working version of the DELF package installation script
      
      * Fixed feedback from PR review
      
      * Push to Github of changes to the TFRecord data generation script for DELF.
      
      * Merged commit includes the following changes:
      315363544  by Andre Araujo:
      
          Added the generation of TRAIN and VALIDATE splits from the train dataset.
      
      --
      314676530  by Andre Araujo:
      
          Updated script to download GLDv2 images for DELF training.
      
      --
      314101235  by Andre Araujo:
      
          Added newly created module 'utils' to the copybara script.
      
      --
      313677085  by Andre Araujo:
      
          Code migration from TF1 to TF2 for:
          - logging (replaced usage of tf.compat.v1.logging.info)
          - testing directories (replaced usage of tf.compat.v1.test.get_temp_dir())
          - feature/object extraction scripts (replaced usage of tf.compat.v1.train.string_input_producer and tf.compat.v1.train.start_queue_runners with PIL)
      
      --
      312770828  by Andre Araujo:
      
          Internal change.
      
      --
      
      PiperOrigin-RevId: 315363544
      
      * First version of the updated README of the DELF training instructions
      
      * Added to the README the section describing the generation of the training data
      
      * Added warning about the TFRecord generation time
      
      * Updated the launch of the training
      
      * Minor README update
      
      * Integrated review feedback
      Co-authored-by: default avatarAndre Araujo <andrearaujo@google.com>
      41613994
  7. 08 Jun, 2020 1 commit
    • Dan Anghel's avatar
      Push to Github of changes to the TFRecord generation of GLDv2 dataset (#8650) · e82a2d9f
      Dan Anghel authored
      * First version of working script to download the GLDv2 dataset
      
      * First version of the DEFL package installation script
      
      * First working version of the DELF package installation script
      
      * Fixed feedback from PR review
      
      * Push to Github of changes to the TFRecord data generation script for DELF.
      
      * Merged commit includes the following changes:
      315363544  
      
          Added the generation of TRAIN and VALIDATE splits from the train dataset.
      
      --
      314676530  
      
          Updated script to download GLDv2 images for DELF training.
      
      --
      314101235  
      
          Added newly created module 'utils' to the copybara script.
      
      --
      313677085  
      
          Code migration from TF1 to TF2 for:
          - logging (replaced usage of tf.compat.v1.logging.info)
          - testing directories (replaced usage of tf.compat.v1.test.get_temp_dir())
          - feature/object extraction scripts (replaced usage of tf.compat.v1.train.string_input_producer and tf.compat.v1.train.start_queue_runners with PIL)
      
      --
      312770828  by 
      
          Internal change.
      
      --
      
      PiperOrigin-RevId: 315363544
      e82a2d9f
  8. 04 Jun, 2020 1 commit
  9. 29 May, 2020 1 commit
  10. 22 May, 2020 2 commits
    • André Araujo's avatar
      Small documentation update (#8558) · 92287fe0
      André Araujo authored
      * 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:
      
          Create directory for writing mapping file if it does not exist.
      
      --
      249581591  by Andre Araujo:
      
          Refactor scripts to extract boxes and features from images in Revisited datasets.
          Also, change tf.logging.info --> print for easier logging in open source code.
      
      --
      249511821  by Andre Araujo:
      
          Small change to function for file/directory handling.
      
      --
      249289499  by Andre Araujo:
      
          Internal change.
      
      --
      
      PiperOrigin-RevId: 253126424
      
      * Updating DELF init to adjust to latest changes
      
      * Editing init files for python packages
      
      * Edit D2R dataset reader to work with py3.
      
      PiperOrigin-RevId: 253135576
      
      * DELF package: fix import ordering
      
      * Adding new requirements to setup.py
      
      * Adding init file for training dir
      
      * Merged commit includes the following changes:
      
      FolderOrigin-RevId: /google/src/cloud/andrearaujo/delf_oss/google3/..
      
      * Adding init file for training subdirs
      
      * Working version of DELF training
      
      * Internal change.
      
      PiperOrigin-RevId: 253248648
      
      * Fix variance loading in open-source code.
      
      PiperOrigin-RevId: 260619120
      
      * Separate image re-ranking as a standalone library, and add metric writing to dataset library.
      
      PiperOrigin-RevId: 260998608
      
      * Tool to read written D2R Revisited datasets metrics file. Test is added.
      
      Also adds a unit test for previously-existing SaveMetricsFile function.
      
      PiperOrigin-RevId: 263361410
      
      * Add optional resize factor for feature extraction.
      
      PiperOrigin-RevId: 264437080
      
      * Fix NumPy's new version spacing changes.
      
      PiperOrigin-RevId: 265127245
      
      * Maker image matching function visible, and add support for RANSAC seed.
      
      PiperOrigin-RevId: 277177468
      
      * Avoid matplotlib failure due to missing display backend.
      
      PiperOrigin-RevId: 287316435
      
      * Removes tf.contrib dependency.
      
      PiperOrigin-RevId: 288842237
      
      * Fix tf contrib removal for feature_aggregation_extractor.
      
      PiperOrigin-RevId: 289487669
      
      * Merged commit includes the following changes:
      309118395  by Andre Araujo:
      
          Make DELF open-source code compatible with TF2.
      
      --
      309067582  by Andre Araujo:
      
          Handle image resizing rounding properly for python extraction.
      
          New behavior is tested with unit tests.
      
      --
      308690144  by Andre Araujo:
      
          Several changes to improve DELF model/training code and make it work in TF 2.1.0:
          - Rename some files for better clarity
          - Using compat.v1 versions of functions
          - Formatting changes
          - Using more appropriate TF function names
      
      --
      308689397  by Andre Araujo:
      
          Internal change.
      
      --
      308341315  by Andre Araujo:
      
          Remove old slim dependency in DELF open-source model.
      
          This avoids issues with requiring old TF-v1, making it compatible with latest TF.
      
      --
      306777559  by Andre Araujo:
      
          Internal change
      
      --
      304505811  by Andre Araujo:
      
          Raise error during geometric verification if local features have different dimensionalities.
      
      --
      301739992  by Andre Araujo:
      
          Transform some geometric verification constants into arguments, to allow custom matching.
      
      --
      301300324  by Andre Araujo:
      
          Apply name change(experimental_run_v2 -> run) for all callers in Tensorflow.
      
      --
      299919057  by Andre Araujo:
      
          Automated refactoring to make code Python 3 compatible.
      
      --
      297953698  by Andre Araujo:
      
          Explicitly replace "import tensorflow" with "tensorflow.compat.v1" for TF2.x migration
      
      --
      297521242  by Andre Araujo:
      
          Explicitly replace "import tensorflow" with "tensorflow.compat.v1" for TF2.x migration
      
      --
      297278247  by Andre Araujo:
      
          Explicitly replace "import tensorflow" with "tensorflow.compat.v1" for TF2.x migration
      
      --
      297270405  by Andre Araujo:
      
          Explicitly replace "import tensorflow" with "tensorflow.compat.v1" for TF2.x migration
      
      --
      297238741  by Andre Araujo:
      
          Explicitly replace "import tensorflow" with "tensorflow.compat.v1" for TF2.x migration
      
      --
      297108605  by Andre Araujo:
      
          Explicitly replace "import tensorflow" with "tensorflow.compat.v1" for TF2.x migration
      
      --
      294676131  by Andre Araujo:
      
          Add option to resize images to square resolutions without aspect ratio preservation.
      
      --
      293849641  by Andre Araujo:
      
          Internal change.
      
      --
      293840896  by Andre Araujo:
      
          Changing Slim import to tf_slim codebase.
      
      --
      293661660  by Andre Araujo:
      
          Allow the delf training script to read from TFRecords dataset.
      
      --
      291755295  by Andre Araujo:
      
          Internal change.
      
      --
      291448508  by Andre Araujo:
      
          Internal change.
      
      --
      291414459  by Andre Araujo:
      
          Adding train script.
      
      --
      291384336  by Andre Araujo:
      
          Adding model export script and test.
      
      --
      291260565  by Andre Araujo:
      
          Adding placeholder for Google Landmarks dataset.
      
      --
      291205548  by Andre Araujo:
      
          Definition of DELF model using Keras ResNet50 as backbone.
      
      --
      289500793  by Andre Araujo:
      
          Add TFRecord building script for delf.
      
      --
      
      PiperOrigin-RevId: 309118395
      
      * Updating README, dependency versions
      
      * Updating training README
      
      * Fixing init import of export_model
      
      * Fixing init import of export_model_utils
      
      * tkinter in INSTALL_INSTRUCTIONS
      
      * Merged commit includes the following changes:
      
      FolderOrigin-RevId: /google/src/cloud/andrearaujo/delf_oss/google3/..
      
      * INSTALL_INSTRUCTIONS mentioning different cloning options
      
      * Updating required TF version, since 2.1 is not available in pip
      
      * Internal change.
      
      PiperOrigin-RevId: 309136003
      
      * Fix missing string_input_producer and start_queue_runners in TF2.
      
      PiperOrigin-RevId: 309437512
      
      * Handle RANSAC from skimage's latest versions.
      
      PiperOrigin-RevId: 310170897
      
      * DELF 2.1 version: badge and setup.py updated
      
      * Add TF version badge in INSTALL_INSTRUCTIONS and paper badges in README
      
      * Add paper badges in paper instructions
      
      * Add paper badge to landmark detection instructions
      
      * Small update to DELF training README
      
      * Merged commit includes the following changes:
      312614961  by Andre Araujo:
      
          Instructions/code to reproduce DELG paper results.
      
      --
      312523414  by Andre Araujo:
      
          Fix a minor bug when post-process extracted features, format config.delf_global_config.image_scales_ind to a list.
      
      --
      312340276  by Andre Araujo:
      
          Add support for global feature extraction in DELF open-source codebase.
      
      --
      311031367  by Andre Araujo:
      
          Add use_square_images as an option in DELF config. The default value is false. if it is set, then images are resized to square resolution before feature extraction (e.g. Starburst use case. ) Thought for a while, whether to have two constructor of DescriptorToImageTemplate, but in the end, decide to only keep one, may be less confusing.
      
      --
      310658638  by Andre Araujo:
      
          Option for producing local feature-based image match visualization.
      
      --
      
      PiperOrigin-RevId: 312614961
      
      * DELF README update / DELG instructions
      
      * DELF README update
      
      * DELG instructions update
      
      * Merged commit includes the following changes:
      
      PiperOrigin-RevId: 312695597
      
      * Merged commit includes the following changes:
      312754894  by Andre Araujo:
      
          Code edits / instructions to reproduce GLDv2 results.
      
      --
      
      PiperOrigin-RevId: 312754894
      
      * Markdown updates after adding GLDv2 stuff
      
      * Small updates to DELF README
      
      * Clarify that library must be installed before reproducing results
      92287fe0
    • André Araujo's avatar
      Add GLDv2 baseline in DELF codebase (#8557) · 979e296a
      André Araujo authored
      * 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:
      
          Create directory for writing mapping file if it does not exist.
      
      --
      249581591  by Andre Araujo:
      
          Refactor scripts to extract boxes and features from images in Revisited datasets.
          Also, change tf.logging.info --> print for easier logging in open source code.
      
      --
      249511821  by Andre Araujo:
      
          Small change to function for file/directory handling.
      
      --
      249289499  by Andre Araujo:
      
          Internal change.
      
      --
      
      PiperOrigin-RevId: 253126424
      
      * Updating DELF init to adjust to latest changes
      
      * Editing init files for python packages
      
      * Edit D2R dataset reader to work with py3.
      
      PiperOrigin-RevId: 253135576
      
      * DELF package: fix import ordering
      
      * Adding new requirements to setup.py
      
      * Adding init file for training dir
      
      * Merged commit includes the following changes:
      
      FolderOrigin-RevId: /google/src/cloud/andrearaujo/delf_oss/google3/..
      
      * Adding init file for training subdirs
      
      * Working version of DELF training
      
      * Internal change.
      
      PiperOrigin-RevId: 253248648
      
      * Fix variance loading in open-source code.
      
      PiperOrigin-RevId: 260619120
      
      * Separate image re-ranking as a standalone library, and add metric writing to dataset library.
      
      PiperOrigin-RevId: 260998608
      
      * Tool to read written D2R Revisited datasets metrics file. Test is added.
      
      Also adds a unit test for previously-existing SaveMetricsFile function.
      
      PiperOrigin-RevId: 263361410
      
      * Add optional resize factor for feature extraction.
      
      PiperOrigin-RevId: 264437080
      
      * Fix NumPy's new version spacing changes.
      
      PiperOrigin-RevId: 265127245
      
      * Maker image matching function visible, and add support for RANSAC seed.
      
      PiperOrigin-RevId: 277177468
      
      * Avoid matplotlib failure due to missing display backend.
      
      PiperOrigin-RevId: 287316435
      
      * Removes tf.contrib dependency.
      
      PiperOrigin-RevId: 288842237
      
      * Fix tf contrib removal for feature_aggregation_extractor.
      
      PiperOrigin-RevId: 289487669
      
      * Merged commit includes the following changes:
      309118395  by Andre Araujo:
      
          Make DELF open-source code compatible with TF2.
      
      --
      309067582  by Andre Araujo:
      
          Handle image resizing rounding properly for python extraction.
      
          New behavior is tested with unit tests.
      
      --
      308690144  by Andre Araujo:
      
          Several changes to improve DELF model/training code and make it work in TF 2.1.0:
          - Rename some files for better clarity
          - Using compat.v1 versions of functions
          - Formatting changes
          - Using more appropriate TF function names
      
      --
      308689397  by Andre Araujo:
      
          Internal change.
      
      --
      308341315  by Andre Araujo:
      
          Remove old slim dependency in DELF open-source model.
      
          This avoids issues with requiring old TF-v1, making it compatible with latest TF.
      
      --
      306777559  by Andre Araujo:
      
          Internal change
      
      --
      304505811  by Andre Araujo:
      
          Raise error during geometric verification if local features have different dimensionalities.
      
      --
      301739992  by Andre Araujo:
      
          Transform some geometric verification constants into arguments, to allow custom matching.
      
      --
      301300324  by Andre Araujo:
      
          Apply name change(experimental_run_v2 -> run) for all callers in Tensorflow.
      
      --
      299919057  by Andre Araujo:
      
          Automated refactoring to make code Python 3 compatible.
      
      --
      297953698  by Andre Araujo:
      
          Explicitly replace "import tensorflow" with "tensorflow.compat.v1" for TF2.x migration
      
      --
      297521242  by Andre Araujo:
      
          Explicitly replace "import tensorflow" with "tensorflow.compat.v1" for TF2.x migration
      
      --
      297278247  by Andre Araujo:
      
          Explicitly replace "import tensorflow" with "tensorflow.compat.v1" for TF2.x migration
      
      --
      297270405  by Andre Araujo:
      
          Explicitly replace "import tensorflow" with "tensorflow.compat.v1" for TF2.x migration
      
      --
      297238741  by Andre Araujo:
      
          Explicitly replace "import tensorflow" with "tensorflow.compat.v1" for TF2.x migration
      
      --
      297108605  by Andre Araujo:
      
          Explicitly replace "import tensorflow" with "tensorflow.compat.v1" for TF2.x migration
      
      --
      294676131  by Andre Araujo:
      
          Add option to resize images to square resolutions without aspect ratio preservation.
      
      --
      293849641  by Andre Araujo:
      
          Internal change.
      
      --
      293840896  by Andre Araujo:
      
          Changing Slim import to tf_slim codebase.
      
      --
      293661660  by Andre Araujo:
      
          Allow the delf training script to read from TFRecords dataset.
      
      --
      291755295  by Andre Araujo:
      
          Internal change.
      
      --
      291448508  by Andre Araujo:
      
          Internal change.
      
      --
      291414459  by Andre Araujo:
      
          Adding train script.
      
      --
      291384336  by Andre Araujo:
      
          Adding model export script and test.
      
      --
      291260565  by Andre Araujo:
      
          Adding placeholder for Google Landmarks dataset.
      
      --
      291205548  by Andre Araujo:
      
          Definition of DELF model using Keras ResNet50 as backbone.
      
      --
      289500793  by Andre Araujo:
      
          Add TFRecord building script for delf.
      
      --
      
      PiperOrigin-RevId: 309118395
      
      * Updating README, dependency versions
      
      * Updating training README
      
      * Fixing init import of export_model
      
      * Fixing init import of export_model_utils
      
      * tkinter in INSTALL_INSTRUCTIONS
      
      * Merged commit includes the following changes:
      
      FolderOrigin-RevId: /google/src/cloud/andrearaujo/delf_oss/google3/..
      
      * INSTALL_INSTRUCTIONS mentioning different cloning options
      
      * Updating required TF version, since 2.1 is not available in pip
      
      * Internal change.
      
      PiperOrigin-RevId: 309136003
      
      * Fix missing string_input_producer and start_queue_runners in TF2.
      
      PiperOrigin-RevId: 309437512
      
      * Handle RANSAC from skimage's latest versions.
      
      PiperOrigin-RevId: 310170897
      
      * DELF 2.1 version: badge and setup.py updated
      
      * Add TF version badge in INSTALL_INSTRUCTIONS and paper badges in README
      
      * Add paper badges in paper instructions
      
      * Add paper badge to landmark detection instructions
      
      * Small update to DELF training README
      
      * Merged commit includes the following changes:
      312614961  by Andre Araujo:
      
          Instructions/code to reproduce DELG paper results.
      
      --
      312523414  by Andre Araujo:
      
          Fix a minor bug when post-process extracted features, format config.delf_global_config.image_scales_ind to a list.
      
      --
      312340276  by Andre Araujo:
      
          Add support for global feature extraction in DELF open-source codebase.
      
      --
      311031367  by Andre Araujo:
      
          Add use_square_images as an option in DELF config. The default value is false. if it is set, then images are resized to square resolution before feature extraction (e.g. Starburst use case. ) Thought for a while, whether to have two constructor of DescriptorToImageTemplate, but in the end, decide to only keep one, may be less confusing.
      
      --
      310658638  by Andre Araujo:
      
          Option for producing local feature-based image match visualization.
      
      --
      
      PiperOrigin-RevId: 312614961
      
      * DELF README update / DELG instructions
      
      * DELF README update
      
      * DELG instructions update
      
      * Merged commit includes the following changes:
      
      PiperOrigin-RevId: 312695597
      
      * Merged commit includes the following changes:
      312754894  by Andre Araujo:
      
          Code edits / instructions to reproduce GLDv2 results.
      
      --
      
      PiperOrigin-RevId: 312754894
      
      * Markdown updates after adding GLDv2 stuff
      
      * Small updates to DELF README
      979e296a
  11. 21 May, 2020 1 commit
    • André Araujo's avatar
      Add DELG code (#8553) · bc7c9810
      André Araujo authored
      * 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:
      
          Create directory for writing mapping file if it does not exist.
      
      --
      249581591  by Andre Araujo:
      
          Refactor scripts to extract boxes and features from images in Revisited datasets.
          Also, change tf.logging.info --> print for easier logging in open source code.
      
      --
      249511821  by Andre Araujo:
      
          Small change to function for file/directory handling.
      
      --
      249289499  by Andre Araujo:
      
          Internal change.
      
      --
      
      PiperOrigin-RevId: 253126424
      
      * Updating DELF init to adjust to latest changes
      
      * Editing init files for python packages
      
      * Edit D2R dataset reader to work with py3.
      
      PiperOrigin-RevId: 253135576
      
      * DELF package: fix import ordering
      
      * Adding new requirements to setup.py
      
      * Adding init file for training dir
      
      * Merged commit includes the following changes:
      
      FolderOrigin-RevId: /google/src/cloud/andrearaujo/delf_oss/google3/..
      
      * Adding init file for training subdirs
      
      * Working version of DELF training
      
      * Internal change.
      
      PiperOrigin-RevId: 253248648
      
      * Fix variance loading in open-source code.
      
      PiperOrigin-RevId: 260619120
      
      * Separate image re-ranking as a standalone library, and add metric writing to dataset library.
      
      PiperOrigin-RevId: 260998608
      
      * Tool to read written D2R Revisited datasets metrics file. Test is added.
      
      Also adds a unit test for previously-existing SaveMetricsFile function.
      
      PiperOrigin-RevId: 263361410
      
      * Add optional resize factor for feature extraction.
      
      PiperOrigin-RevId: 264437080
      
      * Fix NumPy's new version spacing changes.
      
      PiperOrigin-RevId: 265127245
      
      * Maker image matching function visible, and add support for RANSAC seed.
      
      PiperOrigin-RevId: 277177468
      
      * Avoid matplotlib failure due to missing display backend.
      
      PiperOrigin-RevId: 287316435
      
      * Removes tf.contrib dependency.
      
      PiperOrigin-RevId: 288842237
      
      * Fix tf contrib removal for feature_aggregation_extractor.
      
      PiperOrigin-RevId: 289487669
      
      * Merged commit includes the following changes:
      309118395  by Andre Araujo:
      
          Make DELF open-source code compatible with TF2.
      
      --
      309067582  by Andre Araujo:
      
          Handle image resizing rounding properly for python extraction.
      
          New behavior is tested with unit tests.
      
      --
      308690144  by Andre Araujo:
      
          Several changes to improve DELF model/training code and make it work in TF 2.1.0:
          - Rename some files for better clarity
          - Using compat.v1 versions of functions
          - Formatting changes
          - Using more appropriate TF function names
      
      --
      308689397  by Andre Araujo:
      
          Internal change.
      
      --
      308341315  by Andre Araujo:
      
          Remove old slim dependency in DELF open-source model.
      
          This avoids issues with requiring old TF-v1, making it compatible with latest TF.
      
      --
      306777559  by Andre Araujo:
      
          Internal change
      
      --
      304505811  by Andre Araujo:
      
          Raise error during geometric verification if local features have different dimensionalities.
      
      --
      301739992  by Andre Araujo:
      
          Transform some geometric verification constants into arguments, to allow custom matching.
      
      --
      301300324  by Andre Araujo:
      
          Apply name change(experimental_run_v2 -> run) for all callers in Tensorflow.
      
      --
      299919057  by Andre Araujo:
      
          Automated refactoring to make code Python 3 compatible.
      
      --
      297953698  by Andre Araujo:
      
          Explicitly replace "import tensorflow" with "tensorflow.compat.v1" for TF2.x migration
      
      --
      297521242  by Andre Araujo:
      
          Explicitly replace "import tensorflow" with "tensorflow.compat.v1" for TF2.x migration
      
      --
      297278247  by Andre Araujo:
      
          Explicitly replace "import tensorflow" with "tensorflow.compat.v1" for TF2.x migration
      
      --
      297270405  by Andre Araujo:
      
          Explicitly replace "import tensorflow" with "tensorflow.compat.v1" for TF2.x migration
      
      --
      297238741  by Andre Araujo:
      
          Explicitly replace "import tensorflow" with "tensorflow.compat.v1" for TF2.x migration
      
      --
      297108605  by Andre Araujo:
      
          Explicitly replace "import tensorflow" with "tensorflow.compat.v1" for TF2.x migration
      
      --
      294676131  by Andre Araujo:
      
          Add option to resize images to square resolutions without aspect ratio preservation.
      
      --
      293849641  by Andre Araujo:
      
          Internal change.
      
      --
      293840896  by Andre Araujo:
      
          Changing Slim import to tf_slim codebase.
      
      --
      293661660  by Andre Araujo:
      
          Allow the delf training script to read from TFRecords dataset.
      
      --
      291755295  by Andre Araujo:
      
          Internal change.
      
      --
      291448508  by Andre Araujo:
      
          Internal change.
      
      --
      291414459  by Andre Araujo:
      
          Adding train script.
      
      --
      291384336  by Andre Araujo:
      
          Adding model export script and test.
      
      --
      291260565  by Andre Araujo:
      
          Adding placeholder for Google Landmarks dataset.
      
      --
      291205548  by Andre Araujo:
      
          Definition of DELF model using Keras ResNet50 as backbone.
      
      --
      289500793  by Andre Araujo:
      
          Add TFRecord building script for delf.
      
      --
      
      PiperOrigin-RevId: 309118395
      
      * Updating README, dependency versions
      
      * Updating training README
      
      * Fixing init import of export_model
      
      * Fixing init import of export_model_utils
      
      * tkinter in INSTALL_INSTRUCTIONS
      
      * Merged commit includes the following changes:
      
      FolderOrigin-RevId: /google/src/cloud/andrearaujo/delf_oss/google3/..
      
      * INSTALL_INSTRUCTIONS mentioning different cloning options
      
      * Updating required TF version, since 2.1 is not available in pip
      
      * Internal change.
      
      PiperOrigin-RevId: 309136003
      
      * Fix missing string_input_producer and start_queue_runners in TF2.
      
      PiperOrigin-RevId: 309437512
      
      * Handle RANSAC from skimage's latest versions.
      
      PiperOrigin-RevId: 310170897
      
      * DELF 2.1 version: badge and setup.py updated
      
      * Add TF version badge in INSTALL_INSTRUCTIONS and paper badges in README
      
      * Add paper badges in paper instructions
      
      * Add paper badge to landmark detection instructions
      
      * Small update to DELF training README
      
      * Merged commit includes the following changes:
      312614961  by Andre Araujo:
      
          Instructions/code to reproduce DELG paper results.
      
      --
      312523414  by Andre Araujo:
      
          Fix a minor bug when post-process extracted features, format config.delf_global_config.image_scales_ind to a list.
      
      --
      312340276  by Andre Araujo:
      
          Add support for global feature extraction in DELF open-source codebase.
      
      --
      311031367  by Andre Araujo:
      
          Add use_square_images as an option in DELF config. The default value is false. if it is set, then images are resized to square resolution before feature extraction (e.g. Starburst use case. ) Thought for a while, whether to have two constructor of DescriptorToImageTemplate, but in the end, decide to only keep one, may be less confusing.
      
      --
      310658638  by Andre Araujo:
      
          Option for producing local feature-based image match visualization.
      
      --
      
      PiperOrigin-RevId: 312614961
      
      * DELF README update / DELG instructions
      
      * DELF README update
      
      * DELG instructions update
      
      * Merged commit includes the following changes:
      
      PiperOrigin-RevId: 312695597
      bc7c9810
  12. 18 May, 2020 1 commit
    • BasiaFusinska's avatar
      Python 2 -> 3 migration (#8525) · 19e60dc3
      BasiaFusinska authored
      * Changed DELF installation instructions to be Python3 preferred
      
      * Changed DELF landmark detection instructions to be Python3 preferred
      
      * Changed DELF extraction and matching instructions to be Python3 preferred
      
      * Changed DELF detect-to-retrieve instructions to be Python3 preferred
      
      * Changed DELF training instructions to be Python3 preferred
      
      * Added Python3 badge to DELF README
      19e60dc3
  13. 08 May, 2020 1 commit
    • André Araujo's avatar
      Small update to DELF training README. (#8483) · 0fc994b6
      André Araujo authored
      * 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:
      
          Create directory for writing mapping file if it does not exist.
      
      --
      249581591  by Andre Araujo:
      
          Refactor scripts to extract boxes and features from images in Revisited datasets.
          Also, change tf.logging.info --> print for easier logging in open source code.
      
      --
      249511821  by Andre Araujo:
      
          Small change to function for file/directory handling.
      
      --
      249289499  by Andre Araujo:
      
          Internal change.
      
      --
      
      PiperOrigin-RevId: 253126424
      
      * Updating DELF init to adjust to latest changes
      
      * Editing init files for python packages
      
      * Edit D2R dataset reader to work with py3.
      
      PiperOrigin-RevId: 253135576
      
      * DELF package: fix import ordering
      
      * Adding new requirements to setup.py
      
      * Adding init file for training dir
      
      * Merged commit includes the following changes:
      
      FolderOrigin-RevId: /google/src/cloud/andrearaujo/delf_oss/google3/..
      
      * Adding init file for training subdirs
      
      * Working version of DELF training
      
      * Internal change.
      
      PiperOrigin-RevId: 253248648
      
      * Fix variance loading in open-source code.
      
      PiperOrigin-RevId: 260619120
      
      * Separate image re-ranking as a standalone library, and add metric writing to dataset library.
      
      PiperOrigin-RevId: 260998608
      
      * Tool to read written D2R Revisited datasets metrics file. Test is added.
      
      Also adds a unit test for previously-existing SaveMetricsFile function.
      
      PiperOrigin-RevId: 263361410
      
      * Add optional resize factor for feature extraction.
      
      PiperOrigin-RevId: 264437080
      
      * Fix NumPy's new version spacing changes.
      
      PiperOrigin-RevId: 265127245
      
      * Maker image matching function visible, and add support for RANSAC seed.
      
      PiperOrigin-RevId: 277177468
      
      * Avoid matplotlib failure due to missing display backend.
      
      PiperOrigin-RevId: 287316435
      
      * Removes tf.contrib dependency.
      
      PiperOrigin-RevId: 288842237
      
      * Fix tf contrib removal for feature_aggregation_extractor.
      
      PiperOrigin-RevId: 289487669
      
      * Merged commit includes the following changes:
      309118395  by Andre Araujo:
      
          Make DELF open-source code compatible with TF2.
      
      --
      309067582  by Andre Araujo:
      
          Handle image resizing rounding properly for python extraction.
      
          New behavior is tested with unit tests.
      
      --
      308690144  by Andre Araujo:
      
          Several changes to improve DELF model/training code and make it work in TF 2.1.0:
          - Rename some files for better clarity
          - Using compat.v1 versions of functions
          - Formatting changes
          - Using more appropriate TF function names
      
      --
      308689397  by Andre Araujo:
      
          Internal change.
      
      --
      308341315  by Andre Araujo:
      
          Remove old slim dependency in DELF open-source model.
      
          This avoids issues with requiring old TF-v1, making it compatible with latest TF.
      
      --
      306777559  by Andre Araujo:
      
          Internal change
      
      --
      304505811  by Andre Araujo:
      
          Raise error during geometric verification if local features have different dimensionalities.
      
      --
      301739992  by Andre Araujo:
      
          Transform some geometric verification constants into arguments, to allow custom matching.
      
      --
      301300324  by Andre Araujo:
      
          Apply name change(experimental_run_v2 -> run) for all callers in Tensorflow.
      
      --
      299919057  by Andre Araujo:
      
          Automated refactoring to make code Python 3 compatible.
      
      --
      297953698  by Andre Araujo:
      
          Explicitly replace "import tensorflow" with "tensorflow.compat.v1" for TF2.x migration
      
      --
      297521242  by Andre Araujo:
      
          Explicitly replace "import tensorflow" with "tensorflow.compat.v1" for TF2.x migration
      
      --
      297278247  by Andre Araujo:
      
          Explicitly replace "import tensorflow" with "tensorflow.compat.v1" for TF2.x migration
      
      --
      297270405  by Andre Araujo:
      
          Explicitly replace "import tensorflow" with "tensorflow.compat.v1" for TF2.x migration
      
      --
      297238741  by Andre Araujo:
      
          Explicitly replace "import tensorflow" with "tensorflow.compat.v1" for TF2.x migration
      
      --
      297108605  by Andre Araujo:
      
          Explicitly replace "import tensorflow" with "tensorflow.compat.v1" for TF2.x migration
      
      --
      294676131  by Andre Araujo:
      
          Add option to resize images to square resolutions without aspect ratio preservation.
      
      --
      293849641  by Andre Araujo:
      
          Internal change.
      
      --
      293840896  by Andre Araujo:
      
          Changing Slim import to tf_slim codebase.
      
      --
      293661660  by Andre Araujo:
      
          Allow the delf training script to read from TFRecords dataset.
      
      --
      291755295  by Andre Araujo:
      
          Internal change.
      
      --
      291448508  by Andre Araujo:
      
          Internal change.
      
      --
      291414459  by Andre Araujo:
      
          Adding train script.
      
      --
      291384336  by Andre Araujo:
      
          Adding model export script and test.
      
      --
      291260565  by Andre Araujo:
      
          Adding placeholder for Google Landmarks dataset.
      
      --
      291205548  by Andre Araujo:
      
          Definition of DELF model using Keras ResNet50 as backbone.
      
      --
      289500793  by Andre Araujo:
      
          Add TFRecord building script for delf.
      
      --
      
      PiperOrigin-RevId: 309118395
      
      * Updating README, dependency versions
      
      * Updating training README
      
      * Fixing init import of export_model
      
      * Fixing init import of export_model_utils
      
      * tkinter in INSTALL_INSTRUCTIONS
      
      * Merged commit includes the following changes:
      
      FolderOrigin-RevId: /google/src/cloud/andrearaujo/delf_oss/google3/..
      
      * INSTALL_INSTRUCTIONS mentioning different cloning options
      
      * Updating required TF version, since 2.1 is not available in pip
      
      * Internal change.
      
      PiperOrigin-RevId: 309136003
      
      * Fix missing string_input_producer and start_queue_runners in TF2.
      
      PiperOrigin-RevId: 309437512
      
      * Handle RANSAC from skimage's latest versions.
      
      PiperOrigin-RevId: 310170897
      
      * DELF 2.1 version: badge and setup.py updated
      
      * Add TF version badge in INSTALL_INSTRUCTIONS and paper badges in README
      
      * Add paper badges in paper instructions
      
      * Add paper badge to landmark detection instructions
      
      * Small update to DELF training README
      0fc994b6
  14. 06 May, 2020 2 commits
    • André Araujo's avatar
      Updating DELF version: 2.1 (#8473) · bfea93e0
      André Araujo authored
      * 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:
      
          Create directory for writing mapping file if it does not exist.
      
      --
      249581591  by Andre Araujo:
      
          Refactor scripts to extract boxes and features from images in Revisited datasets.
          Also, change tf.logging.info --> print for easier logging in open source code.
      
      --
      249511821  by Andre Araujo:
      
          Small change to function for file/directory handling.
      
      --
      249289499  by Andre Araujo:
      
          Internal change.
      
      --
      
      PiperOrigin-RevId: 253126424
      
      * Updating DELF init to adjust to latest changes
      
      * Editing init files for python packages
      
      * Edit D2R dataset reader to work with py3.
      
      PiperOrigin-RevId: 253135576
      
      * DELF package: fix import ordering
      
      * Adding new requirements to setup.py
      
      * Adding init file for training dir
      
      * Merged commit includes the following changes:
      
      FolderOrigin-RevId: /google/src/cloud/andrearaujo/delf_oss/google3/..
      
      * Adding init file for training subdirs
      
      * Working version of DELF training
      
      * Internal change.
      
      PiperOrigin-RevId: 253248648
      
      * Fix variance loading in open-source code.
      
      PiperOrigin-RevId: 260619120
      
      * Separate image re-ranking as a standalone library, and add metric writing to dataset library.
      
      PiperOrigin-RevId: 260998608
      
      * Tool to read written D2R Revisited datasets metrics file. Test is added.
      
      Also adds a unit test for previously-existing SaveMetricsFile function.
      
      PiperOrigin-RevId: 263361410
      
      * Add optional resize factor for feature extraction.
      
      PiperOrigin-RevId: 264437080
      
      * Fix NumPy's new version spacing changes.
      
      PiperOrigin-RevId: 265127245
      
      * Maker image matching function visible, and add support for RANSAC seed.
      
      PiperOrigin-RevId: 277177468
      
      * Avoid matplotlib failure due to missing display backend.
      
      PiperOrigin-RevId: 287316435
      
      * Removes tf.contrib dependency.
      
      PiperOrigin-RevId: 288842237
      
      * Fix tf contrib removal for feature_aggregation_extractor.
      
      PiperOrigin-RevId: 289487669
      
      * Merged commit includes the following changes:
      309118395  by Andre Araujo:
      
          Make DELF open-source code compatible with TF2.
      
      --
      309067582  by Andre Araujo:
      
          Handle image resizing rounding properly for python extraction.
      
          New behavior is tested with unit tests.
      
      --
      308690144  by Andre Araujo:
      
          Several changes to improve DELF model/training code and make it work in TF 2.1.0:
          - Rename some files for better clarity
          - Using compat.v1 versions of functions
          - Formatting changes
          - Using more appropriate TF function names
      
      --
      308689397  by Andre Araujo:
      
          Internal change.
      
      --
      308341315  by Andre Araujo:
      
          Remove old slim dependency in DELF open-source model.
      
          This avoids issues with requiring old TF-v1, making it compatible with latest TF.
      
      --
      306777559  by Andre Araujo:
      
          Internal change
      
      --
      304505811  by Andre Araujo:
      
          Raise error during geometric verification if local features have different dimensionalities.
      
      --
      301739992  by Andre Araujo:
      
          Transform some geometric verification constants into arguments, to allow custom matching.
      
      --
      301300324  by Andre Araujo:
      
          Apply name change(experimental_run_v2 -> run) for all callers in Tensorflow.
      
      --
      299919057  by Andre Araujo:
      
          Automated refactoring to make code Python 3 compatible.
      
      --
      297953698  by Andre Araujo:
      
          Explicitly replace "import tensorflow" with "tensorflow.compat.v1" for TF2.x migration
      
      --
      297521242  by Andre Araujo:
      
          Explicitly replace "import tensorflow" with "tensorflow.compat.v1" for TF2.x migration
      
      --
      297278247  by Andre Araujo:
      
          Explicitly replace "import tensorflow" with "tensorflow.compat.v1" for TF2.x migration
      
      --
      297270405  by Andre Araujo:
      
          Explicitly replace "import tensorflow" with "tensorflow.compat.v1" for TF2.x migration
      
      --
      297238741  by Andre Araujo:
      
          Explicitly replace "import tensorflow" with "tensorflow.compat.v1" for TF2.x migration
      
      --
      297108605  by Andre Araujo:
      
          Explicitly replace "import tensorflow" with "tensorflow.compat.v1" for TF2.x migration
      
      --
      294676131  by Andre Araujo:
      
          Add option to resize images to square resolutions without aspect ratio preservation.
      
      --
      293849641  by Andre Araujo:
      
          Internal change.
      
      --
      293840896  by Andre Araujo:
      
          Changing Slim import to tf_slim codebase.
      
      --
      293661660  by Andre Araujo:
      
          Allow the delf training script to read from TFRecords dataset.
      
      --
      291755295  by Andre Araujo:
      
          Internal change.
      
      --
      291448508  by Andre Araujo:
      
          Internal change.
      
      --
      291414459  by Andre Araujo:
      
          Adding train script.
      
      --
      291384336  by Andre Araujo:
      
          Adding model export script and test.
      
      --
      291260565  by Andre Araujo:
      
          Adding placeholder for Google Landmarks dataset.
      
      --
      291205548  by Andre Araujo:
      
          Definition of DELF model using Keras ResNet50 as backbone.
      
      --
      289500793  by Andre Araujo:
      
          Add TFRecord building script for delf.
      
      --
      
      PiperOrigin-RevId: 309118395
      
      * Updating README, dependency versions
      
      * Updating training README
      
      * Fixing init import of export_model
      
      * Fixing init import of export_model_utils
      
      * tkinter in INSTALL_INSTRUCTIONS
      
      * Merged commit includes the following changes:
      
      FolderOrigin-RevId: /google/src/cloud/andrearaujo/delf_oss/google3/..
      
      * INSTALL_INSTRUCTIONS mentioning different cloning options
      
      * Updating required TF version, since 2.1 is not available in pip
      
      * Internal change.
      
      PiperOrigin-RevId: 309136003
      
      * Fix missing string_input_producer and start_queue_runners in TF2.
      
      PiperOrigin-RevId: 309437512
      
      * Handle RANSAC from skimage's latest versions.
      
      PiperOrigin-RevId: 310170897
      
      * DELF 2.1 version: badge and setup.py updated
      
      * Add TF version badge in INSTALL_INSTRUCTIONS and paper badges in README
      
      * Add paper badges in paper instructions
      
      * Add paper badge to landmark detection instructions
      bfea93e0
    • André Araujo's avatar
      DELF: update TF required version in setup.py; fix skimage issue with latest version (#8472) · 2316ca1f
      André Araujo authored
      * 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:
      
          Create directory for writing mapping file if it does not exist.
      
      --
      249581591  by Andre Araujo:
      
          Refactor scripts to extract boxes and features from images in Revisited datasets.
          Also, change tf.logging.info --> print for easier logging in open source code.
      
      --
      249511821  by Andre Araujo:
      
          Small change to function for file/directory handling.
      
      --
      249289499  by Andre Araujo:
      
          Internal change.
      
      --
      
      PiperOrigin-RevId: 253126424
      
      * Updating DELF init to adjust to latest changes
      
      * Editing init files for python packages
      
      * Edit D2R dataset reader to work with py3.
      
      PiperOrigin-RevId: 253135576
      
      * DELF package: fix import ordering
      
      * Adding new requirements to setup.py
      
      * Adding init file for training dir
      
      * Merged commit includes the following changes:
      
      FolderOrigin-RevId: /google/src/cloud/andrearaujo/delf_oss/google3/..
      
      * Adding init file for training subdirs
      
      * Working version of DELF training
      
      * Internal change.
      
      PiperOrigin-RevId: 253248648
      
      * Fix variance loading in open-source code.
      
      PiperOrigin-RevId: 260619120
      
      * Separate image re-ranking as a standalone library, and add metric writing to dataset library.
      
      PiperOrigin-RevId: 260998608
      
      * Tool to read written D2R Revisited datasets metrics file. Test is added.
      
      Also adds a unit test for previously-existing SaveMetricsFile function.
      
      PiperOrigin-RevId: 263361410
      
      * Add optional resize factor for feature extraction.
      
      PiperOrigin-RevId: 264437080
      
      * Fix NumPy's new version spacing changes.
      
      PiperOrigin-RevId: 265127245
      
      * Maker image matching function visible, and add support for RANSAC seed.
      
      PiperOrigin-RevId: 277177468
      
      * Avoid matplotlib failure due to missing display backend.
      
      PiperOrigin-RevId: 287316435
      
      * Removes tf.contrib dependency.
      
      PiperOrigin-RevId: 288842237
      
      * Fix tf contrib removal for feature_aggregation_extractor.
      
      PiperOrigin-RevId: 289487669
      
      * Merged commit includes the following changes:
      309118395  by Andre Araujo:
      
          Make DELF open-source code compatible with TF2.
      
      --
      309067582  by Andre Araujo:
      
          Handle image resizing rounding properly for python extraction.
      
          New behavior is tested with unit tests.
      
      --
      308690144  by Andre Araujo:
      
          Several changes to improve DELF model/training code and make it work in TF 2.1.0:
          - Rename some files for better clarity
          - Using compat.v1 versions of functions
          - Formatting changes
          - Using more appropriate TF function names
      
      --
      308689397  by Andre Araujo:
      
          Internal change.
      
      --
      308341315  by Andre Araujo:
      
          Remove old slim dependency in DELF open-source model.
      
          This avoids issues with requiring old TF-v1, making it compatible with latest TF.
      
      --
      306777559  by Andre Araujo:
      
          Internal change
      
      --
      304505811  by Andre Araujo:
      
          Raise error during geometric verification if local features have different dimensionalities.
      
      --
      301739992  by Andre Araujo:
      
          Transform some geometric verification constants into arguments, to allow custom matching.
      
      --
      301300324  by Andre Araujo:
      
          Apply name change(experimental_run_v2 -> run) for all callers in Tensorflow.
      
      --
      299919057  by Andre Araujo:
      
          Automated refactoring to make code Python 3 compatible.
      
      --
      297953698  by Andre Araujo:
      
          Explicitly replace "import tensorflow" with "tensorflow.compat.v1" for TF2.x migration
      
      --
      297521242  by Andre Araujo:
      
          Explicitly replace "import tensorflow" with "tensorflow.compat.v1" for TF2.x migration
      
      --
      297278247  by Andre Araujo:
      
          Explicitly replace "import tensorflow" with "tensorflow.compat.v1" for TF2.x migration
      
      --
      297270405  by Andre Araujo:
      
          Explicitly replace "import tensorflow" with "tensorflow.compat.v1" for TF2.x migration
      
      --
      297238741  by Andre Araujo:
      
          Explicitly replace "import tensorflow" with "tensorflow.compat.v1" for TF2.x migration
      
      --
      297108605  by Andre Araujo:
      
          Explicitly replace "import tensorflow" with "tensorflow.compat.v1" for TF2.x migration
      
      --
      294676131  by Andre Araujo:
      
          Add option to resize images to square resolutions without aspect ratio preservation.
      
      --
      293849641  by Andre Araujo:
      
          Internal change.
      
      --
      293840896  by Andre Araujo:
      
          Changing Slim import to tf_slim codebase.
      
      --
      293661660  by Andre Araujo:
      
          Allow the delf training script to read from TFRecords dataset.
      
      --
      291755295  by Andre Araujo:
      
          Internal change.
      
      --
      291448508  by Andre Araujo:
      
          Internal change.
      
      --
      291414459  by Andre Araujo:
      
          Adding train script.
      
      --
      291384336  by Andre Araujo:
      
          Adding model export script and test.
      
      --
      291260565  by Andre Araujo:
      
          Adding placeholder for Google Landmarks dataset.
      
      --
      291205548  by Andre Araujo:
      
          Definition of DELF model using Keras ResNet50 as backbone.
      
      --
      289500793  by Andre Araujo:
      
          Add TFRecord building script for delf.
      
      --
      
      PiperOrigin-RevId: 309118395
      
      * Updating README, dependency versions
      
      * Updating training README
      
      * Fixing init import of export_model
      
      * Fixing init import of export_model_utils
      
      * tkinter in INSTALL_INSTRUCTIONS
      
      * Merged commit includes the following changes:
      
      FolderOrigin-RevId: /google/src/cloud/andrearaujo/delf_oss/google3/..
      
      * INSTALL_INSTRUCTIONS mentioning different cloning options
      
      * Updating required TF version, since 2.1 is not available in pip
      
      * Internal change.
      
      PiperOrigin-RevId: 309136003
      
      * Fix missing string_input_producer and start_queue_runners in TF2.
      
      PiperOrigin-RevId: 309437512
      
      * Handle RANSAC from skimage's latest versions.
      
      PiperOrigin-RevId: 310170897
      2316ca1f
  15. 02 May, 2020 1 commit
    • André Araujo's avatar
      DELF open-source library v2.0 (#8454) · c627506f
      André Araujo authored
      * 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:
      
          Create directory for writing mapping file if it does not exist.
      
      --
      249581591  by Andre Araujo:
      
          Refactor scripts to extract boxes and features from images in Revisited datasets.
          Also, change tf.logging.info --> print for easier logging in open source code.
      
      --
      249511821  by Andre Araujo:
      
          Small change to function for file/directory handling.
      
      --
      249289499  by Andre Araujo:
      
          Internal change.
      
      --
      
      PiperOrigin-RevId: 253126424
      
      * Updating DELF init to adjust to latest changes
      
      * Editing init files for python packages
      
      * Edit D2R dataset reader to work with py3.
      
      PiperOrigin-RevId: 253135576
      
      * DELF package: fix import ordering
      
      * Adding new requirements to setup.py
      
      * Adding init file for training dir
      
      * Merged commit includes the following changes:
      
      FolderOrigin-RevId: /google/src/cloud/andrearaujo/delf_oss/google3/..
      
      * Adding init file for training subdirs
      
      * Working version of DELF training
      
      * Internal change.
      
      PiperOrigin-RevId: 253248648
      
      * Fix variance loading in open-source code.
      
      PiperOrigin-RevId: 260619120
      
      * Separate image re-ranking as a standalone library, and add metric writing to dataset library.
      
      PiperOrigin-RevId: 260998608
      
      * Tool to read written D2R Revisited datasets metrics file. Test is added.
      
      Also adds a unit test for previously-existing SaveMetricsFile function.
      
      PiperOrigin-RevId: 263361410
      
      * Add optional resize factor for feature extraction.
      
      PiperOrigin-RevId: 264437080
      
      * Fix NumPy's new version spacing changes.
      
      PiperOrigin-RevId: 265127245
      
      * Maker image matching function visible, and add support for RANSAC seed.
      
      PiperOrigin-RevId: 277177468
      
      * Avoid matplotlib failure due to missing display backend.
      
      PiperOrigin-RevId: 287316435
      
      * Removes tf.contrib dependency.
      
      PiperOrigin-RevId: 288842237
      
      * Fix tf contrib removal for feature_aggregation_extractor.
      
      PiperOrigin-RevId: 289487669
      
      * Merged commit includes the following changes:
      309118395  by Andre Araujo:
      
          Make DELF open-source code compatible with TF2.
      
      --
      309067582  by Andre Araujo:
      
          Handle image resizing rounding properly for python extraction.
      
          New behavior is tested with unit tests.
      
      --
      308690144  by Andre Araujo:
      
          Several changes to improve DELF model/training code and make it work in TF 2.1.0:
          - Rename some files for better clarity
          - Using compat.v1 versions of functions
          - Formatting changes
          - Using more appropriate TF function names
      
      --
      308689397  by Andre Araujo:
      
          Internal change.
      
      --
      308341315  by Andre Araujo:
      
          Remove old slim dependency in DELF open-source model.
      
          This avoids issues with requiring old TF-v1, making it compatible with latest TF.
      
      --
      306777559  by Andre Araujo:
      
          Internal change
      
      --
      304505811  by Andre Araujo:
      
          Raise error during geometric verification if local features have different dimensionalities.
      
      --
      301739992  by Andre Araujo:
      
          Transform some geometric verification constants into arguments, to allow custom matching.
      
      --
      301300324  by Andre Araujo:
      
          Apply name change(experimental_run_v2 -> run) for all callers in Tensorflow.
      
      --
      299919057  by Andre Araujo:
      
          Automated refactoring to make code Python 3 compatible.
      
      --
      297953698  by Andre Araujo:
      
          Explicitly replace "import tensorflow" with "tensorflow.compat.v1" for TF2.x migration
      
      --
      297521242  by Andre Araujo:
      
          Explicitly replace "import tensorflow" with "tensorflow.compat.v1" for TF2.x migration
      
      --
      297278247  by Andre Araujo:
      
          Explicitly replace "import tensorflow" with "tensorflow.compat.v1" for TF2.x migration
      
      --
      297270405  by Andre Araujo:
      
          Explicitly replace "import tensorflow" with "tensorflow.compat.v1" for TF2.x migration
      
      --
      297238741  by Andre Araujo:
      
          Explicitly replace "import tensorflow" with "tensorflow.compat.v1" for TF2.x migration
      
      --
      297108605  by Andre Araujo:
      
          Explicitly replace "import tensorflow" with "tensorflow.compat.v1" for TF2.x migration
      
      --
      294676131  by Andre Araujo:
      
          Add option to resize images to square resolutions without aspect ratio preservation.
      
      --
      293849641  by Andre Araujo:
      
          Internal change.
      
      --
      293840896  by Andre Araujo:
      
          Changing Slim import to tf_slim codebase.
      
      --
      293661660  by Andre Araujo:
      
          Allow the delf training script to read from TFRecords dataset.
      
      --
      291755295  by Andre Araujo:
      
          Internal change.
      
      --
      291448508  by Andre Araujo:
      
          Internal change.
      
      --
      291414459  by Andre Araujo:
      
          Adding train script.
      
      --
      291384336  by Andre Araujo:
      
          Adding model export script and test.
      
      --
      291260565  by Andre Araujo:
      
          Adding placeholder for Google Landmarks dataset.
      
      --
      291205548  by Andre Araujo:
      
          Definition of DELF model using Keras ResNet50 as backbone.
      
      --
      289500793  by Andre Araujo:
      
          Add TFRecord building script for delf.
      
      --
      
      PiperOrigin-RevId: 309118395
      
      * Updating README, dependency versions
      
      * Updating training README
      
      * Fixing init import of export_model
      
      * Fixing init import of export_model_utils
      
      * tkinter in INSTALL_INSTRUCTIONS
      
      * Merged commit includes the following changes:
      
      FolderOrigin-RevId: /google/src/cloud/andrearaujo/delf_oss/google3/..
      
      * INSTALL_INSTRUCTIONS mentioning different cloning options
      c627506f
  16. 27 Apr, 2020 1 commit
  17. 13 Apr, 2020 2 commits
    • Noe's avatar
      Corrected tensorflow library install instruction (#8382) · 1e8c0fc3
      Noe authored
      Installing tensorflow1.14 instead of 2.X
      
      python3 -c "import delf" crashed because of call to tf.contrib.slim
      contrib module has been deprecated in tf 2.0
      1e8c0fc3
    • Jaeyoun Kim's avatar
      Updated README files of research models (#8390) · d466d4e6
      Jaeyoun Kim authored
      * Update README.md
      
      No Maintenance Intended
      
      * Update README.md
      
      * Update README.md
      
      No Maintenance Intended
      
      * Update README.md
      
      No Maintenance Intended
      
      * Update README.md
      
      No Maintenance Intended
      
      * Update README.md
      
      No Maintenance Intended
      
      * Update README.md
      
      No Maintenance Intended
      
      * Update README.md
      
      No Maintenance Intended
      
      * Update README.md
      
      No Maintenance Intended
      
      * Update README.md
      
      No Maintenance Intended
      
      * Update README.md
      
      No Maintenance Intended
      
      * Update README.md
      
      No Maintenance Intended
      
      * Update README.md
      
      No Maintenance Intended
      
      * Update README.md
      
      No Maintenance Intended
      
      * Update README.md
      
      No Maintenance Intended
      
      * Update README.md
      
      No Maintenance Intended
      
      * Update README.md
      
      No Maintenance Intended
      
      * Update README.md
      
      No Maintenance Intended
      
      * Create README.md
      
      No Maintenance Intended
      
      * Update README.md
      
      No Maintenance Intended
      
      * Update README.md...
      d466d4e6
  18. 14 Jun, 2019 1 commit
    • André Araujo's avatar
      Some refactoring + Google Landmarks dataset scripts (#7014) · 7cd29f8c
      André Araujo authored
      * 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...
      7cd29f8c
  19. 29 May, 2019 1 commit
    • Marvin Teichmann's avatar
      Put all python dependencies into one line. (#6870) · e0388cfe
      Marvin Teichmann authored
      * Put all python dependencies into one line.
      
      This makes it easier to copy, paste & install all dependencies at once. In addition many users have custom setups (virtualenv, conda, .etc). Having it in one line easily allows to grap the dependencies.
      
      * Remove 'sudo' from all pip install commands and adjust troubleshooting section.
      e0388cfe
  20. 28 May, 2019 1 commit
  21. 21 May, 2019 3 commits
    • André Araujo's avatar
      Small edits to DELF markdown instructions (#6839) · 76256146
      André Araujo authored
      * Initial feature aggregation code for Detect-to-Retrieve paper.
      
      PiperOrigin-RevId: 246043144
      
      * Add support for ASMK/ASMK*/R-ASMK/R-ASMK*.
      
      PiperOrigin-RevId: 247337028
      
      * Add DatumProto uint32 field, and limit datum_io to uint32 and float32/float64 types.
      
      Also, introduce DatumPairProto, to be used for ASMK variants. Functions to read/write in this new format are added and tested.
      
      PiperOrigin-RevId: 247515205
      
      * Add batching option to feature aggregation extraction.
      
      PiperOrigin-RevId: 247614627
      
      * Script to perform local feature aggregation, with associated configs.
      
      Also small edits to the aggregation extractor, for better handling of input features / avoiding OOM.
      
      PiperOrigin-RevId: 248150750
      
      * Tests to check that aggregation using regions with no local features works.
      
      PiperOrigin-RevId: 248153275
      
      * Include new library/proto for aggregation
      
      * Merged commit includes the following changes:
      
      PiperOrigin-RevId: 248176511
      
      * Merged commit includes the following changes:
      248194572  by Andre Araujo:
      
          Change tf.tensor_scatter_nd_add --> tf.compat.v1.tensor_scatter_add to make it compatible with TF 1.X.
      
      --
      
      PiperOrigin-RevId: 248194572
      
      * Functions to parse ground-truth and compute metrics for revisited datasets.
      
      Unit tests are added.
      
      PiperOrigin-RevId: 248561575
      
      * Small change to argparse bool option, which does not work as expected.
      
      PiperOrigin-RevId: 248805505
      
      * Class to compute similarity between aggregated descriptors.
      
      PiperOrigin-RevId: 249102986
      
      * Script to perform retrieval and compute metrics.
      
      PiperOrigin-RevId: 249104011
      
      * feature_aggregation_similarity library in DELF init
      
      * D2R instructions / README update
      
      * Small edit to README
      
      * Internal change.
      
      PiperOrigin-RevId: 249113531
      
      * Instructions to reproduce D2R paper results, and small edits to config files.
      
      PiperOrigin-RevId: 249159850
      
      * Revert "Internal change."
      
      This reverts commit 0529f2b8471a20c88f1fbb37367f142965d098ee.
      
      Undoing incorrect markdown deletion.
      
      * Small updates to markdown instructions
      
      * Small updates to markdown instructions 2
      76256146
    • André Araujo's avatar
      Undo Detect-to-Retrieve markdown deletion (#6831) · 5ec581ae
      André Araujo authored
      * Initial feature aggregation code for Detect-to-Retrieve paper.
      
      PiperOrigin-RevId: 246043144
      
      * Add support for ASMK/ASMK*/R-ASMK/R-ASMK*.
      
      PiperOrigin-RevId: 247337028
      
      * Add DatumProto uint32 field, and limit datum_io to uint32 and float32/float64 types.
      
      Also, introduce DatumPairProto, to be used for ASMK variants. Functions to read/write in this new format are added and tested.
      
      PiperOrigin-RevId: 247515205
      
      * Add batching option to feature aggregation extraction.
      
      PiperOrigin-RevId: 247614627
      
      * Script to perform local feature aggregation, with associated configs.
      
      Also small edits to the aggregation extractor, for better handling of input features / avoiding OOM.
      
      PiperOrigin-RevId: 248150750
      
      * Tests to check that aggregation using regions with no local features works.
      
      PiperOrigin-RevId: 248153275
      
      * Include new library/proto for aggregation
      
      * Merged commit includes the following changes:
      
      PiperOrigin-RevId: 248176511
      
      * Merged commit includes the following changes:
      248194572  by Andre Araujo:
      
          Change tf.tensor_scatter_nd_add --> tf.compat.v1.tensor_scatter_add to make it compatible with TF 1.X.
      
      --
      
      PiperOrigin-RevId: 248194572
      
      * Functions to parse ground-truth and compute metrics for revisited datasets.
      
      Unit tests are added.
      
      PiperOrigin-RevId: 248561575
      
      * Small change to argparse bool option, which does not work as expected.
      
      PiperOrigin-RevId: 248805505
      
      * Class to compute similarity between aggregated descriptors.
      
      PiperOrigin-RevId: 249102986
      
      * Script to perform retrieval and compute metrics.
      
      PiperOrigin-RevId: 249104011
      
      * feature_aggregation_similarity library in DELF init
      
      * D2R instructions / README update
      
      * Small edit to README
      
      * Internal change.
      
      PiperOrigin-RevId: 249113531
      
      * Instructions to reproduce D2R paper results, and small edits to config files.
      
      PiperOrigin-RevId: 249159850
      
      * Revert "Internal change."
      
      This reverts commit 0529f2b8471a20c88f1fbb37367f142965d098ee.
      
      Undoing incorrect markdown deletion.
      5ec581ae
    • André Araujo's avatar
      Code for Detect-to-Retrieve fully integrated (#6829) · 9062d200
      André Araujo authored
      * Initial feature aggregation code for Detect-to-Retrieve paper.
      
      PiperOrigin-RevId: 246043144
      
      * Add support for ASMK/ASMK*/R-ASMK/R-ASMK*.
      
      PiperOrigin-RevId: 247337028
      
      * Add DatumProto uint32 field, and limit datum_io to uint32 and float32/float64 types.
      
      Also, introduce DatumPairProto, to be used for ASMK variants. Functions to read/write in this new format are added and tested.
      
      PiperOrigin-RevId: 247515205
      
      * Add batching option to feature aggregation extraction.
      
      PiperOrigin-RevId: 247614627
      
      * Script to perform local feature aggregation, with associated configs.
      
      Also small edits to the aggregation extractor, for better handling of input features / avoiding OOM.
      
      PiperOrigin-RevId: 248150750
      
      * Tests to check that aggregation using regions with no local features works.
      
      PiperOrigin-RevId: 248153275
      
      * Include new library/proto for aggregation
      
      * Merged commit includes the following changes:
      
      PiperOrigin-RevId: 248176511
      
      * Merged commit includes the following changes:
      248194572  by Andre Araujo:
      
          Change tf.tensor_scatter_nd_add --> tf.compat.v1.tensor_scatter_add to make it compatible with TF 1.X.
      
      --
      
      PiperOrigin-RevId: 248194572
      
      * Functions to parse ground-truth and compute metrics for revisited datasets.
      
      Unit tests are added.
      
      PiperOrigin-RevId: 248561575
      
      * Small change to argparse bool option, which does not work as expected.
      
      PiperOrigin-RevId: 248805505
      
      * Class to compute similarity between aggregated descriptors.
      
      PiperOrigin-RevId: 249102986
      
      * Script to perform retrieval and compute metrics.
      
      PiperOrigin-RevId: 249104011
      
      * feature_aggregation_similarity library in DELF init
      
      * D2R instructions / README update
      
      * Small edit to README
      
      * Internal change.
      
      PiperOrigin-RevId: 249113531
      
      * Instructions to reproduce D2R paper results, and small edits to config files.
      
      PiperOrigin-RevId: 249159850
      9062d200
  22. 14 May, 2019 1 commit
    • André Araujo's avatar
      DELF feature aggregation extraction: VLAD, ASMK, ASMK* (#6780) · a27bad9b
      André Araujo authored
      * Initial feature aggregation code for Detect-to-Retrieve paper.
      
      PiperOrigin-RevId: 246043144
      
      * Add support for ASMK/ASMK*/R-ASMK/R-ASMK*.
      
      PiperOrigin-RevId: 247337028
      
      * Add DatumProto uint32 field, and limit datum_io to uint32 and float32/float64 types.
      
      Also, introduce DatumPairProto, to be used for ASMK variants. Functions to read/write in this new format are added and tested.
      
      PiperOrigin-RevId: 247515205
      
      * Add batching option to feature aggregation extraction.
      
      PiperOrigin-RevId: 247614627
      
      * Script to perform local feature aggregation, with associated configs.
      
      Also small edits to the aggregation extractor, for better handling of input features / avoiding OOM.
      
      PiperOrigin-RevId: 248150750
      
      * Tests to check that aggregation using regions with no local features works.
      
      PiperOrigin-RevId: 248153275
      
      * Include new library/proto for aggregation
      
      * Merged commit includes the following changes:
      
      PiperOrigin-RevId: 248176511
      
      * Merged commit includes the following changes:
      248194572  by Andre Araujo:
      
          Change tf.tensor_scatter_nd_add --> tf.compat.v1.tensor_scatter_add to make it compatible with TF 1.X.
      
      --
      
      PiperOrigin-RevId: 248194572
      a27bad9b
  23. 01 May, 2019 1 commit
    • André Araujo's avatar
      Small edit to DELF README (#6704) · 62ed862e
      André Araujo authored
      * Internal change.
      
      PiperOrigin-RevId: 185564155
      
      * Fix small bug when reading DELF features when file is empty.
      A new test is added that catches this bug.
      
      PiperOrigin-RevId: 213839503
      
      * Refactors DELF example code to expose a function to create a DELF feature extractor.
      
      PiperOrigin-RevId: 241492615
      
      * Merged commit includes the following changes:
      244073180  by Andre Araujo:
      
          Internal change
      
      --
      243646498  by Andre Araujo:
      
          Detect and save bounding boxes for a list of images.
          A new proto is added, along with auxiliary read/write functions, and tests.
      
      --
      
      PiperOrigin-RevId: 244073180
      
      * Merged commit includes the following changes:
      244872693  by Andre Araujo:
      
          Small change.
      
      --
      244871213  by Andre Araujo:
      
          Small edit to DELF extractor function.
      
      --
      244790715  by Andre Araujo:
      
          internal automated change
      
      --
      244773146  by Andre Araujo:
      
          Add option to visualize extracted boxes, and change slightly model input.
      
      --
      244288992  by Andre Araujo:
      
          Script to cluster DELF features using K-means.
      
      --
      244275164  by Andre Araujo:
      
          Scripts to extract DELF features and boxes from Revisited Oxford/Paris datasets, used in Detect-to-Retrieve paper.
      
      --
      
      PiperOrigin-RevId: 244872693
      
      * Merged commit includes the following changes:
      
      PiperOrigin-RevId: 244876167
      
      * Updates instructions to include new released models, instructions for DELF and detector extraction, etc.
      
      * Small fix
      
      * Merged commit includes the following changes:
      244909336  by Andre Araujo:
      
          Update to DELF config example to use latest model.
      
      --
      
      PiperOrigin-RevId: 244909336
      
      * Revert "Merged commit includes the following changes:"
      
      This reverts commit f41be9f159330f62846d5d8b3d3d5d55cd1874f4.
      
      * Update delf_config_example model
      
      * Small edits to detection instructions
      
      * Specifying GLB location in README
      
      * Mention D2R code release in progress
      62ed862e
  24. 24 Apr, 2019 1 commit
    • André Araujo's avatar
      Latest updates from DELF code. (#6651) · 07678af8
      André Araujo authored
      * Internal change.
      
      PiperOrigin-RevId: 185564155
      
      * Fix small bug when reading DELF features when file is empty.
      A new test is added that catches this bug.
      
      PiperOrigin-RevId: 213839503
      
      * Refactors DELF example code to expose a function to create a DELF feature extractor.
      
      PiperOrigin-RevId: 241492615
      
      * Merged commit includes the following changes:
      244073180  by Andre Araujo:
      
          Internal change
      
      --
      243646498  by Andre Araujo:
      
          Detect and save bounding boxes for a list of images.
          A new proto is added, along with auxiliary read/write functions, and tests.
      
      --
      
      PiperOrigin-RevId: 244073180
      
      * Merged commit includes the following changes:
      244872693  by Andre Araujo:
      
          Small change.
      
      --
      244871213  by Andre Araujo:
      
          Small edit to DELF extractor function.
      
      --
      244790715  by Andre Araujo:
      
          internal automated change
      
      --
      244773146  by Andre Araujo:
      
          Add option to visualize extracted boxes, and change slightly model input.
      
      --
      244288992  by Andre Araujo:
      
          Script to cluster DELF features using K-means.
      
      --
      244275164  by Andre Araujo:
      
          Scripts to extract DELF features and boxes from Revisited Oxford/Paris datasets, used in Detect-to-Retrieve paper.
      
      --
      
      PiperOrigin-RevId: 244872693
      
      * Merged commit includes the following changes:
      
      PiperOrigin-RevId: 244876167
      
      * Updates instructions to include new released models, instructions for DELF and detector extraction, etc.
      
      * Small fix
      
      * Merged commit includes the following changes:
      244909336  by Andre Araujo:
      
          Update to DELF config example to use latest model.
      
      --
      
      PiperOrigin-RevId: 244909336
      
      * Revert "Merged commit includes the following changes:"
      
      This reverts commit f41be9f159330f62846d5d8b3d3d5d55cd1874f4.
      
      * Update delf_config_example model
      
      * Small edits to detection instructions
      
      * Specifying GLB location in README
      07678af8
  25. 18 Apr, 2019 1 commit
    • André Araujo's avatar
      Recent DELF updates, including initial Detect-to-Retrieve code (#6599) · 61793e67
      André Araujo authored
      * Internal change.
      
      PiperOrigin-RevId: 185564155
      
      * Fix small bug when reading DELF features when file is empty.
      A new test is added that catches this bug.
      
      PiperOrigin-RevId: 213839503
      
      * Refactors DELF example code to expose a function to create a DELF feature extractor.
      
      PiperOrigin-RevId: 241492615
      
      * Merged commit includes the following changes:
      244073180  by Andre Araujo:
      
          Internal change
      
      --
      243646498  by Andre Araujo:
      
          Detect and save bounding boxes for a list of images.
          A new proto is added, along with auxiliary read/write functions, and tests.
      
      --
      
      PiperOrigin-RevId: 244073180
      61793e67
  26. 09 Apr, 2018 1 commit
  27. 13 Feb, 2018 1 commit
  28. 05 Feb, 2018 1 commit
  29. 03 Feb, 2018 1 commit
  30. 20 Jan, 2018 1 commit
  31. 24 Oct, 2017 2 commits