Skip to content

Commit

Permalink
Merge branch 'main' into schema-perms-user-error
Browse files Browse the repository at this point in the history
  • Loading branch information
KuuCi authored Sep 25, 2024
2 parents d3eeb88 + 275a2a4 commit c1a6ef7
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 4 deletions.
8 changes: 4 additions & 4 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
]

install_requires = [
'mosaicml[libcloud,wandb,oci,gcs,mlflow]>=0.24.1,<0.25',
'mosaicml[libcloud,wandb,oci,gcs,mlflow]>=0.25.0,<0.26',
'mlflow>=2.14.1,<2.17',
'accelerate>=0.25,<0.34', # for HF inference `device_map`
'transformers>=4.43.2,<4.44',
Expand Down Expand Up @@ -91,15 +91,15 @@
]

extra_deps['databricks'] = [
'mosaicml[databricks]>=0.24.1,<0.25',
'mosaicml[databricks]>=0.25.0,<0.26',
'numpy<2',
'databricks-sql-connector>=3,<4',
'databricks-connect==14.1.0',
'lz4>=4,<5',
]

extra_deps['tensorboard'] = [
'mosaicml[tensorboard]>=0.24.1,<0.25',
'mosaicml[tensorboard]>=0.25.0,<0.26',
]

# Flash 2 group kept for backwards compatibility
Expand All @@ -110,7 +110,7 @@
extra_deps['gpu'] = copy.deepcopy(extra_deps['gpu-flash2'])

extra_deps['peft'] = [
'mosaicml[peft]>=0.24.1,<0.25',
'mosaicml[peft]>=0.25.0,<0.26',
]

extra_deps['openai'] = [
Expand Down
2 changes: 2 additions & 0 deletions tests/a_scripts/inference/test_convert_composer_to_hf.py
Original file line number Diff line number Diff line change
Expand Up @@ -1563,6 +1563,8 @@ def test_mptmoe_huggingface_conversion_callback(

# Check output equivalence
loaded_model = loaded_model.cuda().bfloat16() # type: ignore
for k, v in batch.items():
batch[k] = v.cuda()
loaded_model_logits = loaded_model(
input_ids=batch.get('input_ids', None),
attention_mask=batch.get('attention_mask', None),
Expand Down

0 comments on commit c1a6ef7

Please sign in to comment.