1. 22 May, 2019 1 commit
    • Zhuoran Liu's avatar
      Add TPU SavedModel exporter and refactor OD code (#6737) · 80444539
      Zhuoran Liu authored
      247226201  by ronnyvotel:
      
          Updating the visualization tools to accept unique_ids for color coding.
      
      --
      247067830  by Zhichao Lu:
      
          Add box_encodings_clip_range options for the convolutional box predictor (for TPU compatibility).
      
      --
      246888475  by Zhichao Lu:
      
          Remove unused _update_eval_steps function.
      
      --
      246163259  by lzc:
      
          Add a gather op that can handle ignore indices (which are "-1"s in this case).
      
      --
      246084944  by Zhichao Lu:
      
          Keras based implementation for SSD + MobilenetV2 + FPN.
      
      --
      245544227  by rathodv:
      
          Add batch_get_targets method to target assigner module to gather any groundtruth tensors based on the results of target assigner.
      
      --
      245540854  by rathodv:
      
          Update target assigner to return match tensor instead of a match object.
      
      --
      245434441  by Zhichao Lu:
      
          Add README for tpu_exporters package.
      
      --
      245381834  by lzc:
      
          Internal change.
      
      --
      245298983  by Zhichao Lu:
      
          Add conditional_shape_resizer to config_util
      
      --
      245134666  by Zhichao Lu:
      
          Adds ConditionalShapeResizer to the ImageResizer proto which enables resizing only if input image height or width is is greater or smaller than a certain size. Also enables specification of resize method in resize_to_{max, min}_dimension methods.
      
      --
      245093975  by Zhichao Lu:
      
          Exporting SavedModel for Object Detection TPU inference. (faster-rcnn)
      
      --
      245072421  by Zhichao Lu:
      
          Adds a new image resizing method "resize_to_max_dimension" which resizes images only if a dimension is greater than the maximum desired value while maintaining aspect ratio.
      
      --
      244946998  by lzc:
      
          Internal Changes.
      
      --
      244943693  by Zhichao Lu:
      
          Add a custom config to mobilenet v2 that makes it more detection friendly.
      
      --
      244754158  by derekjchow:
      
          Internal change.
      
      --
      244699875  by Zhichao Lu:
      
          Add check_range=False to box_list_ops.to_normalized_coordinates when training
          for instance segmentation.  This is consistent with other calls when training
          for object detection.  There could be wrongly annotated boxes in the dataset.
      
      --
      244507425  by rathodv:
      
          Support bfloat16 for ssd models.
      
      --
      244399982  by Zhichao Lu:
      
          Exporting SavedModel for Object Detection TPU inference. (ssd)
      
      --
      244209387  by Zhichao Lu:
      
          Internal change.
      
      --
      243922296  by rathodv:
      
          Change `raw_detection_scores` to contain softmax/sigmoid scores (not logits) for `raw_ detection_boxes`.
      
      --
      243883978  by Zhichao Lu:
      
          Add a sample fully conv config.
      
      --
      243369455  by Zhichao Lu:
      
          Fix regularization loss gap in Keras and Slim.
      
      --
      243292002  by lzc:
      
          Internal changes.
      
      --
      243097958  by Zhichao Lu:
      
          Exporting SavedModel for Object Detection TPU inference. (ssd model)
      
      --
      243007177  by Zhichao Lu:
      
          Exporting SavedModel for Object Detection TPU inference. (ssd model)
      
      --
      242776550  by Zhichao Lu:
      
          Make object detection pre-processing run on GPU.  tf.map_fn() uses
          TensorArrayV3 ops, which have no int32 GPU implementation.  Cast to int64,
          then cast back to int32.
      
      --
      242723128  by Zhichao Lu:
      
          Using sorted dictionaries for additional heads in non_max_suppression to ensure tensor order
      
      --
      242495311  by Zhichao Lu:
      
          Update documentation to reflect new TFLite examples repo location
      
      --
      242230527  by Zhichao Lu:
      
          Fix Dropout bugs for WeightSharedConvolutionalBoxPred.
      
      --
      242226573  by Zhichao Lu:
      
          Create Keras-based WeightSharedConvolutionalBoxPredictor.
      
      --
      241806074  by Zhichao Lu:
      
          Add inference in unit tests of TFX OD template.
      
      --
      241641498  by lzc:
      
          Internal change.
      
      --
      241637481  by Zhichao Lu:
      
          matmul_crop_and_resize(): Switch to dynamic shaping, so that not all dimensions are required to be known.
      
      --
      241429980  by Zhichao Lu:
      
          Internal change
      
      --
      241167237  by Zhichao Lu:
      
          Adds a faster_rcnn_inception_resnet_v2 Keras feature extractor, and updates the model builder to construct it.
      
      --
      241088616  by Zhichao Lu:
      
          Make it compatible with different dtype, e.g. float32, bfloat16, etc.
      
      --
      240897364  by lzc:
      
          Use image_np_expanded in object_detection_tutorial notebook.
      
      --
      240890393  by Zhichao Lu:
      
          Disable multicore inference for OD template as its not yet compatible.
      
      --
      240352168  by Zhichao Lu:
      
          Make SSDResnetV1FpnFeatureExtractor not protected to allow inheritance.
      
      --
      240351470  by lzc:
      
          Internal change.
      
      --
      239878928  by Zhichao Lu:
      
          Defines Keras box predictors for Faster RCNN and RFCN
      
      --
      239872103  by Zhichao Lu:
      
          Delete duplicated inputs in test.
      
      --
      239714273  by Zhichao Lu:
      
          Adding scope variable to all class heads
      
      --
      239698643  by Zhichao Lu:
      
          Create FPN feature extractor for object detection.
      
      --
      239696657  by Zhichao Lu:
      
          Internal Change.
      
      --
      239299404  by Zhichao Lu:
      
          Allows the faster rcnn meta-architecture to support Keras subcomponents
      
      --
      238502595  by Zhichao Lu:
      
          Lay the groundwork for symmetric quantization.
      
      --
      238496885  by Zhichao Lu:
      
          Add flexible_grid_anchor_generator
      
      --
      238138727  by lzc:
      
          Remove dead code.
      
          _USE_C_SHAPES has been forced True in TensorFlow releases since
          TensorFlow 1.9
          (https://github.com/tensorflow/tensorflow/commit/1d74a69443f741e69f9f52cb6bc2940b4d4ae3b7)
      
      --
      238123936  by rathodv:
      
          Add num_matched_groundtruth summary to target assigner in SSD.
      
      --
      238103345  by ronnyvotel:
      
          Raising error if input file pattern does not match any files.
          Also printing the number of evaluation images for coco metrics.
      
      --
      238044081  by Zhichao Lu:
      
          Fix docstring to state the correct dimensionality of `class_predictions_with_background`.
      
      --
      237920279  by Zhichao Lu:
      
          [XLA] Rework debug flags for dumping HLO.
      
          The following flags (usually passed via the XLA_FLAGS envvar) are removed:
      
            xla_dump_computations_to
            xla_dump_executions_to
            xla_dump_ir_to
            xla_dump_optimized_hlo_proto_to
            xla_dump_per_pass_hlo_proto_to
            xla_dump_unoptimized_hlo_proto_to
            xla_generate_hlo_graph
            xla_generate_hlo_text_to
            xla_hlo_dump_as_html
            xla_hlo_graph_path
            xla_log_hlo_text
      
          The following new flags are added:
      
            xla_dump_to
            xla_dump_hlo_module_re
            xla_dump_hlo_pass_re
            xla_dump_hlo_as_text
            xla_dump_hlo_as_proto
            xla_dump_hlo_as_dot
            xla_dump_hlo_as_url
            xla_dump_hlo_as_html
            xla_dump_ir
            xla_dump_hlo_snapshots
      
          The default is not to dump anything at all, but as soon as some dumping flag is
          specified, we enable the following defaults (most of which can be overridden).
      
           * dump to stdout (overridden by --xla_dump_to)
           * dump HLO modules at the very beginning and end of the optimization pipeline
           * don't dump between any HLO passes (overridden by --xla_dump_hlo_pass_re)
           * dump all HLO modules (overridden by --xla_dump_hlo_module_re)
           * dump in textual format (overridden by
             --xla_dump_hlo_as_{text,proto,dot,url,html}).
      
          For example, to dump optimized and unoptimized HLO text and protos to /tmp/foo,
          pass
      
            --xla_dump_to=/tmp/foo --xla_dump_hlo_as_text --xla_dump_hlo_as_proto
      
          For details on these flags' meanings, see xla.proto.
      
          The intent of this change is to make dumping both simpler to use and more
          powerful.
      
          For example:
      
           * Previously there was no way to dump the HLO module during the pass pipeline
             in HLO text format; the only option was --dump_per_pass_hlo_proto_to, which
             dumped in proto format.
      
             Now this is --xla_dump_pass_re=.* --xla_dump_hlo_as_text.  (In fact, the
             second flag is not necessary in this case, as dumping as text is the
             default.)
      
           * Previously there was no way to dump HLO as a graph before and after
             compilation; the only option was --xla_generate_hlo_graph, which would dump
             before/after every pass.
      
             Now this is --xla_dump_hlo_as_{dot,url,html} (depending on what format you
             want the graph in).
      
           * Previously, there was no coordination between the filenames written by the
             various flags, so info about one module might be dumped with various
             filename prefixes.  Now the filenames are consistent and all dumps from a
             particular module are next to each other.
      
          If you only specify some of these flags, we try to figure out what you wanted.
          For example:
      
           * --xla_dump_to implies --xla_dump_hlo_as_text unless you specify some
             other --xla_dump_as_* flag.
      
           * --xla_dump_hlo_as_text or --xla_dump_ir implies dumping to stdout unless you
             specify a different --xla_dump_to directory.  You can explicitly dump to
             stdout with --xla_dump_to=-.
      
          As part of this change, I simplified the debugging code in the HLO passes for
          dumping HLO modules.  Previously, many tests explicitly VLOG'ed the HLO module
          before, after, and sometimes during the pass.  I removed these VLOGs.  If you
          want dumps before/during/after an HLO pass, use --xla_dump_pass_re=<pass_name>.
      
      --
      237510043  by lzc:
      
          Internal Change.
      
      --
      237469515  by Zhichao Lu:
      
          Parameterize model_builder.build in inputs.py.
      
      --
      237293511  by rathodv:
      
          Remove multiclass_scores from tensor_dict in transform_data_fn always.
      
      --
      237260333  by ronnyvotel:
      
          Updating faster_rcnn_meta_arch to define prediction dictionary fields that are batched.
      
      --
      
      PiperOrigin-RevId: 247226201
      80444539
  2. 30 Nov, 2018 1 commit
    • Zhichao Lu's avatar
      Merged commit includes the following changes: · a1337e01
      Zhichao Lu authored
      223075771  by lzc:
      
          Bring in external fixes.
      
      --
      222919755  by ronnyvotel:
      
          Bug fix in faster r-cnn model builder. Was previously using `inplace_batchnorm_update` for `reuse_weights`.
      
      --
      222885680  by Zhichao Lu:
      
          Use the result_dict_for_batched_example in models_lib
          Also fixes the visualization size on when eval is on GPU
      
      --
      222883648  by Zhichao Lu:
      
          Fix _unmatched_class_label for the _add_background_class == False case in ssd_meta_arch.py.
      
      --
      222836663  by Zhichao Lu:
      
          Adding support for visualizing grayscale images. Without this change, the images are black-red instead of grayscale.
      
      --
      222501978  by Zhichao Lu:
      
          Fix a bug that caused convert_to_grayscale flag not to be respected.
      
      --
      222432846  by richardmunoz:
      
          Fix mapping of groundtruth_confidences from shape [num_boxes] to [num_boxes, num_classes] when the input contains the groundtruth_confidences field.
      
      --
      221725755  by richardmunoz:
      
          Internal change.
      
      --
      221458536  by Zhichao Lu:
      
          Fix saver defer build bug in object detection train codepath.
      
      --
      221391590  by Zhichao Lu:
      
          Add support for group normalization in the object detection API. Just adding MobileNet-v1 SSD currently. This may serve as a road map for other models that wish to support group normalization as an option.
      
      --
      221367993  by Zhichao Lu:
      
          Bug fixes (1) Make RandomPadImage work, (2) Fix keep_checkpoint_every_n_hours.
      
      --
      221266403  by rathodv:
      
          Use detection boxes as proposals to compute correct mask loss in eval jobs.
      
      --
      220845934  by lzc:
      
          Internal change.
      
      --
      220778850  by Zhichao Lu:
      
          Incorporating existing metrics into Estimator framework.
          Should restore:
          -oid_challenge_detection_metrics
          -pascal_voc_detection_metrics
          -weighted_pascal_voc_detection_metrics
          -pascal_voc_instance_segmentation_metrics
          -weighted_pascal_voc_instance_segmentation_metrics
          -oid_V2_detection_metrics
      
      --
      220370391  by alirezafathi:
      
          Adding precision and recall to the metrics.
      
      --
      220321268  by Zhichao Lu:
      
          Allow the option of setting max_examples_to_draw to zero.
      
      --
      220193337  by Zhichao Lu:
      
          This CL fixes a bug where the Keras convolutional box predictor was applying heads in the non-deterministic dict order. The consequence of this bug was that variables were created in non-deterministic orders. This in turn led different workers in a multi-gpu training setup to have slightly different graphs which had variables assigned to mismatched parameter servers. As a result, roughly half of all workers were unable to initialize and did no work, and training time was slowed down approximately 2x.
      
      --
      220136508  by huizhongc:
      
          Add weight equalization loss to SSD meta arch.
      
      --
      220125875  by pengchong:
      
          Rename label_scores to label_weights
      
      --
      219730108  by Zhichao Lu:
      
          Add description of detection_keypoints in postprocessed_tensors to docstring.
      
      --
      219577519  by pengchong:
      
          Support parsing the class confidences and training using them.
      
      --
      219547611  by lzc:
      
          Stop using static shapes in GPU eval jobs.
      
      --
      219536476  by Zhichao Lu:
      
          Migrate TensorFlow Lite out of tensorflow/contrib
      
          This change moves //tensorflow/contrib/lite to //tensorflow/lite in preparation
          for TensorFlow 2.0's deprecation of contrib/. If you refer to TF Lite build
          targets or headers, you will need to update them manually. If you use TF Lite
          from the TensorFlow python package, "tf.contrib.lite" now points to "tf.lite".
          Please update your imports as soon as possible.
      
          For more details, see https://groups.google.com/a/tensorflow.org/forum/#!topic/tflite/iIIXOTOFvwQ
      
          @angersson and @aselle are conducting this migration. Please contact them if
          you have any further questions.
      
      --
      219190083  by Zhichao Lu:
      
          Add a second expected_loss_weights function using an alternative expectation calculation compared to previous. Integrate this op into ssd_meta_arch and losses builder. Affects files that use losses_builder.build to handle the returning of an additional element.
      
      --
      218924451  by pengchong:
      
          Add a new way to assign training targets using groundtruth confidences.
      
      --
      218760524  by chowdhery:
      
          Modify export script to add option for regular NMS in TFLite post-processing op.
      
      --
      
      PiperOrigin-RevId: 223075771
      a1337e01
  3. 13 Jul, 2018 1 commit
    • Zhichao Lu's avatar
      Merged commit includes the following changes: · 85dd5fa4
      Zhichao Lu authored
      204489224  by Zhichao Lu:
      
          Modify ssd mobilenet v1 fpn config to be a bit more tolerant to OOM failure by bumping down the batch size to 64 and doubling the number of iterations to 25k. It now converges in 2.5 hours.
      
      --
      204488942  by Zhichao Lu:
      
          Internal change
      
      204480631  by Zhichao Lu:
      
          This CL makes sure that num_steps parameter are not updated to 0 if num_steps field is not mentioned in config.
      
          The default behavior for number of steps parameter for training is infinite (train forever). The default value num_steps in train.proto is 0 (for training indefinitely). However the estimator/training function expects the num_steps to be set to None to train indefinitely.
      
      --
      204437217  by Zhichao Lu:
      
          Create a Docker image to support TensorFlow Lite / Object Detection blog post.
      
      --
      204317570  by Zhichao Lu:
      
          Internal change
      
      PiperOrigin-RevId: 204489224
      85dd5fa4