Skip to content

Commit 826d05f

Browse files
Merge pull request #27 from chrisjonesBSU/bonds_ibi
Add functionality to perofrm IBI on bonded parameters
2 parents 0e309ef + e9f3460 commit 826d05f

23 files changed

+1780
-6076
lines changed

.github/workflows/build_cpu.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ on:
66
# Run when container or environment is changed
77
paths:
88
- 'containers/dockerfile_cpu'
9-
- 'environment.yml'
9+
- 'environment-cpu.yml'
1010
# Allows workflow to be manually triggered
1111
workflow_dispatch:
1212

.github/workflows/pytest.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,13 @@ on:
55
branches: [ master ]
66
paths:
77
- '.github/workflows/pytest.yml'
8-
- 'environment.yml'
8+
- 'environment-cpu.yml'
99
- 'msibi/**'
1010
pull_request:
1111
branches: [ master ]
1212
paths:
1313
- 'msibi/**'
14-
- 'environment.yml'
14+
- 'environment-cpu.yml'
1515
- '.github/workflows/pytest.yml'
1616
# Allows workflow to be manually triggered
1717
workflow_dispatch:
@@ -27,7 +27,7 @@ jobs:
2727
- name: Build environment
2828
uses: conda-incubator/setup-miniconda@v2
2929
with:
30-
environment-file: environment.yml
30+
environment-file: environment-cpu.yml
3131
miniforge-variant: Mambaforge
3232
miniforge-version: 4.9.2-4
3333
use-mamba: true

containers/dockerfile_cpu

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ ADD . /msibi
66

77
WORKDIR /msibi
88

9-
RUN micromamba install -y -n base -f environment.yml && \
9+
RUN micromamba install -y -n base -f environment-cpu.yml && \
1010
micromamba clean --all --yes && \
1111
python setup.py install
1212

environment-cpu.yml

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
name: msibi
2+
channels:
3+
- conda-forge
4+
dependencies:
5+
- freud=2.7.0
6+
- gsd=2.4.1
7+
- hoomd=2.9.6=*cpu*
8+
- mbuild=0.13.1
9+
- more-itertools
10+
- numpy=1.20.1
11+
- pip=21.0
12+
- py3Dmol=0.8.0
13+
- python=3.9
14+
- pytest
15+
- pytest-cov
16+
- jupyterlab
17+
- ipython
18+
- nodejs>=10
19+
- pip:
20+
- git+https://github.com/cmelab/cmeutils

environment-gpu.yml

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
name: msibi
2+
channels:
3+
- conda-forge
4+
dependencies:
5+
- freud=2.7.0
6+
- gsd=2.4.1
7+
- hoomd=2.9.6=gpu_py39he2a7f1f_1
8+
- mbuild=0.13.1
9+
- more-itertools
10+
- numpy=1.20.1
11+
- pip=21.0
12+
- py3Dmol=0.8.0
13+
- python=3.9
14+
- pytest
15+
- pytest-cov
16+
- jupyterlab
17+
- ipython
18+
- nodejs>=10
19+
- pip:
20+
- git+https://github.com/cmelab/cmeutils

environment.yml

Lines changed: 0 additions & 22 deletions
This file was deleted.

msibi/__init__.py

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,5 @@
1313
"State",
1414
"Bond",
1515
"Angle",
16-
# Potentials.
17-
"mie",
18-
"morse",
1916
"utils"
2017
]

0 commit comments

Comments
 (0)