Commit Graph

127 Commits

Author SHA1 Message Date
Alyssa Travitz
b9f7593b2d migrate to pydantic v2 (#1535) 2025-10-10 23:02:57 +00:00
Alyssa Travitz
0d4fabb0e3 add comment to explain gufe pin in env yamls (#1553) 2025-10-07 08:56:35 -04:00
Irfan Alibay
4344268b2b temp pin numpy (#1542) 2025-09-29 12:55:21 +01:00
Alyssa Travitz
9987706327 temporary pin to pre-pydantic v2 gufe commit (#1533)
* temporary pin to pre-pydantic v2 gufe commit

* pin docs too
2025-09-24 16:02:06 +00:00
Alyssa Travitz
b8147d5734 add news item for openmm 8.3 support (#1446) 2025-07-23 10:30:18 -07:00
Alyssa Travitz
1b8fcdb3b7 unpin numpy 2025-07-14 09:45:45 -07:00
Alyssa Travitz
0422dd02cd min pin kartograf (#1393) 2025-06-27 14:42:00 -07:00
Alyssa Travitz
a15d5a9de9 relaxing pydantic pin (#1387)
* relaxing pydantic pin

* switch to use toolkit base

---------

Co-authored-by: Mike Henry <11765982+mikemhenry@users.noreply.github.com>
2025-06-27 17:50:44 +00:00
Alyssa Travitz
67472c7cf8 updating environment yaml (#1385)
* updating pins

* remove min 8.2 pin

* pin example notebooks version

* update branch

* a comma

* min of 8.1.1

* add comment about pydantic min

* adding comment for openff-units pin

* updating openmm pin
2025-06-26 00:08:38 +00:00
Alyssa Travitz
d33975c363 bump openff-units and pint pins (#1374)
* unpin openff-units and pint

* update pins

* updating Quantity type

* use openff-units 0.3.1

* adding type: ignore to lines that are valid

* adding type: ignore to lines that are valid

* switch from ensure_quantity to from_openmm

* ignore pint Quantity mypy failures for now

* fixing syntax typo

* remove unused imports

* Additional fixes for mypy

Co-authored-by: Irfan Alibay <IAlibay@users.noreply.github.com>

* Update openfe/protocols/openmm_rfe/equil_rfe_methods.py

---------

Co-authored-by: Irfan Alibay <IAlibay@users.noreply.github.com>
2025-06-25 18:13:21 +00:00
Alyssa Travitz
72b3e7f749 move to minimum of pydantic v2 (#1379)
* min pin pydantic v2

* update matrix

* remove omff version
2025-06-18 19:48:12 +00:00
Alyssa Travitz
9ec7a14973 bump to cinnabar 0.5.0 (#1378) 2025-06-18 10:17:54 -07:00
Benjamin Ries
a3a7d5f207 Konnektor integration (#927)
* draft for Konnektor integration

* changing back to mappers iterable as parameter

* consistently using Konnektor also in loading fep or orion net

* adding handles for Konnektor functionality.

* used black for formatting.

* Update test_network_planning.py

fix for tests

* fixes for unittests:
- fix removing the central ligand from list.

* Update test_network_planning.py

remove test for testing if a central component is part of the other component list. This can not happen anymore with the current Konnektor implementation, therefore I propose removing the test.

* updating docstrings

* adjusting n_processes docstring language

* fixing central_ligand default

* rename mappers to mapper to avoid api break

* Revert "rename mappers to mapper to avoid api break"

This reverts commit bf82085d7a86be63d2eaca11e105261107229ecc.

* fixing mapper/s to avoid api break

* switching arg names from 'ligands' to new 'components' keyword to match konnektor

* reverting ordering change

* fixing docstring

* pull konnektor from main for development only

* mapper back to mappers to avoid api break

* clean up

* formatting

* mapper->mappers

* fixing call to network_from_indices

* update radial network test scorer to return between 0 and 1

* organizing tests into classes

* expect only one mapping per edge for maximal networks

* adding TODOs

* adding TODOs for later

* update index error string to match konnektor's clarity improvement

* updating pytest.raises to look for RuntimeError instead of ValueError

* adding TODO

* making unreachable test clearer

* fixing regex AGAIN

* some light formatting

* cleaning up diff

* central_ligand -> central component for msg regex

* regex

* updating regexes to match new konnektor behavior

* formatting :(

* formatting :(

* add connectedness check

* updating TODO

* fix comment

* update progress bar docstring

* fix ambiguous var name

* remove unused imports

* fix mypy checks

* remove unused testing code

* pin konnektor to 0.2

* remove completed TODOs

* add konnektor to docs env

* remove completed TODO

* updating news

* clarifying process and progress additions in news

---------

Co-authored-by: Alyssa Travitz <atravitz@umich.edu>
Co-authored-by: Alyssa Travitz <alyssa.travitz@omsf.io>
Co-authored-by: Alyssa Travitz <31974495+atravitz@users.noreply.github.com>
Co-authored-by: Irfan Alibay <IAlibay@users.noreply.github.com>
2025-06-17 13:53:16 -07:00
Mike Henry
1cee3a2e59 Update environment.yml (#1366) 2025-06-12 14:41:54 -07:00
Mike Henry
a59e43fca1 see if new openmmtools breaks anything (#1360) 2025-06-11 19:09:49 +00:00
Alyssa Travitz
098c0a8a84 updating syntax for click 8.2 (#1276) 2025-05-27 18:35:44 +00:00
Curtis Colwell
5c44c39d5d Remove duplicate line in environment.yml (#1280) 2025-05-21 16:52:18 +00:00
Mike Henry
d21f7360e1 Pin click to <8.2.0 until we fix tests (#1271) 2025-05-12 12:56:26 -07:00
Alyssa Travitz
3f7c9df23a adding rich as a dependency 2025-04-25 09:09:00 -07:00
Alyssa Travitz
1bbe2d9299 use pandas (#1244)
* add pandas construction

* replicate current behavior, but with pandas

* removing csv writer

* fixing type check

* replicating original behavior
2025-04-23 09:23:06 -07:00
Alyssa Travitz
e640424817 Pass through failed simulations to output (#1227)
* reorg for clarity

* moving try/except into function for clarity

* reorg data parsing for clarity

* remove unused function

* add try/except to pass through info about failed edges

* updating tests for new expected failed simulation checking behavior

* pass through for raw and ddg

* pass through failures for dgs

* remove unused import

* adding a missing check

* docstrings

* cleaning up logic

* cleaning up logic

* docstrings and formatting

* fixing conditionals bug

* more docstrings

* make 'name' a tuple for consistency

* make functions private

* updating output statement for clarity (hopefully)

* remove unused dg raw expected output

* adding comment description

* updating tests

* cleaning up test to not use tmp dir

* only use non-None legs for deciding whether to do rbfe/rhfe

* fix typo

* pass empty list instead of None through to ddg

* add cmet data

* add assert success tests - still need output validation

* light reordering for clarity

* adding pytest regressions

* don't include stderr in file regression

* making output more legible

* switch from runtime error to exit(1)

* add missing complex legs test

* adding regressoin tsvs  to manifest

* reordering functions for clarity

* updating tests

* adding test for disconnected network

* updating warning message, not throwing error for now

* updating tests for missing runs

* add disconnected network check

* switch from NaN to Error

* removing unused regression files

* fixing typo

* adding test coverage

* fix typo

* adding news entry
2025-04-22 07:24:31 -07:00
Curtis Colwell
767ac6ea18 Alphabetize environment.yaml (#1235)
* Alphabetize environment.yaml

Have been having some dependency issues. Noticed numpy in there twice.

* Complete alphabetization

---------

Co-authored-by: Alyssa Travitz <31974495+atravitz@users.noreply.github.com>
2025-04-18 08:09:57 -07:00
Alyssa Travitz
5808444fa5 pin numpy to <2.0 (#1230) 2025-04-14 12:04:41 -07:00
Mike Henry
60f708bbd8 Unpin interchange since we have a new openmmff release 2025-03-07 09:08:45 -07:00
Alyssa Travitz
984ba90116 Fix breaking tests from gufe updates (#1107)
* switch to assert_click_success to make debugging easier

* fixing tests to look for logger.INFO instead of warnings (due to gufe change)

* updating expected output due to gufe changes

* updating expected transformations

* remove easy prefix, passing 2fe7741b9448

* define _settings_cls, tests pass against g3c6d5f9

* update string match for partial charge logging
2025-03-04 06:57:27 -08:00
Alyssa Travitz
af76d5a872 block interchange 0.4.2 (#1167) 2025-02-27 12:22:31 -07:00
Mike Henry
ebb3a7ee43 Fix issue 1128 & 1129 (#1135)
* be able to manually trigger package tests

* run package tests on each pr, no reason not to

* we should be installing from conda forge

* skip some openfecli tests if we don't have nagl installed

* plz lets use conda-forge
2025-02-14 15:37:36 -07:00
Alyssa Travitz
ef629602b9 updating lomap and openfe analysis pins (#1125)
Co-authored-by: Mike Henry <11765982+mikemhenry@users.noreply.github.com>
2025-02-12 21:58:34 +00:00
Irfan Alibay
77e7e1a0c2 Merge branch 'main' into multistate-variablewriting 2025-01-31 21:56:57 +00:00
Irfan Alibay
0cd5910da3 Update environment.yml 2025-01-31 21:43:08 +00:00
Mike Henry
cb7d8d54ad Add perses back in for testing, pin gufe, and fix bootstrap tests (#1108)
* Add perses back in for testing

* Update environment.yml

* bump up rtol for bootstrap tests

---------

Co-authored-by: Irfan Alibay <IAlibay@users.noreply.github.com>
2025-01-31 09:04:20 -08:00
Alyssa Travitz
4bb24610dd Merge branch 'main' into cli-partial-charges 2025-01-30 07:21:06 -08:00
Josh Horton
508e21a17d remove perses from test env for now 2025-01-29 16:33:36 +00:00
Josh Horton
37add05c66 update openff-toolkit pin 2025-01-23 14:35:46 +00:00
Josh Horton
8602a39aa6 move ncores cli flag, fix tests, add tests for charge generation 2025-01-20 15:53:43 +00:00
IAlibay
f9507f1072 Switch to Ian's branch 2025-01-20 01:56:55 +00:00
Josh Horton
d87744cfd5 pin perses to see what breaks 2025-01-15 14:39:30 +00:00
Josh Horton
e1dc2485fa support pymbar4 only 2025-01-15 13:14:00 +00:00
Josh Horton
431fad06ae add zstandard for gufe 2024-12-18 10:48:36 +00:00
Irfan Alibay
21b5f431a2 Temporarily pin openmm to < 8.2 2024-11-13 11:54:03 +00:00
Irfan Alibay
c4951c0e54 Some AWS CI updates (#910)
* Update gpu-runner.yaml

* test on a g4dn.xlarge @ 53 cents an hour

* testing on a p2.xlarge @ 90 cents an hour

* Update gpu-runner.yaml

* Update gpu-runner.yaml

* update AMI to correct region (still the 'Deep Learning Base OSS Nvidia Driver GPU AMI' AMI)

* fix default shell, yolo that there is no syntax issues

* use the _REAL_ correct default shell

* Add a timeout of 12 hrs instead of the default 6

* Added oe toolkit + espaloma_charge to GPU env for testing

* fix channel name

* got a download error on the cudatoolkit shim which we don't want anyway

---------

Co-authored-by: Mike Henry <11765982+mikemhenry@users.noreply.github.com>
2024-08-27 14:40:24 +00:00
Irfan Alibay
7a9d6f98c0 Merge branch 'main' into noncubic-solvent 2024-08-13 20:53:56 +01:00
Matthew W. Thompson
788c002a14 Use from pydantic.v1 everywhere 2024-08-06 11:29:10 -05:00
Irfan Alibay
3ae0168734 Merge branch 'main' into noncubic-solvent 2024-07-03 21:12:41 +01:00
Irfan Alibay
48dcbb26e8 Force the old LomapAtomMapper kwarg defaults on extra test (#862)
* Force the old LomapAtomMapper kwarg defaults on extra test

* Update environment a bit
2024-05-31 16:04:34 -07:00
Irfan Alibay
b83e54698e Test with main on Lomap dev branch (#855)
* Test with main on Lomap dev branch

* Switch to packaging for version checks

* more version fixes

* enforce lomap regression tests to use the same kwargs

* Fix several tests for new lomap changes

* comment a few things

* Add news entry

* Actually let's test removing the conda-forge lomap install fully

* Update environment.yml
2024-05-31 12:22:42 -07:00
Mike Henry
acada8001a add osx-arm64 py312 test (#853)
* add osx-arm64 py312 test

* newest duecredit release looks broken
2024-05-16 09:51:20 -07:00
Mike Henry
5be7f737ca Add GAFF test (and GAFF skips) to CI (#847)
* see if this is enough to test the removal of gaff

* see if now we get the right error message

* rerun ci

* rerun ci

* see what happens if we the solver do its thing

* add omff version to matrix

* Added note about how to use gaff

* depending on the ommff version, we make sure the test does what we expect

* add an osx arm test since we should be able to do that now

* see if we can install missing stubs

* add missing stubs directly

* we return a sampler and not a system for the rfe

* Apply suggestions from code review

Co-authored-by: Hannah Baumann <43765638+hannahbaumann@users.noreply.github.com>

* added link to give some context

* testing on python 3.12 now

* unpin numpy

* no openeye toolkits for 3.12

---------

Co-authored-by: Hannah Baumann <43765638+hannahbaumann@users.noreply.github.com>
2024-05-13 13:40:31 -07:00
Irfan Alibay
1cc7652cac Merge branch 'main' into noncubic-solvent 2024-03-11 14:52:33 +00:00
IAlibay
6c71585bb5 just don't install espaloma charge 2024-03-06 13:22:15 +00:00