Skip to content

Commit da62256

Browse files
authored
Merge branch 'main' into fairchem_cpp
2 parents d1d59e8 + 8f74b9e commit da62256

166 files changed

Lines changed: 10099 additions & 2339 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/workflows/build_docs.yml

Lines changed: 17 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,11 @@ on:
1212
- "contributor check"
1313
types:
1414
- completed
15+
env:
16+
# `BASE_URL` determines, relative to the root of the domain, the URL that your site is served from.
17+
# E.g., if your site lives at `https://mydomain.org/myproject`, set `BASE_URL=/myproject`.
18+
# If, instead, your site lives at the root of the domain, at `https://mydomain.org`, set `BASE_URL=''`.
19+
BASE_URL: ''
1520

1621
jobs:
1722
build:
@@ -45,8 +50,15 @@ jobs:
4550
with:
4651
status-context: '${{ github.job }}'
4752

48-
- name: Install pandoc and ffmpeg
49-
run: sudo apt-get update && sudo apt-get -y install pandoc ffmpeg
53+
- uses: actions/setup-node@v6
54+
with:
55+
node-version: 18.x
56+
57+
- name: Install Jupyter Book (via myst)
58+
run: npm install -g jupyter-book
59+
60+
- name: Install latexmk
61+
run: sudo apt-get update && sudo apt-get -y install latexmk pandoc ffmpeg imagemagick texlive-xetex
5062

5163
# Install dependencies
5264
- name: Set up Python
@@ -74,8 +86,8 @@ jobs:
7486
run: |
7587
# Convert MyST markdown files to Jupyter notebooks if needed to get download as ipynb buttons
7688
jupytext --to ipynb ./docs/uma_tutorials/*.md
77-
# find ./docs/ -name "*.md" -exec grep -q "format_name: myst" {} \; -print0 | xargs -0 jupytext --to ipynb
78-
jupyter-book build docs
89+
find ./docs/ -name "*.md" -exec grep -q "format_name: myst" {} \; -print0 | xargs -0 jupytext --to ipynb
90+
cd docs && jupyter-book build --html --execute --execute-parallel 1
7991
8092
- name: Upload documentation artifact
8193
uses: actions/upload-artifact@v6
@@ -87,4 +99,4 @@ jobs:
8799
if: always()
88100
uses: ./.github/actions/multi-trigger-cleanup
89101
with:
90-
status-context: '${{ github.job }}'
102+
status-context: '${{ github.job }}'

.github/workflows/stale.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
issues: write
1111
pull-requests: write
1212
steps:
13-
- uses: actions/stale@v10.1.1
13+
- uses: actions/stale@v10.2.0
1414
with:
1515
days-before-stale: 30
1616
days-before-close: 14

.github/workflows/test.yml

Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ jobs:
3535
strategy:
3636
max-parallel: 10
3737
matrix:
38-
python_version: ['3.10', '3.13']
38+
python_version: ['3.11', '3.13']
3939

4040
steps:
4141
- name: Checkout code
@@ -84,13 +84,22 @@ jobs:
8484
make
8585
echo "$(readlink -f .)" >> $GITHUB_PATH
8686
87+
- name: Download large test files
88+
run: coverage run -m fairchem.core.scripts.download_large_files oc
89+
8790
- name: Core tests
8891
env:
8992
HF_TOKEN: ${{ secrets.HF_TOKEN }}
9093
run: |
91-
NCCL_DEBUG=INFO pytest -n auto tests --durations=0 -vv --ignore=tests/demo/ocpapi/tests/integration/ --ignore=tests/applications/ --ignore=tests/perf --ignore=tests/lammps --cov-report=xml --cov=fairchem --junitxml=junit.xml -o junit_family=legacy -c ./packages/fairchem-core/pyproject.toml
94+
NCCL_DEBUG=INFO pytest -n auto -m "not subprocess and not serial and not gpu" tests --durations=0 -vv --ignore=tests/demo/ocpapi/tests/integration/ --ignore=tests/applications/ --ignore=tests/perf --ignore=tests/lammps --cov-report=xml --cov=fairchem --cov-append --junitxml=junit.xml -o junit_family=legacy -c ./packages/fairchem-core/pyproject.toml
95+
96+
- name: Serial CPU tests
97+
env:
98+
HF_TOKEN: ${{ secrets.HF_TOKEN }}
99+
run: |
100+
pytest -m "serial and not gpu" tests -vv --ignore=tests/demo/ocpapi/tests/integration/ --ignore=tests/applications/ --ignore=tests/perf --ignore=tests/lammps --cov-report=xml --cov=fairchem --cov-append --junitxml=junit-serial.xml -o junit_family=legacy -c ./packages/fairchem-core/pyproject.toml
92101
93-
- if: ${{ matrix.python_version == '3.12' || matrix.python_version == '3.13' }}
102+
- if: ${{ matrix.python_version == '3.13' }}
94103
name: codecov-coverage
95104
uses: codecov/codecov-action@v5
96105
with:
@@ -99,11 +108,11 @@ jobs:
99108
token: ${{ secrets.CODECOV_TOKEN }}
100109
verbose: true
101110

102-
- if: ${{ matrix.python_version == '3.12' || matrix.python_version == '3.13' }}
111+
- if: ${{ matrix.python_version == '3.13' }}
103112
name: codecov-test-results
104113
uses: codecov/test-results-action@v1
105114
with:
106-
files: ./junit.xml,./junit-gpu.xml
115+
files: ./junit.xml,./junit-serial.xml,./junit-gpu.xml
107116
token: ${{ secrets.CODECOV_TOKEN }}
108117
commit_parent: ${{ env.HEAD_SHA }}
109118
verbose: true
@@ -146,7 +155,7 @@ jobs:
146155
- name: Install core dependencies and package
147156
run: |
148157
python -m pip install --upgrade pip
149-
pip install packages/fairchem-core[dev] \
158+
pip install packages/fairchem-core[dev,extras] \
150159
packages/fairchem-data-omol[dev] \
151160
packages/fairchem-data-omat \
152161
-r tests/requirements.txt # pin test packages
Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
name: Trim Dependabot PR description
2+
on:
3+
pull_request:
4+
types: [opened]
5+
6+
jobs:
7+
trim:
8+
if: github.actor == 'dependabot[bot]'
9+
runs-on: ubuntu-latest
10+
steps:
11+
- uses: actions/github-script@v7
12+
with:
13+
script: |
14+
const { owner, repo } = context.repo;
15+
const pull_number = context.payload.pull_request.number;
16+
const body = context.payload.pull_request.body;
17+
await github.rest.issues.createComment({
18+
owner,
19+
repo,
20+
issue_number: pull_number,
21+
body: `<details>\n<summary>Original Dependabot description</summary>\n\n${body}\n</details>`
22+
});
23+
await github.rest.pulls.update({
24+
owner,
25+
repo,
26+
pull_number,
27+
body: ""
28+
});

.gitignore

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -134,3 +134,13 @@ docs/legacy_tutorials/data/*.extxyz
134134
docs/**.json
135135

136136

137+
node_modules/*
138+
cache.*.json
139+
docs/uma_tutorials/ni_tutorial_results/*
140+
docs/**/*.traj.*
141+
_build/*
142+
package.json
143+
package-lock.json
144+
bulks.pkl
145+
# MyST build outputs
146+
_build

0 commit comments

Comments
 (0)