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 regressions #1671

Merged
merged 15 commits into from
Oct 13, 2023
Merged

Refactor regressions #1671

merged 15 commits into from
Oct 13, 2023

Conversation

lintool
Copy link
Member

@lintool lintool commented Oct 6, 2023 •
edited
Loading

  • "threads" and "batch-size" parameters:
    • consistent formatting
    • settable externally in code (rather than hard-coded in yaml)
  • better logging information for running times
  • run_jobs_with_load.py won't spawn too many concurrent jobs, configurable parameter.

@lintool lintool marked this pull request as draft October 6, 2023 18:49
@lintool lintool marked this pull request as ready for review October 12, 2023 23:37
@lintool
Copy link
Member Author

lintool commented Oct 12, 2023

@jasper-xian @ronakice this PR is ready for review now.

Just a quick sanity check is sufficient, I've run the following and they pass; I'll run again from scratch after merge.

nohup python -m pyserini.2cr.msmarco --collection v1-passage --all --directory runs/ --display-commands >& logs/log.msmarco-v1-passage &
nohup python -m pyserini.2cr.msmarco --collection v1-doc     --all --directory runs/ --display-commands >& logs/log.msmarco-v1-doc &
nohup python -m pyserini.2cr.msmarco --collection v2-passage --all --directory runs/ --display-commands >& logs/log.msmarco-v2-passage &
nohup python -m pyserini.2cr.msmarco --collection v2-doc     --all --directory runs/ --display-commands >& logs/log.msmarco-v2-doc &
nohup python -m pyserini.2cr.miracl --all --directory runs/ --display-commands >& logs/log.miracl &
nohup python -m pyserini.2cr.mrtydi --all --directory runs/ --display-commands >& logs/log.mrtydi &
nohup python -m pyserini.2cr.beir   --all --directory runs/ --display-commands >& logs/log.beir &
nohup python -m pyserini.2cr.odqa   --all --directory runs/ --topic tqa --display-commands >& logs/log.odqa.tqa &
nohup python -m pyserini.2cr.odqa   --all --directory runs/ --topic nq  --display-commands >& logs/log.odqa.nq &

jasper-xian
jasper-xian reviewed Oct 13, 2023
View reviewed changes
pyserini/2cr/beir.py
import yaml

from ._base import run_eval_and_return_metric, ok_str, fail_str

dense_threads = 16
Copy link
Member

Choose a reason for hiding this comment

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

I think it might make more sense to move these constants into pyserini/2cr/base since they're reused a bunch. Your call though

Copy link
Member

Choose a reason for hiding this comment

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

Otherwise, this looks good to me!

Copy link
Member Author

Choose a reason for hiding this comment

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

I was thinking that I might want the ability to control on a per-regression basis, so I'll keep separate?

Please +1 the review so I can merge? Thanks!

@lintool lintool merged commit f1d623c into master Oct 13, 2023
@lintool lintool deleted the regression-refactoring branch October 13, 2023 14:32
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jasper-xian jasper-xian jasper-xian approved these changes

@ronakice ronakice Awaiting requested review from ronakice

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
@lintool @jasper-xian