Skip to content

Commit 0aa9196

Browse files
authored
Merge branch 'main' into dependabot/github_actions/actions/checkout-5
2 parents 0599b59 + d631a45 commit 0aa9196

35 files changed

Lines changed: 2445 additions & 68 deletions
Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
include-paths:
2+
- src/fairchem/data/omol
3+
- packages/fairchem-data-omol
4+
tag-prefix: fairchem_data_omol
5+
tag-template: 'fairchem_data_omol-$RESOLVED_VERSION'
6+
name-template: 'fairchem_data_omol-$RESOLVED_VERSION'
7+
exclude-contributors: [github-actions]
8+
categories:
9+
- title: New Features / Enhancements
10+
labels: [enhancement]
11+
- title: Bug Fixes
12+
labels: [bug]
13+
- title: Documentation
14+
labels: [documentation]
15+
- title: Tests
16+
labels: [test]
17+
- title: Deprecations
18+
labels: [deprecation]
19+
- title: Dependencies
20+
labels: [dependencies]
21+
- title: Other Changes
22+
labels: ["*"]
23+
version-resolver:
24+
major:
25+
labels:
26+
- 'major'
27+
minor:
28+
labels:
29+
- 'minor'
30+
patch:
31+
labels:
32+
- 'patch'
33+
default: patch
34+
template: |
35+
## What’s Changed
36+
37+
$CHANGES

