nGraph Preset initial commit

.travis.yml

@@ -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

ci/install-travis.sh

@@ -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

cppbuild.sh

@@ -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

ngraph/CMakeLists.txt.patch

@@ -0,0 +1,11 @@
+--- CMakeLists.txt.ORIG	2018-12-01 16:28:12.228687268 -0500
++++ CMakeLists.txt	2018-12-01 16:28:28.676543930 -0500
+@@ -195,7 +195,7 @@
+     endif()
+
+     add_dependencies(cpu_backend ext_mkldnn ext_eigen)
+-    target_link_libraries(cpu_backend PUBLIC ngraph libmkldnn libeigen libjson libtbb)
++    target_link_libraries(cpu_backend PUBLIC ngraph libmkldnn libeigen libjson)
+     if (NOT NGRAPH_DEX_ONLY)
+         target_link_libraries(cpu_backend PUBLIC codegen)
+     endif()

ngraph/backend.hpp.patch

@@ -0,0 +1,30 @@
+--- backend.hpp.orig	2018-11-09 20:11:42.216762981 -0500
++++ backend.hpp	2018-11-09 20:08:37.998002342 -0500
+@@ -33,18 +33,18 @@
+         class Backend
+         {
+         public:
+-            Backend(const Backend&) = delete;
+-            Backend& operator=(const Backend&) = delete;
++//            Backend(const Backend&) = delete;
++//            Backend& operator=(const Backend&) = delete;
+
+-            Backend(Backend&&) = default;
+-            Backend& operator=(Backend&&) = default;
++//            Backend(Backend&&) = default;
++//            Backend& operator=(Backend&&) = default;
+
+-            Backend() = delete;
++//            Backend() = delete;
+
+-            explicit Backend(const std::string& type)
+-                : m_type{type}
+-            {
+-            }
++           
++          
++         
++        
+
+             const std::string& get_type() const { return m_type; }
+             bool compile(const std::shared_ptr<Function>& function) const

ngraph/backend_manager.hpp.patch

@@ -0,0 +1,11 @@
+--- backend_manager.hpp.ORIG	2018-12-01 14:38:11.990225050 -0500
++++ backend_manager.hpp	2018-12-01 14:38:55.181672255 -0500
+@@ -19,7 +19,7 @@
+ #include <cstddef> // std::size_t, std::uintptr_t
+ #include <map>     // std::map
+ #include <mutex>   // std::mutex
+-#include <onnxifi.h>
++#include "onnxifi.h"
+
+ #include "backend.hpp"
+ #include "ngraph/runtime/backend.hpp"

ngraph/cppbuild.sh

@@ -0,0 +1,94 @@
+#!/bin/bash
+# This file is meant to be included by the parent cppbuild.sh script
+if [[ -z "$PLATFORM" ]]; then
+    pushd ..
+    bash cppbuild.sh "$@" ngraph
+    popd
+    exit
+fi
+
+if [[ $PLATFORM == windows* ]]; then
+    #No Windows support yet
+    echo "Error: Platform \"$PLATFORM\" is not supported"
+    exit 1
+fi
+
+export NGRAPH="0.10.1"
+export NCURSES=6.1
+
+download https://github.com/NervanaSystems/ngraph/archive/v$NGRAPH.tar.gz v$NGRAPH.tar.gz
+download https://ftp.gnu.org/pub/gnu/ncurses/ncurses-$NCURSES.tar.gz ncurses.tar.gz
+mkdir -p "$PLATFORM"
+cd "$PLATFORM"
+INSTALL_PATH=`pwd`
+
+echo "Decompressing archives..."
+tar --totals -xf ../v$NGRAPH.tar.gz
+tar --totals -xf ../ncurses.tar.gz
+
+export LIBRARY_PATH="$INSTALL_PATH/lib"
+export PATH="$PATH:$INSTALL_PATH/bin"
+export CFLAGS="-I$INSTALL_PATH/include"
+export CXXFLAGS="-I$INSTALL_PATH/include"
+
+cd ncurses-$NCURSES
+./configure "--prefix=$INSTALL_PATH" "--with-shared" CFLAGS=-fPIC CXXFLAGS=-fPIC
+make -j $MAKEJ V=0
+make install
+
+cd ..
+
+cd lib
+
+ln -s libncurses.so.6 libtinfo.so.6
+ln -s libncurses.so.6 libtinfo.so
+
+cd ..
+
+cd ngraph-$NGRAPH
+rm -rf build
+mkdir build && cd build
+#-DNGRAPH_TBB_ENABLE=FALSE
+
+
+patch ../src/ngraph/frontend/onnx_import/onnx.cpp ../../../../onnx.cpp.patch
+patch ../src/ngraph/frontend/onnx_import/onnx.hpp ../../../../onnx.hpp.patch
+
+#patch ../src/ngraph/runtime/cpu/CMakeLists.txt ../../../../CMakeLists.txt.patch
+$CMAKE .. -DNGRAPH_UNIT_TEST_ENABLE=FALSE -DNGRAPH_TOOLS_ENABLE=FALSE -DNGRAPH_ONNX_IMPORT_ENABLE=ON -DCMAKE_INSTALL_PREFIX=$INSTALL_PATH -DNGRAPH_USE_PREBUILT_LLVM=TRUE -DNGRAPH_ONNXIFI_ENABLE=TRUE
+make -j $MAKEJ
+make install
+
+#mkdir -p ../../include/ngraph ../../include/ngraph/op ../../include/ngraph/pass ../../include/ngraph/state ../../include/ngraph/codegen ../../include/ngraph/op/util ../../include/ngraph/autodiff/ ../../include/ngraph/descriptor ../../include/ngraph/descriptor/layout ../../include/ngraph/runtime ../../include/ngraph/runtime/cpu ../../include/ngraph/type ../../include/onnx ../../lib
+
+#mkdir ../../include/onnx
+
+cp -r ../src/ngraph/frontend/onnx_import/core/ ../../include/
+cp -r ../src/ngraph/frontend/onnx_import/utils/ ../../include/
+cp -r ../src/ngraph/frontend/onnx_import/utils/ ../../include/ngraph/frontend/onnx_import/op/
+cp -r ../src/ngraph/frontend/onnx_import/exceptions.hpp ../../include/
+
+
+patch ../../include/ngraph/frontend/onnxifi/backend.hpp ../../../../backend.hpp.patch
+patch ../../include/ngraph/frontend/onnxifi/backend_manager.hpp ../../../../backend_manager.hpp.patch
+#patch ../src/ngraph/descriptor/tensor.hpp ../../../../tensor.hpp.patch
+
+
+#execstack -c ../../lib/libtbb.so.2
+
+cp src/ngraph/frontend/onnxifi/libonnxifi-ngraph.so ../../lib/
+cp src/ngraph/libngraph.so ../../lib/
+cp src/ngraph/libcpu_backend.so ../../lib/
+cp src/ngraph/codegen/libcodegen.so ../../lib/
+cp src/ngraph/runtime/cpu/tbb_build/tbb_release/libtbb.so.2 ../../lib/
+cp onnx/bin/libonnxifi.so ../../lib/
+
+ln -sf libtbb.so.2 ../../lib/libtbb.so
+
+cp onnx/src/onnx/onnxifi.h ../../include/ngraph/frontend/onnxifi/
+#cp onnx/src/onnx/onnxifi.h ../../include/onnx/
+#cp ../src/ngraph/frontend/onnx_import/onnx.hpp ../../include/ngraph/
+#cp ../src/ngraph/frontend/onnxifi/backend.hpp ../../include/ngraph/frontend/onnxifi/
+#cp ../src/ngraph/frontend/onnxifi/backend_manager.hpp ../../include/ngraph/frontend/onnxifi/
+
+cd ../../..

ngraph/element_type.hpp.patch

@@ -0,0 +1,41 @@
+--- cppbuild/linux-x86_64/include/ngraph/type/element_type.hpp	2018-11-09 08:30:42.628084431 -0500
++++ element_type.hpp	2018-11-09 08:34:47.872535397 -0500
+@@ -110,38 +110,6 @@
+             std::string m_cname{"dynamic"};
+         };
+
+-        template <typename T>
+-        const Type& from()
+-        {
+-            throw std::invalid_argument("Unknown type");
+-        }
+-        template <>
+-        const Type& from<char>();
+-        template <>
+-        const Type& from<bool>();
+-        template <>
+-        const Type& from<float>();
+-        template <>
+-        const Type& from<double>();
+-        template <>
+-        const Type& from<int8_t>();
+-        template <>
+-        const Type& from<int16_t>();
+-        template <>
+-        const Type& from<int32_t>();
+-        template <>
+-        const Type& from<int64_t>();
+-        template <>
+-        const Type& from<uint8_t>();
+-        template <>
+-        const Type& from<uint16_t>();
+-        template <>
+-        const Type& from<uint32_t>();
+-        template <>
+-        const Type& from<uint64_t>();
+-        template <>
+-        const Type& from<ngraph::bfloat16>();
+-
+         std::ostream& operator<<(std::ostream& out, const ngraph::element::Type& obj);
+     }
+ }

