Skip to content

CV collection: image classification#654

Merged
tkornuta-nvidia merged 34 commits intomasterfrom
dev-cv-image-classification
Jun 3, 2020
Merged

CV collection: image classification#654
tkornuta-nvidia merged 34 commits intomasterfrom
dev-cv-image-classification

Conversation

@tkornuta-nvidia
Copy link
Copy Markdown
Contributor

@tkornuta-nvidia tkornuta-nvidia commented May 22, 2020 •
edited
Loading

MNIST classification:

  • a thin DL wrapper around torchvision MNIST dataset
  • classification with the classic LeNet-5
  • classification with general usage ReshapeTensor + FeedForwardNetwork (ported from PTP)
  • classification with general usage ConvNet + ReshapeTensor + Feed (ported from PTP)

CIFAR10 classification:

  • a thin DL wrapper around torchvision CIFAR10 dataset
  • classification with general usage ConvNet + ReshapeTensor + Feed (ported from PTP)
  • classification with general usage GenericImageEncoder (e.g. ResNet-50 feature map) + FeedForwardNetwork (ported from PTP)

CIFAR100 classification:

  • a thin DL wrapper around torchvision CIFAR100 dataset
  • classification with general usage GenericImageEncoder (e.g. VGG-16 with FC6) (ported from PTP)

New ElementTypes:

  • 'Index'
  • 'Target'
  • 'ClassificationTarge'
  • 'FeatureMapValue'
  • 'ImageValue'
  • 'NormalizedImageValue'

Additional changes:

  • ported ConfigurationError and some configuration parsing functions from PTP
  • NeuralModule: data_iterator by default returns None (simplification of thin DLs, not changing the overall behavior of the NeMo/actions etc.)

Bug fixes:

  • commented no_grad in NonTrainableNM
  • minor NmTensor: str() in type error mismatch

@tkornuta-nvidia
CV collection init: MNIST image classification
44077f9 
Signed-off-by: Tomasz Kornuta <tkornuta@nvidia.com>
@tkornuta-nvidia
Ported FFN and TensorReshaper, MNIST classification working on CPU
519b663 
Signed-off-by: Tomasz Kornuta <tkornuta@nvidia.com>
@tkornuta-nvidia
reformatted code
56fc0b3 
Signed-off-by: Tomasz Kornuta <tkornuta@nvidia.com>
@lgtm-com
Copy link
Copy Markdown

lgtm-com Bot commented May 22, 2020

This pull request introduces 5 alerts when merging 56fc0b3 into 4951396 - view on LGTM.com

new alerts:

  • 4 for Unused import
  • 1 for Iterable can be either a string or a sequence

@tkornuta-nvidia
convnet encoder ported, example working... but showing that CNNs are …
6f99dcb 
…not updated

Signed-off-by: Tomasz Kornuta <tkornuta@nvidia.com>
@tkornuta-nvidia
format fix
9f037f6 
Signed-off-by: Tomasz Kornuta <tkornuta@nvidia.com>
@lgtm-com
Copy link
Copy Markdown

lgtm-com Bot commented May 22, 2020

This pull request introduces 6 alerts when merging 9f037f6 into 09412e2 - view on LGTM.com

new alerts:

  • 6 for Unused import

@tkornuta-nvidia
Trainable NM fix - removing no_grad()
f244a30 
Signed-off-by: Tomasz Kornuta <tkornuta@nvidia.com>
@lgtm-com
Copy link
Copy Markdown

lgtm-com Bot commented May 22, 2020

This pull request introduces 6 alerts when merging f244a30 into 0955a63 - view on LGTM.com

new alerts:

  • 6 for Unused import

@tkornuta-nvidia
CIFAR10 working
4fdaa03 
Signed-off-by: Tomasz Kornuta <tkornuta@nvidia.com>
@lgtm-com
Copy link
Copy Markdown

lgtm-com Bot commented May 23, 2020

This pull request introduces 13 alerts when merging 4fdaa03 into 9127797 - view on LGTM.com

new alerts:

  • 13 for Unused import

