Skip to content

Commit

Permalink
Merge pull request #16 from amazon-science/adivekar
Browse files Browse the repository at this point in the history
[fmcore] Migrations: (i) modules to bears (ii) Pydantic 1.10.15 to >=2.10.5 (iii) external autoenum package.
  • Loading branch information
adivekar-utexas authored Jan 25, 2025
2 parents 86aacc4 + be8fd31 commit 7a7a285
Showing 126 changed files with 1,099 additions and 22,959 deletions.
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -18,4 +18,5 @@ __pycache__/
/doc/_apidoc/
*.swp

.vscode/settings.json
.vscode/settings.json
*.ipynb
31 changes: 10 additions & 21 deletions pyproject.toml
Original file line number Diff line number Diff line change
@@ -10,41 +10,31 @@ authors = [
]
description = "A specialized toolkit for scaling experimental research with Foundation Models."
readme = "README.md"
requires-python = ">=3.11"
requires-python = ">=3.11.11"
classifiers = [
"Programming Language :: Python :: 3",
"Operating System :: OS Independent",
]
license-files = ["LICENSE"]
dependencies = [
"autoenum",
"bears",
"requests",
"pyyaml",
"urllib3",
"pandas==1.*",
"numpy==1.*",
"pydantic==1.10.15",
"scikit-learn",
"xlrd",
"XlsxWriter",
"openpyxl",
"fastparquet",
"pyarrow",
"s3fs",
"tqdm",
"boto3",
"cloudpickle>=3.0.0",
]

[project.optional-dependencies]
all = [
"bears[all]",
"pytest",
"orjson",
"ray==2.9.2",
"ray",
"ray[default]",
"ray[tune]",
"ray[serve]",
"dask[complete]",
"dask==2024.2.0",
"dask",
"gpustat",
"nvitop",
"altair",
@@ -56,8 +46,8 @@ all = [
"hvplot>=0.10.0",
"matplotlib",
"tiktoken",
"torch==2.3.0",
"transformers==4.42.4",
"torch",
"transformers>=4.42.4",
"einops",
"accelerate",
"deepspeed",
@@ -110,7 +100,6 @@ ignore = [
"E731", # lambda-assignment: https://docs.astral.sh/ruff/rules/lambda-assignment/
"E741", # ambiguous-variable-name: https://docs.astral.sh/ruff/rules/ambiguous-variable-name/

## Ignored because of bad interaction with `from typing import *`
"F405", # undefined-local-with-import-star-usage: https://docs.astral.sh/ruff/rules/undefined-local-with-import-star-usage/
"F403", # undefined-local-with-import-star: https://docs.astral.sh/ruff/rules/undefined-local-with-import-star/
## Ignored because it causes no harm (and is needed sometimes):
"F841", # unused-variable: https://docs.astral.sh/ruff/rules/unused-variable/
]
286 changes: 0 additions & 286 deletions requirements.txt

This file was deleted.

3 changes: 2 additions & 1 deletion src/fmcore/__init__.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
## Import in dependency order:
import fmcore.util
_LIBRARY_NAME: str = 'fmcore'
import bears.util
import fmcore.constants
import fmcore.data
import fmcore.framework
2 changes: 1 addition & 1 deletion src/fmcore/algorithm/__init__.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
from importlib import import_module
import os
from pathlib import Path
from fmcore.util.language import String
from bears.util.language import String

__THIS_FILE__ = __file__ ## Needed when calling reload() from outside this file.

Loading

0 comments on commit 7a7a285

Please sign in to comment.