From 559a7c5300797adbdee8ffdbb48f9d88c773de48 Mon Sep 17 00:00:00 2001 From: Dmitry Chaplinsky Date: Tue, 10 Aug 2021 19:53:08 +0300 Subject: [PATCH 1/2] Fixing TF2.0 compatibility --- parser/base_network.py | 4 +++- parser/elmo_network.py | 3 ++- parser/graph_outputs.py | 3 ++- parser/graph_parser_network.py | 3 ++- parser/neural/classifiers.py | 3 ++- parser/neural/embeddings.py | 3 ++- parser/neural/nn.py | 4 ++-- parser/neural/nonlin.py | 5 +++-- parser/neural/optimizers/adam_optimizer.py | 3 ++- parser/neural/optimizers/amsgrad_optimizer.py | 3 ++- parser/neural/optimizers/optimizer.py | 3 ++- parser/neural/recurrent.py | 3 ++- parser/parser_network.py | 3 ++- parser/structs/buckets/dict_bucket.py | 3 ++- parser/structs/buckets/list_bucket.py | 3 ++- parser/structs/buckets/list_multibucket.py | 3 ++- parser/structs/conllu_dataset.py | 3 ++- parser/structs/vocabs/base_vocabs.py | 3 ++- parser/structs/vocabs/feature_vocabs.py | 3 ++- parser/structs/vocabs/index_vocabs.py | 3 ++- parser/structs/vocabs/multivocabs.py | 3 ++- parser/structs/vocabs/pretrained_vocabs.py | 3 ++- parser/structs/vocabs/subtoken_vocabs.py | 3 ++- parser/structs/vocabs/token_vocabs.py | 3 ++- parser/tagger_network.py | 3 ++- 25 files changed, 52 insertions(+), 27 deletions(-) diff --git a/parser/base_network.py b/parser/base_network.py index f93004a..cfa165c 100644 --- a/parser/base_network.py +++ b/parser/base_network.py @@ -27,7 +27,9 @@ import codecs import numpy as np -import tensorflow as tf +import tensorflow.compat.v1 as tf +tf.disable_v2_behavior() + from tensorflow.python.client import timeline from debug.timer import Timer diff --git a/parser/elmo_network.py b/parser/elmo_network.py index 1b96422..8aae086 100644 --- a/parser/elmo_network.py +++ b/parser/elmo_network.py @@ -27,7 +27,8 @@ import codecs import numpy as np -import tensorflow as tf +import tensorflow.compat.v1 as tf +tf.disable_v2_behavior() from parser.base_network import BaseNetwork from parser.neural import nn, nonlin, embeddings, recurrent, classifiers diff --git a/parser/graph_outputs.py b/parser/graph_outputs.py index 2f009e5..c63b4d9 100644 --- a/parser/graph_outputs.py +++ b/parser/graph_outputs.py @@ -30,7 +30,8 @@ import time import numpy as np -import tensorflow as tf +import tensorflow.compat.v1 as tf +tf.disable_v2_behavior() from parser.neural import nn from scripts.chuliu_edmonds import chuliu_edmonds_one_root diff --git a/parser/graph_parser_network.py b/parser/graph_parser_network.py index 42e3c76..a2133f0 100644 --- a/parser/graph_parser_network.py +++ b/parser/graph_parser_network.py @@ -27,7 +27,8 @@ import codecs import numpy as np -import tensorflow as tf +import tensorflow.compat.v1 as tf +tf.disable_v2_behavior() from parser.base_network import BaseNetwork from parser.neural import nn, nonlin, embeddings, recurrent, classifiers diff --git a/parser/neural/classifiers.py b/parser/neural/classifiers.py index 4d57e6c..2dc9d0d 100644 --- a/parser/neural/classifiers.py +++ b/parser/neural/classifiers.py @@ -20,7 +20,8 @@ from __future__ import print_function import numpy as np -import tensorflow as tf +import tensorflow.compat.v1 as tf +tf.disable_v2_behavior() from . import nn from . import nonlin diff --git a/parser/neural/embeddings.py b/parser/neural/embeddings.py index ba59ebe..ccb49a3 100644 --- a/parser/neural/embeddings.py +++ b/parser/neural/embeddings.py @@ -20,7 +20,8 @@ from __future__ import print_function import numpy as np -import tensorflow as tf +import tensorflow.compat.v1 as tf +tf.disable_v2_behavior() from . import nn from .classifiers import linear_attention diff --git a/parser/neural/nn.py b/parser/neural/nn.py index b0cc773..2eed79c 100644 --- a/parser/neural/nn.py +++ b/parser/neural/nn.py @@ -60,7 +60,7 @@ def dropout(inputs, keep_prob, noise_shape=None): if isinstance(noise_shape, (tuple, list)): noise_shape = tf.stack(noise_shape) - return tf.nn.dropout(inputs, keep_prob=keep_prob, noise_shape=noise_shape) + return tf.nn.dropout(inputs, rate=1 - keep_prob, noise_shape=noise_shape) #=============================================================== def unscaled_dropout(inputs, keep_prob, noise_shape=None): @@ -68,7 +68,7 @@ def unscaled_dropout(inputs, keep_prob, noise_shape=None): if isinstance(noise_shape, (tuple, list)): noise_shape = tf.stack(noise_shape) - return tf.nn.dropout(inputs, keep_prob=keep_prob, noise_shape=noise_shape)*keep_prob + return tf.nn.dropout(inputs, rate=1 - keep_prob, noise_shape=noise_shape)*keep_prob #=============================================================== def drop_mask(shape, keep_prob): diff --git a/parser/neural/nonlin.py b/parser/neural/nonlin.py index 7833384..7a9b060 100644 --- a/parser/neural/nonlin.py +++ b/parser/neural/nonlin.py @@ -20,8 +20,9 @@ from __future__ import print_function import numpy as np -import tensorflow as tf - +import tensorflow.compat.v1 as tf +tf.disable_v2_behavior() + from tensorflow import identity, tanh, asinh from tensorflow.python.ops.nn import relu, elu diff --git a/parser/neural/optimizers/adam_optimizer.py b/parser/neural/optimizers/adam_optimizer.py index 1d17982..b81a349 100644 --- a/parser/neural/optimizers/adam_optimizer.py +++ b/parser/neural/optimizers/adam_optimizer.py @@ -19,7 +19,8 @@ from __future__ import division from __future__ import print_function -import tensorflow as tf +import tensorflow.compat.v1 as tf +tf.disable_v2_behavior() from parser.neural.optimizers.optimizer import Optimizer diff --git a/parser/neural/optimizers/amsgrad_optimizer.py b/parser/neural/optimizers/amsgrad_optimizer.py index f202201..d4e30cb 100644 --- a/parser/neural/optimizers/amsgrad_optimizer.py +++ b/parser/neural/optimizers/amsgrad_optimizer.py @@ -19,7 +19,8 @@ from __future__ import division from __future__ import print_function -import tensorflow as tf +import tensorflow.compat.v1 as tf +tf.disable_v2_behavior() from parser.neural.optimizers.optimizer import Optimizer diff --git a/parser/neural/optimizers/optimizer.py b/parser/neural/optimizers/optimizer.py index 84e1fcf..a36827e 100644 --- a/parser/neural/optimizers/optimizer.py +++ b/parser/neural/optimizers/optimizer.py @@ -21,7 +21,8 @@ import six import re -import tensorflow as tf +import tensorflow.compat.v1 as tf +tf.disable_v2_behavior() #*************************************************************** class Optimizer(object): diff --git a/parser/neural/recurrent.py b/parser/neural/recurrent.py index 3632f81..1bb83bf 100644 --- a/parser/neural/recurrent.py +++ b/parser/neural/recurrent.py @@ -20,7 +20,8 @@ from __future__ import print_function import numpy as np -import tensorflow as tf +import tensorflow.compat.v1 as tf +tf.disable_v2_behavior() from . import nn from . import nonlin diff --git a/parser/parser_network.py b/parser/parser_network.py index efd51a4..ebcf245 100644 --- a/parser/parser_network.py +++ b/parser/parser_network.py @@ -27,7 +27,8 @@ import codecs import numpy as np -import tensorflow as tf +import tensorflow.compat.v1 as tf +tf.disable_v2_behavior() from parser.base_network import BaseNetwork from parser.neural import nn, nonlin, embeddings, recurrent, classifiers diff --git a/parser/structs/buckets/dict_bucket.py b/parser/structs/buckets/dict_bucket.py index bb5ed94..c600d4e 100644 --- a/parser/structs/buckets/dict_bucket.py +++ b/parser/structs/buckets/dict_bucket.py @@ -20,7 +20,8 @@ from __future__ import print_function import numpy as np -import tensorflow as tf +import tensorflow.compat.v1 as tf +tf.disable_v2_behavior() from .base_bucket import BaseBucket diff --git a/parser/structs/buckets/list_bucket.py b/parser/structs/buckets/list_bucket.py index 73b1f3e..1ae6b8d 100644 --- a/parser/structs/buckets/list_bucket.py +++ b/parser/structs/buckets/list_bucket.py @@ -20,7 +20,8 @@ from __future__ import print_function import numpy as np -import tensorflow as tf +import tensorflow.compat.v1 as tf +tf.disable_v2_behavior() from .base_bucket import BaseBucket diff --git a/parser/structs/buckets/list_multibucket.py b/parser/structs/buckets/list_multibucket.py index f3387a2..6206e9e 100644 --- a/parser/structs/buckets/list_multibucket.py +++ b/parser/structs/buckets/list_multibucket.py @@ -21,7 +21,8 @@ import six import numpy as np -import tensorflow as tf +import tensorflow.compat.v1 as tf +tf.disable_v2_behavior() from .base_multibucket import BaseMultibucket from .list_bucket import ListBucket diff --git a/parser/structs/conllu_dataset.py b/parser/structs/conllu_dataset.py index 10c7563..b446460 100644 --- a/parser/structs/conllu_dataset.py +++ b/parser/structs/conllu_dataset.py @@ -36,7 +36,8 @@ from collections import Counter import numpy as np -import tensorflow as tf +import tensorflow.compat.v1 as tf +tf.disable_v2_behavior() from parser.structs.buckets import DictMultibucket diff --git a/parser/structs/vocabs/base_vocabs.py b/parser/structs/vocabs/base_vocabs.py index 63eb89e..64930fe 100644 --- a/parser/structs/vocabs/base_vocabs.py +++ b/parser/structs/vocabs/base_vocabs.py @@ -27,7 +27,8 @@ from collections import defaultdict as DefaultDict import numpy as np -import tensorflow as tf +import tensorflow.compat.v1 as tf +tf.disable_v2_behavior() import parser.neural.nn # id_vocab.root = 0 diff --git a/parser/structs/vocabs/feature_vocabs.py b/parser/structs/vocabs/feature_vocabs.py index 8ceff26..ace3e50 100644 --- a/parser/structs/vocabs/feature_vocabs.py +++ b/parser/structs/vocabs/feature_vocabs.py @@ -27,7 +27,8 @@ from collections import defaultdict as DefaultDict import numpy as np -import tensorflow as tf +import tensorflow.compat.v1 as tf +tf.disable_v2_behavior() from parser.structs.vocabs.base_vocabs import BaseVocab from . import conllu_vocabs as cv diff --git a/parser/structs/vocabs/index_vocabs.py b/parser/structs/vocabs/index_vocabs.py index 3f5e9bd..bf072a7 100644 --- a/parser/structs/vocabs/index_vocabs.py +++ b/parser/structs/vocabs/index_vocabs.py @@ -21,7 +21,8 @@ import six import numpy as np -import tensorflow as tf +import tensorflow.compat.v1 as tf +tf.disable_v2_behavior() from .base_vocabs import BaseVocab from . import conllu_vocabs as cv diff --git a/parser/structs/vocabs/multivocabs.py b/parser/structs/vocabs/multivocabs.py index 8154830..6005f11 100644 --- a/parser/structs/vocabs/multivocabs.py +++ b/parser/structs/vocabs/multivocabs.py @@ -20,7 +20,8 @@ from __future__ import print_function import numpy as np -import tensorflow as tf +import tensorflow.compat.v1 as tf +tf.disable_v2_behavior() from .base_vocabs import BaseVocab from . import conllu_vocabs as cv diff --git a/parser/structs/vocabs/pretrained_vocabs.py b/parser/structs/vocabs/pretrained_vocabs.py index c8b36ce..6896963 100644 --- a/parser/structs/vocabs/pretrained_vocabs.py +++ b/parser/structs/vocabs/pretrained_vocabs.py @@ -39,7 +39,8 @@ from collections import Counter import numpy as np -import tensorflow as tf +import tensorflow.compat.v1 as tf +tf.disable_v2_behavior() from parser.structs.vocabs.base_vocabs import SetVocab from . import conllu_vocabs as cv diff --git a/parser/structs/vocabs/subtoken_vocabs.py b/parser/structs/vocabs/subtoken_vocabs.py index 42b8a66..1ed19ba 100644 --- a/parser/structs/vocabs/subtoken_vocabs.py +++ b/parser/structs/vocabs/subtoken_vocabs.py @@ -26,7 +26,8 @@ from collections import Counter import numpy as np -import tensorflow as tf +import tensorflow.compat.v1 as tf +tf.disable_v2_behavior() from parser.structs.buckets import ListMultibucket from .base_vocabs import CountVocab diff --git a/parser/structs/vocabs/token_vocabs.py b/parser/structs/vocabs/token_vocabs.py index 22e500c..c9b3bd3 100644 --- a/parser/structs/vocabs/token_vocabs.py +++ b/parser/structs/vocabs/token_vocabs.py @@ -25,7 +25,8 @@ from collections import Counter import numpy as np -import tensorflow as tf +import tensorflow.compat.v1 as tf +tf.disable_v2_behavior() from parser.structs.vocabs.base_vocabs import CountVocab from . import conllu_vocabs as cv diff --git a/parser/tagger_network.py b/parser/tagger_network.py index c99b957..06ddc74 100644 --- a/parser/tagger_network.py +++ b/parser/tagger_network.py @@ -27,7 +27,8 @@ import codecs import numpy as np -import tensorflow as tf +import tensorflow.compat.v1 as tf +tf.disable_v2_behavior() from debug.timer import Timer From 28db15f20af9f0a3b40b955812d7e2e193b88174 Mon Sep 17 00:00:00 2001 From: Dmitry Chaplinsky Date: Tue, 10 Aug 2021 19:55:49 +0300 Subject: [PATCH 2/2] Adding basic requirements (no versions) --- requirements.txt | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 requirements.txt diff --git a/requirements.txt b/requirements.txt new file mode 100644 index 0000000..6fd68f3 --- /dev/null +++ b/requirements.txt @@ -0,0 +1,5 @@ +tensorflow +pandas +matplotlib +scipy +psutil \ No newline at end of file