@tkornuta-nvidia
Made the types of FFN and ReshapeTensor more
8d051ca 
Signed-off-by: Tomasz Kornuta <tkornuta@nvidia.com>
@tkornuta-nvidia
formatting fix
364aef4 
Signed-off-by: Tomasz Kornuta <tkornuta@nvidia.com>
@lgtm-com
Copy link
Copy Markdown

lgtm-com Bot commented May 23, 2020

This pull request introduces 14 alerts when merging 364aef4 into 9127797 - view on LGTM.com

new alerts:

  • 12 for Unused import
  • 2 for Suspicious unused loop iteration variable

@tkornuta-nvidia
LGTM unused import fixes
eee5915 
Signed-off-by: Tomasz Kornuta <tkornuta@nvidia.com>
@tkornuta-nvidia
LGTM fixes: unused variable in the loop
cf237a4 
Signed-off-by: Tomasz Kornuta <tkornuta@nvidia.com>
@lgtm-com
Copy link
Copy Markdown

lgtm-com Bot commented May 23, 2020

This pull request introduces 4 alerts when merging cf237a4 into 9127797 - view on LGTM.com

new alerts:

  • 4 for Unused import

@lgtm-com
Copy link
Copy Markdown

lgtm-com Bot commented May 23, 2020

This pull request introduces 6 alerts when merging b165288 into 9127797 - view on LGTM.com

new alerts:

  • 4 for Unused import
  • 2 for Unused exception object

@tkornuta-nvidia
Added NonLinearity component, simplified the FFN, cifar10 - ResNet50 …
f0331a9 
…operational

Signed-off-by: Tomasz Kornuta <tkornuta@nvidia.com>
@lgtm-com
Copy link
Copy Markdown

lgtm-com Bot commented May 23, 2020

This pull request introduces 6 alerts when merging f0331a9 into e8e3b2f - view on LGTM.com

new alerts:

  • 4 for Unused import
  • 2 for Unused exception object

@tkornuta-nvidia
LGTM fixes
7ab19d7 
Signed-off-by: Tomasz Kornuta <tkornuta@nvidia.com>
@tkornuta-nvidia tkornuta-nvidia marked this pull request as ready for review May 23, 2020 03:31
@tkornuta-nvidia
Stronger typing in CV modules and examples, introduced several new El…
37ed483 
…ementTypes

Signed-off-by: Tomasz Kornuta <tkornuta@nvidia.com>
@tkornuta-nvidia
formatting
050b424 
Signed-off-by: Tomasz Kornuta <tkornuta@nvidia.com>
@tkornuta-nvidia
Merge branch 'master' of github.com:NVIDIA/NeMo into dev-cv-image-cla…
e43d428 
…ssification
@tkornuta-nvidia
updated requirements, docs, setup, added information about CV collect…
5566638 
…ion to readme

Signed-off-by: Tomasz Kornuta <tkornuta@nvidia.com>
@tkornuta-nvidia
updated description in changelog
af20a4f 
Signed-off-by: Tomasz Kornuta <tkornuta@nvidia.com>
@tkornuta-nvidia
minor comment polish
516642d 
Signed-off-by: Tomasz Kornuta <tkornuta@nvidia.com>
okuchaiev
okuchaiev reviewed Jun 1, 2020
View reviewed changes
Comment thread nemo/collections/cv/modules/trainables/generic_image_encoder.py
okuchaiev
okuchaiev reviewed Jun 1, 2020
View reviewed changes
Comment thread nemo/collections/cv/modules/trainables/generic_image_encoder.py
okuchaiev
okuchaiev reviewed Jun 1, 2020
View reviewed changes
Comment thread nemo/core/neural_types/elements.py Outdated
okuchaiev
okuchaiev reviewed Jun 1, 2020
View reviewed changes
Comment thread nemo/core/neural_types/elements.py Outdated
okuchaiev
okuchaiev reviewed Jun 1, 2020
View reviewed changes
Comment thread nemo/utils/configuration_error.py
okuchaiev
okuchaiev requested changes Jun 1, 2020
View reviewed changes
Copy link
Copy Markdown
Collaborator

@okuchaiev okuchaiev left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Mostly looks good to me. Minor comments/questions are inline.