.github/workflows/build.yml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
- name: Build
2727
run: |
2828
# add packages that are supposed to be built to this list
29-
for package in fairchem-core fairchem-data-oc fairchem-demo-ocpapi fairchem-applications-cattsunami
29+
for package in fairchem-core fairchem-data-oc fairchem-demo-ocpapi fairchem-applications-cattsunami fairchem-data-omol
3030
do
3131
pushd packages/$package
3232
hatch build
@@ -58,3 +58,9 @@ jobs:
5858
with:
5959
name: dist-applications-cattsunami
6060
path: dist-applications-cattsunami/*
61+
62+
- name: Upload data-omol artifact
63+
uses: actions/upload-artifact@v4
64+
with:
65+
name: dist-data-omol
66+
path: dist-data-omol/*

.github/workflows/perf-test.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ on:
44
workflow_call:
55
workflow_dispatch:
66
schedule:
7-
# Run every night at midnight
8-
- cron: "0 0 * * *"
7+
# Run everyday at 8am UTC (midight or 1am pacific time)
8+
- cron: "0 8 * * *"
99

1010
jobs:
1111
perf-test:
Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
name: Release Drafter - fairchem-data-omol
2+
3+
on:
4+
push:
5+
branches:
6+
- main
7+
paths:
8+
- 'src/fairchem/data/omol/**'
9+
- 'packages/fairchem-data-omol/**'
10+
workflow_dispatch:
11+
12+
permissions:
13+
contents: read
14+
15+
jobs:
16+
update_release_draft:
17+
permissions:
18+
# write permission is required to create a github release
19+
contents: write
20+
pull-requests: read
21+
runs-on: ubuntu-latest
22+
steps:
23+
- uses: release-drafter/release-drafter@v6
24+
with:
25+
disable-autolabeler: true
26+
config-name: release-drafter-data-omol.yml
27+
env:
28+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/release.yml

Lines changed: 26 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
test:
1616
uses: ./.github/workflows/test.yml
1717
secrets: inherit
18-
18+
1919
perf-test:
2020
uses: ./.github/workflows/perf-test.yml
2121
secrets: inherit
@@ -128,3 +128,28 @@ jobs:
128128
verbose: true
129129
packages-dir: dist-applications-cattsunami/
130130
skip-existing: true
131+
132+
release-data-omol:
133+
needs: [ build ]
134+
runs-on: ubuntu-latest
135+
if: |
136+
( github.event.inputs.release-pypi == 'true' && startsWith(github.ref_name, 'fairchem_data_omol-') ) || startsWith(github.event.release.tag_name, 'fairchem_data_omol-')
137+
138+
environment:
139+
name: pypi
140+
url: https://pypi.org/p/fairchem-data-omol/
141+
142+
permissions:
143+
id-token: write
144+
145+
steps:
146+
- uses: actions/download-artifact@v5
147+
with:
148+
name: dist-data-omol
149+
path: dist-data-omol
150+
151+
- uses: pypa/gh-action-pypi-publish@release/v1
152+
with:
153+
verbose: true
154+
packages-dir: dist-data-omol/
155+
skip-existing: true

.github/workflows/test-release.yml

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -125,3 +125,29 @@ jobs:
125125
verbose: true
126126
packages-dir: dist-applications-cattsunami/
127127
skip-existing: true
128+
129+
release-data-omol:
130+
needs: [ build ]
131+
runs-on: ubuntu-latest
132+
if: |
133+
github.event.inputs.release-pypi == 'true' && startsWith(github.ref_name, 'fairchem_data_omol-')
134+
135+
environment:
136+
name: test-pypi
137+
url: https://test.pypi.org/p/fairchem-data-omol/
138+
139+
permissions:
140+
id-token: write
141+
142+
steps:
143+
- uses: actions/download-artifact@v5
144+
with:
145+
name: dist-data-omol
146+
path: dist-data-omol
147+
148+
- uses: pypa/gh-action-pypi-publish@release/v1
149+
with:
150+
repository-url: https://test.pypi.org/legacy/
151+
verbose: true
152+
packages-dir: dist-data-omol/
153+
skip-existing: true
Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
defaults:
2+
- cluster: v100
3+
- checkpoint: uma_sm
4+
- _self_
5+
6+
benchmark_name: geom_conformers
7+
8+
job:
9+
run_name: ${checkpoint.model_name}
10+
run_dir: ${cluster.run_dir}
11+
device_type: ${cluster.device}
12+
debug: ${cluster.debug}
13+
scheduler:
14+
mode: ${cluster.mode}
15+
distributed_init_method: FILE
16+
num_array_jobs: 400
17+
slurm:
18+
partition: ${cluster.partition}
19+
mem_gb: ${cluster.mem_gb}
20+
timeout_hr: 72
21+
logger:
22+
_target_: fairchem.core.common.logger.WandBSingletonLogger.init_wandb
23+
_partial_: true
24+
entity: fairchem
25+
project: uma-benchmarks
26+
group: ${checkpoint.model_name}
27+
job_type: ${benchmark_name}
28+
29+
runner:
30+
_target_: fairchem.core.components.calculate.omol_runner.OMolRunner
31+
calculator:
32+
_target_: fairchem.core.FAIRChemCalculator.from_model_checkpoint
33+
name_or_path: ${checkpoint.ckpt_path}
34+
task_name: omol
35+
input_data: ${cluster.data_root_dir}/conformer_inputs.pkl
36+
benchmark_name: ${benchmark_name}
37+
benchmark:
38+
_target_: fairchem.core.components.calculate.recipes.omol.conformers
39+
_partial_: True
40+
41+
reducer:
42+
_target_: fairchem.core.components.benchmark.omol_reducer.OMolReducer
43+
benchmark_name: ${benchmark_name}
Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
defaults:
2+
- cluster: v100
3+
- checkpoint: uma_sm
4+
- _self_
5+
6+
benchmark_name: ie_ea
7+
8+
job:
9+
run_name: ${checkpoint.model_name}
10+
run_dir: ${cluster.run_dir}
11+
device_type: ${cluster.device}
12+
debug: ${cluster.debug}
13+
scheduler:
14+
mode: ${cluster.mode}
15+
distributed_init_method: FILE
16+
num_array_jobs: 10
17+
slurm:
18+
partition: ${cluster.partition}
19+
mem_gb: ${cluster.mem_gb}
20+
timeout_hr: 72
21+
logger:
22+
_target_: fairchem.core.common.logger.WandBSingletonLogger.init_wandb
23+
_partial_: true
24+
entity: fairchem
25+
project: uma-benchmarks
26+
group: ${checkpoint.model_name}
27+
job_type: ${benchmark_name}
28+
29+
runner:
30+
_target_: fairchem.core.components.calculate.omol_runner.OMolRunner
31+
calculator:
32+
_target_: fairchem.core.FAIRChemCalculator.from_model_checkpoint
33+
name_or_path: ${checkpoint.ckpt_path}
34+
task_name: omol
35+
input_data: ${cluster.data_root_dir}/ieea_inputs.pkl
36+
benchmark_name: ${benchmark_name}
37+
benchmark:
38+
_target_: fairchem.core.components.calculate.recipes.omol.ieea
39+
_partial_: True
40+
41+
reducer:
42+
_target_: fairchem.core.components.benchmark.omol_reducer.OMolReducer
43+
benchmark_name: ${benchmark_name}
Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
defaults:
2+
- cluster: v100
3+
- checkpoint: uma_sm
4+
- _self_
5+
6+
benchmark_name: ligand_pocket
7+
8+
job:
9+
run_name: ${checkpoint.model_name}
10+
run_dir: ${cluster.run_dir}
11+
device_type: ${cluster.device}
12+
debug: ${cluster.debug}
13+
scheduler:
14+
mode: ${cluster.mode}
15+
distributed_init_method: FILE
16+
num_array_jobs: 1
17+
slurm:
18+
partition: ${cluster.partition}
19+
mem_gb: ${cluster.mem_gb}
20+
timeout_hr: 72
21+
logger:
22+
_target_: fairchem.core.common.logger.WandBSingletonLogger.init_wandb
23+
_partial_: true
24+
entity: fairchem
25+
project: uma-benchmarks
26+
group: ${checkpoint.model_name}
27+
job_type: ${benchmark_name}
28+
29+
runner:
30+
_target_: fairchem.core.components.calculate.omol_runner.OMolRunner
31+
calculator:
32+
_target_: fairchem.core.FAIRChemCalculator.from_model_checkpoint
33+
name_or_path: ${checkpoint.ckpt_path}
34+
task_name: omol
35+
input_data: ${cluster.data_root_dir}/ligand_pocket_inputs.pkl
36+
benchmark_name: ${benchmark_name}
37+
benchmark:
38+
_target_: fairchem.core.components.calculate.recipes.omol.ligand_pocket
39+
_partial_: True
40+
41+
reducer:
42+
_target_: fairchem.core.components.benchmark.omol_reducer.OMolReducer
43+
benchmark_name: ${benchmark_name}
Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
defaults:
2+
- cluster: v100
3+
- checkpoint: uma_sm
4+
- _self_
5+
6+
benchmark_name: protonation_energies
7+
8+
job:
9+
run_name: ${checkpoint.model_name}
10+
run_dir: ${cluster.run_dir}
11+
device_type: ${cluster.device}
12+
debug: ${cluster.debug}
13+
scheduler:
14+
mode: ${cluster.mode}
15+
distributed_init_method: FILE
16+
num_array_jobs: 400
17+
slurm:
18+
partition: ${cluster.partition}
19+
mem_gb: ${cluster.mem_gb}
20+
timeout_hr: 72
21+
logger:
22+
_target_: fairchem.core.common.logger.WandBSingletonLogger.init_wandb
23+
_partial_: true
24+
entity: fairchem
25+
project: uma-benchmarks
26+
group: ${checkpoint.model_name}
27+
job_type: ${benchmark_name}
28+
29+
runner:
30+
_target_: fairchem.core.components.calculate.omol_runner.OMolRunner
31+
calculator:
32+
_target_: fairchem.core.FAIRChemCalculator.from_model_checkpoint
33+
name_or_path: ${checkpoint.ckpt_path}
34+
task_name: omol
35+
input_data: ${cluster.data_root_dir}/protonation_inputs.pkl
36+
benchmark_name: ${benchmark_name}
37+
benchmark:
38+
_target_: fairchem.core.components.calculate.recipes.omol.protonation
39+
_partial_: True
40+
41+
reducer:
42+
_target_: fairchem.core.components.benchmark.omol_reducer.OMolReducer
43+
benchmark_name: ${benchmark_name}

0 commit comments

Comments
 (0)