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

Refactor Unit Tests #38

Merged
merged 29 commits into from
Mar 4, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
5a8f744
fix variable name in Dihedral._get_distribution
chrisjonesBSU Feb 29, 2024
bd003bb
add correction func attr to Dihedral class
chrisjonesBSU Feb 29, 2024
c6e1b3d
Add adjustments for set_quadratic and dihedrals
chrisjonesBSU Feb 29, 2024
2e5dc64
rework base test
chrisjonesBSU Mar 1, 2024
5ff141b
add pytest fixtures, start with Force tests
chrisjonesBSU Mar 1, 2024
a1f4ad8
fix unit tests, make dev env file
chrisjonesBSU Mar 1, 2024
b97793d
Merge remote-tracking branch 'origin/fix-dihedrals' into unit-tests
chrisjonesBSU Mar 1, 2024
76c0189
finish dihedral unit tests
chrisjonesBSU Mar 1, 2024
c5d7b67
remove force specific test files
chrisjonesBSU Mar 2, 2024
9d56a35
new tests for forces, add .idea dir to gitignore
chrisjonesBSU Mar 2, 2024
449ef56
more tests for Force
chrisjonesBSU Mar 2, 2024
61845d5
add tests for optimize
chrisjonesBSU Mar 2, 2024
fe5d437
rename test file, add more optimize tests
chrisjonesBSU Mar 2, 2024
06a8e9c
rm old asset files
chrisjonesBSU Mar 2, 2024
884b8d0
remove old test files
chrisjonesBSU Mar 2, 2024
496cae0
remove container builders, update pytest yml and setup.py
chrisjonesBSU Mar 2, 2024
747684e
remove tutorials dir
chrisjonesBSU Mar 2, 2024
32b6332
remove containers dir
chrisjonesBSU Mar 2, 2024
535f681
remove unused utils
chrisjonesBSU Mar 2, 2024
e2d7107
add BaseTest to tests init
chrisjonesBSU Mar 2, 2024
61704a6
clean up setup.py
chrisjonesBSU Mar 2, 2024
f1e0c78
add 2 small gsd files for unit testing
chrisjonesBSU Mar 3, 2024
4fa8c0c
add gsd files to states in base test, add run test
chrisjonesBSU Mar 3, 2024
9d9da9d
add more run tests, fix conditional in Force init
chrisjonesBSU Mar 3, 2024
2ccf8f1
remove blank lines
chrisjonesBSU Mar 3, 2024
5f0534e
fix mamba version
chrisjonesBSU Mar 4, 2024
ea322fe
fix pytest arg
chrisjonesBSU Mar 4, 2024
0c88a17
update paths in pytest yml
chrisjonesBSU Mar 4, 2024
e6c5263
add pytest-cov to dev env
chrisjonesBSU Mar 4, 2024
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
44 changes: 0 additions & 44 deletions .github/workflows/build_cpu.yml

This file was deleted.

45 changes: 0 additions & 45 deletions .github/workflows/build_gpu.yml

This file was deleted.

20 changes: 10 additions & 10 deletions .github/workflows/pytest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,15 @@ on:
push:
branches: [ master ]
paths:
- '.github/workflows/pytest.yml'
- 'environment-cpu.yml'
- 'msibi/**'
- msibi/**
- environment-dev.yml
- .github/workflows/pytest.yml
pull_request:
branches: [ master ]
paths:
- 'msibi/**'
- 'environment-cpu.yml'
- '.github/workflows/pytest.yml'
- msibi/**
- environment-dev.yml
- .github/workflows/pytest.yml
# Allows workflow to be manually triggered
workflow_dispatch:

Expand All @@ -27,9 +27,9 @@ jobs:
- name: Build environment
uses: conda-incubator/setup-miniconda@v2
with:
environment-file: environment-cpu.yml
environment-file: environment-dev.yml
miniforge-variant: Mambaforge
miniforge-version: 4.9.2-4
miniforge-version: 23.11.0-0
use-mamba: true

- name: Install package
Expand All @@ -38,10 +38,10 @@ jobs:

- name: Run pytest with coverage report
shell: bash -l {0}
run: python -m pytest --cov=./ --cov-report=xml -v
run: python -m pytest -rs -v --cov=./ --cov-report=xml

- name: Upload coverage to Codecov
uses: codecov/codecov-action@v1
uses: codecov/codecov-action@v3
with:
token: ${{ secrets.CODECOV_TOKEN }}
file: ./coverage.xml
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ msibi/tutorials/lj/state*/run.py
*.dcd
.DS_Store
*.egg-info

*.idea/
# Byte-compiled / optimized / DLL files
__pycache__/
*.py[cod]
Expand Down
6 changes: 0 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@

# MultiState Iterative Boltzmann Inversion (MS-IBI)
----------------------------------------
[![build_cpu](https://github.com/cmelab/msibi/actions/workflows/build_cpu.yml/badge.svg)](https://github.com/cmelab/msibi/actions/workflows/build_cpu.yml)
[![build_gpu](https://github.com/cmelab/msibi/actions/workflows/build_gpu.yml/badge.svg)](https://github.com/cmelab/msibi/actions/workflows/build_gpu.yml)
[![pytest](https://github.com/cmelab/msibi/actions/workflows/pytest.yml/badge.svg)](https://github.com/cmelab/msibi/actions/workflows/pytest.yml)
[![codecov](https://codecov.io/gh/cmelab/msibi/branch/master/graph/badge.svg?token=7NFPBMBN0I)](https://codecov.io/gh/cmelab/msibi)

Expand All @@ -20,10 +18,6 @@ pip install .
```


### Tutorials
[![Binder](https://mybinder.org/badge_logo.svg)](https://mybinder.org/v2/gh/cmelab/msibi/master?urlpath=tree/msibi/tutorials/lj/LJ_Tutorial.ipynb) - Tutorial showing how to recreate the Lennard Jones potential using MS-IBI


### Citation [![Citing MSIBI](https://img.shields.io/badge/DOI-10.1063%2F1.4880555-blue.svg)](http://dx.doi.org/10.1063/1.4880555)
Details of the underlying method and its validation can be found [here](http://dx.doi.org/10.1063/1.4880555).

Expand Down
18 changes: 0 additions & 18 deletions Tutorials/README

This file was deleted.

58 changes: 0 additions & 58 deletions Tutorials/lj/opt.py

This file was deleted.

101 changes: 0 additions & 101 deletions Tutorials/lj/rdfs/rdftarget0.5

This file was deleted.

Loading
Loading