Two main concerns:
(1) For the use-exposed APIs (e.g. class constructors etc.) please use Python3 type hints where possible
(2) Can you get rid of double inheritance from DataLayers? (you don't need to do it a way similar to GenericImageEncoder, though I would do that)

@tkornuta-nvidia
Merge branch 'master' of github.com:NVIDIA/NeMo into dev-cv-image-cla…
44cfdea 
…ssification
@tkornuta-nvidia
polished datalayers, added CIFAR100, added Index and Label types, pol…
ee6ec4a 
…ished types

Signed-off-by: Tomasz Kornuta <tkornuta@nvidia.com>
@tkornuta-nvidia
formatting fix
3730537 
Signed-off-by: Tomasz Kornuta <tkornuta@nvidia.com>
@lgtm-com
Copy link
Copy Markdown

lgtm-com Bot commented Jun 2, 2020

This pull request introduces 1 alert when merging 3730537 into 78b6bef - view on LGTM.com

new alerts:

  • 1 for Unused import

@tkornuta-nvidia
GenericImageEncoder -> ImageEncoder, updated readme file
456c6d3 
Signed-off-by: Tomasz Kornuta <tkornuta@nvidia.com>
@tkornuta-nvidia
changed assert to get_value_from_dict
d3ab6ff 
Signed-off-by: Tomasz Kornuta <tkornuta@nvidia.com>
@tkornuta-nvidia
formatting fix
2160027 
Signed-off-by: Tomasz Kornuta <tkornuta@nvidia.com>
@lgtm-com
Copy link
Copy Markdown

lgtm-com Bot commented Jun 2, 2020

This pull request introduces 1 alert when merging 2160027 into 78b6bef - view on LGTM.com

new alerts:

  • 1 for Unused import

@tkornuta-nvidia
added python 3 typing to all inits, fixed LGTM issue, formatted
8c3a9fd 
Signed-off-by: Tomasz Kornuta <tkornuta@nvidia.com>
@tkornuta-nvidia
Updated docstrings
2cd0ac5 
Signed-off-by: Tomasz Kornuta <tkornuta@nvidia.com>
@tkornuta-nvidia
raise ConfigurationError
bba75f9 
Signed-off-by: Tomasz Kornuta <tkornuta@nvidia.com>
@tkornuta-nvidia
reshape tensor docstring update
6613d40 
Signed-off-by: Tomasz Kornuta <tkornuta@nvidia.com>
okuchaiev
okuchaiev reviewed Jun 2, 2020
View reviewed changes
Comment thread nemo/collections/cv/modules/data_layers/cifar100_datalayer.py
tkornuta-nvidia
tkornuta-nvidia commented Jun 2, 2020
View reviewed changes
Comment thread nemo/collections/cv/modules/trainables/image_encoder.py Outdated
tkornuta-nvidia
tkornuta-nvidia commented Jun 2, 2020
View reviewed changes
Comment thread nemo/core/neural_types/elements.py Outdated
okuchaiev
okuchaiev previously approved these changes Jun 3, 2020
View reviewed changes
@tkornuta-nvidia
Label -> StringLabel, description of ImageEncoder
eee4c1e 
Signed-off-by: Tomasz Kornuta <tkornuta@nvidia.com>
tkornuta-nvidia
tkornuta-nvidia commented Jun 3, 2020
View reviewed changes
Comment thread nemo/collections/cv/modules/trainables/image_encoder.py
@tkornuta-nvidia tkornuta-nvidia merged commit 74bf41d into master Jun 3, 2020
@tkornuta-nvidia tkornuta-nvidia deleted the dev-cv-image-classification branch June 3, 2020 00:45
@tkornuta-nvidia tkornuta-nvidia restored the dev-cv-image-classification branch July 22, 2020 23:57
@tkornuta-nvidia tkornuta-nvidia deleted the dev-cv-image-classification branch July 22, 2020 23:58
dcurran90 pushed a commit to dcurran90/NeMo that referenced this pull request Oct 15, 2024
@derekhiggins
generate list: Add commit support (NVIDIA-NeMo#655)
97bd5ac 
Now supports a diff from a specific commit
(in addition to a branch or HEAD)

Fixes NVIDIA-NeMo#654

Signed-off-by: Derek Higgins <derekh@redhat.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@okuchaiev okuchaiev okuchaiev left review comments

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@tkornuta-nvidia @okuchaiev