From a567a992fb73b1b413db48d1c2e0047ba8d9e6c7 Mon Sep 17 00:00:00 2001 From: Imran Qureshi Date: Sun, 1 Sep 2024 18:13:59 -0700 Subject: [PATCH 1/5] fix for Mac silicon --- esm/utils/misc.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/esm/utils/misc.py b/esm/utils/misc.py index 45622834..561fb394 100644 --- a/esm/utils/misc.py +++ b/esm/utils/misc.py @@ -186,7 +186,7 @@ def fp32_autocast_context(device_type: str) -> ContextManager[torch.amp.autocast Returns: An autocast context manager with the specified behavior. """ - if device_type == "cpu": + if device_type == "cpu" or device_type == "mps": return torch.amp.autocast(device_type, enabled=False) # type: ignore elif device_type == "cuda": return torch.amp.autocast(device_type, dtype=torch.float32) # type: ignore From d16eff0a7b6bae631a4a447eb5c74ed3a03c9467 Mon Sep 17 00:00:00 2001 From: Imran Qureshi Date: Sun, 1 Sep 2024 18:25:20 -0700 Subject: [PATCH 2/5] fix for Mac silicon --- esm/utils/misc.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/esm/utils/misc.py b/esm/utils/misc.py index 561fb394..dd583b3e 100644 --- a/esm/utils/misc.py +++ b/esm/utils/misc.py @@ -1,5 +1,6 @@ import math from collections import defaultdict +from contextlib import nullcontext from typing import ContextManager, Sequence, TypeVar import numpy as np @@ -186,8 +187,11 @@ def fp32_autocast_context(device_type: str) -> ContextManager[torch.amp.autocast Returns: An autocast context manager with the specified behavior. """ - if device_type == "cpu" or device_type == "mps": + if device_type == "cpu": return torch.amp.autocast(device_type, enabled=False) # type: ignore + elif device_type == "mps": + # For CPU and MPS, just return a no-op context manager (nullcontext) + return nullcontext() elif device_type == "cuda": return torch.amp.autocast(device_type, dtype=torch.float32) # type: ignore else: From 894f03fcf82e42b243c11a30c77d49c186f718bc Mon Sep 17 00:00:00 2001 From: Imran Qureshi Date: Sun, 1 Sep 2024 18:26:15 -0700 Subject: [PATCH 3/5] fix for Mac silicon --- esm/utils/misc.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/esm/utils/misc.py b/esm/utils/misc.py index dd583b3e..38660261 100644 --- a/esm/utils/misc.py +++ b/esm/utils/misc.py @@ -190,7 +190,7 @@ def fp32_autocast_context(device_type: str) -> ContextManager[torch.amp.autocast if device_type == "cpu": return torch.amp.autocast(device_type, enabled=False) # type: ignore elif device_type == "mps": - # For CPU and MPS, just return a no-op context manager (nullcontext) + # For MPS, just return a no-op context manager (nullcontext) since MPS does not support autocast. return nullcontext() elif device_type == "cuda": return torch.amp.autocast(device_type, dtype=torch.float32) # type: ignore From ec622b90f3957ad033a9a80bdd709e2f4773ffdd Mon Sep 17 00:00:00 2001 From: Imran Qureshi Date: Sun, 1 Sep 2024 18:46:29 -0700 Subject: [PATCH 4/5] add .gitignore --- .gitignore | 164 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 164 insertions(+) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 00000000..b8c5bcb5 --- /dev/null +++ b/.gitignore @@ -0,0 +1,164 @@ +# Byte-compiled / optimized / DLL files +__pycache__/ +*.py[cod] +*$py.class + +# C extensions +*.so + +# Distribution / packaging +.Python +build/ +develop-eggs/ +dist/ +downloads/ +eggs/ +.eggs/ +lib/ +lib64/ +parts/ +sdist/ +var/ +wheels/ +share/python-wheels/ +*.egg-info/ +.installed.cfg +*.egg +MANIFEST + +# PyInstaller +# Usually these files are written by a python script from a template +# before PyInstaller builds the exe, so as to inject date/other infos into it. +*.manifest +*.spec + +# Installer logs +pip-log.txt +pip-delete-this-directory.txt + +# Unit test / coverage reports +htmlcov/ +.tox/ +.nox/ +.coverage +.coverage.* +.cache +nosetests.xml +coverage.xml +*.cover +*.py,cover +.hypothesis/ +.pytest_cache/ +cover/ + +# Translations +*.mo +*.pot + +# Django stuff: +*.log +local_settings.py +db.sqlite3 +db.sqlite3-journal + +# Flask stuff: +instance/ +.webassets-cache + +# Scrapy stuff: +.scrapy + +# Sphinx documentation +docs/_build/ + +# PyBuilder +.pybuilder/ +target/ + +# Jupyter Notebook +.ipynb_checkpoints + +# IPython +profile_default/ +ipython_config.py + +# pyenv +# For a library or package, you might want to ignore these files since the code is +# intended to run in multiple environments; otherwise, check them in: +# .python-version + +# pipenv +# According to pypa/pipenv#598, it is recommended to include Pipfile.lock in version control. +# However, in case of collaboration, if having platform-specific dependencies or dependencies +# having no cross-platform support, pipenv may install dependencies that don't work, or not +# install all needed dependencies. +#Pipfile.lock + +# poetry +# Similar to Pipfile.lock, it is generally recommended to include poetry.lock in version control. +# This is especially recommended for binary packages to ensure reproducibility, and is more +# commonly ignored for libraries. +# https://python-poetry.org/docs/basic-usage/#commit-your-poetrylock-file-to-version-control +#poetry.lock + +# pdm +# Similar to Pipfile.lock, it is generally recommended to include pdm.lock in version control. +#pdm.lock +# pdm stores project-wide configurations in .pdm.toml, but it is recommended to not include it +# in version control. +# https://pdm.fming.dev/latest/usage/project/#working-with-version-control +.pdm.toml +.pdm-python +.pdm-build/ + +# PEP 582; used by e.g. github.com/David-OConnor/pyflow and github.com/pdm-project/pdm +__pypackages__/ + +# Celery stuff +celerybeat-schedule +celerybeat.pid + +# SageMath parsed files +*.sage.py + +# Environments +.env +.venv +env/ +venv/ +ENV/ +env.bak/ +venv.bak/ + +# Spyder project settings +.spyderproject +.spyproject + +# Rope project settings +.ropeproject + +# mkdocs documentation +/site + +# mypy +.mypy_cache/ +.dmypy.json +dmypy.json + +# Pyre type checker +.pyre/ + +# pytype static type analyzer +.pytype/ + +# Cython debug symbols +cython_debug/ + +# PyCharm +# JetBrains specific template is maintained in a separate JetBrains.gitignore that can +# be found at https://github.com/github/gitignore/blob/main/Global/JetBrains.gitignore +# and can be added to the global gitignore or merged into this file. For a more nuclear +# option (not recommended) you can uncomment the following to ignore the entire idea folder. +#.idea/ +/*.pdb +/.idea/ From ff009b21cf75e733c51816161465054c821dcff8 Mon Sep 17 00:00:00 2001 From: Imran Qureshi Date: Wed, 9 Oct 2024 13:03:13 -0700 Subject: [PATCH 5/5] remove .gitignore --- .gitignore | 164 ----------------------------------------------------- 1 file changed, 164 deletions(-) delete mode 100644 .gitignore diff --git a/.gitignore b/.gitignore deleted file mode 100644 index b8c5bcb5..00000000 --- a/.gitignore +++ /dev/null @@ -1,164 +0,0 @@ -# Byte-compiled / optimized / DLL files -__pycache__/ -*.py[cod] -*$py.class - -# C extensions -*.so - -# Distribution / packaging -.Python -build/ -develop-eggs/ -dist/ -downloads/ -eggs/ -.eggs/ -lib/ -lib64/ -parts/ -sdist/ -var/ -wheels/ -share/python-wheels/ -*.egg-info/ -.installed.cfg -*.egg -MANIFEST - -# PyInstaller -# Usually these files are written by a python script from a template -# before PyInstaller builds the exe, so as to inject date/other infos into it. -*.manifest -*.spec - -# Installer logs -pip-log.txt -pip-delete-this-directory.txt - -# Unit test / coverage reports -htmlcov/ -.tox/ -.nox/ -.coverage -.coverage.* -.cache -nosetests.xml -coverage.xml -*.cover -*.py,cover -.hypothesis/ -.pytest_cache/ -cover/ - -# Translations -*.mo -*.pot - -# Django stuff: -*.log -local_settings.py -db.sqlite3 -db.sqlite3-journal - -# Flask stuff: -instance/ -.webassets-cache - -# Scrapy stuff: -.scrapy - -# Sphinx documentation -docs/_build/ - -# PyBuilder -.pybuilder/ -target/ - -# Jupyter Notebook -.ipynb_checkpoints - -# IPython -profile_default/ -ipython_config.py - -# pyenv -# For a library or package, you might want to ignore these files since the code is -# intended to run in multiple environments; otherwise, check them in: -# .python-version - -# pipenv -# According to pypa/pipenv#598, it is recommended to include Pipfile.lock in version control. -# However, in case of collaboration, if having platform-specific dependencies or dependencies -# having no cross-platform support, pipenv may install dependencies that don't work, or not -# install all needed dependencies. -#Pipfile.lock - -# poetry -# Similar to Pipfile.lock, it is generally recommended to include poetry.lock in version control. -# This is especially recommended for binary packages to ensure reproducibility, and is more -# commonly ignored for libraries. -# https://python-poetry.org/docs/basic-usage/#commit-your-poetrylock-file-to-version-control -#poetry.lock - -# pdm -# Similar to Pipfile.lock, it is generally recommended to include pdm.lock in version control. -#pdm.lock -# pdm stores project-wide configurations in .pdm.toml, but it is recommended to not include it -# in version control. -# https://pdm.fming.dev/latest/usage/project/#working-with-version-control -.pdm.toml -.pdm-python -.pdm-build/ - -# PEP 582; used by e.g. github.com/David-OConnor/pyflow and github.com/pdm-project/pdm -__pypackages__/ - -# Celery stuff -celerybeat-schedule -celerybeat.pid - -# SageMath parsed files -*.sage.py - -# Environments -.env -.venv -env/ -venv/ -ENV/ -env.bak/ -venv.bak/ - -# Spyder project settings -.spyderproject -.spyproject - -# Rope project settings -.ropeproject - -# mkdocs documentation -/site - -# mypy -.mypy_cache/ -.dmypy.json -dmypy.json - -# Pyre type checker -.pyre/ - -# pytype static type analyzer -.pytype/ - -# Cython debug symbols -cython_debug/ - -# PyCharm -# JetBrains specific template is maintained in a separate JetBrains.gitignore that can -# be found at https://github.com/github/gitignore/blob/main/Global/JetBrains.gitignore -# and can be added to the global gitignore or merged into this file. For a more nuclear -# option (not recommended) you can uncomment the following to ignore the entire idea folder. -#.idea/ -/*.pdb -/.idea/