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

RegistryMixin improved alias management #404

Merged
merged 11 commits into from
Jan 23, 2024
Merged

RegistryMixin improved alias management #404

merged 11 commits into from
Jan 23, 2024

Conversation

dbogunowicz
Copy link
Contributor

@dbogunowicz dbogunowicz commented Dec 5, 2023 •
edited
Loading

Feature Description

Adds additional features the the RegistryMixin:

  1. Separates concept of name and alias. Now, we can only have one name and several aliases
  2. Registered names and aliases can be independently inspected using the appropriate methods
  3. Registering and looking up names will be now robust wrt underscores and spaces (see the docstrings and tests)
  4. Improves tests so their are more readable and extendable

@dbogunowicz dbogunowicz mentioned this pull request Dec 21, 2023
Merged
bfineran
bfineran reviewed Dec 21, 2023
View reviewed changes
src/sparsezoo/utils/registry.py Outdated Show resolved Hide resolved
src/sparsezoo/utils/registry.py Show resolved Hide resolved
src/sparsezoo/utils/registry.py Show resolved Hide resolved
Satrat
Satrat previously approved these changes Jan 17, 2024
View reviewed changes
Copy link
Contributor

@Satrat Satrat left a comment

Choose a reason for hiding this comment

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

LGTM, would just vote to standardize aliases in addition to names!

src/sparsezoo/utils/registry.py Show resolved Hide resolved
@dbogunowicz
Copy link
Contributor Author

@bfineran @Satrat you are both right, standardising the alias is necessary. Introduced appropriate changes.

