Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

nGraph Preset initial commit #642

Merged
merged 53 commits into from
Jan 18, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
53 commits
Select commit Hold shift + click to select a range
f7b2a98
nGraph Preset initial commit
EmergentOrder Nov 19, 2018
a1b76fe
Don't need to patch tensor
EmergentOrder Nov 19, 2018
176d8dc
Add RuntimeTensor
EmergentOrder Nov 19, 2018
d263539
Add RuntimeTensor part 2
EmergentOrder Nov 19, 2018
960a2e4
Add runtime::Backend
EmergentOrder Nov 19, 2018
5a75072
Add ONNXIFI nGraph Backend
EmergentOrder Nov 20, 2018
69b4190
Add nGraph to .travis.yml
EmergentOrder Nov 20, 2018
4cd4b5a
Add Backend Manager
EmergentOrder Nov 20, 2018
0ffa40c
Use download instead of git clone; define nGraph version; add header
EmergentOrder Nov 27, 2018
9e813d2
Build and install ncurses
EmergentOrder Nov 27, 2018
73cca96
add symlink for libtinfo
EmergentOrder Nov 27, 2018
94f3dc2
Add paths and flags
EmergentOrder Nov 27, 2018
adbc398
Fix reference to onnx; use INSTALL_PATH for ngraph install
EmergentOrder Nov 28, 2018
e5a3ba3
Don't patch element_type.hpp
EmergentOrder Nov 28, 2018
08aee10
Add ngraph to top-level pom.xml and cppbuild.sh; use CentOS 7 for ngr…
EmergentOrder Nov 30, 2018
2495374
Add from<X> functions; skip BackendManager functions
EmergentOrder Nov 30, 2018
f5f01ec
Update generated ngraph.java
EmergentOrder Nov 30, 2018
41526e3
Add ngraph to top-level platform pom and remove macosx (for now) from…
EmergentOrder Nov 30, 2018
16f937e
Fix typo
EmergentOrder Dec 1, 2018
7a9f8ad
Link cpu_backend to resolve 'undefined symbol'
EmergentOrder Dec 1, 2018
e56c4be
Don't copy headers and so files unless necessary; link codegen lib
EmergentOrder Dec 1, 2018
63ff040
Fix build by restoring onnxifi.h
EmergentOrder Dec 1, 2018
308d20c
Relocate onnxifi.h
EmergentOrder Dec 1, 2018
88b31b6
Relocate onnxifi.h
EmergentOrder Dec 1, 2018
549baa0
Restore libonnxifi.so
EmergentOrder Dec 1, 2018
f395c40
Update generated ngraph.java
EmergentOrder Dec 1, 2018
b8eb5a4
Update nGraph version; attempt to fix issue with libtbb
EmergentOrder Dec 1, 2018
7a1d725
Update backend_manager.hpp patch for nGraph 0.10.1
EmergentOrder Dec 1, 2018
7f036ce
Update backend_manager.hpp patch for nGraph 0.10.1 take 2
EmergentOrder Dec 1, 2018
d53651a
Update nGraph version in platform pom; Patch ngraph cpu runtime to no…
EmergentOrder Dec 1, 2018
a76964b
use ; re-enable TBB
EmergentOrder Dec 2, 2018
bd55477
Fix libtbb
EmergentOrder Dec 2, 2018
efd7c95
Build nGraph without unit tests
EmergentOrder Dec 4, 2018
396e9d9
Disable tools build
EmergentOrder Dec 5, 2018
14bf2ee
Clean up
EmergentOrder Dec 6, 2018
6201366
Copy .so files so that hopefully Travis can find them
EmergentOrder Dec 7, 2018
22aa148
Make Travis happy
EmergentOrder Dec 8, 2018
aa43ade
Temporarily disable other travis and appveyor builds
EmergentOrder Dec 9, 2018
21451e6
use libtbb.so.2
EmergentOrder Dec 9, 2018
82139ad
link TBB correctly
EmergentOrder Dec 14, 2018
d38fa61
Add node, tensor, value_info, etc.
EmergentOrder Dec 20, 2018
5c2be50
add ngraph/op/constant.hpp
EmergentOrder Dec 28, 2018
f7cfd8d
Merge branch 'master' of https://github.com/bytedeco/javacpp-presets …
EmergentOrder Jan 4, 2019
854097d
Bump to trigger Travis build
EmergentOrder Jan 4, 2019
7bf06c7
Add onnx.hpp and modify it to accept a data string rather than an inp…
EmergentOrder Jan 15, 2019
18b7f53
Merge branch 'ngraph' of https://github.com/EmergentOrder/javacpp-pre…
EmergentOrder Jan 15, 2019
bd6a279
Restore appveyor and travis builds
EmergentOrder Jan 16, 2019
263e670
Merge remote-tracking branch 'upstream/master' into ngraph
saudet Jan 17, 2019
ac6fb32
Clean up, fix formatting a bit, and add license files
saudet Jan 17, 2019
18a733d
Add README.md and adjust presets to support example
saudet Jan 17, 2019
aefcb8d
Add required dependencies on MKL-DNN and ncurses
saudet Jan 17, 2019
b46bd6c
Update presets for nGraph 0.11.1
saudet Jan 17, 2019
556cb83
Merge remote-tracking branch 'upstream/master' into ngraph
saudet Jan 17, 2019
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -357,6 +357,10 @@ matrix:
env: PROJ=onnx OS=linux-x86_64
install: true
script: ./ci/install-travis.sh
- os: linux
env: PROJ=ngraph OS=linux-x86_64
install: true
script: ./ci/install-travis.sh
- os: linux
env: PROJ=liquidfun OS=linux-x86_64
install: true
Expand Down
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@

