Brutex
/
cavis
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #9219 from eclipse/ag_tvm_module_fix 

Fixes module reference ambiguity in TvmRUnner
master
Adam Gibson 2021-03-11 11:57:40 +09:00 committed by GitHub
parent ec8341db21 791bed8cdd
commit c14f8845c2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
nd4j/nd4j-tvm/src/main/java/org/nd4j/tvm/runner/TvmRunner.java
View File

@ -28,7 +28,6 @@ import org.bytedeco.javacpp.*;
import org.bytedeco.tvm.*; import org.bytedeco.tvm.*;
import org.nd4j.common.base.Preconditions; import org.nd4j.common.base.Preconditions;
import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.linalg.api.ndarray.INDArray;
import org.nd4j.tvm.util.TVMUtils;
import static org.bytedeco.tvm.global.tvm_runtime.*; import static org.bytedeco.tvm.global.tvm_runtime.*;
import static org.nd4j.tvm.util.TVMUtils.*; import static org.nd4j.tvm.util.TVMUtils.*;
@ -36,12 +35,12 @@ import static org.nd4j.tvm.util.TVMUtils.*;
@Slf4j @Slf4j
public class TvmRunner implements Closeable { public class TvmRunner implements Closeable {
private static DLContext ctx; private static DLContext ctx;
private Module modFactory; private org.bytedeco.tvm.Module modFactory;
private TVMValue values; private TVMValue values;
private IntPointer codes; private IntPointer codes;
private TVMArgsSetter setter; private TVMArgsSetter setter;
private TVMRetValue rv; private TVMRetValue rv;
private Module gmod; private org.bytedeco.tvm.Module gmod;
private PackedFunc getNumInputs; private PackedFunc getNumInputs;
private PackedFunc getNumOutputs; private PackedFunc getNumOutputs;
private PackedFunc setInput; private PackedFunc setInput;
@ -57,7 +56,7 @@ public class TvmRunner implements Closeable {
// create the runtime module // create the runtime module
try (PointerScope scope = new PointerScope()) { try (PointerScope scope = new PointerScope()) {
modFactory = Module.LoadFromFile(modelUri); modFactory = org.bytedeco.tvm.Module.LoadFromFile(modelUri);
values = new TVMValue(2); values = new TVMValue(2);
codes = new IntPointer(2); codes = new IntPointer(2);
setter = new TVMArgsSetter(values, codes); setter = new TVMArgsSetter(values, codes);