Remove %tensorflow_version and from __future__

PiperOrigin-RevId: 308827254
tensorflow · Apr 28, 2020 · b5a7247 · b5a7247
1 parent 897f03d
commit b5a7247
Show file tree

Hide file tree

Showing 6 changed files with 31 additions and 82 deletions.
diff --git a/tensorflow_graphics/g3doc/_index.ipynb b/tensorflow_graphics/g3doc/_index.ipynb
@@ -99,10 +99,6 @@
  },
  "outputs": [],
  "source": [
- "from __future__ import absolute_import\n",
- "from __future__ import division\n",
- "from __future__ import print_function\n",
- "\n",
  "import numpy as np\n",
  "import tensorflow as tf\n",
  "import trimesh\n",

diff --git a/tensorflow_graphics/notebooks/6dof_alignment.ipynb b/tensorflow_graphics/notebooks/6dof_alignment.ipynb
@@ -117,10 +117,6 @@
  },
  "outputs": [],
  "source": [
- "from __future__ import absolute_import\n",
- "from __future__ import division\n",
- "from __future__ import print_function\n",
- "\n",
  "import time\n",
  "\n",
  "import matplotlib.pyplot as plt\n",
@@ -670,15 +666,10 @@
  "metadata": {
  "colab": {
  "collapsed_sections": [],
- "last_runtime": {
- "build_target": "//learning/brain/python/client:colab_notebook",
- "kind": "private"
- },
  "name": "6dof alignment.ipynb",
  "private_outputs": true,
  "provenance": [],
- "toc_visible": true,
- "version": "0.3.2"
+ "toc_visible": true
  },
  "kernelspec": {
  "display_name": "Python 3",

diff --git a/tensorflow_graphics/notebooks/intrinsics_optimization.ipynb b/tensorflow_graphics/notebooks/intrinsics_optimization.ipynb
@@ -116,10 +116,6 @@
  },
  "outputs": [],
  "source": [
- "from __future__ import absolute_import\n",
- "from __future__ import division\n",
- "from __future__ import print_function\n",
- "\n",
  "import tensorflow as tf\n",
  "import matplotlib.pyplot as plt\n",
  "import numpy as np\n",
@@ -129,9 +125,7 @@
  "#################################\n",
  "\n",
  "from tensorflow_graphics.math.optimizer import levenberg_marquardt\n",
- "from tensorflow_graphics.rendering.camera import perspective \n",
- "\n",
- "tf.compat.v1.enable_eager_execution()"
+ "from tensorflow_graphics.rendering.camera import perspective "
  ]
  },
  {
@@ -434,14 +428,10 @@
  "metadata": {
  "colab": {
  "collapsed_sections": [],
- "last_runtime": {
- "build_target": "//learning/brain/python/client:colab_notebook",
- "kind": "private"
- },
  "name": "intrinsics_optimization.ipynb",
  "provenance": [],
  "toc_visible": true,
- "version": "0.3.2"
+ "private_outputs": true
  },
  "kernelspec": {
  "display_name": "Python 3",

diff --git a/tensorflow_graphics/notebooks/mesh_segmentation_demo.ipynb b/tensorflow_graphics/notebooks/mesh_segmentation_demo.ipynb
@@ -1,19 +1,5 @@
 {
- "nbformat": 4,
- "nbformat_minor": 0,
- "metadata": {
- "colab": {
- "name": "mesh_segmentation_demo.ipynb",
- "provenance": [],
- "private_outputs": true,
- "collapsed_sections": [],
- "toc_visible": true
- },
- "kernelspec": {
- "name": "python3",
- "display_name": "Python 3"
- }
- },
+
  "cells": [
  {
  "cell_type": "markdown",
@@ -165,13 +151,10 @@
  "colab": {}
  },
  "source": [
- "from __future__ import absolute_import\n",
- "from __future__ import division\n",
- "from __future__ import print_function\n",
- "\n",
  "import glob\n",
  "import os\n",
- "import tensorflow as tf\n",
+ "import tensorflow.compat.v1 as tf\n",
+ "tf.disable_v2_behavior()\n",
  "\n",
  "from tensorflow_graphics.nn.layer import graph_convolution as graph_conv\n",
  "from tensorflow_graphics.notebooks import mesh_segmentation_dataio as dataio\n",
@@ -661,9 +644,22 @@
  "print('Start training & eval.')\n",
  "tf.estimator.train_and_evaluate(classifier, train_spec, eval_spec)\n",
  "print('Train and eval done.')"
- ],
- "execution_count": 0,
- "outputs": []
+ ]
+ }
+ ],
+ "metadata": {
+ "colab": {
+ "collapsed_sections": [],
+ "name": "mesh_segmentation_demo.ipynb",
+ "private_outputs": true,
+ "provenance": [],
+ "toc_visible": true
+ },
+ "kernelspec": {
+ "display_name": "Python 3",
+ "name": "python3"
  }
- ]
-}
+ },
+ "nbformat": 4,
+ "nbformat_minor": 0
+}
diff --git a/tensorflow_graphics/notebooks/non_rigid_deformation.ipynb b/tensorflow_graphics/notebooks/non_rigid_deformation.ipynb
@@ -7,8 +7,7 @@
  "id": "cDgpEHaUETGA"
  },
  "source": [
- "##### Copyright 2019 Google LLC.\n",
- "\n"
+ "##### Copyright 2019 Google LLC.\n"
  ]
  },
  {
@@ -112,10 +111,6 @@
  },
  "outputs": [],
  "source": [
- "from __future__ import absolute_import\n",
- "from __future__ import division\n",
- "from __future__ import print_function\n",
- "\n",
  "import numpy as np\n",
  "import tensorflow as tf\n",
  "\n",
@@ -124,9 +119,7 @@
  "from tensorflow_graphics.geometry.transformation import quaternion\n",
  "from tensorflow_graphics.math.optimizer import levenberg_marquardt\n",
  "from tensorflow_graphics.notebooks import threejs_visualization\n",
- "from tensorflow_graphics.notebooks.resources import triangulated_stripe\n",
- "\n",
- "tf.compat.v1.enable_eager_execution()"
+ "from tensorflow_graphics.notebooks.resources import triangulated_stripe"
  ]
  },
  {
@@ -271,14 +264,10 @@
  "metadata": {
  "colab": {
  "collapsed_sections": [],
- "last_runtime": {
- "build_target": "//learning/brain/python/client:colab_notebook",
- "kind": "private"
- },
- "name": "non_rigid_deformation_demo.ipynb",
+ "name": "non_rigid_deformation.ipynb",
  "provenance": [],
  "toc_visible": true,
- "version": "0.3.2"
+ "private_outputs": true
  },
  "kernelspec": {
  "display_name": "Python 3",

diff --git a/tensorflow_graphics/notebooks/reflectance.ipynb b/tensorflow_graphics/notebooks/reflectance.ipynb
@@ -114,13 +114,6 @@
  },
  "outputs": [],
  "source": [
- "###########\n",
- "# Imports #\n",
- "###########\n",
- "from __future__ import absolute_import\n",
- "from __future__ import division\n",
- "from __future__ import print_function\n",
- "\n",
  "import math as m\n",
  "import matplotlib.pyplot as plt\n",
  "import numpy as np\n",
@@ -131,9 +124,7 @@
  "from tensorflow_graphics.rendering.camera import orthographic\n",
  "from tensorflow_graphics.geometry.representation import grid\n",
  "from tensorflow_graphics.geometry.representation import ray\n",
- "from tensorflow_graphics.geometry.representation import vector\n",
- "\n",
- "tf.compat.v1.enable_eager_execution()"
+ "from tensorflow_graphics.geometry.representation import vector"
  ]
  },
  {
@@ -296,14 +287,10 @@
  "metadata": {
  "colab": {
  "collapsed_sections": [],
- "last_runtime": {
- "build_target": "//learning/brain/python/client:colab_notebook",
- "kind": "private"
- },
- "name": "reflectance_demo.ipynb",
+ "name": "reflectance.ipynb",
  "provenance": [],
  "toc_visible": true,
- "version": "0.3.2"
+ "private_outputs": true
  },
  "kernelspec": {
  "display_name": "Python 3",