diff --git a/.github/workflows/run-cpu-integration-tests-self-hosted.yml b/.github/workflows/run-cpu-integration-tests-self-hosted.yml index a59e2bfd9..4f13063d3 100644 --- a/.github/workflows/run-cpu-integration-tests-self-hosted.yml +++ b/.github/workflows/run-cpu-integration-tests-self-hosted.yml @@ -1,19 +1,7 @@ on: workflow_dispatch: jobs: - # Wait for up to a minute for previous run to complete, abort if not done by then - pre-ci: - runs-on: self-hosted - timeout-minutes: 1 - steps: - - name: 'Block Concurrent Executions' - uses: softprops/turnstyle@v1 - with: - poll-interval-seconds: 10 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} linux-x86_64: - needs: pre-ci runs-on: [self-hosted] steps: - uses: AutoModality/action-clean@v1 @@ -34,5 +22,5 @@ jobs: cmake --version protoc --version export OMP_NUM_THREADS=1 - mvn -DskipTestResourceEnforcement=true -Ptestresources -Pintegration-tests -Pnd4j-tests-cpu clean test + mvn -DexcludedGroups=long-running-tests -DskipTestResourceEnforcement=true -Ptestresources -Pintegration-tests -Pnd4j-tests-cpu clean test diff --git a/.github/workflows/run-gpu-integration-tests-self-hosted.yml b/.github/workflows/run-gpu-integration-tests-self-hosted.yml index 25fe29250..d70c3f5f6 100644 --- a/.github/workflows/run-gpu-integration-tests-self-hosted.yml +++ b/.github/workflows/run-gpu-integration-tests-self-hosted.yml @@ -34,5 +34,5 @@ jobs: cmake --version protoc --version export OMP_NUM_THREADS=1 - mvn -DskipTestResourceEnforcement=true -Ptestresources -Pintegration-tests -Pnd4j-tests-cuda clean test + mvn -DexcludedGroups=long-running-tests -DskipTestResourceEnforcement=true -Ptestresources -Pintegration-tests -Pnd4j-tests-cuda clean test diff --git a/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/regressiontest/RegressionTest100b3.java b/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/regressiontest/RegressionTest100b3.java index c92131d57..013491845 100644 --- a/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/regressiontest/RegressionTest100b3.java +++ b/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/regressiontest/RegressionTest100b3.java @@ -207,7 +207,6 @@ public class RegressionTest100b3 extends BaseDL4JTest { @Test - @Disabled("AB 2019/05/23 - Failing on linux-x86_64-cuda-9.2 - see issue #7657") public void testYoloHouseNumber() throws Exception { File f = Resources.asFile("regression_testing/100b3/HouseNumberDetection_100b3.bin"); diff --git a/nd4j/nd4j-backends/nd4j-backend-impls/pom.xml b/nd4j/nd4j-backends/nd4j-backend-impls/pom.xml index 82fbffb8c..2b044c655 100644 --- a/nd4j/nd4j-backends/nd4j-backend-impls/pom.xml +++ b/nd4j/nd4j-backends/nd4j-backend-impls/pom.xml @@ -130,9 +130,6 @@ 1 ${env.LD_LIBRARY_PATH}:${user.dir} - - **/Nd4jTestSuite.java - - -Djava.library.path="${nd4j.basedir}/nd4j-backends/nd4j-backend-impls/nd4j-cuda/target/classes" + -Xmx2g diff --git a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/Nd4jTestsC.java b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/Nd4jTestsC.java index 783ba427d..b76faa9b6 100644 --- a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/Nd4jTestsC.java +++ b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/Nd4jTestsC.java @@ -134,12 +134,7 @@ import java.nio.ByteOrder; import java.nio.file.Files; import java.nio.file.Path; import java.nio.file.Paths; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collections; -import java.util.HashSet; -import java.util.Iterator; -import java.util.List; +import java.util.*; import static org.junit.jupiter.api.Assertions.*; @@ -256,9 +251,10 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends { @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs") public void testSerialization(Nd4jBackend backend) throws Exception { Nd4j.getRandom().setSeed(12345); - INDArray arr = Nd4j.rand(1, 20); + INDArray arr = Nd4j.rand(1, 20).castTo(DataType.DOUBLE); - File dir = testDir.toFile(); + File dir = testDir.resolve("new-dir-" + UUID.randomUUID().toString()).toFile(); + assertTrue(dir.mkdirs()); String outPath = FilenameUtils.concat(dir.getAbsolutePath(), "dl4jtestserialization.bin"); @@ -1584,7 +1580,7 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends { @ParameterizedTest @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs") public void testDivide(Nd4jBackend backend) { - INDArray two = Nd4j.create(new double[] {2, 2, 2, 2}); + INDArray two = Nd4j.create(new double[] {2, 2, 2, 2}).castTo(DataType.DOUBLE); INDArray div = two.div(two); assertEquals(Nd4j.ones(4), div); @@ -1599,8 +1595,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends { @ParameterizedTest @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs") public void testSigmoid(Nd4jBackend backend) { - INDArray n = Nd4j.create(new float[] {1, 2, 3, 4}); - INDArray assertion = Nd4j.create(new float[] {0.73105858f, 0.88079708f, 0.95257413f, 0.98201379f}); + INDArray n = Nd4j.create(new float[] {1, 2, 3, 4}).castTo(DataType.DOUBLE); + INDArray assertion = Nd4j.create(new float[] {0.73105858f, 0.88079708f, 0.95257413f, 0.98201379f}).castTo(DataType.DOUBLE); INDArray sigmoid = Transforms.sigmoid(n, false); assertEquals(assertion, sigmoid); } @@ -1608,8 +1604,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends { @ParameterizedTest @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs") public void testNeg(Nd4jBackend backend) { - INDArray n = Nd4j.create(new float[] {1, 2, 3, 4}); - INDArray assertion = Nd4j.create(new float[] {-1, -2, -3, -4}); + INDArray n = Nd4j.create(new float[] {1, 2, 3, 4}).castTo(DataType.DOUBLE); + INDArray assertion = Nd4j.create(new float[] {-1, -2, -3, -4}).castTo(DataType.DOUBLE); INDArray neg = Transforms.neg(n); assertEquals(assertion, neg,getFailureMessage(backend)); @@ -1619,14 +1615,13 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends { @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs") public void testNorm2Double(Nd4jBackend backend) { DataType initialType = Nd4j.dataType(); - Nd4j.setDataType(DataType.DOUBLE); - INDArray n = Nd4j.create(new double[] {1, 2, 3, 4}); + INDArray n = Nd4j.create(new double[] {1, 2, 3, 4}).castTo(DataType.DOUBLE); double assertion = 5.47722557505; double norm3 = n.norm2Number().doubleValue(); assertEquals(assertion, norm3, 1e-1,getFailureMessage(backend)); - INDArray row = Nd4j.create(new double[] {1, 2, 3, 4}, new long[] {2, 2}); + INDArray row = Nd4j.create(new double[] {1, 2, 3, 4}, new long[] {2, 2}).castTo(DataType.DOUBLE); INDArray row1 = row.getRow(1); double norm2 = row1.norm2Number().doubleValue(); double assertion2 = 5.0f; @@ -1639,13 +1634,13 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends { @ParameterizedTest @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs") public void testNorm2(Nd4jBackend backend) { - INDArray n = Nd4j.create(new float[] {1, 2, 3, 4}); + INDArray n = Nd4j.create(new float[] {1, 2, 3, 4}).castTo(DataType.DOUBLE); float assertion = 5.47722557505f; float norm3 = n.norm2Number().floatValue(); assertEquals(assertion, norm3, 1e-1,getFailureMessage(backend)); - INDArray row = Nd4j.create(new float[] {1, 2, 3, 4}, new long[] {2, 2}); + INDArray row = Nd4j.create(new float[] {1, 2, 3, 4}, new long[] {2, 2}).castTo(DataType.DOUBLE); INDArray row1 = row.getRow(1); float norm2 = row1.norm2Number().floatValue(); float assertion2 = 5.0f; @@ -1658,8 +1653,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends { @ParameterizedTest @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs") public void testCosineSim(Nd4jBackend backend) { - INDArray vec1 = Nd4j.create(new double[] {1, 2, 3, 4}); - INDArray vec2 = Nd4j.create(new double[] {1, 2, 3, 4}); + INDArray vec1 = Nd4j.create(new double[] {1, 2, 3, 4}).castTo(DataType.DOUBLE); + INDArray vec2 = Nd4j.create(new double[] {1, 2, 3, 4}).castTo(DataType.DOUBLE); double sim = Transforms.cosineSim(vec1, vec2); assertEquals(1, sim, 1e-1,getFailureMessage(backend)); @@ -1675,7 +1670,7 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends { @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs") public void testScal(Nd4jBackend backend) { double assertion = 2; - INDArray answer = Nd4j.create(new double[] {2, 4, 6, 8}); + INDArray answer = Nd4j.create(new double[] {2, 4, 6, 8}).castTo(DataType.DOUBLE); INDArray scal = Nd4j.getBlasWrapper().scal(assertion, answer); assertEquals(answer, scal,getFailureMessage(backend)); @@ -1691,8 +1686,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends { @ParameterizedTest @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs") public void testExp(Nd4jBackend backend) { - INDArray n = Nd4j.create(new double[] {1, 2, 3, 4}); - INDArray assertion = Nd4j.create(new double[] {2.71828183f, 7.3890561f, 20.08553692f, 54.59815003f}); + INDArray n = Nd4j.create(new double[] {1, 2, 3, 4}).castTo(DataType.DOUBLE); + INDArray assertion = Nd4j.create(new double[] {2.71828183f, 7.3890561f, 20.08553692f, 54.59815003f}).castTo(DataType.DOUBLE); INDArray exped = Transforms.exp(n); assertEquals(assertion, exped); @@ -1715,10 +1710,10 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends { @ParameterizedTest @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs") public void testScalar(Nd4jBackend backend) { - INDArray a = Nd4j.scalar(1.0f); + INDArray a = Nd4j.scalar(1.0f).castTo(DataType.DOUBLE); assertEquals(true, a.isScalar()); - INDArray n = Nd4j.create(new float[] {1.0f}, new long[0]); + INDArray n = Nd4j.create(new float[] {1.0f}, new long[0]).castTo(DataType.DOUBLE); assertEquals(n, a); assertTrue(n.isScalar()); } @@ -1768,7 +1763,7 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends { @ParameterizedTest @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs") public void testColumns(Nd4jBackend backend) { - INDArray arr = Nd4j.create(new long[] {3, 2}); + INDArray arr = Nd4j.create(new long[] {3, 2}).castTo(DataType.DOUBLE); INDArray column2 = arr.getColumn(0); //assertEquals(true, Shape.shapeEquals(new long[]{3, 1}, column2.shape())); INDArray column = Nd4j.create(new double[] {1, 2, 3}, new long[] {3}); @@ -1902,7 +1897,7 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends { @ParameterizedTest @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs") public void testInplaceTranspose(Nd4jBackend backend) { - INDArray test = Nd4j.rand(3, 4); + INDArray test = Nd4j.rand(3, 4).castTo(DataType.DOUBLE); INDArray orig = test.dup(); INDArray transposei = test.transposei(); @@ -1918,7 +1913,7 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends { public void testTADMMul(Nd4jBackend backend) { Nd4j.getRandom().setSeed(12345); val shape = new long[] {4, 5, 7}; - INDArray arr = Nd4j.rand(shape); + INDArray arr = Nd4j.rand(shape).castTo(DataType.DOUBLE); INDArray tad = arr.tensorAlongDimension(0, 1, 2); assertArrayEquals(tad.shape(), new long[] {5, 7}); @@ -1935,7 +1930,7 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends { assertTrue(tad.equals(copy)); tad = tad.reshape(7, 5); copy = copy.reshape(7, 5); - INDArray first = Nd4j.rand(new long[] {2, 7}); + INDArray first = Nd4j.rand(new long[] {2, 7}).castTo(DataType.DOUBLE); INDArray mmul = first.mmul(tad); INDArray mmulCopy = first.mmul(copy); @@ -1947,14 +1942,14 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends { public void testTADMMulLeadingOne(Nd4jBackend backend) { Nd4j.getRandom().setSeed(12345); val shape = new long[] {1, 5, 7}; - INDArray arr = Nd4j.rand(shape); + INDArray arr = Nd4j.rand(shape).castTo(DataType.DOUBLE); INDArray tad = arr.tensorAlongDimension(0, 1, 2); boolean order = Shape.cOrFortranOrder(tad.shape(), tad.stride(), 1); assertArrayEquals(tad.shape(), new long[] {5, 7}); - INDArray copy = Nd4j.zeros(5, 7); + INDArray copy = Nd4j.zeros(5, 7).castTo(DataType.DOUBLE); for (int i = 0; i < 5; i++) { for (int j = 0; j < 7; j++) { copy.putScalar(new long[] {i, j}, tad.getDouble(i, j)); @@ -1965,7 +1960,7 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends { tad = tad.reshape(7, 5); copy = copy.reshape(7, 5); - INDArray first = Nd4j.rand(new long[] {2, 7}); + INDArray first = Nd4j.rand(new long[] {2, 7}).castTo(DataType.DOUBLE); INDArray mmul = first.mmul(tad); INDArray mmulCopy = first.mmul(copy); @@ -1976,11 +1971,11 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends { @ParameterizedTest @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs") public void testSum2(Nd4jBackend backend) { - INDArray test = Nd4j.create(new float[] {1, 2, 3, 4}, new long[] {2, 2}); + INDArray test = Nd4j.create(new float[] {1, 2, 3, 4}, new long[] {2, 2}).castTo(DataType.DOUBLE); INDArray sum = test.sum(1); - INDArray assertion = Nd4j.create(new float[] {3, 7}); + INDArray assertion = Nd4j.create(new float[] {3, 7}).castTo(DataType.DOUBLE); assertEquals(assertion, sum); - INDArray sum0 = Nd4j.create(new float[] {4, 6}); + INDArray sum0 = Nd4j.create(new float[] {4, 6}).castTo(DataType.DOUBLE); assertEquals(sum0, test.sum(0)); } @@ -1991,7 +1986,7 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends { Nd4j.getRandom().setSeed(12345); int[] shape = {3, 2, 4}; - INDArray arr3d = Nd4j.rand(shape); + INDArray arr3d = Nd4j.rand(shape).castTo(DataType.DOUBLE); INDArray get0 = arr3d.get(NDArrayIndex.all(), NDArrayIndex.all(), NDArrayIndex.interval(0, 1)); INDArray getPoint0 = arr3d.get(NDArrayIndex.all(), NDArrayIndex.all(), NDArrayIndex.point(0)); @@ -2036,7 +2031,7 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends { Nd4j.getRandom().setSeed(12345); int[] shape = {3, 2, 4}; - INDArray arr3d = Nd4j.rand(shape); + INDArray arr3d = Nd4j.rand(shape).castTo(DataType.DOUBLE); for (int x = 0; x < 4; x++) { INDArray getInterval = arr3d.get(NDArrayIndex.all(), NDArrayIndex.all(), NDArrayIndex.interval(x, x + 1)); //3d @@ -2059,19 +2054,19 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends { @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs") public void testMmul(Nd4jBackend backend) { DataBuffer data = Nd4j.linspace(1, 10, 10, DataType.DOUBLE).data(); - INDArray n = Nd4j.create(data, new long[] {1, 10}); + INDArray n = Nd4j.create(data, new long[] {1, 10}).castTo(DataType.DOUBLE); INDArray transposed = n.transpose(); assertEquals(true, n.isRowVector()); assertEquals(true, transposed.isColumnVector()); - INDArray d = Nd4j.create(n.rows(), n.columns()); + INDArray d = Nd4j.create(n.rows(), n.columns()).castTo(DataType.DOUBLE); d.setData(n.data()); INDArray d3 = Nd4j.create(new double[] {1, 2}).reshape(2, 1); INDArray d4 = Nd4j.create(new double[] {3, 4}).reshape(1, 2); INDArray resultNDArray = d3.mmul(d4); - INDArray result = Nd4j.create(new double[][] {{3, 4}, {6, 8}}); + INDArray result = Nd4j.create(new double[][] {{3, 4}, {6, 8}}).castTo(DataType.DOUBLE); assertEquals(result, resultNDArray); @@ -2085,12 +2080,12 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends { - INDArray three = Nd4j.create(new double[] {3, 4}); + INDArray three = Nd4j.create(new double[] {3, 4}).castTo(DataType.DOUBLE); INDArray test = Nd4j.create(Nd4j.linspace(1, 30, 30, DataType.DOUBLE).data(), new long[] {3, 5, 2}); INDArray sliceRow = test.slice(0).getRow(1); assertEquals(three, sliceRow,getFailureMessage(backend)); - INDArray twoSix = Nd4j.create(new double[] {2, 6}, new long[] {2, 1}); + INDArray twoSix = Nd4j.create(new double[] {2, 6}, new long[] {2, 1}).castTo(DataType.DOUBLE); INDArray threeTwoSix = three.mmul(twoSix); INDArray sliceRowTwoSix = sliceRow.mmul(twoSix); @@ -2109,7 +2104,7 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends { 154, 165, 0, 12, 24, 36, 48, 60, 72, 84, 96, 108, 120, 132, 144, 156, 168, 180, 0, 13, 26, 39, 52, 65, 78, 91, 104, 117, 130, 143, 156, 169, 182, 195, 0, 14, 28, 42, 56, 70, 84, 98, 112, 126, 140, 154, 168, 182, 196, 210, 0, 15, 30, 45, 60, 75, 90, 105, 120, 135, 150, 165, 180, 195, 210, - 225}, new long[] {16, 16}); + 225}, new long[] {16, 16}).castTo(DataType.DOUBLE); INDArray n1 = Nd4j.create(Nd4j.linspace(0, 15, 16, DataType.DOUBLE).data(), new long[] {1, 16}); @@ -2167,7 +2162,7 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends { @ParameterizedTest @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs") public void testLogX1(Nd4jBackend backend) { - INDArray x = Nd4j.create(10).assign(7); + INDArray x = Nd4j.create(10).assign(7).castTo(DataType.DOUBLE); INDArray logX5 = Transforms.log(x, 5, true); @@ -2179,7 +2174,7 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends { @ParameterizedTest @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs") public void testAddMatrix(Nd4jBackend backend) { - INDArray five = Nd4j.ones(5); + INDArray five = Nd4j.ones(5).castTo(DataType.DOUBLE); five.addi(five); INDArray twos = Nd4j.valueArrayOf(5, 2); assertEquals(twos, five); @@ -2201,7 +2196,7 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends { @ParameterizedTest @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs") public void testRowVectorMultipleIndices(Nd4jBackend backend) { - INDArray linear = Nd4j.create(1, 4); + INDArray linear = Nd4j.create(1, 4).castTo(DataType.DOUBLE); linear.putScalar(new long[] {0, 1}, 1); assertEquals(linear.getDouble(0, 1), 1, 1e-1); } @@ -2210,7 +2205,7 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends { @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs") public void testSize(Nd4jBackend backend) { assertThrows(IllegalArgumentException.class,() -> { - INDArray arr = Nd4j.create(4, 5); + INDArray arr = Nd4j.create(4, 5).castTo(DataType.DOUBLE); for (int i = 0; i < 6; i++) { //This should fail for i >= 2, but doesn't @@ -2224,10 +2219,6 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends { @ParameterizedTest @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs") public void testNullPointerDataBuffer(Nd4jBackend backend) { - DataType initialType = Nd4j.dataType(); - - Nd4j.setDataType(DataType.FLOAT); - ByteBuffer allocate = ByteBuffer.allocateDirect(10 * 4).order(ByteOrder.nativeOrder()); allocate.asFloatBuffer().put(new float[] {1, 2, 3, 4, 5, 6, 7, 8, 9, 10}); DataBuffer buff = Nd4j.createBuffer(allocate, DataType.FLOAT, 10); @@ -2235,7 +2226,6 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends { // System.out.println(sum); assertEquals(55f, sum, 0.001f); - Nd4j.setDataType(initialType); } @ParameterizedTest @@ -2253,8 +2243,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends { @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs") public void testEps2(Nd4jBackend backend) { - INDArray first = Nd4j.valueArrayOf(10, 1e-2); //0.01 - INDArray second = Nd4j.zeros(10); //0.0 + INDArray first = Nd4j.valueArrayOf(10, 1e-2).castTo(DataType.DOUBLE); //0.01 + INDArray second = Nd4j.zeros(10).castTo(DataType.DOUBLE); //0.0 INDArray expAllZeros1 = Nd4j.getExecutioner().exec(new Eps(first, second, Nd4j.create(DataType.BOOL, new long[] {1, 10}, 'f'))); INDArray expAllZeros2 = Nd4j.getExecutioner().exec(new Eps(second, first, Nd4j.create(DataType.BOOL, new long[] {1, 10}, 'f'))); @@ -2336,7 +2326,7 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends { @ParameterizedTest @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs") public void test2DArraySlice(Nd4jBackend backend) { - INDArray array2D = Nd4j.ones(5, 7); + INDArray array2D = Nd4j.ones(5, 7).castTo(DataType.DOUBLE); /** * This should be reverse. * This is compatibility with numpy. @@ -2390,7 +2380,7 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends { @ParameterizedTest @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs") public void testGetRow(Nd4jBackend backend) { - INDArray arr = Nd4j.ones(10, 4); + INDArray arr = Nd4j.ones(10, 4).castTo(DataType.DOUBLE); for (int i = 0; i < 10; i++) { INDArray row = arr.getRow(i); assertArrayEquals(row.shape(), new long[] {4}); @@ -2403,7 +2393,7 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends { public void testGetPermuteReshapeSub(Nd4jBackend backend) { Nd4j.getRandom().setSeed(12345); - INDArray first = Nd4j.rand(new long[] {10, 4}); + INDArray first = Nd4j.rand(new long[] {10, 4}).castTo(DataType.DOUBLE); //Reshape, as per RnnOutputLayer etc on labels INDArray orig3d = Nd4j.rand(new long[] {2, 4, 15}); @@ -2423,7 +2413,7 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends { @ParameterizedTest @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs") public void testPutAtIntervalIndexWithStride(Nd4jBackend backend) { - INDArray n1 = Nd4j.create(3, 3).assign(0.0); + INDArray n1 = Nd4j.create(3, 3).assign(0.0).castTo(DataType.DOUBLE); INDArrayIndex[] indices = {NDArrayIndex.interval(0, 2, 3), NDArrayIndex.all()}; n1.put(indices, 1); INDArray expected = Nd4j.create(new double[][] {{1d, 1d, 1d}, {0d, 0d, 0d}, {1d, 1d, 1d}}); @@ -2434,11 +2424,11 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends { @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs") public void testMMulMatrixTimesColVector(Nd4jBackend backend) { //[1 1 1 1 1; 10 10 10 10 10; 100 100 100 100 100] x [1; 1; 1; 1; 1] = [5; 50; 500] - INDArray matrix = Nd4j.ones(3, 5); + INDArray matrix = Nd4j.ones(3, 5).castTo(DataType.DOUBLE); matrix.getRow(1).muli(10); matrix.getRow(2).muli(100); - INDArray colVector = Nd4j.ones(5, 1); + INDArray colVector = Nd4j.ones(5, 1).castTo(DataType.DOUBLE); INDArray out = matrix.mmul(colVector); INDArray expected = Nd4j.create(new double[] {5, 50, 500}, new long[] {3, 1}); @@ -2449,8 +2439,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends { @ParameterizedTest @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs") public void testMMulMixedOrder(Nd4jBackend backend) { - INDArray first = Nd4j.ones(5, 2); - INDArray second = Nd4j.ones(2, 3); + INDArray first = Nd4j.ones(5, 2).castTo(DataType.DOUBLE); + INDArray second = Nd4j.ones(2, 3).castTo(DataType.DOUBLE); INDArray out = first.mmul(second); assertArrayEquals(out.shape(), new long[] {5, 3}); assertTrue(out.equals(Nd4j.ones(5, 3).muli(2))); @@ -2475,9 +2465,9 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends { @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs") public void testFTimesCAddiRow(Nd4jBackend backend) { - INDArray arrF = Nd4j.create(2, 3, 'f').assign(1.0); - INDArray arrC = Nd4j.create(2, 3, 'c').assign(1.0); - INDArray arr2 = Nd4j.create(new long[] {3, 4}, 'c').assign(1.0); + INDArray arrF = Nd4j.create(2, 3, 'f').assign(1.0).castTo(DataType.DOUBLE); + INDArray arrC = Nd4j.create(2, 3, 'c').assign(1.0).castTo(DataType.DOUBLE); + INDArray arr2 = Nd4j.create(new long[] {3, 4}, 'c').assign(1.0).castTo(DataType.DOUBLE); INDArray mmulC = arrC.mmul(arr2); //[2,4] with elements 3.0 INDArray mmulF = arrF.mmul(arr2); //[2,4] with elements 3.0 @@ -2485,7 +2475,7 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends { assertArrayEquals(mmulF.shape(), new long[] {2, 4}); assertTrue(arrC.equals(arrF)); - INDArray row = Nd4j.zeros(1, 4).assign(0.0).addi(0.5); + INDArray row = Nd4j.zeros(1, 4).assign(0.0).addi(0.5).castTo(DataType.DOUBLE); mmulC.addiRowVector(row); //OK mmulF.addiRowVector(row); //Exception @@ -2503,8 +2493,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends { @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs") public void testMmulGet(Nd4jBackend backend) { Nd4j.getRandom().setSeed(12345L); - INDArray elevenByTwo = Nd4j.rand(new long[] {11, 2}); - INDArray twoByEight = Nd4j.rand(new long[] {2, 8}); + INDArray elevenByTwo = Nd4j.rand(new long[] {11, 2}).castTo(DataType.DOUBLE); + INDArray twoByEight = Nd4j.rand(new long[] {2, 8}).castTo(DataType.DOUBLE); INDArray view = twoByEight.get(NDArrayIndex.all(), NDArrayIndex.interval(0, 2)); INDArray viewCopy = view.dup(); @@ -2520,15 +2510,15 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends { @ParameterizedTest @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs") public void testMMulRowColVectorMixedOrder(Nd4jBackend backend) { - INDArray colVec = Nd4j.ones(5, 1); - INDArray rowVec = Nd4j.ones(1, 3); + INDArray colVec = Nd4j.ones(5, 1).castTo(DataType.DOUBLE); + INDArray rowVec = Nd4j.ones(1, 3).castTo(DataType.DOUBLE); INDArray out = colVec.mmul(rowVec); assertArrayEquals(out.shape(), new long[] {5, 3}); assertTrue(out.equals(Nd4j.ones(5, 3))); //Above: OK - INDArray colVectorC = Nd4j.create(new long[] {5, 1}, 'c'); - INDArray rowVectorF = Nd4j.create(new long[] {1, 3}, 'f'); + INDArray colVectorC = Nd4j.create(new long[] {5, 1}, 'c').castTo(DataType.DOUBLE); + INDArray rowVectorF = Nd4j.create(new long[] {1, 3}, 'f').castTo(DataType.DOUBLE); for (int i = 0; i < colVectorC.length(); i++) colVectorC.putScalar(i, 1.0); for (int i = 0; i < rowVectorF.length(); i++) @@ -2548,9 +2538,9 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends { int nCols = 3; java.util.Random r = new java.util.Random(12345); - INDArray arrC = Nd4j.create(new long[] {nRows, nCols}, 'c'); - INDArray arrF = Nd4j.create(new long[] {nRows, nCols}, 'f'); - INDArray arrC2 = Nd4j.create(new long[] {nRows, nCols}, 'c'); + INDArray arrC = Nd4j.create(new long[] {nRows, nCols}, 'c').castTo(DataType.DOUBLE); + INDArray arrF = Nd4j.create(new long[] {nRows, nCols}, 'f').castTo(DataType.DOUBLE); + INDArray arrC2 = Nd4j.create(new long[] {nRows, nCols}, 'c').castTo(DataType.DOUBLE); for (int i = 0; i < nRows; i++) { for (int j = 0; j < nCols; j++) { double rv = r.nextDouble(); @@ -2570,8 +2560,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends { @ParameterizedTest @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs") public void testMMulColVectorRowVectorMixedOrder(Nd4jBackend backend) { - INDArray colVec = Nd4j.ones(5, 1); - INDArray rowVec = Nd4j.ones(1, 5); + INDArray colVec = Nd4j.ones(5, 1).castTo(DataType.DOUBLE); + INDArray rowVec = Nd4j.ones(1, 5).castTo(DataType.DOUBLE); INDArray out = rowVec.mmul(colVec); assertArrayEquals(new long[] {1, 1}, out.shape()); assertTrue(out.equals(Nd4j.ones(1, 1).muli(5))); @@ -2593,7 +2583,7 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends { @ParameterizedTest @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs") public void testPermute(Nd4jBackend backend) { - INDArray n = Nd4j.create(Nd4j.linspace(1, 20, 20, DataType.DOUBLE).data(), new long[] {5, 4}); + INDArray n = Nd4j.create(Nd4j.linspace(1, 20, 20, DataType.DOUBLE).data(), new long[] {5, 4}).castTo(DataType.DOUBLE); INDArray transpose = n.transpose(); INDArray permute = n.permute(1, 0); assertEquals(permute, transpose); @@ -2612,7 +2602,7 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends { //Check in-place permute vs. copy array permute //2d: - INDArray orig = Nd4j.linspace(1, 3 * 4, 3 * 4, DataType.DOUBLE).reshape('c', 3, 4); + INDArray orig = Nd4j.linspace(1, 3 * 4, 3 * 4, DataType.DOUBLE).reshape('c', 3, 4).castTo(DataType.DOUBLE); INDArray exp01 = orig.permute(0, 1); INDArray exp10 = orig.permute(1, 0); List> list1 = NDArrayCreationUtil.getAllTestMatricesWithShape(3, 4, 12345, DataType.DOUBLE); @@ -2692,7 +2682,7 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends { @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs") public void testPermuteiShape(Nd4jBackend backend) { - INDArray row = Nd4j.create(1, 10); + INDArray row = Nd4j.create(1, 10).castTo(DataType.DOUBLE); INDArray permutedCopy = row.permute(1, 0); INDArray permutedInplace = row.permutei(1, 0); @@ -2797,7 +2787,7 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends { @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs") public void testStdev1(Nd4jBackend backend) { double[][] ind = {{5.1, 3.5, 1.4}, {4.9, 3.0, 1.4}, {4.7, 3.2, 1.3}}; - INDArray in = Nd4j.create(ind); + INDArray in = Nd4j.create(ind).castTo(DataType.DOUBLE); INDArray stdev = in.std(1); // log.info("StdDev: {}", stdev.toDoubleVector()); INDArray exp = Nd4j.create(new double[] {1.8556220879622372, 1.7521415467935233, 1.7039170558842744}); @@ -2811,8 +2801,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends { double[] d = {1.0, -1.1, 1.2, 1.3, -1.4, -1.5, 1.6, -1.7, -1.8, -1.9, -1.01, -1.011}; double[] e = {1.0, -1.0, 1.0, 1.0, -1.0, -1.0, 1.0, -1.0, -1.0, -1.0, -1.0, -1.0}; - INDArray arrF = Nd4j.create(d, new long[] {4, 3}, 'f'); - INDArray arrC = Nd4j.create(new long[] {4, 3}, 'c').assign(arrF); + INDArray arrF = Nd4j.create(d, new long[] {4, 3}, 'f').castTo(DataType.DOUBLE); + INDArray arrC = Nd4j.create(new long[] {4, 3}, 'c').assign(arrF).castTo(DataType.DOUBLE); INDArray exp = Nd4j.create(e, new long[] {4, 3}, 'f'); @@ -3036,7 +3026,7 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends { @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs") public void testTemp(Nd4jBackend backend) { Nd4j.getRandom().setSeed(12345); - INDArray in = Nd4j.rand(new long[] {2, 2, 2}); + INDArray in = Nd4j.rand(new long[] {2, 2, 2}).castTo(DataType.DOUBLE); // System.out.println("In:\n" + in); INDArray permuted = in.permute(0, 2, 1); //Permute, so we get correct order after reshaping INDArray out = permuted.reshape(4, 2); @@ -4225,7 +4215,7 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends { Nd4j.getRandom().setSeed(12345); val s = new long[] {2, 3, 4, 5}; - INDArray arr = Nd4j.rand(s); + INDArray arr = Nd4j.rand(s).castTo(DataType.DOUBLE); //Test 0,1 INDArray exp = Nd4j.create(DataType.BOOL, s); @@ -4308,7 +4298,7 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends { //Based on a c-order traversal of each tensor val imax = new long[] {1, 5, 0}; - INDArray arr = Nd4j.create(3, 2, 3); + INDArray arr = Nd4j.create(3, 2, 3).castTo(DataType.DOUBLE); for (int i = 0; i < 3; i++) { arr.get(NDArrayIndex.point(i), NDArrayIndex.all(), NDArrayIndex.all()).assign(Nd4j.create(slices[i])); } @@ -4328,10 +4318,10 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends { public void testIMax2of4d(Nd4jBackend backend) { Nd4j.getRandom().setSeed(12345); val s = new long[] {2, 3, 4, 5}; - INDArray arr = Nd4j.rand(s); + INDArray arr = Nd4j.rand(s).castTo(DataType.DOUBLE); //Test 0,1 - INDArray exp = Nd4j.create(DataType.LONG, 4, 5); + INDArray exp = Nd4j.create(DataType.LONG, 4, 5).castTo(DataType.DOUBLE); for (int i = 0; i < 4; i++) { for (int j = 0; j < 5; j++) { INDArray subset = arr.get(NDArrayIndex.all(), NDArrayIndex.all(), NDArrayIndex.point(i), @@ -4356,8 +4346,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends { } } - INDArray actC = Nd4j.getExecutioner().exec(new ArgMax(arr.dup('c'), 0,1))[0]; - INDArray actF = Nd4j.getExecutioner().exec(new ArgMax(arr.dup('f'), 0,1))[0]; + INDArray actC = Nd4j.getExecutioner().exec(new ArgMax(arr.dup('c'), 0,1))[0].castTo(DataType.DOUBLE); + INDArray actF = Nd4j.getExecutioner().exec(new ArgMax(arr.dup('f'), 0,1))[0].castTo(DataType.DOUBLE); // assertEquals(exp, actC); assertEquals(exp, actF); @@ -4426,9 +4416,9 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends { @ParameterizedTest @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs") public void testRemainder1(Nd4jBackend backend) { - INDArray x = Nd4j.create(10).assign(5.3); - INDArray y = Nd4j.create(10).assign(2.0); - INDArray exp = Nd4j.create(10).assign(-0.7); + INDArray x = Nd4j.create(10).assign(5.3).castTo(DataType.DOUBLE); + INDArray y = Nd4j.create(10).assign(2.0).castTo(DataType.DOUBLE); + INDArray exp = Nd4j.create(10).assign(-0.7).castTo(DataType.DOUBLE); INDArray result = x.remainder(2.0); assertEquals(exp, result); @@ -4440,9 +4430,9 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends { @ParameterizedTest @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs") public void testFMod1(Nd4jBackend backend) { - INDArray x = Nd4j.create(10).assign(5.3); - INDArray y = Nd4j.create(10).assign(2.0); - INDArray exp = Nd4j.create(10).assign(1.3); + INDArray x = Nd4j.create(10).assign(5.3).castTo(DataType.DOUBLE); + INDArray y = Nd4j.create(10).assign(2.0).castTo(DataType.DOUBLE); + INDArray exp = Nd4j.create(10).assign(1.3).castTo(DataType.DOUBLE); INDArray result = x.fmod(2.0); assertEquals(exp, result); @@ -4454,8 +4444,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends { @ParameterizedTest @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs") public void testStrangeDups1(Nd4jBackend backend) { - INDArray array = Nd4j.create(10).assign(0); - INDArray exp = Nd4j.create(10).assign(1.0f); + INDArray array = Nd4j.create(10).assign(0).castTo(DataType.DOUBLE); + INDArray exp = Nd4j.create(10).assign(1.0f).castTo(DataType.DOUBLE); INDArray copy = null; for (int x = 0; x < array.length(); x++) { @@ -4470,9 +4460,9 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends { @ParameterizedTest @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs") public void testStrangeDups2(Nd4jBackend backend) { - INDArray array = Nd4j.create(10).assign(0); - INDArray exp1 = Nd4j.create(10).assign(1.0f); - INDArray exp2 = Nd4j.create(10).assign(1.0f).putScalar(9, 0f); + INDArray array = Nd4j.create(10).assign(0).castTo(DataType.DOUBLE); + INDArray exp1 = Nd4j.create(10).assign(1.0f).castTo(DataType.DOUBLE); + INDArray exp2 = Nd4j.create(10).assign(1.0f).putScalar(9, 0f).castTo(DataType.DOUBLE); INDArray copy = null; for (int x = 0; x < array.length(); x++) { @@ -4503,7 +4493,7 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends { for (int i = 0; i < 10; i++) { List arrays = new ArrayList<>(); for (int x = 0; x < 10; x++) { - arrays.add(Nd4j.create(1, 100).assign(x)); + arrays.add(Nd4j.create(1, 100).assign(x).castTo(DataType.DOUBLE)); } INDArray matrix = Nd4j.specialConcat(0, arrays.toArray(new INDArray[0])); @@ -4511,7 +4501,7 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends { assertEquals(100, matrix.columns()); for (int x = 0; x < 10; x++) { - assertEquals((double) x, matrix.getRow(x).meanNumber().doubleValue(), 0.1); + assertEquals(x, matrix.getRow(x).meanNumber().doubleValue(), 0.1); assertEquals(arrays.get(x), matrix.getRow(x).reshape(1,matrix.size(1))); } } @@ -4533,7 +4523,7 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends { // log.info("Result: {}", matrix); for (int x = 0; x < 10; x++) { - assertEquals((double) x, matrix.getRow(x).meanNumber().doubleValue(), 0.1); + assertEquals(x, matrix.getRow(x).meanNumber().doubleValue(), 0.1); assertEquals(arrays.get(x), matrix.getRow(x).reshape(1, matrix.size(1))); } } @@ -4541,7 +4531,7 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends { @ParameterizedTest @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs") public void testPutScalar1(Nd4jBackend backend) { - INDArray array = Nd4j.create(10, 3, 96, 96); + INDArray array = Nd4j.create(10, 3, 96, 96).castTo(DataType.DOUBLE); for (int i = 0; i < 10; i++) { // log.info("Trying i: {}", i); @@ -4556,7 +4546,7 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends { List arrays = new ArrayList<>(); for (int i = 0; i < 10; i++) { - arrays.add(Nd4j.create(100).assign((double) i)); + arrays.add(Nd4j.create(100).assign((double) i).castTo(DataType.DOUBLE)); } INDArray result = Nd4j.averageAndPropagate(arrays); @@ -4595,7 +4585,7 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends { List arrays = new ArrayList<>(); for (int i = 0; i < 10; i++) { - arrays.add(Nd4j.create(100).assign((double) i)); + arrays.add(Nd4j.create(100).assign((double) i).castTo(DataType.DOUBLE)); } Nd4j.averageAndPropagate(null, arrays); @@ -4612,11 +4602,11 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends { @ParameterizedTest @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs") public void testZ1(Nd4jBackend backend) { - INDArray matrix = Nd4j.create(10, 10).assign(1.0); + INDArray matrix = Nd4j.create(10, 10).assign(1.0).castTo(DataType.DOUBLE); - INDArray exp = Nd4j.create(10).assign(10.0); + INDArray exp = Nd4j.create(10).assign(10.0).castTo(DataType.DOUBLE); - INDArray res = Nd4j.create(10); + INDArray res = Nd4j.create(10).castTo(DataType.DOUBLE); INDArray sums = matrix.sum(res, 0); assertTrue(res == sums); @@ -4637,7 +4627,7 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends { //log.info("Point A: [{}]", executioner.getQueueLength()); - INDArray in = Nd4j.zeros(10); + INDArray in = Nd4j.zeros(10).castTo(DataType.DOUBLE); List out = new ArrayList<>(); List comp = new ArrayList<>(); @@ -4694,7 +4684,7 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends { @ParameterizedTest @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs") public void tesAbsReductions1(Nd4jBackend backend) { - INDArray array = Nd4j.create(new double[] {-1, -2, -3, -4}); + INDArray array = Nd4j.create(new double[] {-1, -2, -3, -4}).castTo(DataType.DOUBLE); assertEquals(4, array.amaxNumber().intValue()); } @@ -4703,7 +4693,7 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends { @ParameterizedTest @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs") public void tesAbsReductions2(Nd4jBackend backend) { - INDArray array = Nd4j.create(new double[] {-1, -2, -3, -4}); + INDArray array = Nd4j.create(new double[] {-1, -2, -3, -4}).castTo(DataType.DOUBLE); assertEquals(1, array.aminNumber().intValue()); } @@ -4721,7 +4711,7 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends { @ParameterizedTest @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs") public void tesAbsReductions4(Nd4jBackend backend) { - INDArray array = Nd4j.create(new double[] {-2, -2, 2, 3}); + INDArray array = Nd4j.create(new double[] {-2, -2, 2, 3}).castTo(DataType.DOUBLE); assertEquals(1.0, array.sumNumber().doubleValue(), 1e-5); assertEquals(4, array.scan(Conditions.absGreaterThanOrEqual(0.0)).intValue()); @@ -4738,8 +4728,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends { @ParameterizedTest @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs") public void testNewBroadcastComparison1(Nd4jBackend backend) { - val initial = Nd4j.create(3, 5); - val mask = Nd4j.create(new double[] {5, 4, 3, 2, 1}); + val initial = Nd4j.create(3, 5).castTo(DataType.DOUBLE); + val mask = Nd4j.create(new double[] {5, 4, 3, 2, 1}).castTo(DataType.DOUBLE); val result = Nd4j.createUninitialized(DataType.BOOL, initial.shape()); val exp = Nd4j.create(new boolean[] {true, true, true, false, false}); @@ -4766,8 +4756,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends { @ParameterizedTest @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs") public void testNewBroadcastComparison2(Nd4jBackend backend) { - val initial = Nd4j.create(3, 5); - val mask = Nd4j.create(new double[] {5, 4, 3, 2, 1}); + val initial = Nd4j.create(3, 5).castTo(DataType.DOUBLE); + val mask = Nd4j.create(new double[] {5, 4, 3, 2, 1}).castTo(DataType.DOUBLE); val result = Nd4j.createUninitialized(DataType.BOOL, initial.shape()); val exp = Nd4j.create(new boolean[] {false, false, false, true, true}); @@ -4791,8 +4781,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends { @ParameterizedTest @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs") public void testNewBroadcastComparison3(Nd4jBackend backend) { - val initial = Nd4j.create(3, 5); - val mask = Nd4j.create(new double[] {5, 4, 3, 2, 1}); + val initial = Nd4j.create(3, 5).castTo(DataType.DOUBLE); + val mask = Nd4j.create(new double[] {5, 4, 3, 2, 1}).castTo(DataType.DOUBLE); val result = Nd4j.createUninitialized(DataType.BOOL, initial.shape()); val exp = Nd4j.create(new boolean[] {false, false, true, true, true}); @@ -4814,13 +4804,13 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends { @ParameterizedTest @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs") public void testNewBroadcastComparison4(Nd4jBackend backend) { - val initial = Nd4j.create(3, 5); - val mask = Nd4j.create(new double[] {5, 4, 3, 2, 1}); + val initial = Nd4j.create(3, 5).castTo(DataType.DOUBLE); + val mask = Nd4j.create(new double[] {5, 4, 3, 2, 1}).castTo(DataType.DOUBLE); val result = Nd4j.createUninitialized(DataType.BOOL, initial.shape()); val exp = Nd4j.create(new boolean[] {false, false, true, false, false}); for (int i = 0; i < initial.columns(); i++) { - initial.getColumn(i).assign(i+1); + initial.getColumn(i).assign(i + 1); } Nd4j.getExecutioner().commit(); @@ -4840,8 +4830,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends { INDArray haystack = Nd4j.create(new double[] {-0.84443557262, -0.06822254508, 0.74266910552, 0.61765557527, -0.77555125951, -0.99536740779, -0.0257304441183, -0.6512106060, -0.345789492130, -1.25485503673, 0.62955373525, -0.31357592344, 1.03362500667, -0.59279078245, 1.1914824247}) - .reshape(3, 5); - INDArray needle = Nd4j.create(new double[] {-0.99536740779, -0.0257304441183, -0.6512106060, -0.345789492130, -1.25485503673}); + .reshape(3, 5).castTo(DataType.DOUBLE); + INDArray needle = Nd4j.create(new double[] {-0.99536740779, -0.0257304441183, -0.6512106060, -0.345789492130, -1.25485503673}).castTo(DataType.DOUBLE); val row = haystack.getRow(1); val drow = row.dup(); @@ -4856,13 +4846,13 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends { INDArray haystack = Nd4j.create(new double[] {-0.84443557262, -0.06822254508, 0.74266910552, 0.61765557527, -0.77555125951, -0.99536740779, -0.0257304441183, -0.6512106060, -0.345789492130, -1.25485503673, 0.62955373525, -0.31357592344, 1.03362500667, -0.59279078245, 1.1914824247}) - .reshape(3, 5); + .reshape(3, 5).castTo(DataType.DOUBLE); INDArray needle = Nd4j.create(new double[] {-0.99536740779, -0.0257304441183, -0.6512106060, -0.345789492130, - -1.25485503673}); + -1.25485503673}).castTo(DataType.DOUBLE); INDArray reduced = Nd4j.getExecutioner().exec(new CosineDistance(haystack, needle, 1)); - INDArray exp = Nd4j.create(new double[] {0.577452, 0.0, 1.80182}); + INDArray exp = Nd4j.create(new double[] {0.577452, 0.0, 1.80182}).castTo(DataType.DOUBLE); assertEquals(exp, reduced); for (int i = 0; i < haystack.rows(); i++) { @@ -4890,11 +4880,11 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends { @ParameterizedTest @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs") public void testTadReduce3_1(Nd4jBackend backend) { - INDArray initial = Nd4j.create(5, 10); + INDArray initial = Nd4j.create(5, 10).castTo(DataType.DOUBLE); for (int i = 0; i < initial.rows(); i++) { initial.getRow(i).assign(i + 1); } - INDArray needle = Nd4j.create(new double[] {0.01, 0.1, 0.2, 0.3, 0.4, 0.5, 0.6, 0.7, 0.8, 0.9}); + INDArray needle = Nd4j.create(new double[] {0.01, 0.1, 0.2, 0.3, 0.4, 0.5, 0.6, 0.7, 0.8, 0.9}).castTo(DataType.DOUBLE); INDArray reduced = Nd4j.getExecutioner().exec(new CosineSimilarity(initial, needle, 1)); log.warn("Reduced: {}", reduced); @@ -4909,11 +4899,11 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends { @ParameterizedTest @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs") public void testTadReduce3_2(Nd4jBackend backend) { - INDArray initial = Nd4j.create(5, 10); + INDArray initial = Nd4j.create(5, 10).castTo(DataType.DOUBLE); for (int i = 0; i < initial.rows(); i++) { initial.getRow(i).assign(i + 1); } - INDArray needle = Nd4j.create(10).assign(1.0); + INDArray needle = Nd4j.create(10).assign(1.0).castTo(DataType.DOUBLE); INDArray reduced = Nd4j.getExecutioner().exec(new ManhattanDistance(initial, needle, 1)); log.warn("Reduced: {}", reduced); @@ -4928,11 +4918,11 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends { @ParameterizedTest @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs") public void testTadReduce3_3(Nd4jBackend backend) { - INDArray initial = Nd4j.create(5, 10); + INDArray initial = Nd4j.create(5, 10).castTo(DataType.DOUBLE); for (int i = 0; i < initial.rows(); i++) { initial.getRow(i).assign(i + 1); } - INDArray needle = Nd4j.create(10).assign(1.0); + INDArray needle = Nd4j.create(10).assign(1.0).castTo(DataType.DOUBLE); INDArray reduced = Nd4j.getExecutioner().exec(new EuclideanDistance(initial, needle, 1)); log.warn("Reduced: {}", reduced); @@ -4948,11 +4938,11 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends { @ParameterizedTest @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs") public void testTadReduce3_3_NEG(Nd4jBackend backend) { - INDArray initial = Nd4j.create(5, 10); + INDArray initial = Nd4j.create(5, 10).castTo(DataType.DOUBLE); for (int i = 0; i < initial.rows(); i++) { initial.getRow(i).assign(i + 1); } - INDArray needle = Nd4j.create(10).assign(1.0); + INDArray needle = Nd4j.create(10).assign(1.0).castTo(DataType.DOUBLE); INDArray reduced = Nd4j.getExecutioner().exec(new EuclideanDistance(initial, needle, -1)); log.warn("Reduced: {}", reduced); @@ -4968,12 +4958,12 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends { @ParameterizedTest @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs") public void testTadReduce3_3_NEG_2(Nd4jBackend backend) { - INDArray initial = Nd4j.create(5, 10); + INDArray initial = Nd4j.create(5, 10).castTo(DataType.DOUBLE); for (int i = 0; i < initial.rows(); i++) { initial.getRow(i).assign(i + 1); } - INDArray needle = Nd4j.create(10).assign(1.0); - INDArray reduced = Nd4j.create(5); + INDArray needle = Nd4j.create(10).assign(1.0).castTo(DataType.DOUBLE); + INDArray reduced = Nd4j.create(5).castTo(DataType.DOUBLE); Nd4j.getExecutioner().exec(new CosineSimilarity(initial, needle, reduced, -1)); log.warn("Reduced: {}", reduced); @@ -4990,11 +4980,11 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends { @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs") public void testTadReduce3_5(Nd4jBackend backend) { assertThrows(ND4JIllegalStateException.class,() -> { - INDArray initial = Nd4j.create(5, 10); + INDArray initial = Nd4j.create(5, 10).castTo(DataType.DOUBLE); for (int i = 0; i < initial.rows(); i++) { initial.getRow(i).assign(i + 1); } - INDArray needle = Nd4j.create(2, 10).assign(1.0); + INDArray needle = Nd4j.create(2, 10).assign(1.0).castTo(DataType.DOUBLE); INDArray reduced = Nd4j.getExecutioner().exec(new EuclideanDistance(initial, needle, 1)); }); @@ -5004,11 +4994,11 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends { @ParameterizedTest @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs") public void testTadReduce3_4(Nd4jBackend backend) { - INDArray initial = Nd4j.create(5, 6, 7); + INDArray initial = Nd4j.create(5, 6, 7).castTo(DataType.DOUBLE); for (int i = 0; i < 5; i++) { initial.tensorAlongDimension(i, 1, 2).assign(i + 1); } - INDArray needle = Nd4j.create(6, 7).assign(1.0); + INDArray needle = Nd4j.create(6, 7).assign(1.0).castTo(DataType.DOUBLE); INDArray reduced = Nd4j.getExecutioner().exec(new ManhattanDistance(initial, needle, 1,2)); log.warn("Reduced: {}", reduced); @@ -5024,9 +5014,9 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends { @ParameterizedTest @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs") public void testAtan2_1(Nd4jBackend backend) { - INDArray x = Nd4j.create(10).assign(-1.0); - INDArray y = Nd4j.create(10).assign(0.0); - INDArray exp = Nd4j.create(10).assign(Math.PI); + INDArray x = Nd4j.create(10).assign(-1.0).castTo(DataType.DOUBLE); + INDArray y = Nd4j.create(10).assign(0.0).castTo(DataType.DOUBLE); + INDArray exp = Nd4j.create(10).assign(Math.PI).castTo(DataType.DOUBLE); INDArray z = Transforms.atan2(x, y); @@ -5036,9 +5026,9 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends { @ParameterizedTest @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs") public void testAtan2_2(Nd4jBackend backend) { - INDArray x = Nd4j.create(10).assign(1.0); - INDArray y = Nd4j.create(10).assign(0.0); - INDArray exp = Nd4j.create(10).assign(0.0); + INDArray x = Nd4j.create(10).assign(1.0).castTo(DataType.DOUBLE); + INDArray y = Nd4j.create(10).assign(0.0).castTo(DataType.DOUBLE); + INDArray exp = Nd4j.create(10).assign(0.0).castTo(DataType.DOUBLE); INDArray z = Transforms.atan2(x, y); @@ -5048,8 +5038,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends { @ParameterizedTest @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs") public void testJaccardDistance1(Nd4jBackend backend) { - INDArray x = Nd4j.create(new double[] {0, 1, 0, 0, 1, 0}); - INDArray y = Nd4j.create(new double[] {1, 1, 0, 1, 0, 0}); + INDArray x = Nd4j.create(new double[] {0, 1, 0, 0, 1, 0}).castTo(DataType.DOUBLE); + INDArray y = Nd4j.create(new double[] {1, 1, 0, 1, 0, 0}).castTo(DataType.DOUBLE); double val = Transforms.jaccardDistance(x, y); @@ -5059,8 +5049,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends { @ParameterizedTest @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs") public void testJaccardDistance2(Nd4jBackend backend) { - INDArray x = Nd4j.create(new double[] {0, 1, 0, 0, 1, 1}); - INDArray y = Nd4j.create(new double[] {1, 1, 0, 1, 0, 0}); + INDArray x = Nd4j.create(new double[] {0, 1, 0, 0, 1, 1}).castTo(DataType.DOUBLE); + INDArray y = Nd4j.create(new double[] {1, 1, 0, 1, 0, 0}).castTo(DataType.DOUBLE); double val = Transforms.jaccardDistance(x, y); @@ -5070,8 +5060,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends { @ParameterizedTest @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs") public void testHammingDistance1(Nd4jBackend backend) { - INDArray x = Nd4j.create(new double[] {0, 0, 0, 1, 0, 0}); - INDArray y = Nd4j.create(new double[] {0, 0, 0, 0, 1, 0}); + INDArray x = Nd4j.create(new double[] {0, 0, 0, 1, 0, 0}).castTo(DataType.DOUBLE); + INDArray y = Nd4j.create(new double[] {0, 0, 0, 0, 1, 0}).castTo(DataType.DOUBLE); double val = Transforms.hammingDistance(x, y); @@ -5368,7 +5358,7 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends { public void testAllDistances3(Nd4jBackend backend) { Nd4j.getRandom().setSeed(123); - INDArray initialX = Nd4j.rand(5, 10); + INDArray initialX = Nd4j.rand(5, 10).castTo(DataType.DOUBLE); INDArray initialY = initialX.mul(-1); INDArray result = Transforms.allCosineSimilarities(initialX, initialY, 1); @@ -5421,7 +5411,7 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends { @ParameterizedTest @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs") public void testEntropy1(Nd4jBackend backend) { - INDArray x = Nd4j.rand(1, 100); + INDArray x = Nd4j.rand(1, 100).castTo(DataType.DOUBLE); double exp = MathUtils.entropy(x.data().asDouble()); double res = x.entropyNumber().doubleValue(); @@ -5432,7 +5422,7 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends { @ParameterizedTest @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs") public void testEntropy2(Nd4jBackend backend) { - INDArray x = Nd4j.rand(10, 100); + INDArray x = Nd4j.rand(10, 100).castTo(DataType.DOUBLE); INDArray res = x.entropy(1); @@ -5448,7 +5438,7 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends { @ParameterizedTest @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs") public void testEntropy3(Nd4jBackend backend) { - INDArray x = Nd4j.rand(1, 100); + INDArray x = Nd4j.rand(1, 100).castTo(DataType.DOUBLE); double exp = getShannonEntropy(x.data().asDouble()); double res = x.shannonEntropyNumber().doubleValue(); @@ -5459,7 +5449,7 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends { @ParameterizedTest @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs") public void testEntropy4(Nd4jBackend backend) { - INDArray x = Nd4j.rand(1, 100); + INDArray x = Nd4j.rand(1, 100).castTo(DataType.DOUBLE); double exp = getLogEntropy(x.data().asDouble()); double res = x.logEntropyNumber().doubleValue(); @@ -5584,7 +5574,7 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends { @ParameterizedTest @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs") public void testNativeSort2(Nd4jBackend backend) { - INDArray array = Nd4j.rand(1, 10000); + INDArray array = Nd4j.rand(1, 10000).castTo(DataType.DOUBLE); INDArray res = Nd4j.sort(array, true); INDArray exp = res.dup(); @@ -6779,12 +6769,12 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends { @ParameterizedTest @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs") public void testInconsistentOutput(){ - INDArray in = Nd4j.rand(1, 802816); - INDArray W = Nd4j.rand(802816, 1); - INDArray b = Nd4j.create(1); + INDArray in = Nd4j.rand(1, 802816).castTo(DataType.DOUBLE); + INDArray W = Nd4j.rand(802816, 1).castTo(DataType.DOUBLE); + INDArray b = Nd4j.create(1).castTo(DataType.DOUBLE); INDArray out = fwd(in, W, b); - for(int i=0;i<100;i++){ + for(int i = 0;i < 100;i++) { INDArray out2 = fwd(in, W, b); //l.activate(inToLayer1, false, LayerWorkspaceMgr.noWorkspaces()); assertEquals( out, out2,"Failed at iteration [" + String.valueOf(i) + "]"); } @@ -6964,7 +6954,7 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends { for(boolean biasCorrected : new boolean[]{false, true}) { - INDArray indArray1 = Nd4j.rand(1, 4, 10); + INDArray indArray1 = Nd4j.rand(1, 4, 10).castTo(DataType.DOUBLE); double std = indArray1.stdNumber(biasCorrected).doubleValue(); val standardDeviation = new org.apache.commons.math3.stat.descriptive.moment.StandardDeviation(biasCorrected); @@ -7104,7 +7094,7 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends { @ParameterizedTest @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs") public void testTearPile_1(Nd4jBackend backend) { - val source = Nd4j.rand(new int[]{10, 15}); + val source = Nd4j.rand(new int[]{10, 15}).castTo(DataType.DOUBLE); val list = Nd4j.tear(source, 1); @@ -7221,16 +7211,16 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends { public void testEmptyShapeRank0(){ Nd4j.getRandom().setSeed(12345); int[] s = new int[0]; - INDArray create = Nd4j.create(s); - INDArray zeros = Nd4j.zeros(s); - INDArray ones = Nd4j.ones(s); - INDArray uninit = Nd4j.createUninitialized(s).assign(0); - INDArray rand = Nd4j.rand(s); + INDArray create = Nd4j.create(s).castTo(DataType.DOUBLE); + INDArray zeros = Nd4j.zeros(s).castTo(DataType.DOUBLE); + INDArray ones = Nd4j.ones(s).castTo(DataType.DOUBLE); + INDArray uninit = Nd4j.createUninitialized(s).assign(0).castTo(DataType.DOUBLE); + INDArray rand = Nd4j.rand(s).castTo(DataType.DOUBLE); - INDArray tsZero = Nd4j.scalar(0.0); - INDArray tsOne = Nd4j.scalar(1.0); + INDArray tsZero = Nd4j.scalar(0.0).castTo(DataType.DOUBLE); + INDArray tsOne = Nd4j.scalar(1.0).castTo(DataType.DOUBLE); Nd4j.getRandom().setSeed(12345); - INDArray tsRand = Nd4j.scalar(Nd4j.rand(new int[]{1,1}).getDouble(0)); + INDArray tsRand = Nd4j.scalar(Nd4j.rand(new int[]{1,1}).getDouble(0)).castTo(DataType.DOUBLE); assertEquals(tsZero, create); assertEquals(tsZero, zeros); assertEquals(tsOne, ones); @@ -7240,11 +7230,11 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends { Nd4j.getRandom().setSeed(12345); long[] s2 = new long[0]; - create = Nd4j.create(s2); - zeros = Nd4j.zeros(s2); - ones = Nd4j.ones(s2); - uninit = Nd4j.createUninitialized(s2).assign(0); - rand = Nd4j.rand(s2); + create = Nd4j.create(s2).castTo(DataType.DOUBLE); + zeros = Nd4j.zeros(s2).castTo(DataType.DOUBLE); + ones = Nd4j.ones(s2).castTo(DataType.DOUBLE); + uninit = Nd4j.createUninitialized(s2).assign(0).castTo(DataType.DOUBLE); + rand = Nd4j.rand(s2).castTo(DataType.DOUBLE); assertEquals(tsZero, create); assertEquals(tsZero, zeros); @@ -7709,8 +7699,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends { @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs") public void testINDArrayMmulWithTranspose(){ Nd4j.getRandom().setSeed(12345); - INDArray a = Nd4j.rand(2,5); - INDArray b = Nd4j.rand(5,3); + INDArray a = Nd4j.rand(2,5).castTo(DataType.DOUBLE); + INDArray b = Nd4j.rand(5,3).castTo(DataType.DOUBLE); INDArray exp = a.mmul(b); Nd4j.getExecutioner().commit(); @@ -7720,26 +7710,26 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends { assertEquals(exp, act); - a = Nd4j.rand(5,2); - b = Nd4j.rand(5,3); + a = Nd4j.rand(5,2).castTo(DataType.DOUBLE); + b = Nd4j.rand(5,3).castTo(DataType.DOUBLE); exp = a.transpose().mmul(b); act = a.mmul(b, MMulTranspose.builder().transposeA(true).build()); assertEquals(exp, act); - a = Nd4j.rand(2,5); - b = Nd4j.rand(3,5); + a = Nd4j.rand(2,5).castTo(DataType.DOUBLE); + b = Nd4j.rand(3,5).castTo(DataType.DOUBLE); exp = a.mmul(b.transpose()); act = a.mmul(b, MMulTranspose.builder().transposeB(true).build()); assertEquals(exp, act); - a = Nd4j.rand(5,2); - b = Nd4j.rand(3,5); + a = Nd4j.rand(5,2).castTo(DataType.DOUBLE); + b = Nd4j.rand(3,5).castTo(DataType.DOUBLE); exp = a.transpose().mmul(b.transpose()); act = a.mmul(b, MMulTranspose.builder().transposeA(true).transposeB(true).build()); assertEquals(exp, act); - a = Nd4j.rand(5,2); - b = Nd4j.rand(3,5); + a = Nd4j.rand(5,2).castTo(DataType.DOUBLE); + b = Nd4j.rand(3,5).castTo(DataType.DOUBLE); exp = a.transpose().mmul(b.transpose()).transpose(); act = a.mmul(b, MMulTranspose.builder().transposeA(true).transposeB(true).transposeResult(true).build()); assertEquals(exp, act); @@ -7778,7 +7768,7 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends { } try { - Nd4j.rand('z', 1, 1); + Nd4j.rand('z', 1, 1).castTo(DataType.DOUBLE); fail("Expected failure"); } catch (IllegalArgumentException e){ assertTrue(e.getMessage().toLowerCase().contains("order")); @@ -8300,7 +8290,7 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends { @Disabled public void testType1(Nd4jBackend backend) throws IOException { for (int i = 0; i < 10; ++i) { - INDArray in1 = Nd4j.rand(DataType.DOUBLE, new int[]{100, 100}); + INDArray in1 = Nd4j.rand(DataType.DOUBLE, new int[]{100, 100}).castTo(DataType.DOUBLE); File dir = testDir.toFile(); ObjectOutputStream oos = new ObjectOutputStream(new FileOutputStream(new File(dir,"test.bin"))); oos.writeObject(in1); @@ -8601,7 +8591,7 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends { } private static INDArray fwd(INDArray input, INDArray W, INDArray b){ - INDArray ret = Nd4j.createUninitialized(input.size(0), W.size(1)); + INDArray ret = Nd4j.createUninitialized(input.size(0), W.size(1)).castTo(DataType.DOUBLE); input.mmuli(W, ret); ret.addiRowVector(b); return ret; diff --git a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/specials/LongTests.java b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/specials/LongTests.java index f52114b4a..ac375473d 100644 --- a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/specials/LongTests.java +++ b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/specials/LongTests.java @@ -24,6 +24,7 @@ import lombok.extern.slf4j.Slf4j; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.parallel.Isolated; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.MethodSource; @@ -47,6 +48,7 @@ import static org.junit.jupiter.api.Assertions.assertNotEquals; @Slf4j @NativeTag +@Isolated public class LongTests extends BaseNd4jTestWithBackends { DataType initialType = Nd4j.dataType(); diff --git a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/workspace/CyclicWorkspaceTests.java b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/workspace/CyclicWorkspaceTests.java index c7946e39e..f95830543 100644 --- a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/workspace/CyclicWorkspaceTests.java +++ b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/workspace/CyclicWorkspaceTests.java @@ -65,7 +65,6 @@ public class CyclicWorkspaceTests extends BaseNd4jTestWithBackends { } } - @Test @ParameterizedTest @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs") public void testGc(Nd4jBackend backend) {