Skip to content

Commit

Permalink
replace MACE git install with mace-torch pypi pkg
Browse files Browse the repository at this point in the history
  • Loading branch information
janosh committed Jan 11, 2024
1 parent ce513a2 commit 0384169
Show file tree
Hide file tree
Showing 4 changed files with 3 additions and 8 deletions.
1 change: 0 additions & 1 deletion .github/workflows/testing.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@ jobs:
- name: Install dependencies
run: |
pip install numpy
pip install mace@git+https://github.com/ACEsuit/mace
pip install --quiet -r requirements.txt -r requirements-ci.txt
pip install -e '.[models]'
- name: pytest
Expand Down
2 changes: 1 addition & 1 deletion .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ ci:

repos:
- repo: https://github.com/astral-sh/ruff-pre-commit
rev: v0.1.9
rev: v0.1.11
hooks:
- id: ruff
args: [--fix]
Expand Down
2 changes: 1 addition & 1 deletion matcalc/neb.py
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ def __init__(

@classmethod
def from_end_images(
cls,
cls: type[NEBCalc],
start_struct: Structure,
end_struct: Structure,
calculator: str | Calculator = "M3GNet-MP-2021.2.8-DIRECT-PES",
Expand Down
6 changes: 1 addition & 5 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -43,9 +43,7 @@ dependencies = ["ase", "joblib", "phonopy", "pymatgen"]
version = "0.0.4"

[project.optional-dependencies]
models = ["chgnet", "matgl>=0.9.0"]
# can't add "mace@git+https://github.com/ACEsuit/mace" due to requires_dist Error:
# Can't have direct dependency on git repo when attempting PyPI upload
models = ["chgnet", "mace-torch", "matgl>=0.9.0"]

[tool.setuptools]
packages = ["matcalc"]
Expand All @@ -56,9 +54,7 @@ line-length = 120
select = ["ALL"]
ignore = [
"ANN101",
"ANN102",
"ANN401",
"B019", # functools.lru_cache on methods can lead to memory leaks
"COM812", # trailing comma missing
"D105", # Missing docstring in magic method
"D205", # 1 blank line required between summary line and description
Expand Down

0 comments on commit 0384169

Please sign in to comment.