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

cuda build fix for issues introduced by recent refactoring 

Signed-off-by: raver119 <raver119@gmail.com>
master
raver119 2019-08-02 11:50:54 +03:00 committed by AlexDBlack
parent dfec54242d
commit e565788329
2 changed files with 3 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
nd4j/nd4j-backends/nd4j-backend-impls/nd4j-cuda/src/main/java/org/nd4j/linalg/jcublas/JCublasNDArrayFactory.java
View File

@ -167,15 +167,6 @@ public class JCublasNDArrayFactory extends BaseNativeNDArrayFactory {
return new JCublasNDArray(shape, Nd4j.getStrides(shape, ordering), 0, ordering, false); return new JCublasNDArray(shape, Nd4j.getStrides(shape, ordering), 0, ordering, false);
} }
@Override
public INDArray createUninitializedDetached(int[] shape, char ordering) {
MemoryWorkspace workspace = Nd4j.getMemoryManager().getCurrentWorkspace();
Nd4j.getMemoryManager().setCurrentWorkspace(null);
INDArray ret = new JCublasNDArray(shape, Nd4j.getStrides(shape, ordering), 0, ordering, false);
Nd4j.getMemoryManager().setCurrentWorkspace(workspace);
return ret;
}
@Override @Override
public INDArray create(DataBuffer data, int[] newShape, int[] newStride, long offset, char ordering) { public INDArray create(DataBuffer data, int[] newShape, int[] newStride, long offset, char ordering) {
return new JCublasNDArray(data, newShape, newStride, offset, ordering); return new JCublasNDArray(data, newShape, newStride, offset, ordering);
@ -1676,12 +1667,8 @@ public class JCublasNDArrayFactory extends BaseNativeNDArrayFactory {
} }
@Override @Override
public INDArray createUninitializedDetached(long[] shape, char ordering) { public INDArray createUninitializedDetached(DataType dataType, char ordering, long... shape) {
MemoryWorkspace workspace = Nd4j.getMemoryManager().getCurrentWorkspace(); return new JCublasNDArray(Nd4j.createBufferDetached(shape, dataType), shape, Nd4j.getStrides(shape, order), order, dataType);
Nd4j.getMemoryManager().setCurrentWorkspace(null);
INDArray ret = new JCublasNDArray(shape, Nd4j.getStrides(shape, ordering), 0, ordering, false);
Nd4j.getMemoryManager().setCurrentWorkspace(workspace);
return ret;
} }
@Override @Override

7
nd4j/nd4j-backends/nd4j-backend-impls/nd4j-cuda/src/main/java/org/nd4j/linalg/jcublas/JCusparseNDArrayFactory.java
View File

@ -346,12 +346,7 @@ public class JCusparseNDArrayFactory extends BaseSparseNDArrayFactory{
} }
@Override @Override
public INDArray createUninitializedDetached(int[] shape, char ordering) { public INDArray createUninitializedDetached(DataType dataType, char ordering, long... shape) {
return null;
}
@Override
public INDArray createUninitializedDetached(long[] shape, char ordering) {
return null; return null;
} }