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.

Sign up for GitHub

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

Jump to bottom

Trying to solve conflicts between the EncoderDecoder Factory PR and the Pretraining Task PR #193

Open
wants to merge 49 commits into
base: feature/encoder_decoder_factory
Choose a base branch
from
Open

Trying to solve conflicts between the EncoderDecoder Factory PR and the Pretraining Task PR #193

wants to merge 49 commits into from

Conversation

Joao-L-S-Almeida
Copy link
Member

@Joao-L-S-Almeida Joao-L-S-Almeida commented Oct 17, 2024 •
edited
Loading

Trying to solve conflicts between the EncoderDecoder Factory PR and the remaining patches.

Joao-L-S-Almeida and others added 30 commits August 1, 2024 11:57
@Joao-L-S-Almeida
Testing backbones for segmentation
10f82fa 
Signed-off-by: João Lucas de Sousa Almeida <[email protected]>
@Joao-L-S-Almeida
Basic test for segmentation fine-tuning tasks
710f79e 
Signed-off-by: João Lucas de Sousa Almeida <[email protected]>
@Joao-L-S-Almeida
Testing using more samples
023caf2 
Signed-off-by: João Lucas de Sousa Almeida <[email protected]>
@Joao-L-S-Almeida
Logging, remove it after the tests are finished
fdaeea3 
Signed-off-by: João Lucas de Sousa Almeida <[email protected]>
@Joao-L-S-Almeida
Merging updates from main
278c4d0 
Signed-off-by: João Lucas de Sousa Almeida <[email protected]>
@Joao-L-S-Almeida
Removing unnecessary logging
3fe4ac6 
Signed-off-by: João Lucas de Sousa Almeida <[email protected]>
@Joao-L-S-Almeida
Logging
ee17c96 
Signed-off-by: João Lucas de Sousa Almeida <[email protected]>
@Joao-L-S-Almeida
The number of channels can be estimated in different ways according t…
233a5c2 
…o the kind of bands definition

Signed-off-by: João Lucas de Sousa Almeida <[email protected]>
@Joao-L-S-Almeida
terratorch.models.backbones.utils
6bd2bde 
Signed-off-by: João Lucas de Sousa Almeida <[email protected]>
@Joao-L-S-Almeida
HLSBands also need be considered
52f0c12 
Signed-off-by: João Lucas de Sousa Almeida <[email protected]>
@Joao-L-S-Almeida
Better conditional for all the kinds of bands
3d9b5f5 
Signed-off-by: João Lucas de Sousa Almeida <[email protected]>
@Joao-L-S-Almeida
Allowing the configuration to overwrite default arguments from the mo…
5cf5876 
…del constructors

Signed-off-by: João Lucas de Sousa Almeida <[email protected]>
@Joao-L-S-Almeida
Intervals must include the upper extreme
ec8125e 
Signed-off-by: João Lucas de Sousa Almeida <[email protected]>
@Joao-L-S-Almeida
Merge pull request #106 from IBM/extend/bands
f4e9c47 
Extend/bands
@Joao-L-S-Almeida
Merge pull request #107 from IBM/overwrite_default_prithvi
cf963a8 
Overwrite default prithvi
@Joao-L-S-Almeida
Merge pull request #126 from IBM/extend/bands
7c6a5a2 
Extend/bands
@Joao-L-S-Almeida
Solving conflict in tests/test_finetune.py
28a8dfb 
Signed-off-by: João Lucas de Sousa Almeida <[email protected]>
@Joao-L-S-Almeida
Merge branch 'segmentation/tests' of github.com:IBM/terratorch into s…
5da9522 
…egmentation/tests
@Joao-L-S-Almeida
Run the tests again
8007bdf 
Signed-off-by: João Lucas de Sousa Almeida <[email protected]>
@Joao-L-S-Almeida
Merge branch 'main' into segmentation/tests
6055503
@Joao-L-S-Almeida
Regression-like task for pre-training
4b486ab 
Signed-off-by: João Lucas de Sousa Almeida <[email protected]>
@Joao-L-S-Almeida
Avoiding the remotion of the decoder for pre-training tasks
f47bcec 
Signed-off-by: João Lucas de Sousa Almeida <[email protected]>
@Joao-L-S-Almeida
Specifying the pretraining task
6a6f6a7 
Signed-off-by: Joao Lucas de Sousa Almeida <[email protected]>
@Joao-L-S-Almeida
Modifying the forward step of the PixelWise model handler in order to…
1a6030a 
… support pre-training tasks

Signed-off-by: Joao Lucas de Sousa Almeida <[email protected]>
@Joao-L-S-Almeida
Modifying the forward step of the PixelWise model handler in order to…
08424b2 
… support pre-training tasks

Signed-off-by: Joao Lucas de Sousa Almeida <[email protected]>

PixelWiseModel need a non-abstract method

Signed-off-by: João Lucas de Sousa Almeida <[email protected]>

decoder can be optional

Signed-off-by: João Lucas de Sousa Almeida <[email protected]>

EncoderDecoderPreTrainingTask

Signed-off-by: João Lucas de Sousa Almeida <[email protected]>

New Datamodule and Dataset for pre-training

Signed-off-by: João Lucas de Sousa Almeida <[email protected]>

Unpatchify output

Signed-off-by: João Lucas de Sousa Almeida <[email protected]>

Unpatchify output

Signed-off-by: João Lucas de Sousa Almeida <[email protected]>

decoder must be empty for pre-training tasks

