Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixed comment on GPU_COUNT #878

Merged
merged 2 commits into from
Sep 21, 2018
Merged

Fixed comment on GPU_COUNT #878

merged 2 commits into from
Sep 21, 2018

Conversation

maxfrei750
Copy link
Contributor

Removed "For CPU training, use 1", because it doesn't seem to be correct.

Removed "For CPU training, use 1", because it doesn't seem to be correct.
@waleedka
Copy link
Collaborator

It's not clear to me how this fixes the comment. If someone uses CPU only, then need to set GPU_COUNT = 1. Removing that comment makes it seem that when using a CPU then you set the count to 0.

Added part on CPU training.
@maxfrei750
Copy link
Contributor Author

@waleedka First of all: Nice to see you around this repo again!

I see what you mean, so I tried to fix the comment to include CPU usage.

@waleedka waleedka merged commit 80cac4c into matterport:master Sep 21, 2018
@waleedka
Copy link
Collaborator

Thanks! Glad I finally got some time to catch up :)

LexLuc added a commit to LexLuc/Mask_RCNN that referenced this pull request Sep 28, 2018
* Small typo fix

* loss weights

* Fix multi-GPU training.

A previous fix to let validation run across more
than one batch caused an issue with multi-GPU
training. The issue seems to be in how Keras
averages loss and metric values, where it expects
them to be scalars rather than arrays. This fix
causes scalar outputs from a model to remain
scalar in multi-GPU training.

* Replace keep_dims with keepdims in TF calls.

TF replaced keep_dims with keepdims a while ago
and now shows a warning when using the old name.

* Headline typo fix in README.md

Fixed the typo in the headline of the README.md file. "Spash" should be "Splash"

* Splash sample: fix filename and link to blog post

* Update utils.py

* Minor cleanup in compute_overlaps_masks()

* Fix: color_splash when no masks are detected

Reported here: matterport#500

* fix typo

fix typo

* fix "No such file or directory" if not use: "keras.callbacks.TensorBoard"

* Allow dashes in model name.
Print a message when re-starting from saved epoch

* Fix problem with argmax on (0,0) arrays.

Fix matterport#170

* Allow configuration of FPN layers size and top-down pyramid size

* Allow custom backbone implementation through Config.BACKBONE

This allows one to set a callable in Config.BACKBONE to use a custom
backbone model.

* modified comment for image augmentation line import to include correct 'pip3 install imgaug' instructions

* Raise clear error if last training weights are not foundIf using the --weights=last (or --model=last) to resume trainingbut the weights are not found now it raises a clear error message.

* Fix Keras engine topology to saving

* Fix load_weights() for Keras versions before 2.2

Improve previous commit to not break on older versions of Keras.

* Update README.md

* Add custom callbacks to model training

Add an optional parameter for calling a list of keras.callbacks to be add to the original list.

* Add no augmentation sources

Add the possibility to exclude some sources from augmentation by passing a list of sources. This is useful when you want to retrain a model having few images.

* Improve previous commit to avoid mutable default arguments

* Updated Coco Example

* edit loss desc

* spellcheck config.py

* doublecheck on config.py

* spellcheck utils.py

* spellcheck visualize.py

* Links to two more projects in README

* Add Bibtex to README

* make pre_nms_limit configurable

* Make pre_nms_limit configurable

* Made compatible to new version of VIA JSON format

VIA has changed JSON formatting in later versions. Now instead of a dictionary, "regions" has a list, see the issue matterport#928

* Comments to explain VIA 2.0 JSON change

* Fix the comment on output shape in RPN

* Bugfix for MaskRCNN creating empty log_dir that breaks find_last()
- Current implementation creates self.log_dir in set_log_dir() function,
  which creates an empty log directory if none exists. This causes
  find_last() to fail after creating a model because it finds this new
  empty directory instead of the previous training directory.
- New implementation moves log_dir creation to the train() function to
  ensure it is only created when it will be used.

