Commit c7438a66 authored by tsocha's avatar tsocha Committed by Robert Kimball

[Py] Modify default paths (#845)

* Update default paths in setup.py

* Update defaults arguments in tox
parent b5a0d734
......@@ -24,6 +24,7 @@ import distutils.ccompiler
__version__ = '0.2.0'
PYNGRAPH_SOURCE_DIR = os.path.abspath(os.path.dirname(__file__))
NGRAPH_DEFAULT_INSTALL_DIR = os.environ.get('HOME')
def find_ngraph_dist_dir():
......@@ -31,7 +32,7 @@ def find_ngraph_dist_dir():
if os.environ.get('NGRAPH_CPP_BUILD_PATH'):
ngraph_dist_dir = os.environ.get('NGRAPH_CPP_BUILD_PATH')
else:
ngraph_dist_dir = os.path.join(PYNGRAPH_SOURCE_DIR, 'build/ngraph_dist')
ngraph_dist_dir = os.path.join(NGRAPH_DEFAULT_INSTALL_DIR, 'ngraph_dist')
found = os.path.exists(os.path.join(ngraph_dist_dir, 'include/ngraph'))
if not found:
......@@ -47,7 +48,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, 'build/pybind11')
pybind_headers_dir = os.path.join(PYNGRAPH_SOURCE_DIR, 'pybind11')
found = os.path.exists(os.path.join(pybind_headers_dir, 'include/pybind11'))
if not found:
......
......@@ -8,9 +8,9 @@ deps =
-rrequirements.txt
-rtest_requirements.txt
setenv =
NGRAPH_CPP_BUILD_PATH = {env:NGRAPH_CPP_BUILD_PATH:build/ngraph_dist}
LD_LIBRARY_PATH = {env:LD_LIBRARY_PATH:build/ngraph_dist/lib}
DYLD_LIBRARY_PATH = {env:DYLD_LIBRARY_PATH:build/ngraph_dist/lib}
NGRAPH_CPP_BUILD_PATH = {env:NGRAPH_CPP_BUILD_PATH:{homedir}/ngraph_dist}
LD_LIBRARY_PATH = {env:LD_LIBRARY_PATH:{homedir}/ngraph_dist/lib}
DYLD_LIBRARY_PATH = {env:DYLD_LIBRARY_PATH:{homedir}/ngraph_dist/lib}
PYBIND_HEADERS_PATH = {env:PYBIND_HEADERS_PATH:}
[testenv:py3]
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment