remove graph api (#818)

* remove graph api

* changelog

* timeout test

* codacy

* remove graph in tl.models

* increase timeout time

* remove tl in tests

* Additional Cleaning

* Timeout time added

* tests directory refactored

* Tests Fix Update python, 2.6

* YAPF Cleaning

* get_env fix

* Python 2 fix applied

* Python 2 Error fixes

* TL 1.10.1rc0 released

* Doc and YAPF Fix

* Test YAPF Fix

* RTD Lazy Import Fix

* Travis config restored

* Revert "Travis config restored"

This reverts commit 03fe83e.

Author: zsdonghao

.gitignore

@@ -127,3 +127,4 @@ update_tl.py
 *.gz
 *.npz
 venv_doc/
+venv_py2/

.travis.yml

@@ -21,16 +21,12 @@ env:
   # Backward Compatibility in insured for release less than 1 year old.
   # https://pypi.org/project/tensorflow/#history
   matrix:
-    - _TF_VERSION=1.10.0 # Remove on Apr 28, 2019
+    - _TF_VERSION=1.10.1 # Remove on Apr 28, 2019
     - _TF_VERSION=1.9.0 # Remove on Apr 28, 2019
     - _TF_VERSION=1.8.0 # Remove on Apr 28, 2019
     - _TF_VERSION=1.7.1 # Remove on May 08, 2019
     - _TF_VERSION=1.7.0 # Remove on Mar 29, 2019
     - _TF_VERSION=1.6.0 # Remove on Mar 01, 2019
-    # - _TF_VERSION=1.5.1 # Remove on Mar 20, 2019
-    # - _TF_VERSION=1.5.0 # Remove on Jan 26, 2019
-    # - _TF_VERSION=1.4.1 # Remove on Dec 08, 2018
-    # - _TF_VERSION=1.4.0 # Remove on Nov 01, 2018
 
   global:
 
@@ -61,7 +57,7 @@ install:
     if [[ -v _DOC_AND_YAPF_TEST ]]; then
         pip install tensorflow 
         pip install yapf
-        pip install -r requirements/requirements_doc.txt
+        pip install -e .[doc]
     else
         pip install tensorflow==$_TF_VERSION
         pip install -e .[all_cpu_dev]
@@ -97,7 +93,7 @@ deploy:
   on:
     tags: true
     python: '3.6'
-    condition: '$_TF_VERSION = 1.10.0'
+    condition: '$_TF_VERSION = 1.10.1'
 
 # Documentation: https://docs.travis-ci.com/user/deployment/releases/
 - provider: releases
@@ -110,4 +106,4 @@ deploy:
   on:
     tags: true
     python: '3.6'
-    condition: '$_TF_VERSION = 1.10.0'
+    condition: '$_TF_VERSION = 1.10.1'

CHANGELOG.md

@@ -145,6 +145,7 @@ To release a new version, please update the changelog as followed:
 ### Removed
 
   - `conv_layers()`  has been removed in both vgg16 and vgg19(PR #710)
+  - graph API (PR #818)
 
 ### Fixed
 
@@ -171,7 +172,7 @@ To release a new version, please update the changelog as followed:
 - @DEKHTIARJonathan: #739 #747 #750 #754
 - @lgarithm: #705 #700
 - @OwenLiuzZ: #698 #710 #775 #776
-- @zsdonghao: #711 #712 #734 #736 #737 #700 #751 #809
+- @zsdonghao: #711 #712 #734 #736 #737 #700 #751 #809 #818
 - @luomai: #700 #751 #766 #802
 - @XJTUWYD: #735
 - @mutewall: #735

docs/modules/files.rst

@@ -31,13 +31,14 @@ Load benchmark dataset, save and restore model, save and load variables.
    load_and_assign_npz
    save_npz_dict
    load_and_assign_npz_dict
+   save_ckpt
+   load_ckpt
+
+..
    save_graph
    load_graph
    save_graph_and_params
    load_graph_and_params
-   save_ckpt
-   load_ckpt
-
 
    save_any_to_npy
    load_npy_to_any
@@ -183,21 +184,22 @@ Load network from dict (npz)
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 .. autofunction:: load_and_assign_npz_dict
 
-Save network architecture as a graph
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-.. autofunction:: save_graph
+..
+  Save network architecture as a graph
+  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+  .. autofunction:: save_graph
 
-Load network architecture from a graph
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-.. autofunction:: load_graph
+  Load network architecture from a graph
+  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+  .. autofunction:: load_graph
 
-Save network architecture and parameters
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-.. autofunction:: save_graph_and_params
+  Save network architecture and parameters
+  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+  .. autofunction:: save_graph_and_params
 
-Load network architecture and parameters
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-.. autofunction:: load_graph_and_params
+  Load network architecture and parameters
+  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+  .. autofunction:: load_graph_and_params
 
 Save network into ckpt
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

setup.py

@@ -89,7 +89,7 @@ def req_file(filename, folder="requirements"):
 
 
 # Readthedocs requires TF 1.5.0 to build properly
-if os.environ.get('READTHEDOCS', None) == 'True':
+if 'READTHEDOCS' in os.environ:
     ext_modules = [
         Extension('install_requirements_for_rtd', []),
     ]

tensorlayer/__init__.py

@@ -2,8 +2,6 @@
 # -*- coding: utf-8 -*-
 """Deep learning and Reinforcement learning library for Researchers and Engineers"""
 
-from __future__ import absolute_import
-
 import os
 from distutils.version import LooseVersion
 

tensorlayer/db.py

@@ -9,7 +9,11 @@
 
 import gridfs
 import pymongo
-from tensorlayer.files import load_graph_and_params, exists_or_mkdir, del_folder
+
+# from tensorlayer.files import load_graph_and_params
+from tensorlayer.files import exists_or_mkdir
+from tensorlayer.files import del_folder
+
 from tensorlayer import logging
 
 import tensorflow as tf

tensorlayer/distributed.py

@@ -107,7 +107,7 @@ def __init__(
             self, training_dataset, build_training_func, optimizer, optimizer_args, batch_size=32, num_epochs=100,
             prefetch_buffer_size=None, shuffle_data=False, shuffle_seed=0, checkpoint_dir=None,
             scaling_learning_rate=True, log_step_size=1, validation_dataset=None, build_validation_func=None,
-            max_iteration=math.inf
+            max_iteration=float('inf')
     ):
         # Initialize Horovod.
         hvd.init()

tensorlayer/files/__init__.py

@@ -67,8 +67,8 @@
     'save_ckpt',
     'save_npz',
     'save_npz_dict',
-    'save_graph',
-    'load_graph',
-    'save_graph_and_params',
-    'load_graph_and_params',
+    #'save_graph',
+    #'load_graph',
+    #'save_graph_and_params',
+    #'load_graph_and_params',
 ]

tensorlayer/files/utils.py

@@ -41,7 +41,8 @@
 
 import tensorflow as tf
 from tensorflow.python.platform import gfile
-import tensorlayer as tl  # it is used in eval() of _graph2net
+
+import tensorlayer as tl
 from tensorlayer import logging
 from tensorlayer import nlp
 from tensorlayer import utils
@@ -71,10 +72,10 @@
     'save_ckpt',
     'save_npz',
     'save_npz_dict',
-    'save_graph',
-    'load_graph',
-    'save_graph_and_params',
-    'load_graph_and_params',
+    #'save_graph',
+    #'load_graph',
+    #'save_graph_and_params',
+    #'load_graph_and_params',
 ]
 
 
@@ -1894,6 +1895,7 @@ def load_ckpt(sess=None, mode_name='model.ckpt', save_dir='checkpoint', var_list
         logging.info("[*] load ckpt fail ...")
 
 
+'''
 def save_graph(network=None, name='graph.pkl'):
     """Save the architecture of TL model into a pickle file. No parameters be saved.
 
@@ -2058,6 +2060,7 @@ def load_graph_and_params(name='model', sess=None):
     network = load_graph(name=os.path.join(name, 'graph.pkl'))
     load_and_assign_npz(sess=sess, name=os.path.join(name, 'params.npz'), network=network)
     return network
+'''
 
 
 def save_any_to_npy(save_dict=None, name='file.npy'):