Skip to content

Commit 5357b8c

Browse files
authored
Merge pull request #54 from wehs7661/final_tweaks
Final tweaks before releasing version 1.0.0
2 parents 63cece8 + 8bcdd9e commit 5357b8c

File tree

3 files changed

+12
-14
lines changed

3 files changed

+12
-14
lines changed

.circleci/config.yml

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@ jobs:
44
test:
55
docker:
66
- image: cimg/python:<<parameters.python-version>>
7-
environment:
8-
PYTHON_VERSION: "<<parameters.python-version>>"
97
parameters:
108
python-version:
119
type: string
@@ -61,17 +59,20 @@ jobs:
6159
6260
- run:
6361
name: Run unit tests
62+
# no_output_timeout: 1h
6463
command: |
6564
source $HOME/pkgs/bin/GMXRC
6665
pip3 install pytest
6766
pip3 install pytest-mpi
6867
pip3 install pytest-cov
68+
69+
# sleep 3000 # only for debugging purposes
6970
7071
coverage run -m pytest -vv --disable-pytest-warnings --color=yes ensemble_md/tests
71-
mpirun -np 4 coverage run --rcfile setup.cfg -m pytest ensemble_md/tests/test_mpi_func.py --with-mpi -vv --disable-pytest-warnings --color=yes # this will generate multiple .coverage* files that can be combined
72-
coverage combine # This will combine multiple .coverage* files into a single .coverage file that will be uploaded and reported.
72+
# mpirun -np 4 coverage run --rcfile setup.cfg -m pytest ensemble_md/tests/test_mpi_func.py --with-mpi -vv --disable-pytest-warnings --color=yes # this will generate multiple .coverage* files that can be combined
73+
# coverage combine # This will combine multiple .coverage* files into a single .coverage file that will be uploaded and reported.
7374
74-
# Below are some old commands:
75+
# Another section of old commands
7576
# pytest -vv --disable-pytest-warnings --cov=ensemble_md --cov-report=xml --color=yes ensemble_md/tests/
7677
# COVERAGE_FILE=.coverage_1 pytest -vv --disable-pytest-warnings --cov=ensemble_md --cov-report=xml --color=yes ensemble_md/tests/
7778
# COVERAGE_FILE=.coverage_2 mpirun -np 4 pytest -vv --disable-pytest-warnings --cov=ensemble_md --cov-report=xml --color=yes ensemble_md/tests/test_mpi_func.py --with-mpi
@@ -88,12 +89,6 @@ jobs:
8889
workflows:
8990
continuous-integration:
9091
jobs:
91-
- test:
92-
name: test-python-3.8
93-
python-version: "3.8"
94-
# - test:
95-
# name: test-python-3.9
96-
# python-version: "3.9"
9792
- test:
9893
name: test-python-3.10
9994
python-version: "3.10"

docs/examples/tutorial_1/standard_REXEE.ipynb

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
"id": "48c42ec7",
1414
"metadata": {},
1515
"source": [
16-
"[![Binder](https://mybinder.org/badge_logo.svg)](https://mybinder.org/v2/gh/wehs7661/ensemble_md/c0f6d48ce3fe746e349e4a4a9610f935cca8b0b5?urlpath=lab%2Ftree%2Fdocs%2Fexamples%2Ftutorial_1%2Frun_REXEE.ipynb)\n",
16+
"[![Binder](https://mybinder.org/badge_logo.svg)](https://mybinder.org/v2/gh/wehs7661/ensemble_md.git/HEAD?labpath=docs%2Fexamples%2Ftutorial_1%2Fstandard_REXEE.ipynb)\n",
1717
"\n",
1818
"In this tutorial, we will demonstrate how one can use the different command-line interfaces (CLIs) implemented in the Python package `ensemble_md` to prepare, perform, and analyze a REXEE simulation to estimate the solvation free energy of a toy molecule composed of 4 interaction sites. For a more comprehensive understanding, we strongly recommend reading our [documentation](https://ensemble-md.readthedocs.io/en/latest/simulations.html) on launching REXEE simulations before starting this tutorial. For the theory behind the REXEE method, we recommend reading our [JCTC paper](https://pubs.acs.org/doi/10.1021/acs.jctc.1c00494) or the [theory section](https://ensemble-md.readthedocs.io/en/add_tutorials/theory.html) of our documentation.\n",
1919
"\n",
@@ -1093,8 +1093,6 @@
10931093
"id": "4378660a-e52c-4fac-acbd-6269b6fe2a1f",
10941094
"metadata": {},
10951095
"source": [
1096-
"</br>\n",
1097-
"\n",
10981096
"### 4.1. Replica-space sampling\n",
10991097
"As shown in the replica-space trajectories in the left figure below, each replica was able to sample all different sets of states by exchanging coordinates with other replicas, indicating good sampling in the replica space. This decent sampling in the replica space is also reflected in the replica-space transition matrix in the right figure, where all tridiagonal elements are non-zero. "
11001098
]

ensemble_md/tests/test_replica_exchange_EE.py

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,9 @@
2525
from ensemble_md.replica_exchange_EE import ReplicaExchangeEE
2626
from ensemble_md.utils.exceptions import ParameterError
2727

28+
import logging
29+
logging.basicConfig(level=logging.DEBUG)
30+
2831
current_path = os.path.dirname(os.path.abspath(__file__))
2932
input_path = os.path.join(current_path, "data")
3033

@@ -74,8 +77,10 @@ def check_param_error(REXEE_dict, param, match, wrong_val='cool', right_val=None
7477

7578
class Test_ReplicaExchangeEE:
7679
def test_init(self, params_dict):
80+
logging.debug("Initializing ReplicaExchangeEE")
7781
REXEE = get_REXEE_instance(params_dict)
7882
assert REXEE.yaml == 'params.yaml'
83+
logging.debug("Finished initializing ReplicaExchangeEE")
7984

8085
def test_set_params_error(self, params_dict):
8186
# 1. Required parameters

0 commit comments

Comments
 (0)