Skip to content

Commit

Permalink
Realtime analysis interval to default to checkpoint interval (#1227)
Browse files Browse the repository at this point in the history
* CI miscellaneous fixes (#1217)

* CI minor fixes. Allow codecov to fail.

* bump ci

---------

Co-authored-by: Mike Henry <11765982+mikemhenry@users.noreply.github.com>

* Changing offline freq default to checkpoint interval

* Fixing input yaml for example

* commenting offline-freq param

---------

Co-authored-by: Mike Henry <11765982+mikemhenry@users.noreply.github.com>
  • Loading branch information
ijpulidos and mikemhenry authored Aug 22, 2023
1 parent d77ab23 commit ef15992
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 8 deletions.
3 changes: 1 addition & 2 deletions .github/workflows/CI.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,6 @@ jobs:
extra-specs: |
python==${{ matrix.python-version }}
openmm==${{ matrix.openmm }}
openmmtools==0.23.0
- name: Install package
shell: bash -l {0}
Expand Down Expand Up @@ -108,4 +107,4 @@ jobs:
uses: codecov/codecov-action@v1
with:
file: ./coverage.xml
fail_ci_if_error: true
fail_ci_if_error: false
2 changes: 1 addition & 1 deletion devtools/conda-envs/test_env.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ dependencies:
- openff-units >=0.1.8
- openmm >=7.7
- openmmforcefields >=0.9.0
- openmmtools # may need to sort out ambermini/ambertools/parmed dependencies
- openmmtools >=0.23 # may need to sort out ambermini/ambertools/parmed dependencies
- openmoltools # may need to sort out ambermini/ambertools/parmed dependencies (we don't want ambertools)
- parmed
- pdbfixer
Expand Down
2 changes: 1 addition & 1 deletion examples/protein-ligand-repex/cli/protein-ligand.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ bond_expession:
# One of ['repex', 'nonequilibrium', 'sams']
fe_type: repex
checkpoint_interval: 100 # number of iterations
offline-freq: 100 # Real time FE estimate analysis -- multiple of checkpoint interval
#offline-freq: 100 # Real time FE estimate analysis -- multiple of checkpoint interval (optional)

# Number of iterations to run
n_cycles: 5000
Expand Down
8 changes: 4 additions & 4 deletions perses/app/setup_relative_calculation.py
Original file line number Diff line number Diff line change
Expand Up @@ -149,8 +149,8 @@ def getSetupOptions(filename, override_string=None):
setup_options['flatness-criteria'] = 'minimum-visits'
_logger.info(f"\t\t\tflatness-criteria not specified: default to minimum-visits.")
if 'offline-freq' not in setup_options:
setup_options['offline-freq'] = 10
_logger.info(f"\t\t\toffline-freq not specified: default to 10.")
setup_options['offline-freq'] = setup_options["checkpoint_interval"]
_logger.info(f"\t\t\toffline-freq not specified: default to checkpoint interval.")
if 'gamma0' not in setup_options:
setup_options['gamma0'] = 1.
_logger.info(f"\t\t\tgamma0 not specified: default to 1.0.")
Expand All @@ -162,8 +162,8 @@ def getSetupOptions(filename, override_string=None):
elif setup_options['fe_type'] == 'repex':
_logger.info(f"\t\tfe_type: repex")
if 'offline-freq' not in setup_options:
setup_options['offline-freq'] = 10
_logger.info(f"\t\t\toffline-freq not specified: default to 10.")
setup_options['offline-freq'] = setup_options["checkpoint_interval"]
_logger.info(f"\t\t\toffline-freq not specified: default to checkpoint interval.")
elif setup_options['fe_type'] == 'neq': #there are some neq attributes that are not used with the equilibrium samplers...
_logger.info(f"\t\tfe_type: neq")
if 'n_equilibrium_steps_per_iteration' not in setup_options:
Expand Down

0 comments on commit ef15992

Please sign in to comment.