Scipy Update to 1.1.0 and TL import restructured to fix #549 (#550)

* Pin scipy to latest version 1.1.0

* Pin scipy to latest version 1.1.0

* Update requirements.txt

* Update requirements.txt

* Update requirements.txt

* Requirements Structure Changed - Import Process modified to fix #549

* Error Fix

* Indent error fix

* Python Style Cleaning - YAPF and Codacy Fixed

Author: pyup-bot

.readthedocs.yml

@@ -6,6 +6,7 @@ python:
     version: 3.5
     pip_install: true
     extra_requirements:
-        - doc
+        - db
         - dev
+        - doc
         - test

.travis.yml

@@ -4,11 +4,11 @@ language: python
 python:
   - "2.7"
   - "3.5"
-  - "3.6" 
-  
+  - "3.6"
+
 env:
   global:
-  
+
   - PYPI_USER='jonathandekhtiar'
 
   ### == PYPI_PASSWORD === ###
@@ -18,25 +18,25 @@ env:
   ### === GITHUB_PERSONAL_TOKEN === ###
   ## To update: travis encrypt GITHUB_PERSONAL_TOKEN=################################
   - secure: "GmdokEVWFS4LlSIdhfYvET+53hcuN9gN5gbhYduWkvyqvCJnP5PENzxdDz6Y3EJCSXxfKTT+jBLmJkgOElgeWxyAEa+wGj3jJzpjFD8BEcxIf5mNsyJ2LryzecFoKjcCR7viid14GDEYSeA3UB0MgKgitm9rMmcQ2W9RLJfAmTfGRQ+kMwhM7GTeFc5c99YL7DW7AUFSbiAac/k50AMx2j9KNT1JAGhDoc5yVTdVvtKrdtuCZUa82q4Cm/h4IEd6BbNrcImYyxQ814LHCrHWBi9jmuc+UxqvsTH1ErNapIObz490ri3DmZg+LUrH5dIuhSa5HGqZjob6tKG6XCKFWOuv9E73+URDitJllXHc1qSP/K61SMmsQrE2FnaxVjxpQCOcqueRMKszwH5/k3UoGbUPWsBFwbBznXrnHO/DNHAgL9XwOFP6biPP8TKp2ReX41YwcU6sbiYb7naGWo3Dhe+yEB9wBGOwuGHipDQm9R4SSIJgjpdc642KjcEMQqb3yL7DWpOmItXMxoGNM+X93kU4u4u1tGgq1yxnhEk6VG2l/yI6A2QOVIPyOu+L9FkZL3mrl9mbUeBKr/SHX4CTFODi5io8D0lqwNSRZrmi/GGWh2glbNnTapD67UnTnsh/6LE2YiSqGteH47EByb9V4ykrjfdv5EZhyJNwI7jYPDw="
-  
-  
+
+
 install:
-  - pip install -e .[tf_cpu,dev,test,doc]
-  
-  
+  - pip install -e .[tf_cpu,db,dev,test,doc]
+
+
 script:
   # units test
   # https://docs.pytest.org/en/latest/
   - pytest
-  
- 
+
+
 before_deploy:
   - python setup.py sdist
   - python setup.py bdist_wheel
   - python setup.py bdist_wheel --universal
   - python setup.py egg_info
-  
-  
+
+
 deploy:
 
 # Documentation: https://docs.travis-ci.com/user/deployment/pypi/

README.md

@@ -94,10 +94,10 @@ $ source venv/bin/activate
 $ venv\Scripts\activate.bat
 
 # for a machine **without** an NVIDIA GPU
-$ pip install -e .[tf_cpu,dev,test,doc]
+$ pip install -e .[tf_cpu,db,dev,test,doc]
 
 # for a machine **with** an NVIDIA GPU
