Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Changes to openff-qcsubmit to use next QCFractal #195

Merged
merged 107 commits into from
Nov 1, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
107 commits
Select commit Hold shift + click to select a range
389e280
Fix imports for qcfractal next, remove unnecessary bits
dotsdl Apr 8, 2022
9d698d3
Additional fixes
dotsdl Apr 8, 2022
841999c
More name updates
dotsdl Apr 8, 2022
5cf24d0
More renames
dotsdl Apr 8, 2022
223f077
KeywordSet is no longer
dotsdl Apr 14, 2022
fb95037
CI conda envs adjusted to use `next` branches
dotsdl Apr 14, 2022
78a5c68
FractalClient -> PortalClient
dotsdl Apr 14, 2022
0a60639
Dataset updates
dotsdl Apr 15, 2022
9e701fa
Test updates
dotsdl Apr 15, 2022
fce4eea
Data model fixes in test_results
dotsdl Apr 22, 2022
c30f13d
Test fixes...
dotsdl Apr 22, 2022
2df4d9a
More dataset cleanup to match qcportal next
bennybp Apr 22, 2022
46db68a
Fix missing import
dotsdl Apr 23, 2022
cbd5667
Changes from working session with @bennybp
dotsdl May 13, 2022
b398d7b
Update to new qcportal
bennybp May 20, 2022
80de222
Fixes for singlepoint dataset
bennybp May 25, 2022
b75d11b
More work on portal updates
bennybp May 27, 2022
b88fa24
Fix where cmiles is for opt datasets
bennybp May 27, 2022
157e609
Lint
mattwthompson Nov 14, 2022
e4ae148
Lint
mattwthompson Nov 14, 2022
3399fd0
More updates for work with next
bennybp Feb 3, 2023
7032de5
update test env with beta QCF packages
j-wags Jul 4, 2023
c1b3279
lint and kick CI
j-wags Jul 4, 2023
f7fffaf
update envs, drop bad test folder temporarily
j-wags Jul 4, 2023
498f588
update PortalClient to snowflake, get a basic submission test working
j-wags Jul 7, 2023
c577bb7
isort test_submission.py
ntBre Jul 17, 2023
6dc612d
factor `await_results` out of `basic_submissions_single_spec`
ntBre Jul 17, 2023
28654ae
error if await_results fails and pass optional timeout
ntBre Jul 17, 2023
9887cad
uncomment other single_spec tests
ntBre Jul 17, 2023
ba126b8
call await_results with client instead of fulltest_client
ntBre Jul 17, 2023
7317bff
update psi4.yaml to work with psi4 1.8, openff-toolkit-base 0.14.0
ntBre Jul 18, 2023
4fa292b
pass check_fn to await_results and print more info on error
ntBre Jul 18, 2023
e1b837c
pass test_submissions through test_basic_submissions_multiple_spec
ntBre Jul 18, 2023
d0d7459
move RecordStatusEnum import to top level and isort
ntBre Jul 18, 2023
6bbb161
pass test_submissions through test_basic_submissions_single_pcm_spec
ntBre Jul 18, 2023
1bc6f7e
factor out check_last_spec; pass test_basic_submissions_wavefunction
ntBre Jul 18, 2023
4b6cf36
pass test_index_not_changed
ntBre Jul 19, 2023
3b60c84
don't inherit TorsiondriveDataset.get_specifications
ntBre Jul 19, 2023
d067270
pass test_expanding_compute minus object_map check at the end
ntBre Jul 19, 2023
80a8f1f
get rid of enough snowflakes that all tests terminate
ntBre Jul 19, 2023
16675eb
add docstring to check_metadata
ntBre Jul 19, 2023
f8f55a2
pass test_optimization_submissions with a minor (?) todo
ntBre Jul 19, 2023
f1966d9
constraints as additional_keywords in OptimizationDatasetNewEntry
ntBre Jul 25, 2023
7de8c52
pass test_optimization_submissions_with_constraints
ntBre Jul 25, 2023
8d48a7c
get test_adding_specifications working, but just by disabling half of it
j-wags Aug 7, 2023
f8004e2
Exposed `find_existing` kwarg for PortalClient datasets in QCSubmit d…
dotsdl Aug 22, 2023
a005bbd
fix merge conflicts
j-wags Aug 22, 2023
e78fc66
Merge branch 'next' of github.com:openforcefield/openff-qcsubmit into…
j-wags Aug 22, 2023
b3782e8
Merge branch 'main' into next
j-wags Aug 22, 2023
b154f62
run CI on python 3.9
j-wags Aug 22, 2023
e9f3e0d
skip tests/results folder for now
j-wags Aug 23, 2023
ed39bc4
standardize on use of fulltest_client instead of snowflake, fix test_…
j-wags Aug 23, 2023
8ab13c0
fixed other cases in test_add_compute
j-wags Aug 23, 2023
f4f87f0
fixing more tests in test_submissions
j-wags Aug 24, 2023
023fede
temporarily remove find_existing for testing purposes
j-wags Aug 24, 2023
1c1ab04
more fixes in test_submissions.py
j-wags Aug 24, 2023
2a50c87
test/dataset class updates to get most dataset tests passing
j-wags Aug 25, 2023
ab63e07
bring tests/results back online
j-wags Aug 25, 2023
79a67bf
re-enable tests/results
j-wags Aug 25, 2023
4fc0a90
update two filter tests
j-wags Aug 26, 2023
7bf74b8
More fixes for filters.py and tests
j-wags Aug 29, 2023
ff195c7
remaining "easy" fixes for test_filters
j-wags Aug 29, 2023
1c67869
Fixing more tests in test_results
j-wags Aug 30, 2023
51e456a
lining up dataset type names with QCF next
j-wags Aug 30, 2023
b050928
arbitrarily take the last trajectory step in pcm opt test
j-wags Aug 30, 2023
47cfafc
fix keyword checks
j-wags Aug 31, 2023
fc651d8
finish fixing test_datasets, note future actions in PR to-dos
j-wags Sep 5, 2023
c8c90a3
fix mocking for singlepoint and optimization to_records tests
j-wags Sep 12, 2023
c39b36e
manually set portal address
j-wags Sep 12, 2023
58e01c7
Fix OptimizationResultCollection.to_basic_record_collection, rewire t…
j-wags Sep 19, 2023
8f9a5b4
update test_to_records with specs that have no failures
j-wags Oct 11, 2023
d2c7e0c
resolve merge conflicts
j-wags Oct 13, 2023
294ae98
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Oct 13, 2023
ea30ec8
get final molecules instead of initial ones in ORC.to_records
j-wags Oct 13, 2023
8848032
Merge remote-tracking branch 'origin/next' into next
j-wags Oct 13, 2023
9619ef7
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Oct 13, 2023
4517880
Update CI
j-wags Oct 16, 2023
917ee5c
partial test fixes
j-wags Oct 16, 2023
477fd2e
fix test_submissions by re-adding dataset.submit's verbose kwarg and …
j-wags Oct 17, 2023
a1fe643
fix submission checking in tests
j-wags Oct 17, 2023
1ca6af8
fix molecule vs. record counting in test_results
j-wags Oct 17, 2023
48825cb
fix propagating qc spec keywords(?)
j-wags Oct 18, 2023
bcdda27
increase timeout for pcm test
ntBre Oct 24, 2023
000a903
try smaller mol and longer timeout for pcm test, fix keywords in that…
j-wags Oct 24, 2023
4734512
actually have test_torsiondrive_submissions test torsiondrive submiss…
j-wags Oct 25, 2023
1365683
delete caching.py, imports, and tests
j-wags Oct 26, 2023
5361d61
fix torsiondrive constraint keyword propagation and tests
j-wags Oct 26, 2023
af3853d
stop using cached clients
j-wags Oct 26, 2023
d5a8a4d
small cleanups
j-wags Oct 26, 2023
b7455ad
add specification descriptions to qcportal, update tests
jthorton Oct 30, 2023
58de0c3
fix smirnoff99frost method
jthorton Oct 30, 2023
508452e
remove print
jthorton Oct 30, 2023
e2cb2e4
update invalid-cmiles test, wire up propagation of some attributes to…
j-wags Oct 30, 2023
8204dcb
fix inchi lookup in results.py
j-wags Oct 30, 2023
ab19147
try fixing test timeouts and reduce output spam
j-wags Oct 30, 2023
73ec386
walk back overzealous identifier assignment
j-wags Oct 30, 2023
d182225
testing fixes
j-wags Oct 30, 2023
7d1e7d8
clean up unused code+comments
j-wags Oct 31, 2023
ebf3999
black and isort
j-wags Oct 31, 2023
a0b1098
re-add pre-commit config
j-wags Oct 31, 2023
b23030a
flake8 cleanups
j-wags Oct 31, 2023
3079f42
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Oct 31, 2023
e5944bf
fix import and formatting
j-wags Oct 31, 2023
1f15067
Merge remote-tracking branch 'origin/next' into next
j-wags Oct 31, 2023
fda1c7d
increase timeout for test_torsiondrive_constraints and format
j-wags Oct 31, 2023
3489932
remove unused imports
j-wags Oct 31, 2023
73136c3
update examples and skip unavailable hessian results
j-wags Nov 1, 2023
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
3 changes: 0 additions & 3 deletions .git-blame-ignore-revs

