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

Refactor DPR for haystack compatibility #606

Merged
merged 28 commits into from
Oct 28, 2020
Merged

Refactor DPR for haystack compatibility #606

merged 28 commits into from
Oct 28, 2020

Conversation

kolk
Copy link
Contributor

@kolk kolk commented Oct 27, 2020 •
edited
Loading

  • TextSimilarityProcessor query/passage optional
  • BiAdaptiveModel query/passage forward pass optional
  • max_seq_len_query and max_seq_len_context added to TextSimilarityProcessor
  • Incorporate changes from PR: DPR transformers modelhub model load bugfix DPR transformers modelhub model load bugfix #595

kolk and others added 10 commits October 26, 2020 11:57
@kolk
DPRProcessor, BiAdaptiveModel modified for optional query/passage
0cde000
@kolk
TextSimilarityProcessor, BiAdaptiveModel haystack inference compatibi…
47efb36 
…lity added
@kolk
TextSimilarityProcessor query/passage features optional
8cad1c9
@kolk
DPRProcessor, BiAdaptiveModel modified for optional query/passage
3ba08fc
@kolk
TextSimilarityProcessor, BiAdaptiveModel haystack inference compatibi…
88911a8 
…lity added
@kolk
TextSimilarityProcessor query/passage features optional
cf33c6a
@kolk
Merge branch 'dpr_haystack_compatibility' of https://github.com/deeps…
96da2a5 
…et-ai/FARM into dpr_haystack_compatibility
@kolk
prediction head modified
ea0e504
@kolk
bugfix in BiAdaptiveModel init
e53af92
@brandenchan @ftesser @tholor
Fix removal of yes no answers (#540)
b33e17c 
* fix removal of yes no answers

* Make use of the answer_type linked to each answers.

* pin seqeval version

* remove hardcoded answer types list

Co-authored-by: Fabio Tesser <fabio.tesser@gmail.com>
Co-authored-by: Malte Pietsch <malte.pietsch@deepset.ai>
@kolk kolk requested a review from tholor October 27, 2020 16:10
tholor
tholor reviewed Oct 27, 2020
View reviewed changes
farm/data_handler/processor.py Outdated Show resolved Hide resolved
farm/data_handler/processor.py Outdated Show resolved Hide resolved
farm/modeling/prediction_head.py Outdated Show resolved Hide resolved
bogdankostic and others added 14 commits October 27, 2020 18:34
@bogdankostic
Infer model type from config (#600)
b7ecb37 
* Inference model and tokenizer type from config

* Infer type from model name as fallback
@kolk
BiAdaptive model output type modified to tuple from dict
3f66a21
@kolk
dpr tests reflect biadaptive model output type(tuple)
f97e857
@kolk
DPRProcessor, BiAdaptiveModel modified for optional query/passage
3e7f7c8
@kolk
TextSimilarityProcessor, BiAdaptiveModel haystack inference compatibi…
cf41a04 
…lity added
@kolk
TextSimilarityProcessor query/passage features optional
83892ee
@kolk
DPRProcessor, BiAdaptiveModel modified for optional query/passage
af0459b
@kolk
TextSimilarityProcessor, BiAdaptiveModel haystack inference compatibi…
7f4d8e8 
…lity added
@kolk
prediction head modified
59e6abe
@kolk
bugfix in BiAdaptiveModel init
6efe1e1
@kolk
DPR test modified for max_seq_len_query/max_seq_len_context
da6b3c1
@kolk
BiAdaptive model output type modified to tuple from dict
cf7e733
@kolk
dpr tests reflect biadaptive model output type(tuple)
21428a9
@kolk
merge conflicts fixed
ca2606c
@tholor tholor changed the title DPR haystack compatibility Refactor DPR for haystack compatibility Oct 28, 2020
@tholor tholor mentioned this pull request Oct 28, 2020
Closed
tholor
tholor approved these changes Oct 28, 2020
View reviewed changes
Copy link
Member

@tholor tholor left a comment

Choose a reason for hiding this comment

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

Looking good. Once CI passes, we can merge this

@tholor tholor merged commit 6dd113d into master Oct 28, 2020
@kolk kolk linked an issue Oct 29, 2020 that may be closed by this pull request
Separate max_seq_len for question and passages in DPR #593
Closed
@kolk kolk mentioned this pull request Oct 29, 2020
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@tholor tholor tholor approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Separate max_seq_len for question and passages in DPR
4 participants
@kolk @tholor @brandenchan @bogdankostic