Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
51 commits
Select commit Hold shift + click to select a range
43d6007
Migrate validation to Protocol._validate
IAlibay Dec 5, 2025
2cd56ba
some fixes
IAlibay Dec 5, 2025
70e6d7a
Merge branch 'main' into validate-rfe
IAlibay Dec 5, 2025
f330562
move some things around
IAlibay Dec 8, 2025
95b92b3
Merge branch 'main' into validate-rfe
IAlibay Dec 15, 2025
1e0153e
add validate endstate tests
IAlibay Dec 15, 2025
fe2b879
Merge branch 'validate-rfe' of github.com:OpenFreeEnergy/openfe into …
IAlibay Dec 15, 2025
fbc4554
validate mapping tests
IAlibay Dec 15, 2025
c2f49d2
net charge validation tests
IAlibay Dec 15, 2025
c50f99c
more stuff
IAlibay Dec 22, 2025
9e0d29b
remove old tests
IAlibay Dec 24, 2025
2fe8ff9
make hybrid samplers not rely on htf
IAlibay Dec 24, 2025
4a0bd26
fix up test
IAlibay Dec 24, 2025
5848adc
fix up some slow tests
IAlibay Dec 24, 2025
1aaef87
Merge branch 'main' into multistate-nohtf
IAlibay Dec 24, 2025
b6d5ecd
Fix up the one test
IAlibay Dec 26, 2025
0605d11
fix a few things
IAlibay Dec 26, 2025
48106a2
fix the remaining tests
IAlibay Dec 26, 2025
5af66e8
cleanup imports
IAlibay Dec 26, 2025
ad0b5fb
Merge branch 'validate-rfe' into move-rfe-protocol
IAlibay Dec 26, 2025
45e004c
Merge branch 'multistate-nohtf' into move-rfe-protocol
IAlibay Dec 26, 2025
58dd71c
Migrate protocol, units, and results for the hybridtop protocol
IAlibay Dec 26, 2025
792996e
Add news item
IAlibay Dec 26, 2025
91f1788
Merge branch 'validate-rfe' into move-rfe-protocol
IAlibay Dec 26, 2025
527b870
Merge branch 'main' into validate-rfe
IAlibay Dec 26, 2025
7d17998
fix redefine
IAlibay Dec 27, 2025
43eb947
start modularising everything
IAlibay Dec 27, 2025
d1bd736
Add charge validation for smcs when dealing with ismorphic molecules
IAlibay Dec 27, 2025
51a6de1
break down the rfe units into bits
IAlibay Dec 29, 2025
6a5a76a
more broadly disallow oechem as a backend when creating systems
IAlibay Dec 29, 2025
cdd3da0
fix issue with nc being undefined
IAlibay Dec 29, 2025
e0a8e2a
Merge branch 'validate-rfe' into move-rfe-protocol
IAlibay Dec 29, 2025
a0ef737
Merge branch 'move-rfe-protocol' into breakdown-rfe-protocolunit
IAlibay Dec 29, 2025
b826803
Fix missing import
IAlibay Dec 29, 2025
42ddbcf
Merge branch 'move-rfe-protocol' into breakdown-rfe-protocolunit
IAlibay Dec 29, 2025
063e8ce
Fix comp getter
IAlibay Dec 29, 2025
3844bb5
Merge branch 'move-rfe-protocol' into breakdown-rfe-protocolunit
IAlibay Dec 29, 2025
a98c799
update module name
IAlibay Dec 30, 2025
5d0bc7e
Merge branch 'move-rfe-protocol' into breakdown-rfe-protocolunit
IAlibay Dec 30, 2025
7c915ed
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Jan 3, 2026
951ac15
move a few things around to make life easier
IAlibay Jan 3, 2026
b9f8264
Merge branch 'main' into breakdown-rfe-protocolunit
IAlibay Jan 7, 2026
2e4b455
fix typo
IAlibay Jan 7, 2026
7182805
fix some merge issues
IAlibay Jan 7, 2026
28b4381
fix test failures due to integrator checks
IAlibay Jan 7, 2026
726f517
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Jan 7, 2026
1587673
try to make mypy happy
IAlibay Jan 7, 2026
5cca950
Merge branch 'breakdown-rfe-protocolunit' of github.com:OpenFreeEnerg…
IAlibay Jan 7, 2026
1fbec7d
add early exist if there's no molecules
IAlibay Jan 7, 2026
3cd758e
Apply suggestions from code review
IAlibay Jan 7, 2026
6622428
Update openfe/protocols/openmm_rfe/hybridtop_units.py
IAlibay Jan 7, 2026
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
[pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
  • Loading branch information
pre-commit-ci[bot] committed Jan 3, 2026
commit 7c915ed69c84f09e6997bb820b8d73ca74e858b1
4 changes: 2 additions & 2 deletions openfe/protocols/openmm_rfe/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# For details, see https://github.com/OpenFreeEnergy/openfe

from . import _rfe_utils
from .hybridtop_protocols import RelativeHybridTopologyProtocol
from .equil_rfe_settings import RelativeHybridTopologyProtocolSettings
from .hybridtop_protocol_results import RelativeHybridTopologyProtocolResult
from .hybridtop_protocols import RelativeHybridTopologyProtocol
from .hybridtop_units import RelativeHybridTopologyProtocolUnit
from .equil_rfe_settings import RelativeHybridTopologyProtocolSettings
2 changes: 1 addition & 1 deletion openfe/protocols/openmm_rfe/equil_rfe_methods.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,5 +18,5 @@

from .equil_rfe_settings import RelativeHybridTopologyProtocolSettings
from .hybridtop_protocol_results import RelativeHybridTopologyProtocolResult
from .hybridtop_units import RelativeHybridTopologyProtocolUnit
from .hybridtop_protocols import RelativeHybridTopologyProtocol
from .hybridtop_units import RelativeHybridTopologyProtocolUnit
1 change: 0 additions & 1 deletion openfe/protocols/openmm_rfe/hybridtop_protocol_results.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
from openff.units import Quantity
from openmmtools import multistate


logger = logging.getLogger(__name__)


Expand Down
23 changes: 13 additions & 10 deletions openfe/protocols/openmm_rfe/hybridtop_protocols.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@
import warnings
from collections import defaultdict
from typing import Any, Iterable, Optional, Union
import numpy as np

import gufe
import numpy as np
from gufe import (
ChemicalSystem,
Component,
Expand Down Expand Up @@ -51,7 +51,6 @@
from .hybridtop_protocol_results import RelativeHybridTopologyProtocolResult
from .hybridtop_units import RelativeHybridTopologyProtocolUnit


logger = logging.getLogger(__name__)


Expand Down Expand Up @@ -277,9 +276,13 @@ def _validate_mapping(
# check that the mapping components are in the alchemical components
for m in mapping:
if m.componentA not in alchemical_components["stateA"]:
raise ValueError(f"Mapping componentA {m.componentA} not in alchemical components of stateA")
raise ValueError(
f"Mapping componentA {m.componentA} not in alchemical components of stateA"
)
if m.componentB not in alchemical_components["stateB"]:
raise ValueError(f"Mapping componentB {m.componentB} not in alchemical components of stateB")
raise ValueError(
f"Mapping componentB {m.componentB} not in alchemical components of stateB"
)

# TODO: remove - this is now the default behaviour?
# Check for element changes in mappings
Expand Down Expand Up @@ -419,10 +422,7 @@ def _validate_charge_difference(
)
raise ValueError(errmsg)

ion = {
-1: solvent_component.positive_ion,
1: solvent_component.negative_ion
}[difference]
ion = {-1: solvent_component.positive_ion, 1: solvent_component.negative_ion}[difference]

wmsg = (
f"A charge difference of {difference} is observed "
Expand Down Expand Up @@ -453,7 +453,7 @@ def _validate_simulation_settings(
Raises
------
ValueError
* If the
* If the
"""

steps_per_iteration = settings_validation.convert_steps_per_iteration(
Expand Down Expand Up @@ -561,7 +561,10 @@ def _validate(

# Validate alchemical settings
# PR #125 temporarily pin lambda schedule spacing to n_replicas
if self.settings.simulation_settings.n_replicas != self.settings.lambda_settings.lambda_windows:
if (
self.settings.simulation_settings.n_replicas
!= self.settings.lambda_settings.lambda_windows
):
errmsg = (
"Number of replicas in ``simulation_settings``: "
f"{self.settings.simulation_settings.n_replicas} must equal "
Expand Down
Loading
Loading