Skip to content

Commit

Permalink
* Include nnvm/c_api.h header file in presets for MXNet (issue #912)
Browse files Browse the repository at this point in the history
  • Loading branch information
saudet committed Jul 24, 2020
1 parent 17a1f75 commit 976e6f7
Show file tree
Hide file tree
Showing 9 changed files with 710 additions and 2 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@

* Include `nnvm/c_api.h` header file in presets for MXNet ([issue #912](https://github.com/bytedeco/javacpp-presets/issues/912))
* Enable OpenMP for DNNL and ONNX Runtime on Mac using same library name as MKL to prevent conflicts ([issue #907](https://github.com/bytedeco/javacpp-presets/issues/907))
* Fix loading issue with `opencv_ximgproc` ([issue #911](https://github.com/bytedeco/javacpp-presets/issues/911))
* Build LibTIFF after WebP to make sure they link correctly in presets for Leptonica
Expand Down
31 changes: 31 additions & 0 deletions mxnet/src/gen/java/org/bytedeco/mxnet/GraphHandle.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
// Targeted by JavaCPP version 1.5.4-SNAPSHOT: DO NOT EDIT THIS FILE

package org.bytedeco.mxnet;

import java.nio.*;
import org.bytedeco.javacpp.*;
import org.bytedeco.javacpp.annotation.*;

import static org.bytedeco.javacpp.presets.javacpp.*;
import static org.bytedeco.openblas.global.openblas_nolapack.*;
import static org.bytedeco.openblas.global.openblas.*;
import org.bytedeco.opencv.opencv_core.*;
import static org.bytedeco.opencv.global.opencv_core.*;
import org.bytedeco.opencv.opencv_imgproc.*;
import static org.bytedeco.opencv.global.opencv_imgproc.*;
import static org.bytedeco.opencv.global.opencv_imgcodecs.*;
import org.bytedeco.opencv.opencv_videoio.*;
import static org.bytedeco.opencv.global.opencv_videoio.*;
import org.bytedeco.opencv.opencv_highgui.*;
import static org.bytedeco.opencv.global.opencv_highgui.*;

import static org.bytedeco.mxnet.global.mxnet.*;

/** \brief handle to Graph */
@Namespace @Name("void") @Opaque @Properties(inherit = org.bytedeco.mxnet.presets.mxnet.class)
public class GraphHandle extends Pointer {
/** Empty constructor. Calls {@code super((Pointer)null)}. */
public GraphHandle() { super((Pointer)null); }
/** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */
public GraphHandle(Pointer p) { super(p); }
}
3 changes: 3 additions & 0 deletions mxnet/src/gen/java/org/bytedeco/mxnet/LibFeature.java
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,9 @@ public class LibFeature extends Pointer {
@Override public LibFeature position(long position) {
return (LibFeature)super.position(position);
}
@Override public LibFeature getPointer(long i) {
return new LibFeature(this).position(position + i);
}

public native @Cast("const char*") BytePointer name(); public native LibFeature name(BytePointer setter);
public native @Cast("bool") boolean enabled(); public native LibFeature enabled(boolean setter);
Expand Down
3 changes: 3 additions & 0 deletions mxnet/src/gen/java/org/bytedeco/mxnet/MXCallbackList.java
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,9 @@ public class MXCallbackList extends Pointer {
@Override public MXCallbackList position(long position) {
return (MXCallbackList)super.position(position);
}
@Override public MXCallbackList getPointer(long i) {
return new MXCallbackList(this).position(position + i);
}

public native int num_callbacks(); public native MXCallbackList num_callbacks(int setter);
public static class Int_Callbacks extends FunctionPointer {
Expand Down
3 changes: 3 additions & 0 deletions mxnet/src/gen/java/org/bytedeco/mxnet/NDArrayOpInfo.java
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,9 @@ public class NDArrayOpInfo extends Pointer {
@Override public NDArrayOpInfo position(long position) {
return (NDArrayOpInfo)super.position(position);
}
@Override public NDArrayOpInfo getPointer(long i) {
return new NDArrayOpInfo(this).position(position + i);
}

public static class Forward_int_PointerPointer_IntPointer_Pointer extends FunctionPointer {
static { Loader.load(); }
Expand Down
3 changes: 3 additions & 0 deletions mxnet/src/gen/java/org/bytedeco/mxnet/NativeOpInfo.java
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,9 @@ public class NativeOpInfo extends Pointer {
@Override public NativeOpInfo position(long position) {
return (NativeOpInfo)super.position(position);
}
@Override public NativeOpInfo getPointer(long i) {
return new NativeOpInfo(this).position(position + i);
}

public static class Forward_int_PointerPointer_IntPointer_PointerPointer_IntPointer_Pointer extends FunctionPointer {
static { Loader.load(); }
Expand Down
32 changes: 32 additions & 0 deletions mxnet/src/gen/java/org/bytedeco/mxnet/OpHandle.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
// Targeted by JavaCPP version 1.5.4-SNAPSHOT: DO NOT EDIT THIS FILE

package org.bytedeco.mxnet;

import java.nio.*;
import org.bytedeco.javacpp.*;
import org.bytedeco.javacpp.annotation.*;

import static org.bytedeco.javacpp.presets.javacpp.*;
import static org.bytedeco.openblas.global.openblas_nolapack.*;
import static org.bytedeco.openblas.global.openblas.*;
import org.bytedeco.opencv.opencv_core.*;
import static org.bytedeco.opencv.global.opencv_core.*;
import org.bytedeco.opencv.opencv_imgproc.*;
import static org.bytedeco.opencv.global.opencv_imgproc.*;
import static org.bytedeco.opencv.global.opencv_imgcodecs.*;
import org.bytedeco.opencv.opencv_videoio.*;
import static org.bytedeco.opencv.global.opencv_videoio.*;
import org.bytedeco.opencv.opencv_highgui.*;
import static org.bytedeco.opencv.global.opencv_highgui.*;

import static org.bytedeco.mxnet.global.mxnet.*;


/** \brief handle to a function that takes param and creates symbol */
@Namespace @Name("void") @Opaque @Properties(inherit = org.bytedeco.mxnet.presets.mxnet.class)
public class OpHandle extends Pointer {
/** Empty constructor. Calls {@code super((Pointer)null)}. */
public OpHandle() { super((Pointer)null); }
/** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */
public OpHandle(Pointer p) { super(p); }
}
Loading

0 comments on commit 976e6f7

Please sign in to comment.