Skip to content
This repository was archived by the owner on Jun 3, 2025. It is now read-only.

[BugFix] Adds a numpy_array_representer to yaml #454

Merged
merged 1 commit into from
Feb 15, 2024
Merged

[BugFix] Adds a numpy_array_representer to yaml #454

merged 1 commit into from
Feb 15, 2024

Conversation

rahul-tuli
Copy link
Member

@rahul-tuli rahul-tuli commented Feb 15, 2024 •
edited
Loading

This PR adds numpy serialization support for all our Pydantic BaseModel(s) that are yaml_serializable

Test Code:

from sparsezoo.analyze import ModelAnalysis
import yaml

def save_model_analysis(model_path, save_path):
    analysis = ModelAnalysis.create(model_path)
    analysis.yaml(file_path=save_path)

def load_model_analysis(save_path):
    with open(save_path, 'r') as file:
       return yaml.safe_load(file)


if __name__ == "__main__":
    model_path ="/network/alexandre/tyler/single_layer/deployment/model.onnx"
    save_path = "test-analysis.yaml"
    save_model_analysis(model_path, save_path)
    loaded_yaml = load_model_analysis(save_path)

The test-analysis.yaml file has been attached with this description (I had to change the name to test-analysis.log cause GitHub doesn't support yaml file upload in PR description)

test-analysis.log

@rahul-tuli
Adds a numpy_array_representer to yaml
02a71c9 
on runtime, to avoid serialization issues
@rahul-tuli rahul-tuli self-assigned this Feb 15, 2024
@rahul-tuli rahul-tuli mentioned this pull request Feb 15, 2024
Merged
@rahul-tuli rahul-tuli merged commit 7a82196 into main Feb 15, 2024
@rahul-tuli rahul-tuli deleted the support-numpy-to-yaml-serialization branch February 15, 2024 20:36
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 subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@Satrat Satrat Awaiting requested review from Satrat

@bfineran bfineran Awaiting requested review from bfineran

@dbogunowicz dbogunowicz Awaiting requested review from dbogunowicz

2 more reviewers

@dsikka dsikka dsikka approved these changes

@horheynm horheynm horheynm approved these changes

Reviewers whose approvals may not affect merge requirements
Assignees

@rahul-tuli rahul-tuli

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@rahul-tuli @dsikka @horheynm