This file was deleted.

4 changes: 2 additions & 2 deletions .github/workflows/CI.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
fail-fast: false
matrix:
python-version:
- "3.9"
- 3.9
cfg:
- os: ubuntu-latest
conda-env: basic
Expand Down Expand Up @@ -60,7 +60,7 @@ jobs:

- name: Install Package
run: |
python -m pip install .
python setup.py develop --no-deps

- name: Conda Environment Information
run: |
Expand Down
37 changes: 37 additions & 0 deletions .github/workflows/Lint.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
name: lint

on:
push:
branches:
- "main"
pull_request:
branches:
- "main"

jobs:

build:

runs-on: ubuntu-latest

steps:

- uses: actions/checkout@v2
- uses: actions/setup-python@v2.2.2
with:
python-version: '3.8'
- name: Install the package
run: |
python setup.py develop --no-deps

- name: Install isort / black
run: |
pip install isort black

- name: Run isort
run: |
isort --recursive --check-only openff

- name: Run black
run: |
black openff --check
5 changes: 1 addition & 4 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,4 @@ ENV/
.mypy_cache/

# PyCharm
.idea

# macOS
.DS_Store
.idea
2 changes: 1 addition & 1 deletion .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,4 @@ repos:
rev: 6.1.0
hooks:
- id: flake8
files: ^openff
files: ^openff
9 changes: 7 additions & 2 deletions devtools/conda-envs/basic.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,23 +19,28 @@ dependencies:

