ONNX (v1.2.2) preset

.travis.yml

@@ -691,6 +691,10 @@ matrix:
         env: PROJ=ale OS=linux-x86_64
         install: true
         script: ./ci/install-travis.sh
+      - os: linux
+        env: PROJ=onnx OS=linux-x86_64
+        install: true
+        script: ./ci/install-travis.sh
       - os: linux
         env: PROJ=liquidfun OS=linux-x86_64
         install: true

CHANGELOG.md

@@ -1,4 +1,5 @@
 
+ * Add presets for ONNX 1.2.2 ([pull #547](https://github.com/bytedeco/javacpp-presets/pull/547))
  * Define `std::vector<tensorflow::OpDef>` type to `OpDefVector` for TensorFlow
  * Link HDF5 with zlib on Windows also ([issue deeplearning4j/deeplearning4j#6017](https://github.com/deeplearning4j/deeplearning4j/issues/6017))
  * Enable MKL-DNN for TensorFlow

README.md

@@ -136,6 +136,7 @@ Each child module in turn relies by default on the included [`cppbuild.sh` scrip
  * TensorFlow 1.10.0-rc1  https://github.com/tensorflow/tensorflow
  * TensorRT 4.0  https://developer.nvidia.com/tensorrt
  * The Arcade Learning Environment 0.6.0  https://github.com/mgbellemare/Arcade-Learning-Environment
+ * ONNX 1.2.2  https://github.com/onnx/onnx
  * LiquidFun  http://google.github.io/liquidfun/
  * Skia  https://skia.org
  * System APIs of the build environments:

ci/install-travis.sh

@@ -33,7 +33,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 rh-maven33 python27"
-  if [[ "librealsense mxnet tensorflow skia " =~ "$PROJ " ]] || [[ "$OS" =~ android ]]; then
+  if [[ "librealsense mxnet tensorflow onnx skia " =~ "$PROJ " ]] || [[ "$OS" =~ android ]]; then
     CENTOS_VERSION=7
     SCL_ENABLE="rh-maven33 rh-python35"
   fi

cppbuild.sh

@@ -155,7 +155,7 @@ function sedinplace {
 }
 
 if [[ -z ${PROJECTS:-} ]]; then
-    PROJECTS=(opencv ffmpeg flycapture libdc1394 libfreenect libfreenect2 librealsense videoinput artoolkitplus chilitags flandmark hdf5 mkl mkl-dnn openblas arpack-ng cminpack fftw gsl llvm libpostal leptonica tesseract caffe cuda mxnet tensorflow tensorrt ale liquidfun skia systems)
+    PROJECTS=(opencv ffmpeg flycapture libdc1394 libfreenect libfreenect2 librealsense videoinput artoolkitplus chilitags flandmark hdf5 mkl mkl-dnn openblas arpack-ng cminpack fftw gsl llvm libpostal leptonica tesseract caffe cuda mxnet tensorflow tensorrt ale onnx liquidfun skia systems)
 fi
 
 for PROJECT in ${PROJECTS[@]}; do

onnx/LICENSE

@@ -0,0 +1,12 @@
+Open Neural Network Exchange
+
+Copyright (c) Facebook, Inc. and Microsoft Corporation.
+All rights reserved. 
+
+MIT License
+
+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, 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 AUTHORS OR 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.

onnx/README.md

@@ -0,0 +1,70 @@
+JavaCPP Presets for ONNX
+========================
+
+Introduction
+------------
+This directory contains the JavaCPP Presets module for:
+
+ * ONNX 1.2.2  https://onnx.ai/
+
+Please refer to the parent README.md file for more detailed information about the JavaCPP Presets.
+
+
+Documentation
+-------------
+Java API documentation is available here:
+
+ * http://bytedeco.org/javacpp-presets/onnx/apidocs/
+
+
+Sample Usage
+------------
+Here is a simple example of ONNX ported to Java from this C++ source file and for this data:
+
+ * https://github.com/onnx/onnx/issues/418#issuecomment-357596638
+ * https://github.com/onnx/onnx/blob/master/onnx/examples/resources/single_relu.onnx
+
+We can use [Maven 3](http://maven.apache.org/) to download and install automatically all the class files as well as the native binaries. To run this sample code, after creating the `pom.xml` and `src/main/java/LoadModel.java` source files below, simply execute on the command line:
+```bash
+ $ mvn compile exec:java
+```
+
+### The `pom.xml` build file
+```xml
+<project>
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>org.bytedeco.javacpp-presets.onnx</groupId>
+    <artifactId>loadmodel</artifactId>
+    <version>1.4.3-SNAPSHOT</version>
+    <properties>
+        <exec.mainClass>LoadModel</exec.mainClass>
+    </properties>
+    <dependencies>
+        <dependency>
+            <groupId>org.bytedeco.javacpp-presets</groupId>
+            <artifactId>onnx-platform</artifactId>
+            <version>1.2.2-1.4.3-SNAPSHOT</version>
+        </dependency>
+    </dependencies>
+</project>
+```
+
+### The `src/main/java/LoadModel.java` source file
+```java
+import java.nio.file.*;
+import org.bytedeco.javacpp.*;
+import static org.bytedeco.javacpp.onnx.*;
+
+public class LoadModel {
+    public static void main(String[] args) throws Exception {
+        OpSchemaRegistry.get_all_schemas();
+
+        byte[] bytes = Files.readAllBytes(Paths.get("examples/resources/single_relu.onnx"));
+
+        ModelProto model = new ModelProto();
+        ParseProtoFromBytes(model, new BytePointer(bytes), bytes.length);
+
+        System.out.println(model.graph().input_size());
+    }
+}
+```

onnx/cppbuild.sh

@@ -0,0 +1,60 @@
+#!/bin/bash
+# This file is meant to be included by the parent cppbuild.sh script
+if [[ -z "$PLATFORM" ]]; then
+    pushd ..
+    bash cppbuild.sh "$@" onnx
+    popd
+    exit
+fi
+
+if [[ $PLATFORM == windows* ]]; then
+    #No Windows support yet
+    echo "Error: Platform \"$PLATFORM\" is not supported"
+    exit 1
+fi
+
+export ONNX=1.2.2
+export PROTO=3.5.1
+export PYBIND=2.2.3
+
+download https://github.com/onnx/onnx/archive/v$ONNX.tar.gz onnx-$ONNX.tar.gz
+download https://github.com/google/protobuf/releases/download/v$PROTO/protobuf-cpp-$PROTO.tar.gz protobuf-$PROTO.tar.gz
+download https://github.com/pybind/pybind11/archive/v$PYBIND.tar.gz pybind11-$PYBIND.tar.gz
+
+mkdir -p "$PLATFORM"
+cd "$PLATFORM"
+INSTALL_PATH=`pwd`
+
+echo "Decompressing archives..."
+tar --totals -xf ../onnx-$ONNX.tar.gz
+tar --totals -xf ../protobuf-$PROTO.tar.gz
+tar --totals -xf ../pybind11-$PYBIND.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 protobuf-$PROTO
+./configure "--prefix=$INSTALL_PATH" CFLAGS=-fPIC CXXFLAGS=-fPIC --disable-shared
+make -j $MAKEJ V=0
+make install
+
+cd ../onnx-$ONNX
+rm -df third_party/pybind11
+ln -sf $INSTALL_PATH/pybind11-$PYBIND third_party/pybind11
+
+#to build with "Traditional ML" support. Untested.
+#export ONNX_ML=1
+export CMAKE_BUILD_DIR=.setuptools-cmake-build/
+export CMAKE_ARGS=-DBUILD_SHARED_LIBS=ON
+python3 setup.py build
+
+mkdir -p ../include/onnx ../include/onnx/common ../include/onnx/defs
+cp onnx/*.h ../include/onnx/
+cp onnx/common/*.h ../include/onnx/common/
+cp onnx/defs/*.h ../include/onnx/defs/
+cp $CMAKE_BUILD_DIR/onnx/*.h ../include/onnx/
+cp $CMAKE_BUILD_DIR/*.so ../lib
+
+cd ../..

onnx/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.3-SNAPSHOT</version>
+    <relativePath>../../</relativePath>
+  </parent>
+
+  <groupId>org.bytedeco.javacpp-presets</groupId>
+  <artifactId>onnx-platform</artifactId>
+  <version>1.2.2-${project.parent.version}</version>
+  <name>JavaCPP Presets Platform for ONNX</name>
+
+  <properties>
+    <javacpp.moduleId>onnx</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>

onnx/pom.xml

@@ -0,0 +1,63 @@
+<?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.3-SNAPSHOT</version>
+  </parent>
+
+  <groupId>org.bytedeco.javacpp-presets</groupId>
+  <artifactId>onnx</artifactId>
+  <version>1.2.2-1.4.3-SNAPSHOT</version>
+  <name>JavaCPP Presets for ONNX</name>
+
+  <dependencies>
+    <dependency>
+      <groupId>org.bytedeco</groupId>
+      <artifactId>javacpp</artifactId>
+    </dependency>
+  </dependencies>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-surefire-plugin</artifactId>
+        <configuration>
+        </configuration>
+      </plugin>
+      <plugin>
+        <artifactId>maven-resources-plugin</artifactId>
+      </plugin>
+      <plugin>
+        <artifactId>maven-compiler-plugin</artifactId>
+      </plugin>
+      <plugin>
+        <groupId>org.bytedeco</groupId>
+        <artifactId>javacpp</artifactId>
+        <configuration>
+          <compilerOptions>
+            <compilerOption>-std=c++11</compilerOption>
+            <compilerOption>-fpermissive</compilerOption>
+          </compilerOptions>
+        </configuration>
+      </plugin>
+      <plugin>
+        <artifactId>maven-jar-plugin</artifactId>
+      </plugin>
+      <plugin>
+        <artifactId>maven-dependency-plugin</artifactId>
+      </plugin>
+      <plugin>
+        <artifactId>maven-source-plugin</artifactId>
+      </plugin>
+      <plugin>
+        <artifactId>maven-javadoc-plugin</artifactId>
+      </plugin>
+    </plugins>
+  </build>
+
+</project>