@dbogunowicz dbogunowicz merged commit 2532f7b into main Jan 23, 2024
4 checks passed
@dbogunowicz dbogunowicz deleted the feature/damian/hyphens_underscore branch January 23, 2024 15:14
@dbogunowicz dbogunowicz mentioned this pull request Jan 23, 2024
Merged
@dbogunowicz dbogunowicz mentioned this pull request Jan 23, 2024
Merged
dbogunowicz added a commit that referenced this pull request Jan 24, 2024
@dbogunowicz
RegistryMixin improved alias management (#404)
79d5de2 
* initial commit

* add docstrings

* simplify

* hardening

* refactor

* format registry lookup strings to be lowercases

* standardise aliases
@dbogunowicz dbogunowicz mentioned this pull request Jan 24, 2024
Merged
3 tasks
dbogunowicz added a commit that referenced this pull request Jan 24, 2024
@dbogunowicz @rahul-tuli
[Cherry-Picks] for 1.7 as of Wed, Jan 24th, 2024 11:01PM (#413)
3fc414d 
* `RegistryMixin` improved alias management (#404)

* initial commit

* add docstrings

* simplify

* hardening

* refactor

* format registry lookup strings to be lowercases

* standardise aliases

* Move evaluator registry (#411)

* More control over external data size (#412)

---------

Co-authored-by: Rahul Tuli <rahul@neuralmagic.com>
Satrat added a commit that referenced this pull request Feb 22, 2024
@Satrat @dbogunowicz
@rahul-tuli @dsikka @bfineran @horheynm
[Cherry Picks] Analyze Bug Fixes (Updated) (#465)
edf177e 
* `RegistryMixin` improved alias management (#404)

* initial commit

* add docstrings

* simplify

* hardening

* refactor

* format registry lookup strings to be lowercases

* standardise aliases

* Move evaluator registry (#411)

* More control over external data size (#412)

* When splitting external data, avoid renaming `model.data` to `model.data.1` if only one external data file gets eventually saved (#414)

* [model.download] fix function returning nothing (#420)

* [BugFix] Path not expanded (#418)

* [Fix] Allow for processing Path in the sparsezoo analysis (#417)

* Raise TypeError instead of ValueError (#426)

* Fix misleading docstring (#416)

Add test

* add support for benchmark.yaml (#415)

* add support for benchmark.yaml

recent zoo models use `benchmark.yaml` instead of `benchmarks.yaml`. adding this additional pathway so `benchmark.yaml` is downloaded in the bulk model download

* update files filter

* fix tests

---------

Co-authored-by: dbogunowicz <damian@neuralmagic.com>

* [BugFix] Add analyze to init (#421)

* Add analyze to init

* Move onnxruntime to deps

* Print model analysis (#423)

* [model.download] fix function returning nothing (#420)

* [BugFix] Path not expanded (#418)

* print model-analysis

* [Fix] Allow for processing Path in the sparsezoo analysis (#417)

* add print statement at the end of cli run

---------

Co-authored-by: Dipika Sikka <dipikasikka1@gmail.com>
Co-authored-by: Rahul Tuli <rahul@neuralmagic.com>
Co-authored-by: dbogunowicz <97082108+dbogunowicz@users.noreply.github.com>

* Omit scalar weight (#424)

* ommit scalar weights:

* remove unwanted files

* comment

* Update src/sparsezoo/utils/onnx/analysis.py

Co-authored-by: Benjamin Fineran <bfineran@users.noreply.github.com>

---------

Co-authored-by: Benjamin Fineran <bfineran@users.noreply.github.com>

---------

Co-authored-by: George <george@neuralmagic.com>
Co-authored-by: Dipika Sikka <dipikasikka1@gmail.com>
Co-authored-by: dbogunowicz <97082108+dbogunowicz@users.noreply.github.com>
Co-authored-by: Benjamin Fineran <bfineran@users.noreply.github.com>

* update analyze help message for correctness (#432)

* initial commit (#430)

* [sparsezoo.analyze] Fix pathway such that it works for larger models (#437)

* fix analyze to work with larger models

* update for failing tests; add comments

* Update src/sparsezoo/utils/onnx/external_data.py

Co-authored-by: dbogunowicz <97082108+dbogunowicz@users.noreply.github.com>

---------

Co-authored-by: Dipika Sikka <dipikasikka1@gmail.coom>
Co-authored-by: dbogunowicz <97082108+dbogunowicz@users.noreply.github.com>

* Delete hehe.py (#439)

* Download deployment dir for llms (#435)

* Download deployment dir for llms

* Use path instead of download

* only set save_as_external_data to true if the model originally had external data (#442)

* Add Channel Wise Quantization Support (#441)

* Chunk download (#429)

* chunk download, break down into 10

* lint

* threads download

* draft

* chunk download draft

* job based download and combining/deleteing chunks

* delete old code

* lint

* fix num jobs if file_size is less than the chunk size

* doc string and return types

* test

* lint

* fix type hints (#445)

* fix bug if the value is a dict (#447)

* [deepsparse.analyze] Fix v1 functionality to  work with llms (#451)

* fix equivalent changes made to analyze_v2 such that inference session works for llms; update wanrings to be debug printouts

* typo

* overwrite file (#450)

Co-authored-by: 21 <a21@21s-MacBook-Pro.local>

* Adds a `numpy_array_representer` to yaml (#454)

on runtime, to avoid serialization issues

* Avoid division by zero (#457)

Avoid log of zero

* op analysis total counts had double sparse counts (#461)

* Rename legacy analyze to analyze_v1 (#459)

* Fixing Quant % Calcuation (#462)

* initial fix

* style

* Include Sparsity in Size Calculation (#463)

* initial fix

* style

* incorporate sparsity into size calculation

* quality

* op analysis total counts had double sparse counts (#461)

* Fixing Quant % Calcuation (#462)

* initial fix

* style

* Include Sparsity in Size Calculation (#463)

* initial fix

* style

* incorporate sparsity into size calculation

* quality

* Revert "Merge branch 'main' into analyze_cherry_picks"

This reverts commit 509fa1a, reversing
changes made to 08f94c4.

---------

Co-authored-by: dbogunowicz <97082108+dbogunowicz@users.noreply.github.com>
Co-authored-by: Rahul Tuli <rahul@neuralmagic.com>
Co-authored-by: Dipika Sikka <dipikasikka1@gmail.com>
Co-authored-by: Benjamin Fineran <bfineran@users.noreply.github.com>
Co-authored-by: dbogunowicz <damian@neuralmagic.com>
Co-authored-by: George <george@neuralmagic.com>
Co-authored-by: Dipika Sikka <dipikasikka1@gmail.coom>
Co-authored-by: 21 <a21@21s-MacBook-Pro.local>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Satrat Satrat Satrat approved these changes

@bfineran bfineran bfineran approved these changes

@dsikka dsikka Awaiting requested review from dsikka

@rahul-tuli rahul-tuli Awaiting requested review from rahul-tuli

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

Successfully merging this pull request may close these issues.

None yet
3 participants
@dbogunowicz @Satrat @bfineran