Commit 67a39939 authored by Santi Villalba's avatar Santi Villalba
Browse files

support openmm >= 7.6

parent 04fd6d34
...@@ -28,10 +28,18 @@ import openfold.utils.loss as loss ...@@ -28,10 +28,18 @@ import openfold.utils.loss as loss
from openfold.np.relax import cleanup, utils from openfold.np.relax import cleanup, utils
import ml_collections import ml_collections
import numpy as np import numpy as np
from simtk import openmm try:
from simtk import unit # openmm >= 7.6
from simtk.openmm import app as openmm_app import openmm
from simtk.openmm.app.internal.pdbstructure import PdbStructure from openmm import unit
from openmm import app as openmm_app
from openmm.app.internal.pdbstructure import PdbStructure
except ImportError:
# openmm < 7.6 (requires DeepMind patch)
from simtk import openmm
from simtk import unit
from simtk.openmm import app as openmm_app
from simtk.openmm.app.internal.pdbstructure import PdbStructure
ENERGY = unit.kilocalories_per_mole ENERGY = unit.kilocalories_per_mole
LENGTH = unit.angstroms LENGTH = unit.angstroms
......
...@@ -20,8 +20,14 @@ cases like removing chains of length one (see clean_structure). ...@@ -20,8 +20,14 @@ cases like removing chains of length one (see clean_structure).
import io import io
import pdbfixer import pdbfixer
from simtk.openmm import app try:
from simtk.openmm.app import element # openmm >= 7.6
from openmm import app
from openmm.app import element
except ImportError:
# openmm < 7.6 (requires DeepMind patch)
from simtk.openmm import app
from simtk.openmm.app import element
def fix_pdb(pdbfile, alterations_info): def fix_pdb(pdbfile, alterations_info):
......
...@@ -18,8 +18,14 @@ import io ...@@ -18,8 +18,14 @@ import io
from openfold.np import residue_constants from openfold.np import residue_constants
from Bio import PDB from Bio import PDB
import numpy as np import numpy as np
from simtk.openmm import app as openmm_app try:
from simtk.openmm.app.internal.pdbstructure import PdbStructure # openmm >= 7.6
from openmm import app as openmm_app
from openmm.app.internal.pdbstructure import PdbStructure
except ImportError:
# openmm < 7.6 (requires DeepMind patch)
from simtk.openmm import app as openmm_app
from simtk.openmm.app.internal.pdbstructure import PdbStructure
def overwrite_pdb_coordinates(pdb_str: str, pos) -> str: def overwrite_pdb_coordinates(pdb_str: str, pos) -> str:
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment