Merge remote-tracking branch 'origin/master' into r0.10

Author: Adam Procter

licenses/notifications.txt

@@ -0,0 +1,5 @@
+The MPL 2.0 license used by the eigen library used by this ngraph core
+component requires distribution of the following information:
+
+          Eigen source code can be viewed or downloaded from here:
+          http://eigen.tuxfamily.org

python/setup.py

@@ -22,7 +22,7 @@
 import distutils.ccompiler
 
 __version__ = os.environ.get('NGRAPH_VERSION', '0.0.0-dev')
-PYNGRAPH_SOURCE_DIR = os.path.abspath(os.path.dirname(__file__))
+PYNGRAPH_ROOT_DIR = os.path.abspath(os.path.dirname(__file__))
 NGRAPH_DEFAULT_INSTALL_DIR = os.environ.get('HOME')
 NGRAPH_ONNX_IMPORT_ENABLE = os.environ.get('NGRAPH_ONNX_IMPORT_ENABLE')
 
@@ -50,7 +50,7 @@ def find_pybind_headers_dir():
     if os.environ.get('PYBIND_HEADERS_PATH'):
         pybind_headers_dir = os.environ.get('PYBIND_HEADERS_PATH')
     else:
-        pybind_headers_dir = os.path.join(PYNGRAPH_SOURCE_DIR, 'pybind11')
+        pybind_headers_dir = os.path.join(PYNGRAPH_ROOT_DIR, 'pybind11')
 
     found = os.path.exists(os.path.join(pybind_headers_dir, 'include/pybind11'))
     if not found:
@@ -233,13 +233,13 @@ def cpp_flag(compiler):
 ]
 
 package_dir = {
-    'ngraph': PYNGRAPH_SOURCE_DIR + "/ngraph",
-    'ngraph.utils': PYNGRAPH_SOURCE_DIR + "/ngraph/utils",
-    'ngraph.impl': PYNGRAPH_SOURCE_DIR + "/ngraph/impl",
-    'ngraph.impl.op': PYNGRAPH_SOURCE_DIR + "/ngraph/impl/op",
-    'ngraph.impl.op.util': PYNGRAPH_SOURCE_DIR + "/ngraph/impl/op/util",
-    'ngraph.impl.passes': PYNGRAPH_SOURCE_DIR + "/ngraph/impl/passes",
-    'ngraph.impl.runtime': PYNGRAPH_SOURCE_DIR + "/ngraph/impl/runtime",
+    'ngraph': PYNGRAPH_ROOT_DIR + "/ngraph",
+    'ngraph.utils': PYNGRAPH_ROOT_DIR + "/ngraph/utils",
+    'ngraph.impl': PYNGRAPH_ROOT_DIR + "/ngraph/impl",
+    'ngraph.impl.op': PYNGRAPH_ROOT_DIR + "/ngraph/impl/op",
+    'ngraph.impl.op.util': PYNGRAPH_ROOT_DIR + "/ngraph/impl/op/util",
+    'ngraph.impl.passes': PYNGRAPH_ROOT_DIR + "/ngraph/impl/passes",
+    'ngraph.impl.runtime': PYNGRAPH_ROOT_DIR + "/ngraph/impl/runtime",
 }
 packages = [
     'ngraph',
@@ -251,9 +251,9 @@ def cpp_flag(compiler):
     'ngraph.impl.runtime',
 ]
 
-sources = [PYNGRAPH_SOURCE_DIR + "/" + source for source in sources]
+sources = [PYNGRAPH_ROOT_DIR + "/" + source for source in sources]
 
-include_dirs = [PYNGRAPH_SOURCE_DIR, NGRAPH_CPP_INCLUDE_DIR, PYBIND11_INCLUDE_DIR]
+include_dirs = [PYNGRAPH_ROOT_DIR, NGRAPH_CPP_INCLUDE_DIR, PYBIND11_INCLUDE_DIR]
 
 library_dirs = [NGRAPH_CPP_LIBRARY_DIR]
 
@@ -274,13 +274,13 @@ def cpp_flag(compiler):
     (
         'licenses',
         [
-            PYNGRAPH_SOURCE_DIR + "/../licenses/" + license
-            for license in os.listdir(PYNGRAPH_SOURCE_DIR + "/../licenses")
+            PYNGRAPH_ROOT_DIR + "/../licenses/" + license
+            for license in os.listdir(PYNGRAPH_ROOT_DIR + "/../licenses")
         ],
     ),
     (
         '',
-        [PYNGRAPH_SOURCE_DIR + "/../LICENSE"],
+        [PYNGRAPH_ROOT_DIR + "/../LICENSE"],
     )
 ]
 
@@ -302,10 +302,10 @@ def cpp_flag(compiler):
         'pyngraph/pyngraph_onnx_import.cpp',
         'pyngraph/onnx_import/onnx_import.cpp',
     ]
-    onnx_sources = [PYNGRAPH_SOURCE_DIR + "/" + source for source in onnx_sources]
+    onnx_sources = [PYNGRAPH_ROOT_DIR + "/" + source for source in onnx_sources]
 
     package_dir['ngraph.impl.onnx_import'] = (
-        PYNGRAPH_SOURCE_DIR + "/ngraph/impl/onnx_import"
+        PYNGRAPH_ROOT_DIR + "/ngraph/impl/onnx_import"
     )
     packages.append('ngraph.impl.onnx_import')
 
@@ -360,17 +360,17 @@ def build_extensions(self):
         build_ext.build_extensions(self)
 
 
-with open(os.path.join(PYNGRAPH_SOURCE_DIR, 'requirements.txt')) as req:
+with open(os.path.join(PYNGRAPH_ROOT_DIR, 'requirements.txt')) as req:
     requirements = req.read().splitlines()
 
 setup(
     name='ngraph-core',
+    description=open(os.path.join(PYNGRAPH_ROOT_DIR, 'README.md')).read(),
     version=__version__,
     author='Intel',
     author_email='[email protected]',
     url='https://ai.intel.com/',
     license='License :: OSI Approved :: Apache Software License',
-    description='Python API for nGraph',
     long_description='',
     ext_modules=ext_modules,
     package_dir=package_dir,