* Add presets for nGraph 0.11.1 ([pull #642](https://github.com/bytedeco/javacpp-presets/pull/642))
* Upgrade presets for ARPACK-NG 3.7.0
* Build OpenCV without UI when environment variable `HEADLESS=yes` ([pull #667](https://github.com/bytedeco/javacpp-presets/pull/667))

Expand Down
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -139,6 +139,7 @@ Each child module in turn relies by default on the included [`cppbuild.sh` scrip
* TensorRT 5.0 https://developer.nvidia.com/tensorrt
* The Arcade Learning Environment 0.6.0 https://github.com/mgbellemare/Arcade-Learning-Environment
* ONNX 1.3.0 https://github.com/onnx/onnx
* nGraph 0.11.1 https://github.com/NervanaSystems/ngraph
* LiquidFun http://google.github.io/liquidfun/
* Skia https://skia.org
* System APIs of the build environments:
Expand Down
2 changes: 1 addition & 1 deletion ci/install-travis.sh
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ if [ "$TRAVIS_OS_NAME" == "osx" ]; then export JAVA_HOME=$(/usr/libexec/java_hom
if [[ "$OS" == "linux-x86" ]] || [[ "$OS" == "linux-x86_64" ]] || [[ "$OS" =~ android ]]; then
CENTOS_VERSION=6
SCL_ENABLE="devtoolset-6 python27"
if [[ "cpython mxnet tensorflow onnx skia " =~ "$PROJ " ]] || [[ "$OS" =~ android ]]; then
if [[ "cpython mxnet tensorflow onnx ngraph skia " =~ "$PROJ " ]] || [[ "$OS" =~ android ]]; then
CENTOS_VERSION=7
SCL_ENABLE="python36-devel python36-setuptools"
fi
Expand Down
2 changes: 1 addition & 1 deletion cppbuild.sh
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@ function sedinplace {
}

if [[ -z ${PROJECTS:-} ]]; then
PROJECTS=(opencv ffmpeg flycapture spinnaker libdc1394 libfreenect libfreenect2 librealsense videoinput artoolkitplus chilitags flandmark hdf5 mkl mkl-dnn openblas arpack-ng cminpack fftw gsl cpython llvm libpostal leptonica tesseract caffe cuda mxnet tensorflow tensorrt ale onnx liquidfun skia systems)
PROJECTS=(opencv ffmpeg flycapture spinnaker libdc1394 libfreenect libfreenect2 librealsense videoinput artoolkitplus chilitags flandmark hdf5 mkl mkl-dnn openblas arpack-ng cminpack fftw gsl cpython llvm libpostal leptonica tesseract caffe cuda mxnet tensorflow tensorrt ale onnx ngraph liquidfun skia systems)
fi

for PROJECT in ${PROJECTS[@]}; do
Expand Down
28 changes: 28 additions & 0 deletions ngraph/COPYING
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
Copyright (c) 1998-2017,2018 Free Software Foundation, Inc.

Permission is hereby granted, free of charge, to any person obtaining a
copy of this software and associated documentation files (the
"Software"), to deal in the Software without restriction, including
without limitation the rights to use, copy, modify, merge, publish,
distribute, distribute with modifications, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included
in all copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
IN NO EVENT SHALL THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR
THE USE OR OTHER DEALINGS IN THE SOFTWARE.

Except as contained in this notice, the name(s) of the above copyright
holders shall not be used in advertising or otherwise to promote the
sale, use or other dealings in this Software without prior written
authorization.

-- vile:txtmode fc=72
-- $Id: COPYING,v 1.6 2018/01/01 12:00:00 tom Exp $
201 changes: 201 additions & 0 deletions ngraph/LICENSE
Original file line number Diff line number Diff line change
@@ -0,0 +1,201 @@
Apache License
Version 2.0, January 2004
http://www.apache.org/licenses/

TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION

1. Definitions.

"License" shall mean the terms and conditions for use, reproduction,
and distribution as defined by Sections 1 through 9 of this document.

"Licensor" shall mean the copyright owner or entity authorized by
the copyright owner that is granting the License.

"Legal Entity" shall mean the union of the acting entity and all
other entities that control, are controlled by, or are under common
control with that entity. For the purposes of this definition,
"control" means (i) the power, direct or indirect, to cause the
direction or management of such entity, whether by contract or
otherwise, or (ii) ownership of fifty percent (50%) or more of the
outstanding shares, or (iii) beneficial ownership of such entity.

"You" (or "Your") shall mean an individual or Legal Entity
exercising permissions granted by this License.

"Source" form shall mean the preferred form for making modifications,
including but not limited to software source code, documentation
source, and configuration files.

"Object" form shall mean any form resulting from mechanical
transformation or translation of a Source form, including but
not limited to compiled object code, generated documentation,
and conversions to other media types.

"Work" shall mean the work of authorship, whether in Source or
Object form, made available under the License, as indicated by a
copyright notice that is included in or attached to the work
(an example is provided in the Appendix below).

"Derivative Works" shall mean any work, whether in Source or Object
form, that is based on (or derived from) the Work and for which the
editorial revisions, annotations, elaborations, or other modifications
represent, as a whole, an original work of authorship. For the purposes
of this License, Derivative Works shall not include works that remain
separable from, or merely link (or bind by name) to the interfaces of,
the Work and Derivative Works thereof.

"Contribution" shall mean any work of authorship, including
the original version of the Work and any modifications or additions
to that Work or Derivative Works thereof, that is intentionally
submitted to Licensor for inclusion in the Work by the copyright owner
or by an individual or Legal Entity authorized to submit on behalf of
the copyright owner. For the purposes of this definition, "submitted"
means any form of electronic, verbal, or written communication sent
to the Licensor or its representatives, including but not limited to
communication on electronic mailing lists, source code control systems,
and issue tracking systems that are managed by, or on behalf of, the
Licensor for the purpose of discussing and improving the Work, but
excluding communication that is conspicuously marked or otherwise
designated in writing by the copyright owner as "Not a Contribution."

"Contributor" shall mean Licensor and any individual or Legal Entity
on behalf of whom a Contribution has been received by Licensor and
subsequently incorporated within the Work.

2. Grant of Copyright License. Subject to the terms and conditions of
this License, each Contributor hereby grants to You a perpetual,
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
copyright license to reproduce, prepare Derivative Works of,
publicly display, publicly perform, sublicense, and distribute the
Work and such Derivative Works in Source or Object form.

3. Grant of Patent License. Subject to the terms and conditions of
this License, each Contributor hereby grants to You a perpetual,
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
(except as stated in this section) patent license to make, have made,
use, offer to sell, sell, import, and otherwise transfer the Work,
where such license applies only to those patent claims licensable
by such Contributor that are necessarily infringed by their
Contribution(s) alone or by combination of their Contribution(s)
with the Work to which such Contribution(s) was submitted. If You
institute patent litigation against any entity (including a
cross-claim or counterclaim in a lawsuit) alleging that the Work
or a Contribution incorporated within the Work constitutes direct
or contributory patent infringement, then any patent licenses
granted to You under this License for that Work shall terminate
as of the date such litigation is filed.

4. Redistribution. You may reproduce and distribute copies of the
Work or Derivative Works thereof in any medium, with or without
modifications, and in Source or Object form, provided that You
meet the following conditions:

(a) You must give any other recipients of the Work or
Derivative Works a copy of this License; and

(b) You must cause any modified files to carry prominent notices
stating that You changed the files; and

(c) You must retain, in the Source form of any Derivative Works
that You distribute, all copyright, patent, trademark, and
attribution notices from the Source form of the Work,
excluding those notices that do not pertain to any part of
the Derivative Works; and

(d) If the Work includes a "NOTICE" text file as part of its
distribution, then any Derivative Works that You distribute must
include a readable copy of the attribution notices contained
within such NOTICE file, excluding those notices that do not
pertain to any part of the Derivative Works, in at least one
of the following places: within a NOTICE text file distributed
as part of the Derivative Works; within the Source form or
documentation, if provided along with the Derivative Works; or,
within a display generated by the Derivative Works, if and
wherever such third-party notices normally appear. The contents
of the NOTICE file are for informational purposes only and
do not modify the License. You may add Your own attribution
notices within Derivative Works that You distribute, alongside
or as an addendum to the NOTICE text from the Work, provided
that such additional attribution notices cannot be construed
as modifying the License.

You may add Your own copyright statement to Your modifications and
may provide additional or different license terms and conditions
for use, reproduction, or distribution of Your modifications, or
for any such Derivative Works as a whole, provided Your use,
reproduction, and distribution of the Work otherwise complies with
the conditions stated in this License.

5. Submission of Contributions. Unless You explicitly state otherwise,
any Contribution intentionally submitted for inclusion in the Work
by You to the Licensor shall be under the terms and conditions of
this License, without any additional terms or conditions.
Notwithstanding the above, nothing herein shall supersede or modify
the terms of any separate license agreement you may have executed
with Licensor regarding such Contributions.

6. Trademarks. This License does not grant permission to use the trade
names, trademarks, service marks, or product names of the Licensor,
except as required for reasonable and customary use in describing the
origin of the Work and reproducing the content of the NOTICE file.

7. Disclaimer of Warranty. Unless required by applicable law or
agreed to in writing, Licensor provides the Work (and each
Contributor provides its Contributions) on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
implied, including, without limitation, any warranties or conditions
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
PARTICULAR PURPOSE. You are solely responsible for determining the
appropriateness of using or redistributing the Work and assume any
risks associated with Your exercise of permissions under this License.

8. Limitation of Liability. In no event and under no legal theory,
whether in tort (including negligence), contract, or otherwise,
unless required by applicable law (such as deliberate and grossly
negligent acts) or agreed to in writing, shall any Contributor be
liable to You for damages, including any direct, indirect, special,
incidental, or consequential damages of any character arising as a
result of this License or out of the use or inability to use the
Work (including but not limited to damages for loss of goodwill,
work stoppage, computer failure or malfunction, or any and all
other commercial damages or losses), even if such Contributor
has been advised of the possibility of such damages.

9. Accepting Warranty or Additional Liability. While redistributing
the Work or Derivative Works thereof, You may choose to offer,
and charge a fee for, acceptance of support, warranty, indemnity,
or other liability obligations and/or rights consistent with this
License. However, in accepting such obligations, You may act only
on Your own behalf and on Your sole responsibility, not on behalf
of any other Contributor, and only if You agree to indemnify,
defend, and hold each Contributor harmless for any liability
incurred by, or claims asserted against, such Contributor by reason
of your accepting any such warranty or additional liability.

END OF TERMS AND CONDITIONS

APPENDIX: How to apply the Apache License to your work.

To apply the Apache License to your work, attach the following
boilerplate notice, with the fields enclosed by brackets "[]"
replaced with your own identifying information. (Don't include
the brackets!) The text should be enclosed in the appropriate
comment syntax for the file format. We also recommend that a
file or class name and description of purpose be included on the
same "printed page" as the copyright notice for easier
identification within third-party archives.

Copyright [yyyy] [name of copyright owner]

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at

http://www.apache.org/licenses/LICENSE-2.0

Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
Loading