Skip to content

Commit

Permalink
Merge pull request #264 from IRL2/fix/remove-lammps
Browse files Browse the repository at this point in the history
Remove unmaintained lammps package
  • Loading branch information
Ragzouken authored Oct 11, 2024
2 parents 8342750 + b117037 commit 338087f
Show file tree
Hide file tree
Showing 26 changed files with 2 additions and 8,018 deletions.
3 changes: 1 addition & 2 deletions .github/workflows/conda.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@ jobs:
python-libraries/nanover-openmm/conda \
python-libraries/nanover-ase/conda \
python-libraries/nanover-mdanalysis/conda \
python-libraries/nanover-lammps/conda \
python-libraries/nanover-omni/conda \
python-libraries/nanover-jupyter/conda \
python-libraries/nanover-server/conda
Expand Down Expand Up @@ -78,7 +77,7 @@ jobs:
with:
name: conda-packages
- name: Install NanoVer
run: conda install -y -c conda-forge -c ./conda-bld mpi4py nanover-server nanover-lammps
run: conda install -y -c conda-forge -c ./conda-bld nanover-server
- name: Install tests dependancies
run: python -m pip install -r python-libraries/requirements.test
- name: Parallel tests
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ jobs:
auto-update-conda: true
miniforge-version: latest
- name: Install nanover dependancies
run: conda install -y mpi4py openmm
run: conda install -y openmm
- name: Install tests dependancies
run: python -m pip install -r python-libraries/requirements.test
- name: Compile (mypy requires --no-edit)
Expand Down
2 changes: 0 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -46,5 +46,3 @@ examples/ase/neuraminidase_nanover.xml
examples/fundamentals/.ipynb_checkpoints/

examples/examples/lmp

examples/examples/log\.lammps
151 changes: 0 additions & 151 deletions .gitlab-ci.yml

This file was deleted.

30 changes: 0 additions & 30 deletions .gitlab/issue_templates/Bug.md

This file was deleted.

24 changes: 0 additions & 24 deletions .gitlab/issue_templates/Feature Proposal.md

This file was deleted.

24 changes: 0 additions & 24 deletions .gitlab/merge_request_templates/Merge Request.md

This file was deleted.

3 changes: 0 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,6 @@ page in our documentation for detailed instructions on installing NanoVer.
* Activate the conda environment: `conda activate nanover-dev`
* Install the required conda packages: `conda install -c conda-forge openmm MDAnalysis MDAnalysisTests ase`
* Compile the protocol and install the NanoVer libraries in your conda environment: `./win_compile.ps1`. If you do not plan on modifying the python packages, run `./win_compile.ps1 -noedit` instead. Otherwise, by default, the nanover packages will be installed in edit mode (`pip install -e`) meaning that changes in the `nanover-protocol` directory will be directly reflected in your python environment.
* The `nanover-lammps` module and its tests require MPI to be installed. Download and install Microsoft MPI from https://docs.microsoft.com/en-us/message-passing-interface/microsoft-mpi

### Mac and Linux

Expand Down Expand Up @@ -194,11 +193,9 @@ This project has been made possible by the following open source projects. We gr
* [gRPC](https://grpc.io/) (Apache v2) - Communication protocol.
* [ASE](https://wiki.fysik.dtu.dk/ase/) (LGPLv3): Atomic simulation environment used for running simulations ([citation](https://iopscience.iop.org/article/10.1088/1361-648X/aa680e)).
* [OpenMM](http://openmm.org/) (MIT, LGPLv3): GPU accelerated molecular mechanics library ([citation](https://simtk.org/plugins/publications/index.php/?group_id=161)).
* [LAMMPS](https://lammps.sandia.gov/) (GPLv2): Molecular mechanics library ([citation](https://lammps.sandia.gov/cite.html)).
* [MDAnalysis](https://www.mdanalysis.org/) (GPLv2): Molecular dynamics analysis library ([citations](https://www.mdanalysis.org/pages/citations/)).
* [NGLView](https://nglviewer.org/#nglview) (MIT): IPython/Jupyter widget to interactively view structures and trajectories ([citations](http://nglviewer.org/nglview/latest/#cite)).
* [python-osc](https://pypi.org/project/python-osc/) (Public domain) - Open sound control library.
* [MPI4Py](https://mpi4py.readthedocs.io/en/stable/index.html) ([BSD 2-clause license](https://bitbucket.org/mpi4py/mpi4py/src/master/LICENSE.rst)): MPI library for python, used with LAMMPS ([citation](https://mpi4py.readthedocs.io/en/stable/citing.html)).
* [Numpy](https://numpy.org/) (BSD) - Numerical computation library.
* [Netifaces](https://pypi.org/project/netifaces/) (MIT) - Portable library for accessing network interface information.
* [Pytest](https://docs.pytest.org/en/latest/) (MIT) - Python testing framework
Expand Down
10 changes: 0 additions & 10 deletions compile.sh
Original file line number Diff line number Diff line change
Expand Up @@ -43,16 +43,6 @@ if [[ ! -z "${edit_option}" ]]; then
fi

if [[ $with_python == true ]]; then
# mpi4py (required for nanover-lammps) needs MPI to be installed on the system.
python -c "import mpi4py" 2>&1 >/dev/null || {
announce "The mpi4py library is required but cannot be found."
announce "Because it requires a system library, it is not installed by this"
announce "script; you have to install it yourself."
announce "If you are using conda, install mpi4py by running"
announce "conda install -c conda-forge mpi4py"
exit 1
}

announce "Installing python requirements"
python -m pip install -r ./python-libraries/nanover-core/requirements.txt ${user_option}

Expand Down
Loading

0 comments on commit 338087f

Please sign in to comment.