-$ pip install -e .[tf_gpu,dev,test,doc]
+$ pip install -e .[tf_gpu,db,dev,test,doc]
 ```
 
 Dockerfile is supplied to build images, build as usual
@@ -137,7 +137,7 @@ Examples can be found [in this folder](https://github.com/zsdonghao/tensorlayer/
  - Data augmentation with TensorLayer, see [tutorial\_image_preprocess.py](https://github.com/zsdonghao/tensorlayer/blob/master/example/tutorial_image_preprocess.py).
  - Float 16 half-precision model, see [tutorial\_mnist_float16.py](https://github.com/zsdonghao/tensorlayer/blob/master/example/tutorial_mnist_float16.py)
  - Distributed Training. [mnist](https://github.com/zsdonghao/tensorlayer/blob/master/example/tutorial_mnist_distributed.py) and [imagenet](https://github.com/tensorlayer/tensorlayer/blob/master/example/tutorial_imagenet_inceptionV3_distributed.py) by [jorgemf](https://github.com/jorgemf).
- 
+
 ## Vision
  - ArcFace: Additive Angular Margin Loss for Deep Face Recognition, see [InsignFace](https://github.com/auroua/InsightFace_TF).
  - BinaryNet. Model acceleration, see [mnist](https://github.com/tensorlayer/tensorlayer/blob/master/example/tutorial_binarynet_mnist_cnn.py) [cifar10](https://github.com/tensorlayer/tensorlayer/blob/master/example/tutorial_binarynet_cifar10_tfrecord.py).
@@ -159,7 +159,7 @@ Examples can be found [in this folder](https://github.com/zsdonghao/tensorlayer/
 - [Super Resolution GAN](https://arxiv.org/abs/1609.04802) by [zsdonghao](https://github.com/zsdonghao/SRGAN).
 - [BEGAN: Boundary Equilibrium Generative Adversarial Networks](http://arxiv.org/abs/1703.10717) by [2wins](https://github.com/2wins/BEGAN-tensorlayer).
 - [DAGAN: Fast Compressed Sensing MRI Reconstruction](https://github.com/nebulaV/DAGAN) by [nebulaV](https://github.com/nebulaV/DAGAN).
-  
+
 ## Natural Language Processing
  - Recurrent Neural Network (LSTM). Apply multiple LSTM to PTB dataset for language modeling, see [tutorial_ptb_lstm.py](https://github.com/zsdonghao/tensorlayer/blob/master/example/tutorial_ptb_lstm.py) and [tutorial\_ptb\_lstm\_state\_is_tuple.py](https://github.com/zsdonghao/tensorlayer/blob/master/example/tutorial_ptb_lstm_state_is_tuple.py).
  - Word Embedding (Word2vec). Train a word embedding matrix, see [tutorial\_word2vec_basic.py](https://github.com/zsdonghao/tensorlayer/blob/master/example/tutorial\_word2vec_basic.py).

docs/requirements.txt

@@ -1,7 +1,3 @@
 flake8-docstrings>=1.3,<1.4
 matplotlib>=2.2,<2.3
-pymongo>=3.6,<3.7
-progressbar2>=3.37,<3.38
-scikit-image>=0.13,<0.14
-scipy>=1.0,<1.1
 sphinx>=1.7,<1.8

requirements.txt

@@ -2,5 +2,5 @@ matplotlib>=2.2,<2.3
 numpy>=1.14,<1.15
 progressbar2>=3.37,<3.38
 scikit-image>=0.13,<0.14
-scipy>=1.0,<1.1
-imageio>=2.3,<2.4
+scipy>=1.1,<1.2
+imageio>=2.3,<2.4

requirements_db.txt

@@ -0,0 +1 @@
+pymongo>=3.6,<3.7

setup.py

@@ -57,6 +57,7 @@ def req_file(filename):
 extras_require = {
     'tf_cpu': ['tensorflow>=1.8.0,<1.9'],
     'tf_gpu': ['tensorflow-gpu>=1.8.0,<1.9'],
+	'db': req_file("requirements_db.txt"),
 	'dev': req_file("requirements_dev.txt"),
 	'doc': req_file("docs/requirements.txt"),
 	'test': req_file("tests/requirements.txt")

tensorlayer/__init__.py

@@ -3,19 +3,7 @@
 """Deep learning and Reinforcement learning library for Researchers and Engineers"""
 from __future__ import absolute_import
 
-import pkg_resources
-installed_packages = [d for d in pkg_resources.working_set]
-
-TF_is_installed = False
-TL_is_installed = False
-
-for package in installed_packages:
-    if 'tensorflow' in package.project_name:
-        TF_is_installed = True
-    if 'tensorlayer' in package.project_name and 'site-packages' in package.location:
-        TL_is_installed = True
-
-if TF_is_installed:  # The tensorlayer package is installed
+try:
     import tensorflow
 
     from . import activation
@@ -38,9 +26,14 @@
     global_flag = {}
     global_dict = {}
 
-elif TL_is_installed:
-    install_instr = "Please make sure you install a recent enough version of TensorFlow."
-    raise ImportError("__init__.py : Could not import TensorFlow. {}".format(install_instr))
+except Exception as e:
+
+    import pkg_resources
+    installed_packages = [d for d in pkg_resources.working_set]
+
+    for package in installed_packages:
+        if 'tensorlayer' in package.project_name and 'site-packages' in package.location:
+            raise ImportError("__init__.py : Could not import TensorLayer.\nError: {}".format(e))
 
 # Use the following formating: (major, minor, patch, prerelease)
 VERSION = (1, 8, 5, 'rc2')