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

Merge branch 'master' of https://github.com/eclipse/deeplearning4j

Browse Source
This commit is contained in:
agibsonccc 2021-03-12 18:44:11 +09:00
commit 74ec451934
25 changed files with 41849 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/cpu-integration-tests.yaml vendored
View File

@ -39,7 +39,7 @@ jobs:
- uses: actions/checkout@v2
- uses: ./.github/actions/msys2-base-setup
- uses: ./.github/actions/download-dl4j-test-resources-windows
- name: Run tests
- name: Run testsLossOpValidation
shell: cmd
run: |
set "PATH=C:\msys64\usr\bin;%PATH%"

2
.github/workflows/run-gpu-tests-sanity-checks.yml vendored
View File

@ -35,5 +35,5 @@ jobs:
protoc --version
bash ./change-cuda-versions.sh 11.2
export OMP_NUM_THREADS=1
mvn -DskipTestResourceEnforcement=true -Ptestresources -pl ":deeplearning4j-modelimport,:deeplearning4j-core,:nd4j-cuda-11.2,:samediff-import,:libnd4j" -Dlibnd4j.compute="5.0 5.2 5.3 6.0 8.0" -Ptest-nd4j-cuda --also-make -Dlibnd4j.chip=cuda clean test
mvn -DskipTestResourceEnforcement=true -Ptestresources -pl ":deeplearning4j-modelimport,:deeplearning4j-core,:nd4j-cuda-11.2,:samediff-import,:libnd4j" -Dlibnd4j.helper=cudnn -Dlibnd4j.compute="5.0 5.2 5.3 6.0 8.0" -Ptest-nd4j-cuda --also-make -Dlibnd4j.chip=cuda clean test

4
contrib/codegen-tools/codegen/src/main/resources/logback.xml
View File

@ -39,8 +39,8 @@
<logger name="org.apache.catalina.core" level="DEBUG" />
<logger name="org.springframework" level="WARN" />
<logger name="org.nd4j" level="TRACE" />
<logger name="org.deeplearning4j" level="TRACE" />
<logger name="org.nd4j" level="INFO" />
<logger name="org.deeplearning4j" level="INFO" />
<root level="ERROR">

1
deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/regressiontest/RegressionTest100a.java
View File