- qcengine >=0.25
- qcelemental >=0.25.1
- qcfractal>=0.15.7
- qcfractal>0.49
- qcarchivetesting>0.49
- qcportal>=0.49

- postgresql

- openeye-toolkits

### Core dependencies.

# openmmforcefields brings in the full toolkit; if that is ever re-packaged
# this should be changed to openff-toolkit-base

- openff-toolkit >= 0.14.0
- openff-units >=0.2.1
- pydantic =1
- pyyaml
- qcportal>=0.15.7, <0.50.0a0
- torsiondrive
- basis_set_exchange
- typing-extensions
- h5py>=3.6.0
- psycopg2 # for qcfractal to pip-install without issue

# Optional
- openmmforcefields
Expand Down
12 changes: 8 additions & 4 deletions devtools/conda-envs/psi4.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ name: qcsubmit-test-psi4

channels:
- conda-forge
- conda-forge/label/libint_dev # needed for psi4/libint2
- openeye
- conda-forge/label/libint_dev # for psi4 1.8

dependencies:

Expand All @@ -19,8 +19,9 @@ dependencies:

- qcengine >=0.25
- qcelemental >=0.25.1
- qcfractal >=0.15.7
- qcfractal-core >=0.15.7
- qcfractal>0.49
- qcarchivetesting>0.49
- qcportal>=0.49

- openeye-toolkits

Expand All @@ -33,7 +34,6 @@ dependencies:
- rdkit
- pydantic =1
- pyyaml
- qcportal>=0.15.7, <0.50.0a0
- torsiondrive
- basis_set_exchange
- typing-extensions
Expand All @@ -43,3 +43,7 @@ dependencies:
- openmmforcefields >=0.9.0
- openff-fragmenter-base >=0.2.0
- openmm

- pint=0.21
- openff-units=0.2.1
- postgresql
6 changes: 1 addition & 5 deletions docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@

master_doc = "index"

language = "en"
language = 'en'

exclude_patterns = ["_build", "Thumbs.db", ".DS_Store"]

Expand Down Expand Up @@ -105,10 +105,6 @@
"http://docs.qcarchive.molssi.org/projects/qcelemental/en/latest/",
None,
),
"openff.docs": (
"https://docs.openforcefield.org/en/latest/",
None,
),
}

# Set up mathjax.
Expand Down
2 changes: 0 additions & 2 deletions docs/installation.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,6 @@ The recommended way to install QCSubmit is via the `conda` package manger:
conda install -c conda-forge openff-qcsubmit
```

If you do not have Conda installed, see the [OpenFF installation guide](openff.docs:install)

### Optional dependencies

If you have access to the OpenEye toolkits (namely `oechem`, `oequacpac`, `oeomega` and `oedepict`), we recommend installing these also as these can speed up various operations performed by this framework significantly:
Expand Down
Loading