ngraph/onnx.cpp.patch

@@ -0,0 +1,70 @@
+--- onnx.cpp.ORIG	2019-01-15 13:26:42.108157168 -0500
++++ onnx.cpp	2019-01-15 13:41:27.859816460 -0500
+@@ -31,18 +31,10 @@
+         {
+             namespace error
+             {
+-                struct file_open : ngraph_error
++                struct data_parse : ngraph_error
+                 {
+-                    explicit file_open(const std::string& path)
+-                        : ngraph_error{"failure opening file:" + path}
+-                    {
+-                    }
+-                };
+-
+-                struct stream_parse : ngraph_error
+-                {
+-                    explicit stream_parse(std::istream&)
+-                        : ngraph_error{"failure parsing data from the stream"}
++                    explicit data_parse(const std::string& data)
++                        : ngraph_error{"failure parsing data from the string"}
+                     {
+                     }
+                 };
+@@ -50,13 +42,13 @@
+             } // namespace error
+         }     // namespace detail
+
+-        std::vector<std::shared_ptr<Function>> load_onnx_model(std::istream& sin,
++        std::vector<std::shared_ptr<Function>> load_onnx_model(const std::string& data,
+                                                                const Weights& weights)
+         {
+             onnx::ModelProto model_proto;
+-            if (!model_proto.ParseFromIstream(&sin))
++            if (!model_proto.ParseFromString(data))
+             {
+-                throw detail::error::stream_parse{sin};
++                throw detail::error::data_parse{data};
+             }
+             std::vector<std::shared_ptr<Function>> output_functions;
+             Model model{model_proto};
+@@ -69,28 +61,6 @@
+             return output_functions;
+         }
+
+-        std::vector<std::shared_ptr<Function>> load_onnx_model(const std::string& path,
+-                                                               const Weights& weights)
+-        {
+-            std::ifstream ifs{path, std::ios::in | std::ios::binary};
+-            if (!ifs.is_open())
+-            {
+-                throw detail::error::file_open{path};
+-            }
+-            return load_onnx_model(ifs, weights);
+-        }
+-
+-        std::shared_ptr<Function> import_onnx_function(std::istream& sin, const Weights& weights)
+-        {
+-            return load_onnx_model(sin, weights).front();
+-        }
+-
+-        std::shared_ptr<Function> import_onnx_function(const std::string& path,
+-                                                       const Weights& weights)
+-        {
+-            return load_onnx_model(path, weights).front();
+-        }
+-
+         void register_operator(const std::string& name,
+                                std::int64_t version,
+                                const std::string& domain,

ngraph/onnx.hpp.patch

@@ -0,0 +1,48 @@
+--- onnx.hpp.ORIG	2019-01-15 13:26:36.332226565 -0500
++++ onnx.hpp	2019-01-15 13:41:54.215455942 -0500
+@@ -50,44 +50,8 @@
+         ///                   the model  will take precedence).
+         /// \return The function returns a vector of nGraph functions. The number of functions
+         ///          depends on number of outputs from ONNX graph.
+-        std::vector<std::shared_ptr<Function>> load_onnx_model(std::istream& sin,
++        std::vector<std::shared_ptr<Function>> load_onnx_model(const std::string& data,
+                                                                const Weights& weights = {});
+-        /// \brief Convert an ONNX model to nGraph functions
+-        /// The function translated serialized ONNX model to nGraph functions. The ONNX model
+-        /// is read from ONNX file.
+-        /// \param filename  file name (relative or absolute path name),
+-        /// \param weights  weights associated with the model. If weights are embedded into
+-        ///                   the model this parameter shall be empty. Having weights in a model
+-        ///                   and providing through this parameters is invalid (the weights from
+-        ///                   the model  will take precedence).
+-        /// \return The function returns a vector of nGraph functions. The number of functions
+-        ///          depends on number of outputs from ONNX graph.
+-        std::vector<std::shared_ptr<Function>> load_onnx_model(const std::string& filename,
+-                                                               const Weights& weights = {});
+-
+-        /// \brief Convert an ONNX model to nGraph function
+-        /// The function translated serialized ONNX model to nGraph function. The serialized
+-        /// ONNX model is read from input stream.
+-        /// \param sin       input stream (e.g. file stream, memory stream, etc),
+-        /// \param weights  weights associated with the model. If weights are embedded into
+-        ///                   the model this parameter shall be empty. Having weights in a model
+-        ///                   and providing through this parameters is invalid (the weights from
+-        ///                   the model  will take precedence).
+-        /// \return The function returns a nGraph function representing single output from graph.
+-        std::shared_ptr<Function> import_onnx_function(std::istream& sin,
+-                                                       const Weights& weights = {});
+-
+-        /// \brief Convert an ONNX model to nGraph functions
+-        /// The function translated serialized ONNX model to nGraph functions. The ONNX model
+-        /// is read from ONNX file.
+-        /// \param filename  file name (relative or absolute path name),
+-        /// \param weights  weights associated with the model. If weights are embedded into
+-        ///                   the model this parameter shall be empty. Having weights in a model
+-        ///                   and providing through this parameters is invalid (the weights from
+-        ///                   the model  will take precedence).
+-        /// \return The function returns a nGraph function representing single output from graph.
+-        std::shared_ptr<Function> import_onnx_function(const std::string& filename,
+-                                                       const Weights& weights = {});
+
+     } // namespace onnx_import
+

ngraph/platform/pom.xml

@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <groupId>org.bytedeco</groupId>
+    <artifactId>javacpp-presets</artifactId>
+    <version>1.4.4-SNAPSHOT</version>
+    <relativePath>../../</relativePath>
+  </parent>
+
+  <groupId>org.bytedeco.javacpp-presets</groupId>
+  <artifactId>ngraph-platform</artifactId>
+  <version>0.10.1-${project.parent.version}</version>
+  <name>JavaCPP Presets Platform for nGraph</name>
+
+  <properties>
+    <javacpp.moduleId>ngraph</javacpp.moduleId>
+  </properties>
+
+  <dependencies>
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>${javacpp.moduleId}</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>${javacpp.moduleId}</artifactId>
+      <version>${project.version}</version>
+      <classifier>${javacpp.platform.linux-x86_64}</classifier>
+    </dependency>
+  </dependencies>
+
+  <build>
+    <plugins>
+      <plugin>
+        <artifactId>maven-jar-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>default-jar</id>
+            <configuration>
+              <archive>
+                <manifestEntries>
+                  <Class-Path>${javacpp.moduleId}.jar ${javacpp.moduleId}-linux-x86_64.jar</Class-Path>
+                </manifestEntries>
+              </archive>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
+
+</project>