@ -56,6 +56,7 @@ import java.io.FileInputStream;
import static org.junit.Assert.*;
@Slf4j
@Ignore
public class RegressionTest100a extends BaseDL4JTest {
@Override

2
deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/regressiontest/RegressionTest100b3.java
View File

@ -51,7 +51,7 @@ import java.io.FileInputStream;
import java.util.List;
import static org.junit.Assert.*;
@Ignore
public class RegressionTest100b3 extends BaseDL4JTest {
@Override

2
deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/regressiontest/RegressionTest100b4.java
View File

@ -71,7 +71,7 @@ import org.nd4j.linalg.learning.regularization.L2Regularization;
import org.nd4j.linalg.lossfunctions.impl.LossMAE;
import org.nd4j.linalg.lossfunctions.impl.LossMCXENT;
import org.nd4j.common.resources.Resources;
@Ignore
public class RegressionTest100b4 extends BaseDL4JTest {
@Override

3
deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/regressiontest/RegressionTest100b6.java
View File

@ -35,6 +35,7 @@ import org.deeplearning4j.nn.graph.vertex.impl.MergeVertex;
import org.deeplearning4j.nn.multilayer.MultiLayerNetwork;
import org.deeplearning4j.nn.weights.WeightInitXavier;
import org.deeplearning4j.regressiontest.customlayer100a.CustomLayer;
import org.junit.Ignore;
import org.junit.Test;
import org.nd4j.linalg.activations.impl.*;
import org.nd4j.linalg.api.buffer.DataType;
@ -52,7 +53,7 @@ import java.io.File;
import java.io.FileInputStream;
import static org.junit.Assert.*;
@Ignore
public class RegressionTest100b6 extends BaseDL4JTest {
@Override

2
deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/util/ModelGuesserTest.java
View File

@ -31,6 +31,7 @@ import org.deeplearning4j.nn.conf.layers.DenseLayer;
import org.deeplearning4j.nn.conf.layers.OutputLayer;
import org.deeplearning4j.nn.multilayer.MultiLayerNetwork;
import org.deeplearning4j.nn.weights.WeightInit;
import org.junit.Ignore;
import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.TemporaryFolder;
@ -51,6 +52,7 @@ import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
import static org.junit.Assume.assumeNotNull;
@Ignore
public class ModelGuesserTest extends BaseDL4JTest {
@Rule

4
deeplearning4j/deeplearning4j-core/src/test/resources/logback-test.xml
View File

@ -37,9 +37,9 @@
<logger name="org.apache.catalina.core" level="DEBUG" />
<logger name="org.springframework" level="DEBUG" />
<logger name="org.deeplearning4j" level="TRACE" />
<logger name="org.deeplearning4j" level="DEBUG" />
<logger name="org.datavec" level="INFO" />
<logger name="org.nd4j" level="TRACE" />
<logger name="org.nd4j" level="INFO" />
<logger name="opennlp.uima.util" level="OFF" />
<logger name="org.apache.uima" level="OFF" />
<logger name="org.cleartk" level="OFF" />

2
deeplearning4j/deeplearning4j-modelimport/src/test/java/org/deeplearning4j/nn/modelimport/keras/MiscTests.java
View File

@ -24,6 +24,7 @@ import org.apache.commons.io.FileUtils;
import org.deeplearning4j.BaseDL4JTest;
import org.deeplearning4j.nn.modelimport.keras.utils.DL4JKerasModelValidator;
import org.deeplearning4j.nn.multilayer.MultiLayerNetwork;
import org.junit.Ignore;
import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.TemporaryFolder;
@ -41,6 +42,7 @@ import java.util.concurrent.atomic.AtomicInteger;
import static org.junit.Assert.*;
@Ignore
public class MiscTests extends BaseDL4JTest {
@Rule

2
deeplearning4j/deeplearning4j-modelimport/src/test/java/org/deeplearning4j/nn/modelimport/keras/configurations/KerasModelImportTest.java
View File

@ -31,6 +31,7 @@ import org.deeplearning4j.nn.modelimport.keras.KerasModelImport;
import org.deeplearning4j.nn.modelimport.keras.exceptions.InvalidKerasConfigurationException;
import org.deeplearning4j.nn.modelimport.keras.exceptions.UnsupportedKerasConfigurationException;
import org.deeplearning4j.nn.multilayer.MultiLayerNetwork;
import org.junit.Ignore;
import org.junit.Test;
import org.nd4j.common.resources.Resources;
import org.nd4j.linalg.convolution.Convolution;
@ -58,6 +59,7 @@ public class KerasModelImportTest extends BaseDL4JTest {
}
@Test
@Ignore
public void testNCHWNWHCChangeImport() {
MultiLayerNetwork model = loadModel("modelimport/keras/weights/conv2dnchw/simpleconv2d.hdf5");
MultiLayerConfiguration multiLayerConfiguration = model.getLayerWiseConfigurations();

1
deeplearning4j/deeplearning4j-modelimport/src/test/java/org/deeplearning4j/nn/modelimport/keras/e2e/KerasModelEndToEndTest.java
View File

@ -77,6 +77,7 @@ import static org.junit.Assert.*;
* @author dave@skymind.io, Max Pumperla
*/
@Slf4j
@Ignore
public class KerasModelEndToEndTest extends BaseDL4JTest {
private static final String GROUP_ATTR_INPUTS = "inputs";
private static final String GROUP_ATTR_OUTPUTS = "outputs";

2
deeplearning4j/deeplearning4j-nlp-parent/deeplearning4j-nlp/src/main/resources/org/deeplearning4j/ehcache.xml
View File

@ -248,7 +248,7 @@
This is the size to allocate the DiskStore for a spool buffer. Writes are made
to this area and then asynchronously written to disk. The default size is 30MB.
Each spool buffer is used only by its cache. If you get OutOfMemory errors consider
lowering this value. To improve DiskStore performance consider increasing it. Trace level
lowering this value. To improve DiskStore performance consider increasing it. INFO level
logging in the DiskStore will show if put back ups are occurring.
clearOnFlush:

2
libnd4j/include/ops/declarable/generic/tensor/strided_slice.cpp
View File

@ -531,11 +531,9 @@ namespace sd {
// } else {
// newShape = ConstantShapeHelper::getInstance().scalarShapeInfo(ArrayOptions::dataType(inShape));
// }
nd4j_printf("Returning new shape %d\n",0);
return SHAPELIST(newShape);
}
nd4j_printf("Returning empty shape info %d\n",0);
return SHAPELIST(ConstantShapeHelper::getInstance().emptyShapeInfo(ArrayOptions::dataType(inShape)));
}

2
libnd4j/include/ops/declarable/helpers/cuda/ctcLoss.cu
View File

@ -13,11 +13,9 @@
*
* SPDX-License-Identifier: Apache-2.0
*******************************************************************************/
//
// @author AbdelRauf
//
#include <type_traits>
#include <cmath>
#include <stdexcept>

2
nd4j/nd4j-backends/nd4j-tests/pom.xml
View File

@ -39,7 +39,7 @@
<kotlin.version>1.4.30-M1</kotlin.version>
<kotlin.compiler.jvmTarget>1.8</kotlin.compiler.jvmTarget>
<kotlin.compiler.incremental>true</kotlin.compiler.incremental>
<junit.version>4.12</junit.version>
<junit.version>4.13</junit.version>
<junit-jupiter.version>5.4.2</junit-jupiter.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.compiler.source>1.8</maven.compiler.source>

2
nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/autodiff/opvalidation/LossOpValidation.java
View File

@ -49,7 +49,7 @@ public class LossOpValidation extends BaseOpValidation {
@Override
public long getTimeoutMilliseconds() {
return 90000L;
return Long.MAX_VALUE;
}
// All tested Loss Ops have backprop at the moment 2019/01/30

1
nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/imports/TFGraphs/TFGraphTestAllSameDiff.java
View File

@ -40,6 +40,7 @@ import java.util.*;
@Slf4j
@RunWith(Parameterized.class)
@Ignore
public class TFGraphTestAllSameDiff { //Note: Can't extend BaseNd4jTest here as we need no-arg constructor for parameterized tests
@Rule

4
nd4j/nd4j-backends/nd4j-tests/src/test/resources/logback.xml
View File

@ -39,8 +39,8 @@
<logger name="org.apache.catalina.core" level="DEBUG" />
<logger name="org.springframework" level="WARN" />
<logger name="org.nd4j" level="TRACE" />
<logger name="org.deeplearning4j" level="TRACE" />
<logger name="org.nd4j" level="INFO" />
<logger name="org.deeplearning4j" level="INFO" />
<root level="ERROR">

7
nd4j/nd4j-common/src/test/java/org/nd4j/common/resources/TestStrumpf.java
View File

@ -23,6 +23,7 @@ package org.nd4j.common.resources;
import org.apache.commons.io.FileUtils;
import org.apache.commons.io.IOUtils;
import org.apache.commons.io.LineIterator;
import org.junit.Ignore;
import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.TemporaryFolder;
@ -38,13 +39,13 @@ import java.nio.charset.StandardCharsets;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
@Ignore
public class TestStrumpf {
@Rule
public TemporaryFolder testDir = new TemporaryFolder();
@Test
/* @Test
public void testResolvingReference() throws Exception {
File f = Resources.asFile("big/raw_sentences.txt");
@ -57,7 +58,7 @@ public class TestStrumpf {
System.out.println("LINE " + i + ": " + iter.next());
}
}
}
}*/
@Test
public void testResolvingActual() throws Exception {

2
nd4j/samediff-import/pom.xml
View File

@ -49,7 +49,7 @@
<kotlin.version>1.4.30</kotlin.version>
<kotlin.compiler.jvmTarget>1.8</kotlin.compiler.jvmTarget>
<kotlin.compiler.incremental>true</kotlin.compiler.incremental>
<junit.version>4.12</junit.version>
<junit.version>4.13</junit.version>
<junit-jupiter.version>5.4.2</junit-jupiter.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.compiler.source>1.8</maven.compiler.source>

20909
nd4j/samediff-import/samediff-import-onnx/src/main/resources/nd4j-op-def.pbtxt Normal file
View File

File diff suppressed because it is too large Load Diff

20909
nd4j/samediff-import/samediff-import-tensorflow/src/main/resources/nd4j-op-def.pbtxt Normal file
View File

File diff suppressed because it is too large Load Diff

2
nd4j/samediff-import/samediff-import-tensorflow/src/test/resources/logback.xml
View File

@ -39,7 +39,7 @@
<logger name="org.apache.catalina.core" level="DEBUG" />
<logger name="org.springframework" level="WARN" />
<logger name="org.nd4j" level="TRACE" />
<logger name="org.nd4j" level="INFO" />
<logger name="org.deeplearning4j" level="INFO" />

2
pom.xml
View File

@ -224,7 +224,7 @@
<spark.major.version>2</spark.major.version>
<args4j.version>2.0.29</args4j.version>
<slf4j.version>1.7.21</slf4j.version>
<junit.version>4.12</junit.version>
<junit.version>4.13</junit.version>
<archunit.version>0.14.1</archunit.version>
<logback.version>1.2.3</logback.version>
<jackson.version>2.10.1</jackson.version>