* Added automated epoch recognition for Windows. (matterport#798)

Unified regex expression for both, Linux and Windows.

* Fixed tabbing issue in previous commit

* bug fix: the output_shape of roi_gt_class_ids is incorrect

* Bug fix: inspect_balloon_model.ipynb

Fix bugs of not showing boxes in 1.b RPN Predictions.
TF 1.9 introduces "ROI/rpn_non_max_suppression/NonMaxSuppressionV3:0", so the original code can't work.

* Apply previous commit to the other notebooks

* Fixed comment on GPU_COUNT (matterport#878)

Fixed comment on GPU_COUNT

* add IMAGE_CHANNEL_COUNT class variable to config to make it easier to use Mask_RCNN for non 3-channel images

* Additional comments for the previous commit

* Link to new projects in README

* Tiny correction in README.

* Adjust PyramidROIAlign layer shape comment

For PyramidROIAlign's output shape, use pool_height and pool_width instead of height and width to avoid confusion with those of feature_maps.

* fix output shape of fpn_classifier_graph

1. fix the comment on output shape in fpn_classifier_graph
2. unify NUM_CLASSES and num_classes to NUM_CLASSES
3. unify boxes, num_boxes, num_rois, roi_count to num_rois
4. use more specific POOL_SIZE and MASK_ POOL_SIZE to replace pool_height and pool_width

* Fix PyramidROIAlign output shape

As discussed in: matterport#919

* Fix comments in Detection Layer

1. fix description on window
2. fix output shape of detection layer

* use smooth_l1_loss() to reduce code duplication

* A wrapper for skimage resize() to avoid warnings

skimage generates different warnings depending on the version. This wrapper function calls skimage.tranform.resize() with the right parameter for each version.

* Remove unused method: append_data()
LexLuc added a commit to LexLuc/Mask_RCNN that referenced this pull request Sep 28, 2018
* Small typo fix

* loss weights

* Fix multi-GPU training.

A previous fix to let validation run across more
than one batch caused an issue with multi-GPU
training. The issue seems to be in how Keras
averages loss and metric values, where it expects
them to be scalars rather than arrays. This fix
causes scalar outputs from a model to remain
scalar in multi-GPU training.

* Replace keep_dims with keepdims in TF calls.

TF replaced keep_dims with keepdims a while ago
and now shows a warning when using the old name.

* Headline typo fix in README.md

Fixed the typo in the headline of the README.md file. "Spash" should be "Splash"

* Splash sample: fix filename and link to blog post

* Update utils.py

* Minor cleanup in compute_overlaps_masks()

* Fix: color_splash when no masks are detected

Reported here: matterport#500

* fix typo

fix typo

* fix "No such file or directory" if not use: "keras.callbacks.TensorBoard"

* Allow dashes in model name.
Print a message when re-starting from saved epoch

* Fix problem with argmax on (0,0) arrays.

Fix matterport#170

* Allow configuration of FPN layers size and top-down pyramid size

* Allow custom backbone implementation through Config.BACKBONE

This allows one to set a callable in Config.BACKBONE to use a custom
backbone model.

* modified comment for image augmentation line import to include correct 'pip3 install imgaug' instructions

* Raise clear error if last training weights are not foundIf using the --weights=last (or --model=last) to resume trainingbut the weights are not found now it raises a clear error message.

* Fix Keras engine topology to saving

* Fix load_weights() for Keras versions before 2.2

Improve previous commit to not break on older versions of Keras.

* Update README.md

* Add custom callbacks to model training

Add an optional parameter for calling a list of keras.callbacks to be add to the original list.

* Add no augmentation sources

Add the possibility to exclude some sources from augmentation by passing a list of sources. This is useful when you want to retrain a model having few images.

* Improve previous commit to avoid mutable default arguments

* Updated Coco Example

* edit loss desc

* spellcheck config.py

* doublecheck on config.py

* spellcheck utils.py

* spellcheck visualize.py

* Links to two more projects in README

* Add Bibtex to README

* make pre_nms_limit configurable

* Make pre_nms_limit configurable

* Made compatible to new version of VIA JSON format

VIA has changed JSON formatting in later versions. Now instead of a dictionary, "regions" has a list, see the issue matterport#928

* Comments to explain VIA 2.0 JSON change

* Fix the comment on output shape in RPN

* Bugfix for MaskRCNN creating empty log_dir that breaks find_last()
- Current implementation creates self.log_dir in set_log_dir() function,
  which creates an empty log directory if none exists. This causes
  find_last() to fail after creating a model because it finds this new
  empty directory instead of the previous training directory.
- New implementation moves log_dir creation to the train() function to
  ensure it is only created when it will be used.

* Added automated epoch recognition for Windows. (matterport#798)

Unified regex expression for both, Linux and Windows.

* Fixed tabbing issue in previous commit

* bug fix: the output_shape of roi_gt_class_ids is incorrect

* Bug fix: inspect_balloon_model.ipynb

Fix bugs of not showing boxes in 1.b RPN Predictions.
TF 1.9 introduces "ROI/rpn_non_max_suppression/NonMaxSuppressionV3:0", so the original code can't work.

* Apply previous commit to the other notebooks

* Fixed comment on GPU_COUNT (matterport#878)

Fixed comment on GPU_COUNT

* add IMAGE_CHANNEL_COUNT class variable to config to make it easier to use Mask_RCNN for non 3-channel images

* Additional comments for the previous commit

* Link to new projects in README

* Tiny correction in README.

* Adjust PyramidROIAlign layer shape comment

For PyramidROIAlign's output shape, use pool_height and pool_width instead of height and width to avoid confusion with those of feature_maps.

* fix output shape of fpn_classifier_graph

1. fix the comment on output shape in fpn_classifier_graph
2. unify NUM_CLASSES and num_classes to NUM_CLASSES
3. unify boxes, num_boxes, num_rois, roi_count to num_rois
4. use more specific POOL_SIZE and MASK_ POOL_SIZE to replace pool_height and pool_width

* Fix PyramidROIAlign output shape

As discussed in: matterport#919

* Fix comments in Detection Layer

1. fix description on window
2. fix output shape of detection layer

* use smooth_l1_loss() to reduce code duplication

* A wrapper for skimage resize() to avoid warnings

skimage generates different warnings depending on the version. This wrapper function calls skimage.tranform.resize() with the right parameter for each version.

* Remove unused method: append_data()
Cpruce pushed a commit to Cpruce/Mask_RCNN that referenced this pull request Jan 17, 2019
aneeshchauhan pushed a commit to aneeshchauhan/Mask_RCNN that referenced this pull request Jul 9, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants