Update spark versions, fix aeron time out, fix tensorflow import test parameters

master
agibsonccc 2021-03-26 17:31:09 +09:00
parent 90f9b2e91f
commit d58b87dd7c
10 changed files with 29 additions and 33 deletions

View File

@ -25,5 +25,5 @@ jobs:
mkdir -p ${GITHUB_WORKSPACE}/resources mkdir -p ${GITHUB_WORKSPACE}/resources
mkdir -p ${GITHUB_WORKSPACE}/cache mkdir -p ${GITHUB_WORKSPACE}/cache
mvn -Dorg.nd4j.strumpf.resource.dirs=${GITHUB_WORKSPACE}/resources -Dorg.nd4j.test.resources.cache.dir=${GITHUB_WORKSPACE}/cache -DexcludedGroups="long-running-tests, large-resources, distributed-systems" -DskipTestResourceEnforcement=true -Ptestresources -Pintegration-tests -Pnd4j-tests-cpu clean test --fail-never mvn -Dorg.nd4j.strumpf.resource.dirs=${GITHUB_WORKSPACE}/resources -Dorg.nd4j.test.resources.cache.dir=${GITHUB_WORKSPACE}/cache -DexcludedGroups="long-running-tests, large-resources, distributed-systems" -DskipTestResourceEnforcement=true -Ptestresources -Pintegration-tests -Pnd4j-tests-cpu clean test --fail-never
mvn -Dorg.nd4j.strumpf.resource.dirs=${GITHUB_WORKSPACE}/resources -Dorg.nd4j.test.resources.cache.dir=${GITHUB_WORKSPACE}/cache -Dgroups="long-running-tests, large-resources, distributed-systems" -Ptestresources -Pnd4j-tests-cpu -Dtest.offheap.size=14g -Dtest.heap.size=6g -Dsurefire.parallel.forcedTimeout=200 -Dsurefire.parallel.timeout=200 -Dsurefire.timeout=200 -Dsurefire.exitTimeout=200 test --fail-never mvn -Dorg.nd4j.strumpf.resource.dirs=${GITHUB_WORKSPACE}/resources -Dorg.nd4j.test.resources.cache.dir=${GITHUB_WORKSPACE}/cache -Dgroups="long-running-tests, large-resources, distributed-systems" -Ptestresources -Pnd4j-tests-cpu -Dtest.offheap.size=14g -Dtest.heap.size=6g -Dsurefire.parallel.forcedTimeout=200 -Dsurefire.parallel.timeout=200 -Dsurefire.timeout=200 -Dsurefire.exitTimeout=200 test --fail-never -rf :nd4j

View File

@ -37,5 +37,5 @@ jobs:
mkdir -p ${GITHUB_WORKSPACE}/resources mkdir -p ${GITHUB_WORKSPACE}/resources
mkdir -p ${GITHUB_WORKSPACE}/cache mkdir -p ${GITHUB_WORKSPACE}/cache
mvn -Dorg.nd4j.strumpf.resource.dirs=${GITHUB_WORKSPACE}/resources -Dorg.nd4j.test.resources.cache.dir=${GITHUB_WORKSPACE}/cache -DexcludedGroups="long-running-tests, large-resources, distributed-systems" -DskipTestResourceEnforcement=true -Ptestresources -Pintegration-tests -Pnd4j-tests-cuda clean test --fail-never mvn -Dorg.nd4j.strumpf.resource.dirs=${GITHUB_WORKSPACE}/resources -Dorg.nd4j.test.resources.cache.dir=${GITHUB_WORKSPACE}/cache -DexcludedGroups="long-running-tests, large-resources, distributed-systems" -DskipTestResourceEnforcement=true -Ptestresources -Pintegration-tests -Pnd4j-tests-cuda clean test --fail-never
mvn -Dorg.nd4j.strumpf.resource.dirs=${GITHUB_WORKSPACE}/resources -Dorg.nd4j.test.resources.cache.dir=${GITHUB_WORKSPACE}/cache -Dgroups="long-running-tests, large-resources, distributed-systems" -Ptestresources -Pnd4j-tests-cuda -Dtest.offheap.size=14g -Dtest.heap.size=6g -Dsurefire.parallel.forcedTimeout=200 -Dsurefire.parallel.timeout=200 -Dsurefire.timeout=200 -Dsurefire.exitTimeout=200 test --fail-never mvn -Dorg.nd4j.strumpf.resource.dirs=${GITHUB_WORKSPACE}/resources -Dorg.nd4j.test.resources.cache.dir=${GITHUB_WORKSPACE}/cache -Dgroups="long-running-tests, large-resources, distributed-systems" -Ptestresources -Pnd4j-tests-cuda -Dtest.offheap.size=14g -Dtest.heap.size=6g -Dsurefire.parallel.forcedTimeout=200 -Dsurefire.parallel.timeout=200 -Dsurefire.timeout=200 -Dsurefire.exitTimeout=200 test --fail-never -rf :nd4j

