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

Ep/add fixres resnext101 32x48d wsl #1103

Merged
merged 4 commits into from
Sep 26, 2024

Conversation

pellegreene
Copy link
Contributor

No description provided.

Ethan Pellegrini added 2 commits July 30, 2024 08:45
@pellegreene pellegreene self-assigned this Jul 30, 2024
Copy link
Member

@mike-ferguson mike-ferguson left a comment

Choose a reason for hiding this comment

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

lgtm pending test results

from brainscore_vision.model_helpers.activations.pytorch import PytorchWrapper
from fixres.hubconf import load_state_dict_from_url
from fixres.transforms_v2 import get_transforms
from model_helpers.activations.pytorch import load_images
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
from model_helpers.activations.pytorch import load_images
from brainscore_vision.model_helpers.activations.pytorch import load_images

@pellegreene pellegreene reopened this Jul 30, 2024
@mike-ferguson
Copy link
Member

Opening and closing just to test new Jenkins flow

@mike-ferguson mike-ferguson merged commit 54a8a34 into master Sep 26, 2024
10 of 13 checks passed
@mike-ferguson mike-ferguson deleted the ep/add_fixres_resnext101_32x48d_wsl branch September 26, 2024 15:21
KartikP added a commit that referenced this pull request Sep 26, 2024
* point to pypi instead of git (#1236)

* update dependency names w/ hyphens (#1238)

* point to pypi instead of git

* Update pyproject.toml with hyphens

* Custom trained scaling models (#1206)

* Custom trained models

* Fix missing library

* Fix a missing library

* Not every model needs timm

* Trigger build tests

* Use model_id instead of model_name to ensure correct weights are loaded

* timm is missing from deit models

* timm is missing from deit models

* Fix requirements.txt newline

* Package models into a single plugin

* Update requirements.txt

* Update requirements.txt

* Update requirements.txt

* Change the order of models

* Update model.py

* Disable resultcaching for vits

* Tests reordering

* Revert tests back

* Update model.py

* Update model.py

* Update to sync workflow (#1248)

* Update to sync workflow

Adds dynamic PR title and commit history included in PR description.

Adds `No changes detected` job.

* Update no_changes condition and text

Refined condition to not require PR_merge because that is when this condition SHOULD be triggered to indicate the correct status of the workflow.

* enable unverified SSL for scaling models (#1263)

* Add pathfinder benchmark (#1193)

* add pathfinder task

* update data packaging

* modify benchmark file

* add benchmark tests

* upload datasets

* add some tests and fix some bugs

* add dataset tests

* fix errors with plugin imports

* add error with stimulus set naming test

* fix bug with field name test

* remove field from test that shouldn't be there

* fix model loading bug in test

* fix ceiled test value -> raw test value

---------

Co-authored-by: Martin Schrimpf <[email protected]>

* Ep/add fixres resnext101 32x48d wsl (#1103)

* Add model

* Modify test

* Fix imports

---------

Co-authored-by: Ethan Pellegrini <[email protected]>
Co-authored-by: Kartik Pradeepan <[email protected]>

---------

Co-authored-by: Sam Winebrake <[email protected]>
Co-authored-by: Abdulkadir Gokce <[email protected]>
Co-authored-by: Ben Lonnqvist <[email protected]>
Co-authored-by: Martin Schrimpf <[email protected]>
Co-authored-by: pellegreene <[email protected]>
Co-authored-by: Ethan Pellegrini <[email protected]>
KartikP added a commit that referenced this pull request Sep 26, 2024
* point to pypi instead of git (#1236)

* update dependency names w/ hyphens (#1238)

* point to pypi instead of git

* Update pyproject.toml with hyphens

* Custom trained scaling models (#1206)

* Custom trained models

* Fix missing library

* Fix a missing library

* Not every model needs timm

* Trigger build tests

* Use model_id instead of model_name to ensure correct weights are loaded

* timm is missing from deit models

* timm is missing from deit models

* Fix requirements.txt newline

* Package models into a single plugin

* Update requirements.txt

* Update requirements.txt

* Update requirements.txt

* Change the order of models

* Update model.py

* Disable resultcaching for vits

* Tests reordering

* Revert tests back

* Update model.py

* Update model.py

* Update to sync workflow (#1248)

* Update to sync workflow

Adds dynamic PR title and commit history included in PR description.

Adds `No changes detected` job.

* Update no_changes condition and text

Refined condition to not require PR_merge because that is when this condition SHOULD be triggered to indicate the correct status of the workflow.

* enable unverified SSL for scaling models (#1263)

* Add pathfinder benchmark (#1193)

* add pathfinder task

* update data packaging

* modify benchmark file

* add benchmark tests

* upload datasets

* add some tests and fix some bugs

* add dataset tests

* fix errors with plugin imports

* add error with stimulus set naming test

* fix bug with field name test

* remove field from test that shouldn't be there

* fix model loading bug in test

* fix ceiled test value -> raw test value

---------

Co-authored-by: Martin Schrimpf <[email protected]>

* Ep/add fixres resnext101 32x48d wsl (#1103)

* Add model

* Modify test

* Fix imports

---------

Co-authored-by: Ethan Pellegrini <[email protected]>
Co-authored-by: Kartik Pradeepan <[email protected]>

* Ep/add inception v4 (#1099)

* Add inception_v4

* Update model.py

* Update model.py

* Fix layer mapping

* Fix imports

---------

Co-authored-by: Ethan Pellegrini <[email protected]>

---------

Co-authored-by: Sam Winebrake <[email protected]>
Co-authored-by: Abdulkadir Gokce <[email protected]>
Co-authored-by: Ben Lonnqvist <[email protected]>
Co-authored-by: Martin Schrimpf <[email protected]>
Co-authored-by: pellegreene <[email protected]>
Co-authored-by: Ethan Pellegrini <[email protected]>
KartikP added a commit that referenced this pull request Sep 28, 2024
* point to pypi instead of git (#1236)

* update dependency names w/ hyphens (#1238)

* point to pypi instead of git

* Update pyproject.toml with hyphens

* Custom trained scaling models (#1206)

* Custom trained models

* Fix missing library

* Fix a missing library

* Not every model needs timm

* Trigger build tests

* Use model_id instead of model_name to ensure correct weights are loaded

* timm is missing from deit models

* timm is missing from deit models

* Fix requirements.txt newline

* Package models into a single plugin

* Update requirements.txt

* Update requirements.txt

* Update requirements.txt

* Change the order of models

* Update model.py

* Disable resultcaching for vits

* Tests reordering

* Revert tests back

* Update model.py

* Update model.py

* Update to sync workflow (#1248)

* Update to sync workflow

Adds dynamic PR title and commit history included in PR description.

Adds `No changes detected` job.

* Update no_changes condition and text

Refined condition to not require PR_merge because that is when this condition SHOULD be triggered to indicate the correct status of the workflow.

* enable unverified SSL for scaling models (#1263)

* Add pathfinder benchmark (#1193)

* add pathfinder task

* update data packaging

* modify benchmark file

* add benchmark tests

* upload datasets

* add some tests and fix some bugs

* add dataset tests

* fix errors with plugin imports

* add error with stimulus set naming test

* fix bug with field name test

* remove field from test that shouldn't be there

* fix model loading bug in test

* fix ceiled test value -> raw test value

---------

Co-authored-by: Martin Schrimpf <[email protected]>

* Ep/add fixres resnext101 32x48d wsl (#1103)

* Add model

* Modify test

* Fix imports

---------

Co-authored-by: Ethan Pellegrini <[email protected]>
Co-authored-by: Kartik Pradeepan <[email protected]>

* Ep/add inception v4 (#1099)

* Add inception_v4

* Update model.py

* Update model.py

* Fix layer mapping

* Fix imports

---------

Co-authored-by: Ethan Pellegrini <[email protected]>

* Fixed pip install git (#1280)

---------

Co-authored-by: Sam Winebrake <[email protected]>
Co-authored-by: Abdulkadir Gokce <[email protected]>
Co-authored-by: Ben Lonnqvist <[email protected]>
Co-authored-by: Martin Schrimpf <[email protected]>
Co-authored-by: pellegreene <[email protected]>
Co-authored-by: Ethan Pellegrini <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants