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

do not relocate stuff on java side ()

Browse Source 
Signed-off-by: raver119@gmail.com <raver119@gmail.com>
This commit is contained in:
raver119 2020-05-09 12:56:45 +03:00 committed by GitHub
parent 2849299bfb
commit 10d6c3b024
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 1362 additions and 1382 deletions
nd4j/nd4j-backends/nd4j-backend-impls
nd4j-cuda/src/main/java/org/nd4j
linalg/jcublas/ops/executioner
CudaOpContext.java
nativeblas
Nd4jCuda.java
nd4j-native/src/main/java/org/nd4j/nativeblas
Nd4jCpu.java

4
nd4j/nd4j-backends/nd4j-backend-impls/nd4j-cuda/src/main/java/org/nd4j/linalg/jcublas/ops/executioner/CudaOpContext.java

@ -106,7 +106,7 @@ public class CudaOpContext extends BaseOpContext implements OpContext, Deallocat
@Override @Override
public void setInputArray(int index, @NonNull INDArray array) { public void setInputArray(int index, @NonNull INDArray array) {
val ctx = AtomicAllocator.getInstance().getFlowController().prepareAction(null, array); //val ctx = AtomicAllocator.getInstance().getFlowController().prepareAction(null, array);
nativeOps.setGraphContextInputBuffer(context, index, array.isEmpty() ? null : ((BaseCudaDataBuffer) array.data()).getOpaqueDataBuffer(), array.shapeInfoDataBuffer().addressPointer(), AtomicAllocator.getInstance().getPointer(array.shapeInfoDataBuffer())); nativeOps.setGraphContextInputBuffer(context, index, array.isEmpty() ? null : ((BaseCudaDataBuffer) array.data()).getOpaqueDataBuffer(), array.shapeInfoDataBuffer().addressPointer(), AtomicAllocator.getInstance().getPointer(array.shapeInfoDataBuffer()));
super.setInputArray(index, array); super.setInputArray(index, array);
@ -114,7 +114,7 @@ public class CudaOpContext extends BaseOpContext implements OpContext, Deallocat
@Override @Override
public void setOutputArray(int index, @NonNull INDArray array) { public void setOutputArray(int index, @NonNull INDArray array) {
val ctx = AtomicAllocator.getInstance().getFlowController().prepareAction(array, null); //val ctx = AtomicAllocator.getInstance().getFlowController().prepareAction(array, null);
nativeOps.setGraphContextOutputBuffer(context, index, array.isEmpty() ? null : ((BaseCudaDataBuffer) array.data()).getOpaqueDataBuffer(), array.shapeInfoDataBuffer().addressPointer(), AtomicAllocator.getInstance().getPointer(array.shapeInfoDataBuffer())); nativeOps.setGraphContextOutputBuffer(context, index, array.isEmpty() ? null : ((BaseCudaDataBuffer) array.data()).getOpaqueDataBuffer(), array.shapeInfoDataBuffer().addressPointer(), AtomicAllocator.getInstance().getPointer(array.shapeInfoDataBuffer()));
super.setOutputArray(index, array); super.setOutputArray(index, array);

1370
nd4j/nd4j-backends/nd4j-backend-impls/nd4j-cuda/src/main/java/org/nd4j/nativeblas/Nd4jCuda.java

File diff suppressed because it is too large Load Diff

1370
nd4j/nd4j-backends/nd4j-backend-impls/nd4j-native/src/main/java/org/nd4j/nativeblas/Nd4jCpu.java

File diff suppressed because it is too large Load Diff