From 8d1fe8b1b3766c6f146f83232206f0bbce6fb290 Mon Sep 17 00:00:00 2001 From: Samuel Audet Date: Fri, 26 Jul 2019 07:22:44 +0000 Subject: [PATCH] Fix functions of OpaqueVariablesSet --- libnd4j/blas/NativeOps.h | 12 ++++----- libnd4j/blas/cpu/NativeOps.cpp | 14 +++------- libnd4j/blas/cuda/NativeOps.cu | 27 ++++++++++++------- .../java/org/nd4j/nativeblas/NativeOps.java | 10 +++---- ...riableSet.java => OpaqueVariablesSet.java} | 4 +-- .../ops/executioner/CudaExecutioner.java | 8 +++--- .../java/org/nd4j/nativeblas/Nd4jCuda.java | 14 +++++----- .../org/nd4j/nativeblas/Nd4jCudaPresets.java | 2 +- .../nativecpu/ops/NativeOpExecutioner.java | 8 +++--- .../java/org/nd4j/nativeblas/Nd4jCpu.java | 14 +++++----- .../org/nd4j/nativeblas/Nd4jCpuPresets.java | 2 +- 11 files changed, 58 insertions(+), 57 deletions(-) rename nd4j/nd4j-backends/nd4j-api-parent/nd4j-native-api/src/main/java/org/nd4j/nativeblas/{OpaqueVariableSet.java => OpaqueVariablesSet.java} (89%) diff --git a/libnd4j/blas/NativeOps.h b/libnd4j/blas/NativeOps.h index 12d34ba06..87555a303 100755 --- a/libnd4j/blas/NativeOps.h +++ b/libnd4j/blas/NativeOps.h @@ -1678,14 +1678,14 @@ ND4J_EXPORT void deleteShapeList(Nd4jPointer shapeList); ND4J_EXPORT int registerGraph(Nd4jPointer *extraPointers, Nd4jLong graphId, Nd4jPointer flatBufferPointer); -typedef nd4j::graph::VariablesSet OpaqueVariableSet; +typedef nd4j::graph::VariablesSet OpaqueVariablesSet; typedef nd4j::graph::Variable OpaqueVariable; -ND4J_EXPORT OpaqueVariableSet *executeStoredGraph(Nd4jPointer *extraPointers, Nd4jLong graphId, Nd4jPointer *inputBuffers, Nd4jPointer *inputShapes, int* inputIndices, int numInputs); +ND4J_EXPORT OpaqueVariablesSet *executeStoredGraph(Nd4jPointer *extraPointers, Nd4jLong graphId, Nd4jPointer *inputBuffers, Nd4jPointer *inputShapes, int* inputIndices, int numInputs); -ND4J_EXPORT Nd4jLong getVariableSetSize(OpaqueVariableSet* set); -ND4J_EXPORT Nd4jStatus getVariableSetStatus(OpaqueVariableSet* set); -ND4J_EXPORT OpaqueVariable* getVariable(OpaqueVariableSet* set, Nd4jLong i); +ND4J_EXPORT Nd4jLong getVariablesSetSize(OpaqueVariablesSet* set); +ND4J_EXPORT Nd4jStatus getVariablesSetStatus(OpaqueVariablesSet* set); +ND4J_EXPORT OpaqueVariable* getVariable(OpaqueVariablesSet* set, Nd4jLong i); ND4J_EXPORT int getVariableId(OpaqueVariable* variable); ND4J_EXPORT int getVariableIndex(OpaqueVariable* variable); ND4J_EXPORT const char* getVariableName(OpaqueVariable* variable); @@ -1699,7 +1699,7 @@ ND4J_EXPORT void deleteIntArray(Nd4jPointer pointer); ND4J_EXPORT void deleteLongArray(Nd4jPointer pointer); ND4J_EXPORT void deletePointerArray(Nd4jPointer pointer); -ND4J_EXPORT void deleteVariablesSet(OpaqueVariableSet pointer); +ND4J_EXPORT void deleteVariablesSet(OpaqueVariablesSet* pointer); // GraphState creation ND4J_EXPORT Nd4jPointer getGraphState(Nd4jLong id); diff --git a/libnd4j/blas/cpu/NativeOps.cpp b/libnd4j/blas/cpu/NativeOps.cpp index 9dffb412c..7f60de91c 100644 --- a/libnd4j/blas/cpu/NativeOps.cpp +++ b/libnd4j/blas/cpu/NativeOps.cpp @@ -2337,11 +2337,11 @@ nd4j::graph::VariablesSet* executeStoredGraph(Nd4jPointer *extraPointers, Nd4jLo return nullptr; } -Nd4jLong getVariableSetSize(nd4j::graph::VariablesSet* set) { +Nd4jLong getVariablesSetSize(nd4j::graph::VariablesSet* set) { return set->size(); } -Nd4jStatus getVariableSetStatus(nd4j::graph::VariablesSet* set) { +Nd4jStatus getVariablesSetStatus(nd4j::graph::VariablesSet* set) { return set->status(); } @@ -2396,14 +2396,8 @@ void deleteLongArray(Nd4jPointer pointer) { delete[] ptr; } -template -static void deleteVariablesSetT(Nd4jPointer pointer) { - auto ptr = reinterpret_cast(pointer); - delete ptr; -} - -void deleteVariablesSet(Nd4jPointer pointer) { - deleteVariablesSetT(pointer); +void deleteVariablesSet(nd4j::graph::VariablesSet* pointer) { + delete pointer; } const char* getAllOperations() { diff --git a/libnd4j/blas/cuda/NativeOps.cu b/libnd4j/blas/cuda/NativeOps.cu index 3f0e432a9..f01f83fab 100755 --- a/libnd4j/blas/cuda/NativeOps.cu +++ b/libnd4j/blas/cuda/NativeOps.cu @@ -1935,6 +1935,19 @@ void execAggregate(Nd4jPointer *extraPointers, nd4j::DebugHelper::checkErrorCode(stream, "execAggregateFloat(...) failed"); } +void batchExecutor(Nd4jPointer *extraPointers, + int numAggregates, + int opNum, + int maxArgs, + int maxShapes, + int maxIntArrays, + int maxIntArraySize, + int maxIdx, + int maxReals, + void *ptrToArguments, + nd4j::DataType dtype) { +} + void execAggregateBatch(Nd4jPointer *extraPointers, int numAggregates, int opNum, int maxArgs, int maxShapes, @@ -2808,11 +2821,11 @@ VariablesSet* executeStoredGraph(Nd4jPointer *extraPointers, Nd4jLong graphId, N return executeStoredGraphT(extraPointers, graphId, inputBuffers, inputShapes, inputIndices, numInputs); } -Nd4jLong getVariableSetSize(nd4j::graph::VariablesSet* set) { +Nd4jLong getVariablesSetSize(nd4j::graph::VariablesSet* set) { return set->size(); } -Nd4jStatus getVariableSetStatus(nd4j::graph::VariablesSet* set) { +Nd4jStatus getVariablesSetStatus(nd4j::graph::VariablesSet* set) { return set->status(); } @@ -2867,14 +2880,8 @@ void deleteLongArray(Nd4jPointer pointer) { delete[] ptr; } -template -static void deleteVariablesSetT(Nd4jPointer pointer) { - nd4j::graph::VariablesSet* ptr = reinterpret_cast(pointer); - delete ptr; -} - -void deleteVariablesSet(Nd4jPointer pointer) { - deleteVariablesSetT(pointer); +void deleteVariablesSet(nd4j::graph::VariablesSet* pointer) { + delete pointer; } void deleteShapeList(Nd4jPointer shapeList) { diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-native-api/src/main/java/org/nd4j/nativeblas/NativeOps.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-native-api/src/main/java/org/nd4j/nativeblas/NativeOps.java index 77cbdd4eb..b3885962a 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-native-api/src/main/java/org/nd4j/nativeblas/NativeOps.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-native-api/src/main/java/org/nd4j/nativeblas/NativeOps.java @@ -1068,11 +1068,11 @@ public interface NativeOps { int registerGraph(PointerPointer extraPointers, long graphId, Pointer flatBufferPointer); - OpaqueVariableSet executeStoredGraph(PointerPointer extraPointers, long graphId, PointerPointer inputBuffers, PointerPointer inputShapes, IntPointer inputIndices, int numInputs); + OpaqueVariablesSet executeStoredGraph(PointerPointer extraPointers, long graphId, PointerPointer inputBuffers, PointerPointer inputShapes, IntPointer inputIndices, int numInputs); - long getVariableSetSize(OpaqueVariableSet set); - int getVariableSetStatus(OpaqueVariableSet set); - OpaqueVariable getVariable(OpaqueVariableSet set, long i); + long getVariablesSetSize(OpaqueVariablesSet set); + int getVariablesSetStatus(OpaqueVariablesSet set); + OpaqueVariable getVariable(OpaqueVariablesSet set, long i); int getVariableId(OpaqueVariable variable); int getVariableIndex(OpaqueVariable variable); String getVariableName(OpaqueVariable variable); @@ -1095,7 +1095,7 @@ public interface NativeOps { void deleteNPArrayMap(Pointer pointer); - void deleteVariablesSet(OpaqueVariableSet pointer); + void deleteVariablesSet(OpaqueVariablesSet pointer); // GraphState creation Pointer getGraphState(long id); diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-native-api/src/main/java/org/nd4j/nativeblas/OpaqueVariableSet.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-native-api/src/main/java/org/nd4j/nativeblas/OpaqueVariablesSet.java similarity index 89% rename from nd4j/nd4j-backends/nd4j-api-parent/nd4j-native-api/src/main/java/org/nd4j/nativeblas/OpaqueVariableSet.java rename to nd4j/nd4j-backends/nd4j-api-parent/nd4j-native-api/src/main/java/org/nd4j/nativeblas/OpaqueVariablesSet.java index 321a049ce..78c7fddb8 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-native-api/src/main/java/org/nd4j/nativeblas/OpaqueVariableSet.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-native-api/src/main/java/org/nd4j/nativeblas/OpaqueVariablesSet.java @@ -22,6 +22,6 @@ import org.bytedeco.javacpp.Pointer; * * @author saudet */ -public class OpaqueVariableSet extends Pointer { - public OpaqueVariableSet(Pointer p) { super(p); } +public class OpaqueVariablesSet extends Pointer { + public OpaqueVariablesSet(Pointer p) { super(p); } } diff --git a/nd4j/nd4j-backends/nd4j-backend-impls/nd4j-cuda/src/main/java/org/nd4j/linalg/jcublas/ops/executioner/CudaExecutioner.java b/nd4j/nd4j-backends/nd4j-backend-impls/nd4j-cuda/src/main/java/org/nd4j/linalg/jcublas/ops/executioner/CudaExecutioner.java index 90e77c7ae..3d1f66ef8 100644 --- a/nd4j/nd4j-backends/nd4j-backend-impls/nd4j-cuda/src/main/java/org/nd4j/linalg/jcublas/ops/executioner/CudaExecutioner.java +++ b/nd4j/nd4j-backends/nd4j-backend-impls/nd4j-cuda/src/main/java/org/nd4j/linalg/jcublas/ops/executioner/CudaExecutioner.java @@ -76,7 +76,7 @@ import org.nd4j.nativeblas.OpaqueConstantDataBuffer; import org.nd4j.nativeblas.OpaqueShapeList; import org.nd4j.nativeblas.OpaqueTadPack; import org.nd4j.nativeblas.OpaqueVariable; -import org.nd4j.nativeblas.OpaqueVariableSet; +import org.nd4j.nativeblas.OpaqueVariablesSet; import java.util.*; @@ -2427,14 +2427,14 @@ public class CudaExecutioner extends DefaultOpExecutioner { val newMap = new LinkedHashMap(); - OpaqueVariableSet result = nativeOps.executeStoredGraph(null, id, ptrBuffers, ptrShapes, ptrIndices, map.size()); + OpaqueVariablesSet result = nativeOps.executeStoredGraph(null, id, ptrBuffers, ptrShapes, ptrIndices, map.size()); - OpStatus status = OpStatus.byNumber(nativeOps.getVariableSetStatus(result)); + OpStatus status = OpStatus.byNumber(nativeOps.getVariablesSetStatus(result)); if (status != OpStatus.ND4J_STATUS_OK) throw new ND4JIllegalStateException("Op execution failed: " + status); - for (int e = 0; e < nativeOps.getVariableSetSize(result); e++) { + for (int e = 0; e < nativeOps.getVariablesSetSize(result); e++) { OpaqueVariable var = nativeOps.getVariable(result, e); int nodeId = nativeOps.getVariableId(var); int index = nativeOps.getVariableIndex(var); diff --git a/nd4j/nd4j-backends/nd4j-backend-impls/nd4j-cuda/src/main/java/org/nd4j/nativeblas/Nd4jCuda.java b/nd4j/nd4j-backends/nd4j-backend-impls/nd4j-cuda/src/main/java/org/nd4j/nativeblas/Nd4jCuda.java index be024e5f4..064537990 100644 --- a/nd4j/nd4j-backends/nd4j-backend-impls/nd4j-cuda/src/main/java/org/nd4j/nativeblas/Nd4jCuda.java +++ b/nd4j/nd4j-backends/nd4j-backend-impls/nd4j-cuda/src/main/java/org/nd4j/nativeblas/Nd4jCuda.java @@ -2988,13 +2988,13 @@ public native void deleteShapeList(@Cast("Nd4jPointer") Pointer shapeList); public native int registerGraph(@Cast("Nd4jPointer*") PointerPointer extraPointers, @Cast("Nd4jLong") long graphId, @Cast("Nd4jPointer") Pointer flatBufferPointer); -public native OpaqueVariableSet executeStoredGraph(@Cast("Nd4jPointer*") PointerPointer extraPointers, @Cast("Nd4jLong") long graphId, @Cast("Nd4jPointer*") PointerPointer inputBuffers, @Cast("Nd4jPointer*") PointerPointer inputShapes, IntPointer inputIndices, int numInputs); -public native OpaqueVariableSet executeStoredGraph(@Cast("Nd4jPointer*") PointerPointer extraPointers, @Cast("Nd4jLong") long graphId, @Cast("Nd4jPointer*") PointerPointer inputBuffers, @Cast("Nd4jPointer*") PointerPointer inputShapes, IntBuffer inputIndices, int numInputs); -public native OpaqueVariableSet executeStoredGraph(@Cast("Nd4jPointer*") PointerPointer extraPointers, @Cast("Nd4jLong") long graphId, @Cast("Nd4jPointer*") PointerPointer inputBuffers, @Cast("Nd4jPointer*") PointerPointer inputShapes, int[] inputIndices, int numInputs); +public native OpaqueVariablesSet executeStoredGraph(@Cast("Nd4jPointer*") PointerPointer extraPointers, @Cast("Nd4jLong") long graphId, @Cast("Nd4jPointer*") PointerPointer inputBuffers, @Cast("Nd4jPointer*") PointerPointer inputShapes, IntPointer inputIndices, int numInputs); +public native OpaqueVariablesSet executeStoredGraph(@Cast("Nd4jPointer*") PointerPointer extraPointers, @Cast("Nd4jLong") long graphId, @Cast("Nd4jPointer*") PointerPointer inputBuffers, @Cast("Nd4jPointer*") PointerPointer inputShapes, IntBuffer inputIndices, int numInputs); +public native OpaqueVariablesSet executeStoredGraph(@Cast("Nd4jPointer*") PointerPointer extraPointers, @Cast("Nd4jLong") long graphId, @Cast("Nd4jPointer*") PointerPointer inputBuffers, @Cast("Nd4jPointer*") PointerPointer inputShapes, int[] inputIndices, int numInputs); -public native @Cast("Nd4jLong") long getVariableSetSize(OpaqueVariableSet set); -public native @Cast("Nd4jStatus") int getVariableSetStatus(OpaqueVariableSet set); -public native OpaqueVariable getVariable(OpaqueVariableSet set, @Cast("Nd4jLong") long i); +public native @Cast("Nd4jLong") long getVariablesSetSize(OpaqueVariablesSet set); +public native @Cast("Nd4jStatus") int getVariablesSetStatus(OpaqueVariablesSet set); +public native OpaqueVariable getVariable(OpaqueVariablesSet set, @Cast("Nd4jLong") long i); public native int getVariableId(OpaqueVariable variable); public native int getVariableIndex(OpaqueVariable variable); public native @Cast("char*") String getVariableName(OpaqueVariable variable); @@ -3008,7 +3008,7 @@ public native void deleteIntArray(@Cast("Nd4jPointer") Pointer pointer); public native void deleteLongArray(@Cast("Nd4jPointer") Pointer pointer); public native void deletePointerArray(@Cast("Nd4jPointer") Pointer pointer); -public native void deleteVariablesSet(@ByVal OpaqueVariableSet pointer); +public native void deleteVariablesSet(OpaqueVariablesSet pointer); // GraphState creation public native @Cast("Nd4jPointer") Pointer getGraphState(@Cast("Nd4jLong") long id); diff --git a/nd4j/nd4j-backends/nd4j-backend-impls/nd4j-cuda/src/main/java/org/nd4j/nativeblas/Nd4jCudaPresets.java b/nd4j/nd4j-backends/nd4j-backend-impls/nd4j-cuda/src/main/java/org/nd4j/nativeblas/Nd4jCudaPresets.java index 78093cf04..6b9979ec2 100644 --- a/nd4j/nd4j-backends/nd4j-backend-impls/nd4j-cuda/src/main/java/org/nd4j/nativeblas/Nd4jCudaPresets.java +++ b/nd4j/nd4j-backends/nd4j-backend-impls/nd4j-cuda/src/main/java/org/nd4j/nativeblas/Nd4jCudaPresets.java @@ -116,7 +116,7 @@ public class Nd4jCudaPresets implements InfoMapper { .put(new Info("OpaqueTadPack").pointerTypes("OpaqueTadPack")) .put(new Info("OpaqueResultWrapper").pointerTypes("OpaqueResultWrapper")) .put(new Info("OpaqueShapeList").pointerTypes("OpaqueShapeList")) - .put(new Info("OpaqueVariableSet").pointerTypes("OpaqueVariableSet")) + .put(new Info("OpaqueVariablesSet").pointerTypes("OpaqueVariablesSet")) .put(new Info("OpaqueVariable").pointerTypes("OpaqueVariable")) .put(new Info("OpaqueConstantDataBuffer").pointerTypes("OpaqueConstantDataBuffer")) .put(new Info("OpaqueContext").pointerTypes("OpaqueContext")) diff --git a/nd4j/nd4j-backends/nd4j-backend-impls/nd4j-native/src/main/java/org/nd4j/linalg/cpu/nativecpu/ops/NativeOpExecutioner.java b/nd4j/nd4j-backends/nd4j-backend-impls/nd4j-native/src/main/java/org/nd4j/linalg/cpu/nativecpu/ops/NativeOpExecutioner.java index 49eb05208..5494dff50 100644 --- a/nd4j/nd4j-backends/nd4j-backend-impls/nd4j-native/src/main/java/org/nd4j/linalg/cpu/nativecpu/ops/NativeOpExecutioner.java +++ b/nd4j/nd4j-backends/nd4j-backend-impls/nd4j-native/src/main/java/org/nd4j/linalg/cpu/nativecpu/ops/NativeOpExecutioner.java @@ -74,7 +74,7 @@ import org.nd4j.nativeblas.OpaqueConstantDataBuffer; import org.nd4j.nativeblas.OpaqueShapeList; import org.nd4j.nativeblas.OpaqueTadPack; import org.nd4j.nativeblas.OpaqueVariable; -import org.nd4j.nativeblas.OpaqueVariableSet; +import org.nd4j.nativeblas.OpaqueVariablesSet; import java.util.*; @@ -1950,14 +1950,14 @@ public class NativeOpExecutioner extends DefaultOpExecutioner { val newMap = new LinkedHashMap(); - OpaqueVariableSet result = loop.executeStoredGraph(null, id, ptrBuffers, ptrShapes, ptrIndices, map.size()); + OpaqueVariablesSet result = loop.executeStoredGraph(null, id, ptrBuffers, ptrShapes, ptrIndices, map.size()); - OpStatus status = OpStatus.byNumber(loop.getVariableSetStatus(result)); + OpStatus status = OpStatus.byNumber(loop.getVariablesSetStatus(result)); if (status != OpStatus.ND4J_STATUS_OK) throw new ND4JIllegalStateException("Op execution failed: " + status); - for (int e = 0; e < loop.getVariableSetSize(result); e++) { + for (int e = 0; e < loop.getVariablesSetSize(result); e++) { OpaqueVariable var = loop.getVariable(result, e); int nodeId = loop.getVariableId(var); int index = loop.getVariableIndex(var); diff --git a/nd4j/nd4j-backends/nd4j-backend-impls/nd4j-native/src/main/java/org/nd4j/nativeblas/Nd4jCpu.java b/nd4j/nd4j-backends/nd4j-backend-impls/nd4j-native/src/main/java/org/nd4j/nativeblas/Nd4jCpu.java index 0af5910e8..d840850e4 100644 --- a/nd4j/nd4j-backends/nd4j-backend-impls/nd4j-native/src/main/java/org/nd4j/nativeblas/Nd4jCpu.java +++ b/nd4j/nd4j-backends/nd4j-backend-impls/nd4j-native/src/main/java/org/nd4j/nativeblas/Nd4jCpu.java @@ -2988,13 +2988,13 @@ public native void deleteShapeList(@Cast("Nd4jPointer") Pointer shapeList); public native int registerGraph(@Cast("Nd4jPointer*") PointerPointer extraPointers, @Cast("Nd4jLong") long graphId, @Cast("Nd4jPointer") Pointer flatBufferPointer); -public native OpaqueVariableSet executeStoredGraph(@Cast("Nd4jPointer*") PointerPointer extraPointers, @Cast("Nd4jLong") long graphId, @Cast("Nd4jPointer*") PointerPointer inputBuffers, @Cast("Nd4jPointer*") PointerPointer inputShapes, IntPointer inputIndices, int numInputs); -public native OpaqueVariableSet executeStoredGraph(@Cast("Nd4jPointer*") PointerPointer extraPointers, @Cast("Nd4jLong") long graphId, @Cast("Nd4jPointer*") PointerPointer inputBuffers, @Cast("Nd4jPointer*") PointerPointer inputShapes, IntBuffer inputIndices, int numInputs); -public native OpaqueVariableSet executeStoredGraph(@Cast("Nd4jPointer*") PointerPointer extraPointers, @Cast("Nd4jLong") long graphId, @Cast("Nd4jPointer*") PointerPointer inputBuffers, @Cast("Nd4jPointer*") PointerPointer inputShapes, int[] inputIndices, int numInputs); +public native OpaqueVariablesSet executeStoredGraph(@Cast("Nd4jPointer*") PointerPointer extraPointers, @Cast("Nd4jLong") long graphId, @Cast("Nd4jPointer*") PointerPointer inputBuffers, @Cast("Nd4jPointer*") PointerPointer inputShapes, IntPointer inputIndices, int numInputs); +public native OpaqueVariablesSet executeStoredGraph(@Cast("Nd4jPointer*") PointerPointer extraPointers, @Cast("Nd4jLong") long graphId, @Cast("Nd4jPointer*") PointerPointer inputBuffers, @Cast("Nd4jPointer*") PointerPointer inputShapes, IntBuffer inputIndices, int numInputs); +public native OpaqueVariablesSet executeStoredGraph(@Cast("Nd4jPointer*") PointerPointer extraPointers, @Cast("Nd4jLong") long graphId, @Cast("Nd4jPointer*") PointerPointer inputBuffers, @Cast("Nd4jPointer*") PointerPointer inputShapes, int[] inputIndices, int numInputs); -public native @Cast("Nd4jLong") long getVariableSetSize(OpaqueVariableSet set); -public native @Cast("Nd4jStatus") int getVariableSetStatus(OpaqueVariableSet set); -public native OpaqueVariable getVariable(OpaqueVariableSet set, @Cast("Nd4jLong") long i); +public native @Cast("Nd4jLong") long getVariablesSetSize(OpaqueVariablesSet set); +public native @Cast("Nd4jStatus") int getVariablesSetStatus(OpaqueVariablesSet set); +public native OpaqueVariable getVariable(OpaqueVariablesSet set, @Cast("Nd4jLong") long i); public native int getVariableId(OpaqueVariable variable); public native int getVariableIndex(OpaqueVariable variable); public native @Cast("char*") String getVariableName(OpaqueVariable variable); @@ -3008,7 +3008,7 @@ public native void deleteIntArray(@Cast("Nd4jPointer") Pointer pointer); public native void deleteLongArray(@Cast("Nd4jPointer") Pointer pointer); public native void deletePointerArray(@Cast("Nd4jPointer") Pointer pointer); -public native void deleteVariablesSet(@ByVal OpaqueVariableSet pointer); +public native void deleteVariablesSet(OpaqueVariablesSet pointer); // GraphState creation public native @Cast("Nd4jPointer") Pointer getGraphState(@Cast("Nd4jLong") long id); diff --git a/nd4j/nd4j-backends/nd4j-backend-impls/nd4j-native/src/main/java/org/nd4j/nativeblas/Nd4jCpuPresets.java b/nd4j/nd4j-backends/nd4j-backend-impls/nd4j-native/src/main/java/org/nd4j/nativeblas/Nd4jCpuPresets.java index e695a724b..5ad008055 100644 --- a/nd4j/nd4j-backends/nd4j-backend-impls/nd4j-native/src/main/java/org/nd4j/nativeblas/Nd4jCpuPresets.java +++ b/nd4j/nd4j-backends/nd4j-backend-impls/nd4j-native/src/main/java/org/nd4j/nativeblas/Nd4jCpuPresets.java @@ -159,7 +159,7 @@ public class Nd4jCpuPresets implements InfoMapper, BuildEnabled { .put(new Info("OpaqueTadPack").pointerTypes("OpaqueTadPack")) .put(new Info("OpaqueResultWrapper").pointerTypes("OpaqueResultWrapper")) .put(new Info("OpaqueShapeList").pointerTypes("OpaqueShapeList")) - .put(new Info("OpaqueVariableSet").pointerTypes("OpaqueVariableSet")) + .put(new Info("OpaqueVariablesSet").pointerTypes("OpaqueVariablesSet")) .put(new Info("OpaqueVariable").pointerTypes("OpaqueVariable")) .put(new Info("OpaqueConstantDataBuffer").pointerTypes("OpaqueConstantDataBuffer")) .put(new Info("OpaqueContext").pointerTypes("OpaqueContext"))