experiments/STT-tensorflow
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Automated rollback of commit 1171258036

Browse Source 
PiperOrigin-RevId: 265128581
This commit is contained in:
Anna R 2019-08-23 13:58:39 -07:00 committed by TensorFlower Gardener
parent c12866ab1c
commit 1d1f7dfcbd
5 changed files with 6 additions and 18 deletions

4
tensorflow/BUILD
View File

@ -812,8 +812,8 @@ genrule(
}), }),
outs = ["__init__.py"], outs = ["__init__.py"],
cmd = select({ cmd = select({
"api_version_2": "cp $(@D)/_api/v2/v2.py $(OUTS) && sed -i'.original' 's:from . import:from . _api.v2 import:g' $(OUTS)", "api_version_2": "cp $(@D)/_api/v2/v2.py $(OUTS)",
"//conditions:default": "cp $(@D)/_api/v1/v1.py $(OUTS) && sed -i'.original' 's:from . import:from ._api.v1 import:g' $(OUTS)", "//conditions:default": "cp $(@D)/_api/v1/v1.py $(OUTS)",
}), }),
) )

2
tensorflow/api_template.__init__.py
View File

@ -78,7 +78,7 @@ except ImportError:
pass pass
try: try:
from .python.keras.api._v2 import keras from tensorflow.python.keras.api._v2 import keras
_current_module.__path__ = ( _current_module.__path__ = (
[_module_util.get_parent_dir(keras)] + _current_module.__path__) [_module_util.get_parent_dir(keras)] + _current_module.__path__)
setattr(_current_module, "keras", keras) setattr(_current_module, "keras", keras)

2
tensorflow/api_template_v1.__init__.py
View File

@ -69,7 +69,7 @@ except ImportError:
pass pass
try: try:
from .python.keras.api._v1 import keras from tensorflow.python.keras.api._v1 import keras
_current_module.__path__ = ( _current_module.__path__ = (
[_module_util.get_parent_dir(keras)] + _current_module.__path__) [_module_util.get_parent_dir(keras)] + _current_module.__path__)
setattr(_current_module, "keras", keras) setattr(_current_module, "keras", keras)

3
tensorflow/python/tools/api/generator/create_python_api.py
View File

@ -195,7 +195,8 @@ class _ModuleInitCodeBuilder(object):
dest_module_name=parent_module, dest_module_name=parent_module,
dest_name=module_split[submodule_index]) dest_name=module_split[submodule_index])
else: else:
import_from = '.' if submodule_index > 0:
import_from += '.' + '.'.join(module_split[:submodule_index])
self.add_import( self.add_import(
symbol=None, symbol=None,
source_module_name=import_from, source_module_name=import_from,

13
tensorflow/tools/api/tests/module_test.py
View File

@ -23,7 +23,6 @@ import pkgutil
import tensorflow as tf import tensorflow as tf
from tensorflow.python import tf2
from tensorflow.python.platform import test from tensorflow.python.platform import test
@ -51,18 +50,6 @@ class ModuleTest(test.TestCase):
def testName(self): def testName(self):
self.assertEqual('tensorflow', tf.__name__) self.assertEqual('tensorflow', tf.__name__)
def testBuiltInName(self):
# range is a built-in name in Python. Just checking that
# tf.range works fine.
if tf2.enabled():
self.assertEqual(
'tf.Tensor([1 2 3 4 5 6 7 8 9], shape=(9,), dtype=int32)',
str(tf.range(1, 10)))
else:
self.assertEqual(
'Tensor("range:0", shape=(9,), dtype=int32)',
str(tf.range(1, 10)))
if __name__ == '__main__': if __name__ == '__main__':
test.main() test.main()