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

Classification Evaluation #17

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
a11d7e7
Resolved Merging Issues
Negiiiin Sep 10, 2024
735c345
Used torch.metrics
Negiiiin Sep 13, 2024
a56a9c7
Added set_all_dataset_info
Negiiiin Sep 17, 2024
50aa88f
Debugged pre-commit errors
Negiiiin Sep 17, 2024
ddddae9
Adding new file
Negiiiin Sep 23, 2024
480d883
Separated zeroshot and linear-probing
Negiiiin Sep 24, 2024
66a29fd
Resolved pre-commit issues
Negiiiin Sep 24, 2024
ed3f2de
Some changes in getting description embeddings
Negiiiin Sep 24, 2024
cc07fc7
Changed creating new metrics
Negiiiin Sep 30, 2024
d8ce7e3
Resolves some issues
Negiiiin Sep 30, 2024
d0f1711
Remove trainer argument from EvaluationHooks
fcogidi Oct 7, 2024
a29a414
Refactor datasets
fcogidi Oct 7, 2024
2ba0698
Refactor zero shot classification task
fcogidi Oct 7, 2024
8f3b946
Fix pre-commit errors
fcogidi Oct 7, 2024
2bddd33
Merge branch 'VectorInstitute:main' into feature/classification_evalu…
Negiiiin Oct 7, 2024
02df8cf
Added new datasets
Negiiiin Oct 7, 2024
ae63447
Merge branch 'feature/classification_evaluation' of https://github.co…
Negiiiin Oct 7, 2024
716a2fb
Added diles
Negiiiin Oct 10, 2024
75b8d70
Added test cases
Negiiiin Oct 10, 2024
2b06e11
Add support for custom configuration in load_huggingface_model function
fcogidi Oct 15, 2024
06fb609
Update default configuration for `HFCLIPTokenizer`
fcogidi Oct 15, 2024
7b90734
Remove commented out code and rearrage code blocks
fcogidi Oct 15, 2024
8e91fe7
Refactor zero-shot classification eval and config
fcogidi Oct 15, 2024
88b1175
Merge remote-tracking branch 'upstream/main' into feature/classificat…
fcogidi Oct 15, 2024
b501d64
Update integration_tests.yml to use snok/install-poetry action and ca…
fcogidi Oct 15, 2024
15dc0e2
Removed dataset_info
Negiiiin Oct 15, 2024
29bad87
Resolved pre-commit errors
Negiiiin Oct 15, 2024
b0993ea
Debugged datasets
Negiiiin Oct 17, 2024
ac5c9fd
Debugged datasets
Negiiiin Oct 17, 2024
05ee172
cleanup
fcogidi Oct 17, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletions .github/workflows/integration_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,14 +33,18 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/[email protected]
- name: Install poetry
run: python3 -m pip install --upgrade pip && python3 -m pip install poetry
- name: Install and configure Poetry
uses: snok/install-poetry@v1
with:
virtualenvs-create: true
virtualenvs-in-project: true
- uses: actions/[email protected]
with:
python-version: '3.10'
cache: 'poetry'
- name: Install dependencies and check code
run: |
poetry env use '3.10'
source $(poetry env info --path)/bin/activate
source .venv/bin/activate
poetry install --with test
pytest -m integration_test
44 changes: 23 additions & 21 deletions mmlearn/conf/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -151,27 +151,29 @@ class MMLearnConf:
},
metadata={"help": "Configuration for torch.jit.compile."},
)
hydra: HydraConf = HydraConf(
searchpath=["pkg://mmlearn.conf"],
run=RunDir(
dir=SI("./outputs/${experiment_name}/${now:%Y-%m-%d}/${now:%H-%M-%S}")
),
sweep=SweepDir(
dir=SI("./outputs/${experiment_name}/${now:%Y-%m-%d}/${now:%H-%M-%S}"),
subdir=SI("${hydra.job.num}_${hydra.job.id}"),
),
help=HelpConf(
app_name="mmlearn",
header="mmlearn: A modular framework for research on multimodal representation learning.",
),
job=JobConf(
name=II("experiment_name"),
env_set={
"NCCL_IB_DISABLE": "1", # disable InfiniBand (the Vector cluster does not have it)
"TORCH_NCCL_ASYNC_ERROR_HANDLING": "3",
"HYDRA_FULL_ERROR": "1",
},
),
hydra: HydraConf = field(
default_factory=lambda: HydraConf(
searchpath=["pkg://mmlearn.conf"],
run=RunDir(
dir=SI("./outputs/${experiment_name}/${now:%Y-%m-%d}/${now:%H-%M-%S}")
),
sweep=SweepDir(
dir=SI("./outputs/${experiment_name}/${now:%Y-%m-%d}/${now:%H-%M-%S}"),
subdir=SI("${hydra.job.num}_${hydra.job.id}"),
),
help=HelpConf(
app_name="mmlearn",
header="mmlearn: A modular framework for research on multimodal representation learning.",
),
job=JobConf(
name=II("experiment_name"),
env_set={
"NCCL_IB_DISABLE": "1",
"TORCH_NCCL_ASYNC_ERROR_HANDLING": "3",
"HYDRA_FULL_ERROR": "1",
},
),
)
)


Expand Down
Loading