From a5efafff3a49f65d6cf168be932f66524921c279 Mon Sep 17 00:00:00 2001 From: Augustin Zidek Date: Wed, 4 Mar 2020 12:41:59 +0000 Subject: [PATCH] Import TensorFlow without compat mode as our code targets TF 1.14. PiperOrigin-RevId: 298822315 --- alphafold_casp13/contacts.py | 2 +- alphafold_casp13/contacts_dataset.py | 2 +- alphafold_casp13/contacts_experiment.py | 2 +- alphafold_casp13/distogram_io.py | 2 +- alphafold_casp13/ensemble_contact_maps.py | 2 +- alphafold_casp13/parsers.py | 2 +- alphafold_casp13/paste_contact_maps.py | 2 +- alphafold_casp13/two_dim_resnet.py | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/alphafold_casp13/contacts.py b/alphafold_casp13/contacts.py index fff0dd4..68e4292 100644 --- a/alphafold_casp13/contacts.py +++ b/alphafold_casp13/contacts.py @@ -24,7 +24,7 @@ from absl import logging import numpy as np import six import sonnet as snt -import tensorflow.compat.v1 as tf # pylint: disable=g-explicit-tensorflow-version-import +import tensorflow as tf # pylint: disable=g-explicit-tensorflow-version-import from alphafold_casp13 import config_dict from alphafold_casp13 import contacts_experiment diff --git a/alphafold_casp13/contacts_dataset.py b/alphafold_casp13/contacts_dataset.py index c68a870..b41c464 100644 --- a/alphafold_casp13/contacts_dataset.py +++ b/alphafold_casp13/contacts_dataset.py @@ -18,7 +18,7 @@ import collections import enum import json -import tensorflow.compat.v1 as tf # pylint: disable=g-explicit-tensorflow-version-import +import tensorflow as tf # pylint: disable=g-explicit-tensorflow-version-import _ProteinDescription = collections.namedtuple( diff --git a/alphafold_casp13/contacts_experiment.py b/alphafold_casp13/contacts_experiment.py index e3d3e2c..b8d05d4 100644 --- a/alphafold_casp13/contacts_experiment.py +++ b/alphafold_casp13/contacts_experiment.py @@ -15,7 +15,7 @@ """Contact prediction convnet experiment example.""" from absl import logging -import tensorflow.compat.v1 as tf # pylint: disable=g-explicit-tensorflow-version-import +import tensorflow as tf # pylint: disable=g-explicit-tensorflow-version-import from alphafold_casp13 import contacts_dataset from alphafold_casp13 import contacts_network diff --git a/alphafold_casp13/distogram_io.py b/alphafold_casp13/distogram_io.py index 507653a..c8374b7 100644 --- a/alphafold_casp13/distogram_io.py +++ b/alphafold_casp13/distogram_io.py @@ -22,7 +22,7 @@ import os import numpy as np import six.moves.cPickle as pickle -import tensorflow.compat.v1 as tf # pylint: disable=g-explicit-tensorflow-version-import +import tensorflow as tf # pylint: disable=g-explicit-tensorflow-version-import RR_FORMAT = """PFRMAT RR diff --git a/alphafold_casp13/ensemble_contact_maps.py b/alphafold_casp13/ensemble_contact_maps.py index 43d95a5..9e85bf1 100644 --- a/alphafold_casp13/ensemble_contact_maps.py +++ b/alphafold_casp13/ensemble_contact_maps.py @@ -24,7 +24,7 @@ import os from absl import app from absl import flags from absl import logging -import tensorflow.compat.v1 as tf # pylint: disable=g-explicit-tensorflow-version-import +import tensorflow as tf # pylint: disable=g-explicit-tensorflow-version-import from alphafold_casp13 import distogram_io from alphafold_casp13 import parsers diff --git a/alphafold_casp13/parsers.py b/alphafold_casp13/parsers.py index 0809d39..d0ef9d1 100644 --- a/alphafold_casp13/parsers.py +++ b/alphafold_casp13/parsers.py @@ -16,7 +16,7 @@ import pickle -import tensorflow.compat.v1 as tf # pylint: disable=g-explicit-tensorflow-version-import +import tensorflow as tf # pylint: disable=g-explicit-tensorflow-version-import def distance_histogram_dict(f): diff --git a/alphafold_casp13/paste_contact_maps.py b/alphafold_casp13/paste_contact_maps.py index c360904..e2fbe6b 100644 --- a/alphafold_casp13/paste_contact_maps.py +++ b/alphafold_casp13/paste_contact_maps.py @@ -21,7 +21,7 @@ from absl import flags from absl import logging import numpy as np import six -import tensorflow.compat.v1 as tf # pylint: disable=g-explicit-tensorflow-version-import +import tensorflow as tf # pylint: disable=g-explicit-tensorflow-version-import from alphafold_casp13 import distogram_io from alphafold_casp13 import parsers diff --git a/alphafold_casp13/two_dim_resnet.py b/alphafold_casp13/two_dim_resnet.py index eb05942..d0036ba 100644 --- a/alphafold_casp13/two_dim_resnet.py +++ b/alphafold_casp13/two_dim_resnet.py @@ -15,7 +15,7 @@ """2D Resnet.""" from absl import logging -import tensorflow.compat.v1 as tf # pylint: disable=g-explicit-tensorflow-version-import +import tensorflow as tf # pylint: disable=g-explicit-tensorflow-version-import from alphafold_casp13 import two_dim_convnet