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

Pydantic v2 migration #5167

Merged
merged 68 commits into from
Aug 22, 2024
Merged

Pydantic v2 migration #5167

Changes from 1 commit
Commits
Show all changes
68 commits
Select commit Hold shift + click to select a range
99323fa
initial changes to migrate to pydantic V2
mrwyattii Feb 21, 2024
3e0979c
update requirements
mrwyattii Feb 21, 2024
4571701
fix migration bug
mrwyattii Feb 21, 2024
643ae42
Merge branch 'master' into mrwyattii/pydantic-2-support
loadams Feb 21, 2024
96fee35
fix inference config type annotations
mrwyattii Feb 21, 2024
dfe47eb
update RTD reqs
mrwyattii Feb 21, 2024
a6f8651
fix error in offload config
mrwyattii Feb 21, 2024
e780745
final fixes and updates to remove deprecated warnings from pydantic
mrwyattii Feb 21, 2024
9037e3c
Merge branch 'master' into mrwyattii/pydantic-2-support
loadams Feb 22, 2024
c12cfe6
Merge branch 'master' into mrwyattii/pydantic-2-support
loadams Feb 26, 2024
e2d075a
Merge branch 'master' into mrwyattii/pydantic-2-support
loadams Feb 27, 2024
fea7c1d
Test with updating thinc version - fixes pydantic on a6000
loadams Feb 27, 2024
5266568
Remove thinc
loadams Feb 27, 2024
65be824
Confirm uninstall of thinc
loadams Feb 27, 2024
ed08718
Also uninstall spacy
loadams Feb 27, 2024
a97e569
Reverting testing commits
loadams Feb 27, 2024
b398ba6
Update packages to support latest pydantic
loadams Feb 27, 2024
43e6367
further changes to support MII
mrwyattii Feb 28, 2024
1e8ba21
Merge branch 'master' into mrwyattii/pydantic-2-support
mrwyattii Mar 2, 2024
b9781e1
Merge branch 'master' into mrwyattii/pydantic-2-support
loadams Mar 4, 2024
ae5fd5b
Merge branch 'master' into mrwyattii/pydantic-2-support
loadams Mar 8, 2024
4969551
Merge branch 'master' into mrwyattii/pydantic-2-support
loadams Apr 4, 2024
cf7bee9
Merge branch 'master' into mrwyattii/pydantic-2-support
loadams Apr 4, 2024
91789b5
Update file that was modified in #5234
loadams Apr 4, 2024
93d3d6a
Merge branch 'master' into mrwyattii/pydantic-2-support
loadams Apr 4, 2024
203f5b7
Update container to newer version rather than updating specific packages
loadams Apr 5, 2024
aea6795
Revert "Update container to newer version rather than updating specif…
loadams Apr 5, 2024
a8658ca
Add comment
loadams Apr 5, 2024
55193a5
Merge branch 'master' into mrwyattii/pydantic-2-support
loadams Apr 8, 2024
4161028
Merge branch 'master' into mrwyattii/pydantic-2-support
loadams Apr 24, 2024
2d5327d
Merge branch 'master' into mrwyattii/pydantic-2-support
tjruwase Apr 27, 2024
0978380
Merge branch 'master' into mrwyattii/pydantic-2-support
loadams May 7, 2024
a7ddc5e
Merge branch 'master' into mrwyattii/pydantic-2-support
loadams May 9, 2024
55d39c0
Merge branch 'master' into mrwyattii/pydantic-2-support
loadams May 16, 2024
fcee6a7
Merge branch 'master' into mrwyattii/pydantic-2-support
loadams May 20, 2024
d80508d
Merge branch 'master' into mrwyattii/pydantic-2-support
loadams May 22, 2024
8c0b98f
Merge branch 'master' into mrwyattii/pydantic-2-support
adk9 May 24, 2024
ace913b
Fix a couple of failing CI tests
adk9 May 28, 2024
aee5f9d
Merge branch 'master' into mrwyattii/pydantic-2-support
loadams May 28, 2024
62ca5f2
Merge branch 'master' into mrwyattii/pydantic-2-support
loadams May 28, 2024
4cb7ac3
Correct fix for dtype validation in DeepSpeedInferenceConfig
adk9 May 28, 2024
45a9c25
Rename model_config to model_conf
adk9 May 28, 2024
96edbbf
Revert "Rename model_config to model_conf"
adk9 May 28, 2024
8c982d2
Merge branch 'master' into mrwyattii/pydantic-2-support
lekurile May 30, 2024
a04de7f
Temporarily checkout PR branch in the nv-accelerate-v100 pipeline
adk9 May 30, 2024
08c16c1
Merge branch 'master' into mrwyattii/pydantic-2-support
adk9 Jun 3, 2024
75640e3
PR 2814 is now merged into accelerate/master
adk9 Jun 6, 2024
d72db03
Merge branch 'master' into mrwyattii/pydantic-2-support
adk9 Jun 6, 2024
b97d514
Merge branch 'master' into mrwyattii/pydantic-2-support
adk9 Jun 10, 2024
0ac9533
Merge branch 'master' into mrwyattii/pydantic-2-support
adk9 Jun 12, 2024
437ecee
Merge branch 'master' into mrwyattii/pydantic-2-support
adk9 Jun 14, 2024
ca9c8ef
Merge branch 'master' into mrwyattii/pydantic-2-support
adk9 Jun 18, 2024
670ac94
Merge branch 'master' into mrwyattii/pydantic-2-support
loadams Jun 26, 2024
f973393
Merge branch 'master' into mrwyattii/pydantic-2-support
loadams Jun 26, 2024
09fa6b5
Merge branch 'master' into mrwyattii/pydantic-2-support
adk9 Jun 27, 2024
5d8fb2d
Merge branch 'master' into mrwyattii/pydantic-2-support
loadams Jul 1, 2024
1cbf3e1
Merge branch 'master' into mrwyattii/pydantic-2-support
loadams Jul 1, 2024
b3804ad
Merge branch 'master' into mrwyattii/pydantic-2-support
loadams Jul 12, 2024
41fc635
Merge branch 'master' into mrwyattii/pydantic-2-support
adk9 Jul 16, 2024
9f65563
Merge branch 'master' into mrwyattii/pydantic-2-support
loadams Jul 23, 2024
79c0835
Merge branch 'master' into mrwyattii/pydantic-2-support
loadams Jul 23, 2024
295a806
Merge branch 'master' into mrwyattii/pydantic-2-support
loadams Jul 25, 2024
1e3925e
Merge branch 'master' into mrwyattii/pydantic-2-support
adk9 Aug 1, 2024
1eec90f
Merge branch 'master' into mrwyattii/pydantic-2-support
loadams Aug 14, 2024
c82a73c
Merge branch 'master' into mrwyattii/pydantic-2-support
loadams Aug 15, 2024
75a9288
Merge branch 'master' into mrwyattii/pydantic-2-support
loadams Aug 19, 2024
e557489
Merge branch 'master' into mrwyattii/pydantic-2-support
loadams Aug 20, 2024
628cf25
Merge branch 'master' into mrwyattii/pydantic-2-support
loadams Aug 21, 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
Prev Previous commit
Next Next commit
Revert "Rename model_config to model_conf" 
This reverts commit 45a9c25.
  • Loading branch information
@adk9
adk9 committed May 28, 2024
commit 96edbbf8100da3dbb0efb5157b675cc5642b89af
2 changes: 1 addition & 1 deletion deepspeed/runtime/config_utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ def _deprecated_fields_check(self):
if field_info.json_schema_extra and field_info.json_schema_extra.get("deprecated", False):
self._process_deprecated_field(field_name)

model_conf = ConfigDict(
model_config = ConfigDict(
validate_default=True,
validate_assignment=True,
use_enum_values=True,
Expand Down
Loading