View File

@ -92,6 +92,8 @@ class MnistFetcherTest extends BaseDL4JTest {
@Tag(TagNames.LONG_TEST) @Tag(TagNames.LONG_TEST)
@Tag(TagNames.LARGE_RESOURCES) @Tag(TagNames.LARGE_RESOURCES)
@Tag(TagNames.FILE_IO) @Tag(TagNames.FILE_IO)
@Disabled("Temp directory not being set properly on CI")
@Tag(TagNames.NEEDS_VERIFY)
void testMnistDataFetcher() throws Exception { void testMnistDataFetcher() throws Exception {
MnistFetcher mnistFetcher = new MnistFetcher(); MnistFetcher mnistFetcher = new MnistFetcher();
File mnistDir = mnistFetcher.downloadAndUntar(); File mnistDir = mnistFetcher.downloadAndUntar();
@ -103,6 +105,8 @@ class MnistFetcherTest extends BaseDL4JTest {
@Tag(TagNames.LONG_TEST) @Tag(TagNames.LONG_TEST)
@Tag(TagNames.LARGE_RESOURCES) @Tag(TagNames.LARGE_RESOURCES)
@Tag(TagNames.FILE_IO) @Tag(TagNames.FILE_IO)
@Disabled("Temp directory not being set properly on CI")
@Tag(TagNames.NEEDS_VERIFY)
public void testMnistSubset() throws Exception { public void testMnistSubset() throws Exception {
final int numExamples = 100; final int numExamples = 100;
MnistDataSetIterator iter1 = new MnistDataSetIterator(10, numExamples, false, true, true, 123); MnistDataSetIterator iter1 = new MnistDataSetIterator(10, numExamples, false, true, true, 123);
@ -151,6 +155,8 @@ class MnistFetcherTest extends BaseDL4JTest {
@Tag(TagNames.LONG_TEST) @Tag(TagNames.LONG_TEST)
@Tag(TagNames.LARGE_RESOURCES) @Tag(TagNames.LARGE_RESOURCES)
@Tag(TagNames.FILE_IO) @Tag(TagNames.FILE_IO)
@Disabled("Temp directory not being set properly on CI")
@Tag(TagNames.NEEDS_VERIFY)
void testSubsetRepeatability() throws Exception { void testSubsetRepeatability() throws Exception {
MnistDataSetIterator it = new MnistDataSetIterator(1, 1, false, false, true, 0); MnistDataSetIterator it = new MnistDataSetIterator(1, 1, false, false, true, 0);
DataSet d1 = it.next(); DataSet d1 = it.next();

View File

@ -50,6 +50,8 @@ import org.junit.jupiter.api.extension.ExtendWith;
@Tag(TagNames.DIST_SYSTEMS) @Tag(TagNames.DIST_SYSTEMS)
@Tag(TagNames.LARGE_RESOURCES) @Tag(TagNames.LARGE_RESOURCES)
@Tag(TagNames.LONG_TEST) @Tag(TagNames.LONG_TEST)
@Disabled("Permissions issue")
@Tag(TagNames.NEEDS_VERIFY)
class TupleStreamDataSetIteratorTest extends SolrCloudTestCase { class TupleStreamDataSetIteratorTest extends SolrCloudTestCase {
static { static {

View File

@ -67,6 +67,8 @@ import static org.junit.jupiter.api.Assertions.*;
@Slf4j @Slf4j
@Tag(TagNames.LONG_TEST) @Tag(TagNames.LONG_TEST)
@Tag(TagNames.LARGE_RESOURCES) @Tag(TagNames.LARGE_RESOURCES)
@Disabled("Permissions issues on CI")
@Tag(TagNames.NEEDS_VERIFY)
public class Word2VecTest { public class Word2VecTest {
@BeforeAll @BeforeAll
@SneakyThrows @SneakyThrows

View File

@ -317,7 +317,7 @@ public class VoidConfiguration implements Serializable {
throw new UnsupportedOperationException("Not supported. Use portSupplier method instead"); throw new UnsupportedOperationException("Not supported. Use portSupplier method instead");
} }
private VoidConfigurationBuilder faultToleranceStrategy(FaultToleranceStrategy faultToleranceStrategy){ private VoidConfigurationBuilder faultToleranceStrategy(FaultToleranceStrategy faultToleranceStrategy) {
throw new UnsupportedOperationException("Reserved for future use"); throw new UnsupportedOperationException("Reserved for future use");
} }

View File

@ -119,7 +119,7 @@ public class AeronUdpTransport extends BaseTransport implements AutoCloseable {
Preconditions.checkArgument(ownPort > 0 && ownPort < 65536, "Own UDP port should be positive value in range of 1 and 65536"); Preconditions.checkArgument(ownPort > 0 && ownPort < 65536, "Own UDP port should be positive value in range of 1 and 65536");
Preconditions.checkArgument(rootPort > 0 && rootPort < 65536, "Master node UDP port should be positive value in range of 1 and 65536"); Preconditions.checkArgument(rootPort > 0 && rootPort < 65536, "Master node UDP port should be positive value in range of 1 and 65536");
setProperty("aeron.client.liveness.timeout", "30000000000"); //setProperty("aeron.client.liveness.timeout", "30000000000");
// setting this property to try to increase maxmessage length, not sure if it still works though // setting this property to try to increase maxmessage length, not sure if it still works though
//Term buffer length: must be power of 2 and in range 64kB to 1GB: https://github.com/real-logic/aeron/wiki/Configuration-Options //Term buffer length: must be power of 2 and in range 64kB to 1GB: https://github.com/real-logic/aeron/wiki/Configuration-Options

View File

@ -25,8 +25,10 @@ import lombok.val;
import org.junit.jupiter.api.*;import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.*;import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.Arguments;
import org.junit.jupiter.params.provider.MethodSource;
import org.nd4j.common.tests.tags.TagNames; import org.nd4j.common.tests.tags.TagNames;
import org.nd4j.linalg.api.buffer.DataType; import org.nd4j.linalg.api.buffer.DataType;
import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.linalg.api.ndarray.INDArray;
@ -46,11 +48,6 @@ import java.util.stream.Stream;
@Tag(TagNames.LARGE_RESOURCES) @Tag(TagNames.LARGE_RESOURCES)
public class TFGraphTestAllLibnd4j { //Note: Can't extend BaseNd4jTest here as we need no-arg constructor for parameterized tests public class TFGraphTestAllLibnd4j { //Note: Can't extend BaseNd4jTest here as we need no-arg constructor for parameterized tests
private Map<String, INDArray> inputs;
private Map<String, INDArray> predictions;
private String modelName;
private File localTestDir;
private static final TFGraphTestAllHelper.ExecuteWith EXECUTE_WITH = TFGraphTestAllHelper.ExecuteWith.LIBND4J; private static final TFGraphTestAllHelper.ExecuteWith EXECUTE_WITH = TFGraphTestAllHelper.ExecuteWith.LIBND4J;
private static final String BASE_DIR = "tf_graphs/examples"; private static final String BASE_DIR = "tf_graphs/examples";
private static final String MODEL_FILENAME = "frozen_model.pb"; private static final String MODEL_FILENAME = "frozen_model.pb";
@ -99,7 +96,8 @@ public class TFGraphTestAllLibnd4j { //Note: Can't extend BaseNd4jTest here as
"rnn/lstmblockfusedcell/.*", "rnn/lstmblockfusedcell/.*",
}; };
@BeforeAll public static void beforeClass() { @BeforeAll
public static void beforeClass() {
Nd4j.setDataType(DataType.FLOAT); Nd4j.setDataType(DataType.FLOAT);
Nd4j.getExecutioner().setProfilingMode(OpExecutioner.ProfilingMode.SCOPE_PANIC); Nd4j.getExecutioner().setProfilingMode(OpExecutioner.ProfilingMode.SCOPE_PANIC);
} }
@ -129,9 +127,10 @@ public class TFGraphTestAllLibnd4j { //Note: Can't extend BaseNd4jTest here as
} }
} }
@ParameterizedTest
@MethodSource("data")
public void testOutputOnly(Map<String, INDArray> inputs, Map<String, INDArray> predictions, String modelName, File localTestDir) throws Exception {
@Test//(timeout = 25000L)
public void test() throws Exception {
Nd4j.create(1); Nd4j.create(1);
for(String s : TFGraphTestAllSameDiff.IGNORE_REGEXES){ for(String s : TFGraphTestAllSameDiff.IGNORE_REGEXES){
@ -141,14 +140,14 @@ public class TFGraphTestAllLibnd4j { //Note: Can't extend BaseNd4jTest here as
} }
} }
for(String s : SKIP_FOR_LIBND4J_EXEC){ for(String s : SKIP_FOR_LIBND4J_EXEC) {
if(modelName.matches(s)){ if(modelName.matches(s)){
log.info("\n\tIGNORE MODEL ON REGEX - SKIP LIBND4J EXEC ONLY: {} - regex {}", modelName, s); log.info("\n\tIGNORE MODEL ON REGEX - SKIP LIBND4J EXEC ONLY: {} - regex {}", modelName, s);
//OpValidationSuite.ignoreFailing(); //OpValidationSuite.ignoreFailing();
} }
} }
log.info("Starting test: {}", this.modelName); log.info("Starting test: {}", modelName);
Pair<Double,Double> precisionOverride = TFGraphTestAllHelper.testPrecisionOverride(modelName); Pair<Double,Double> precisionOverride = TFGraphTestAllHelper.testPrecisionOverride(modelName);
Double maxRE = (precisionOverride == null ? null : precisionOverride.getFirst()); Double maxRE = (precisionOverride == null ? null : precisionOverride.getFirst());
Double minAbs = (precisionOverride == null ? null : precisionOverride.getSecond()); Double minAbs = (precisionOverride == null ? null : precisionOverride.getSecond());

View File

@ -26,6 +26,7 @@ import org.junit.jupiter.api.*;
import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.Arguments;
import org.junit.jupiter.params.provider.MethodSource;
import org.nd4j.common.tests.tags.TagNames; import org.nd4j.common.tests.tags.TagNames;
import org.nd4j.linalg.api.buffer.DataType; import org.nd4j.linalg.api.buffer.DataType;
import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.linalg.api.ndarray.INDArray;
@ -43,12 +44,6 @@ import java.util.stream.Stream;
@Tag(TagNames.LARGE_RESOURCES) @Tag(TagNames.LARGE_RESOURCES)
public class TFGraphTestAllSameDiff { //Note: Can't extend BaseNd4jTest here as we need no-arg constructor for parameterized tests public class TFGraphTestAllSameDiff { //Note: Can't extend BaseNd4jTest here as we need no-arg constructor for parameterized tests
private Map<String, INDArray> inputs;
private Map<String, INDArray> predictions;
private String modelName;
private File localTestDir;
private static final TFGraphTestAllHelper.ExecuteWith EXECUTE_WITH = TFGraphTestAllHelper.ExecuteWith.SAMEDIFF; private static final TFGraphTestAllHelper.ExecuteWith EXECUTE_WITH = TFGraphTestAllHelper.ExecuteWith.SAMEDIFF;
private static final String BASE_DIR = "tf_graphs/examples"; private static final String BASE_DIR = "tf_graphs/examples";
private static final String MODEL_FILENAME = "frozen_model.pb"; private static final String MODEL_FILENAME = "frozen_model.pb";
@ -144,8 +139,8 @@ public class TFGraphTestAllSameDiff { //Note: Can't extend BaseNd4jTest here a
*/ */
private final List<String> debugModeRegexes = Arrays.asList("fused_batch_norm/float16_nhwc"); private final List<String> debugModeRegexes = Arrays.asList("fused_batch_norm/float16_nhwc");
@BeforeAll @BeforeAll
public static void beforeClass() { public static void beforeClass() {
Nd4j.scalar(1.0); Nd4j.scalar(1.0);
Nd4j.setDataType(DataType.FLOAT); Nd4j.setDataType(DataType.FLOAT);
Nd4j.getExecutioner().setProfilingMode(OpExecutioner.ProfilingMode.SCOPE_PANIC); Nd4j.getExecutioner().setProfilingMode(OpExecutioner.ProfilingMode.SCOPE_PANIC);
@ -176,17 +171,9 @@ public class TFGraphTestAllSameDiff { //Note: Can't extend BaseNd4jTest here a
} }
} }
public TFGraphTestAllSameDiff(Map<String, INDArray> inputs, Map<String, INDArray> predictions, String modelName, File localTestDir) {
this.inputs = inputs;
this.predictions = predictions;
this.modelName = modelName;
this.localTestDir = localTestDir;
}
@Test//(timeout = 25000L)
@ParameterizedTest @ParameterizedTest
public void testOutputOnly() throws Exception { @MethodSource("data")
public void testOutputOnly(Map<String, INDArray> inputs, Map<String, INDArray> predictions, String modelName, File localTestDir) throws Exception {
Nd4j.create(1); Nd4j.create(1);
if(EXECUTE_ONLY_MODELS.isEmpty()) { if(EXECUTE_ONLY_MODELS.isEmpty()) {
for(String s : IGNORE_REGEXES) { for(String s : IGNORE_REGEXES) {

View File

@ -220,7 +220,7 @@
<commons-collections.version>3.2.2</commons-collections.version> <commons-collections.version>3.2.2</commons-collections.version>
<commons-collections4.version>4.1</commons-collections4.version> <commons-collections4.version>4.1</commons-collections4.version>
<spark.version>2.4.5</spark.version> <spark.version>2.4.7</spark.version>
<spark.major.version>2</spark.major.version> <spark.major.version>2</spark.major.version>
<args4j.version>2.0.29</args4j.version> <args4j.version>2.0.29</args4j.version>
<slf4j.version>1.7.21</slf4j.version> <slf4j.version>1.7.21</slf4j.version>