Signed-off-by: João Lucas de Sousa Almeida <[email protected]>
@Joao-L-S-Almeida
merging
6a31ce9 
Signed-off-by: João Lucas de Sousa Almeida <[email protected]>
@Joao-L-S-Almeida
YAML file to test pre-training tasks
78fa652 
Signed-off-by: João Lucas de Sousa Almeida <[email protected]>
@Joao-L-S-Almeida
Datasets have plotting methods
adf8210 
Signed-off-by: Joao Lucas de Sousa Almeida <[email protected]>
@Joao-L-S-Almeida
Adapting the plotting methods of the pretraining dataset
7862fe0 
Signed-off-by: João Lucas de Sousa Almeida <[email protected]>

Adjusts, commentaries and corrections

Signed-off-by: João Lucas de Sousa Almeida <[email protected]>

Enforcing that decoder is defined when it's required.

Signed-off-by: João Lucas de Sousa Almeida <[email protected]>
@Joao-L-S-Almeida
Classification also need be considered in these conditionals
e2cb29f 
Signed-off-by: João Lucas de Sousa Almeida <[email protected]>
Joao-L-S-Almeida and others added 15 commits September 3, 2024 12:43
@Joao-L-S-Almeida
Basic test for pre-training tasks
2db4960 
Signed-off-by: João Lucas de Sousa Almeida <[email protected]>
@Joao-L-S-Almeida
This config file was missing
42a2988 
Signed-off-by: João Lucas de Sousa Almeida <[email protected]>

The ViT forward must return the mask too

Signed-off-by: João Lucas de Sousa Almeida <[email protected]>

Loss can handle more than one input

Signed-off-by: João Lucas de Sousa Almeida <[email protected]>

Some method need be inherited from the backbone

Signed-off-by: João Lucas de Sousa Almeida <[email protected]>
@Joao-L-S-Almeida
Custom losses
f0dbed9 
Signed-off-by: João Lucas de Sousa Almeida <[email protected]>
@Joao-L-S-Almeida
A TODO about hard-coded removal of the time dimension
c5d825c 
Signed-off-by: João Lucas de Sousa Almeida <[email protected]>
@Joao-L-S-Almeida
Avoiding zeroed masks
8b71f41 
Signed-off-by: João Lucas de Sousa Almeida <[email protected]>
@Joao-L-S-Almeida
revert modification
0220ffc 
Signed-off-by: João Lucas de Sousa Almeida <[email protected]>
@Joao-L-S-Almeida
This function is no more required
a7aac27 
Signed-off-by: João Lucas de Sousa Almeida <[email protected]>
@Joao-L-S-Almeida
This function is no more required
b10d892 
Signed-off-by: João Lucas de Sousa Almeida <[email protected]>
@Joao-L-S-Almeida
merging
3232145 
Signed-off-by: João Lucas de Sousa Almeida <[email protected]>
@Joao-L-S-Almeida
No more required.
7d4b4a5 
Signed-off-by: João Lucas de Sousa Almeida <[email protected]>
@Joao-L-S-Almeida
Merge pull request #68 from IBM/segmentation/tests
ab6628f 
Allowing to overwrite Prithvi and new segmentation tests.
@fmartiescofet
Fix freeze_decoder
7f142de 
Signed-off-by: Francesc Marti Escofet <[email protected]>
@Joao-L-S-Almeida
Merge pull request #189 from fmartiescofet/patch_freeze_decoder
cb08b1c 
Fix `freeze_decoder`
@Joao-L-S-Almeida
Merge branch 'feature/encoder_decoder_factory' of github.com:IBM/terr…
8c87965 
…atorch into melting_pot
@Joao-L-S-Almeida
partial merging
d17a7e1 
Signed-off-by: João Lucas de Sousa Almeida <[email protected]>
@Joao-L-S-Almeida Joao-L-S-Almeida self-assigned this Oct 17, 2024
@Joao-L-S-Almeida Joao-L-S-Almeida marked this pull request as ready for review October 17, 2024 16:53
@Joao-L-S-Almeida Joao-L-S-Almeida marked this pull request as draft October 17, 2024 16:54
@Joao-L-S-Almeida
Removing duplicated args
9365a7c 
Signed-off-by: João Lucas de Sousa Almeida <[email protected]>
@Joao-L-S-Almeida Joao-L-S-Almeida changed the title Melting pot Trying to solve conflicts between the EncoderDecoder Factory PR and the Pretraining Task PR Oct 17, 2024
@Joao-L-S-Almeida Joao-L-S-Almeida marked this pull request as ready for review October 17, 2024 20:28
@Joao-L-S-Almeida
Removing unused parameters
5f5b157 
Signed-off-by: João Lucas de Sousa Almeida <[email protected]>
@Joao-L-S-Almeida
missing import
6fb90b7 
Signed-off-by: João Lucas de Sousa Almeida <[email protected]>
@CarlosGomes98
Copy link
Collaborator

This approach would make the #186 even bigger :( can we try to either first merge #194 or #186 and then the other one?

@Joao-L-S-Almeida
Copy link
Member Author

#194 Is an attempt of running the automated tests, we can ignore it for now.
My idea was just solving possible conflicts, so if you agree with the modifications carried out here, we could try to merge #186 and after it this PR.

@Joao-L-S-Almeida
missing import
4ed20b5 
Signed-off-by: João Lucas de Sousa Almeida <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@CarlosGomes98 CarlosGomes98 Awaiting requested review from CarlosGomes98

@romeokienzler romeokienzler Awaiting requested review from romeokienzler

Assignees

@Joao-L-S-Almeida Joao-L-S-Almeida

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@Joao-L-S-Almeida @CarlosGomes98 @fmartiescofet