Skip to content

Commit 3f3912a

Browse files
authored
Merge pull request PolusAI#209 from jfennick/move_mm_viewer
move molecular modeling viewer
2 parents e6f59d6 + c6502e4 commit 3f3912a

13 files changed

+0
-406
lines changed

README.md

-12
Original file line numberDiff line numberDiff line change
@@ -75,18 +75,6 @@ timeseriesplots
7575

7676
![Plots](examples/gromacs/plots.png)
7777

78-
You can also view the 3D structures in the Jupyter notebook `src/vis/viewer.ipynb`. The visualization currently needs to be in its own conda environment.
79-
80-
```
81-
install/install_conda.sh
82-
conda create --name vis
83-
conda activate vis
84-
install/install_nglview.sh
85-
pip install -e ".[all]"
86-
```
87-
88-
![Plots](docs/tree_viewer.png)
89-
9078
The Workflow Inference Compiler is a [Domain Specific Language](https://en.wikipedia.org/wiki/Domain-specific_language) (DSL) based on the [Common Workflow Language](https://www.commonwl.org). CWL is fantastic, but explicitly constructing the Directed Acyclic Graph (DAG) associated with a non-trivial workflow is not so simple. For example, the workflow shown above is based on the following [gromacs tutorial](https://mmb.irbbarcelona.org/biobb/availability/tutorials/cwl). Instead of writing raw CWL, you can write your workflows in a much simpler yml DSL. For technical reasons edge inference is far from unique, so ***`users should always check that edge inference actually produces the intended DAG`***.
9179

9280
## Edge Inference

docs/dev/api.rst

-8
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,6 @@
11
Developer API
22
====================================
33

4-
vis.filewatcher
5-
------------------------------------
6-
.. automodule:: vis.filewatcher
7-
8-
vis.viewer
9-
------------------------------------
10-
.. automodule:: vis.viewer
11-
124
wic.ast
135
------------------------------------
146
.. automodule:: wic.ast

docs/installguide.md

-12
Original file line numberDiff line numberDiff line change
@@ -89,18 +89,6 @@ pre-commit install
8989

9090
You should now have the `wic` executable available in your terminal.
9191

92-
## Jupyter notebook visualization
93-
94-
The visualization currently needs to be in its own conda environment.
95-
96-
```
97-
./install_conda.sh
98-
conda create --name vis
99-
conda activate vis
100-
./install_nglview.sh
101-
pip install -e ".[all]"
102-
```
103-
10492
## CUDA
10593

10694
Some of the workflows require an Nvidia CUDA GPU. Please see the Nvidia [installation guides](https://docs.nvidia.com/cuda/#installation-guides) for more information.

docs/requirements.txt

-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
ipytree
21
myst-parser
32
# https://docs.readthedocs.io/en/stable/intro/getting-started-with-sphinx.html
43
# "We strongly recommend to pin the Sphinx version used for your project to build the docs to avoid potential future incompatibilities."

docs/tree_viewer.png

-1.11 MB
Binary file not shown.

docs/tutorials/multistep.md

-6
Original file line numberDiff line numberDiff line change
@@ -54,12 +54,6 @@ docs/tutorials/multistep1.yml.gv.png
5454
5555
The first thing you might notice is the `!&` and `!*` notation. This is the syntax for explicitly creating an edge between an output and a later input. Note that `!&` must come first and can only be defined once, but then you can use `!*` multiple times in any later step.
5656

57-
## Visualizing the results
58-
59-
This particular workflow creates files which represent 3D coordinates, so we can view them in the Jupyter notebook `src/vis/viewer.ipynb`. Make sure you are using the `vis` conda environment as mentioned in the installation guide.
60-
61-
![Multistep](protein.png)
62-
6357
## Edge Inference
6458

6559
Creating explicit edges can be a bit tedious and verbose, but in many cases the correct edges can be determined automatically. In this case, all of the steps take the previous pdb file as input and produce an output pdb file, so this is rather trivial. However, for more complex workflows edge inference can drastically simplify the yml files. Note that explicit edges are drawn in blue, and inferred edges are drawn in black/white.

docs/tutorials/protein.png

-642 KB
Binary file not shown.

install/install_nglview.sh

-24
This file was deleted.

pyproject.toml

-6
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
# Based on https://packaging.python.org/en/latest/tutorials/packaging-projects/
22
[build-system]
33
requires = ["setuptools>=42,<68", "wheel", "versioneer[toml]==0.29"]
4-
# NOTE: The above list mostly comes from https://github.com/nglviewer/nglview/pull/969/files
54
# NOTE: Use upper bound of <68 for setuptools due to 2to3 error.
65
# See https://stackoverflow.com/questions/72414481/error-in-anyjson-setup-command-use-2to3-is-invalid
76

@@ -30,7 +29,6 @@ dependencies = [
3029
"requests",
3130
"mergedeep",
3231
"networkx",
33-
"beautifulsoup4", # Solely for parsing gromacs mdp options html
3432
"cwl-utils>=0.32",
3533
# CommandInputParameter attr changed from `type_` to `type` and back to `type_`
3634
# between versions 0.30, 0.31, 0.32
@@ -109,7 +107,6 @@ doc = [
109107
"sphinx",
110108
"myst-parser",
111109
"sphinx-autodoc-typehints",
112-
"ipytree",
113110
]
114111
plots = ["matplotlib"]
115112
cyto = ["ipycytoscape"] # only for DAG visualization
@@ -211,10 +208,7 @@ module = [
211208
"graphviz.*",
212209
"mergedeep.*",
213210
"networkx.*",
214-
"mdtraj.*",
215-
"nglview.*",
216211
"matplotlib.*",
217-
"ipytree.*",
218212
"ipywidgets.*",
219213
"scipy.*",
220214
"ruamel.*",

src/vis/__init__.py

Whitespace-only changes.

src/vis/filewatcher.py

-42
This file was deleted.

src/vis/viewer.ipynb

-55
This file was deleted.

0 commit comments

Comments
 (0)