Repository: incubator-systemml Updated Branches: refs/heads/master 50d211baa -> 10727e5d0
[MINOR] Update maven test suites (consistency w/ actual test suite) Project: http://git-wip-us.apache.org/repos/asf/incubator-systemml/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-systemml/commit/10727e5d Tree: http://git-wip-us.apache.org/repos/asf/incubator-systemml/tree/10727e5d Diff: http://git-wip-us.apache.org/repos/asf/incubator-systemml/diff/10727e5d Branch: refs/heads/master Commit: 10727e5d03711d59675d2adf15e04d98b5acf2b7 Parents: 50d211b Author: Matthias Boehm <mboe...@gmail.com> Authored: Sat Jun 3 11:26:19 2017 -0700 Committer: Matthias Boehm <mboe...@gmail.com> Committed: Sat Jun 3 11:26:19 2017 -0700 ---------------------------------------------------------------------- .../applications/parfor/ZPackageSuite.java | 8 ++--- .../integration/conversion/ZPackageSuite.java | 2 +- .../functions/aggregate/ZPackageSuite.java | 30 ++++++++-------- .../functions/append/ZPackageSuite.java | 10 +++--- .../functions/binary/matrix/ZPackageSuite.java | 4 --- .../binary/matrix_full_other/ZPackageSuite.java | 8 ++--- .../functions/codegen/ZPackageSuite.java | 1 + .../functions/compress/ZPackageSuite.java | 1 + .../functions/data/ZPackageSuite.java | 3 +- .../functions/misc/ZPackageSuite.java | 4 +-- .../functions/parfor/ZPackageSuite.java | 8 ++--- .../functions/quaternary/ZPackageSuite.java | 2 +- .../functions/tensor/ZPackageSuite.java | 3 +- .../functions/unary/scalar/ZPackageSuite.java | 2 +- .../functions/updateinplace/ZPackageSuite.java | 36 ++++++++++++++++++++ 15 files changed, 77 insertions(+), 45 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/10727e5d/src/test_suites/java/org/apache/sysml/test/integration/applications/parfor/ZPackageSuite.java ---------------------------------------------------------------------- diff --git a/src/test_suites/java/org/apache/sysml/test/integration/applications/parfor/ZPackageSuite.java b/src/test_suites/java/org/apache/sysml/test/integration/applications/parfor/ZPackageSuite.java index ade4a81..095e427 100644 --- a/src/test_suites/java/org/apache/sysml/test/integration/applications/parfor/ZPackageSuite.java +++ b/src/test_suites/java/org/apache/sysml/test/integration/applications/parfor/ZPackageSuite.java @@ -27,12 +27,12 @@ import org.junit.runners.Suite; @RunWith(Suite.class) @Suite.SuiteClasses({ ParForBivariateStatsTest.class, - ParForCVMulticlassSVMTest.class, - ParForUnivariateStatsTest.class, - ParForCorrelationTest.class, ParForCorrelationTestLarge.class, - ParForNaiveBayesTest.class + ParForCVMulticlassSVMTest.class, + ParForNaiveBayesTest.class, + ParForSampleTest.class, + ParForUnivariateStatsTest.class, }) http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/10727e5d/src/test_suites/java/org/apache/sysml/test/integration/conversion/ZPackageSuite.java ---------------------------------------------------------------------- diff --git a/src/test_suites/java/org/apache/sysml/test/integration/conversion/ZPackageSuite.java b/src/test_suites/java/org/apache/sysml/test/integration/conversion/ZPackageSuite.java index b8ab13d..b9fd8f9 100644 --- a/src/test_suites/java/org/apache/sysml/test/integration/conversion/ZPackageSuite.java +++ b/src/test_suites/java/org/apache/sysml/test/integration/conversion/ZPackageSuite.java @@ -26,7 +26,7 @@ import org.junit.runners.Suite; * won't run two of them at once. */ @RunWith(Suite.class) @Suite.SuiteClasses({ - org.apache.sysml.test.integration.conversion.RDDConverterUtilsExtTest.class + RDDConverterUtilsExtTest.class }) http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/10727e5d/src/test_suites/java/org/apache/sysml/test/integration/functions/aggregate/ZPackageSuite.java ---------------------------------------------------------------------- diff --git a/src/test_suites/java/org/apache/sysml/test/integration/functions/aggregate/ZPackageSuite.java b/src/test_suites/java/org/apache/sysml/test/integration/functions/aggregate/ZPackageSuite.java index 679c15f..c99fe0a 100644 --- a/src/test_suites/java/org/apache/sysml/test/integration/functions/aggregate/ZPackageSuite.java +++ b/src/test_suites/java/org/apache/sysml/test/integration/functions/aggregate/ZPackageSuite.java @@ -27,33 +27,31 @@ import org.junit.runners.Suite; @RunWith(Suite.class) @Suite.SuiteClasses({ AggregateInfTest.class, + ColStdDevsTest.class, + ColSumsSqTest.class, ColSumTest.class, + ColVariancesTest.class, + FullAggregateTest.class, + FullColAggregateTest.class, + FullGroupedAggregateMatrixTest.class, + FullGroupedAggregateTest.class, + FullRowAggregateTest.class, LengthTest.class, MaxTest.class, MinTest.class, NColTest.class, NRowTest.class, ProdTest.class, + PushdownSumBinaryTest.class, + RowStdDevsTest.class, + RowSumsSqTest.class, RowSumTest.class, - SumTest.class, + RowVariancesTest.class, + StdDevTest.class, SumSqTest.class, - RowSumsSqTest.class, - ColSumsSqTest.class, + SumTest.class, TraceTest.class, - StdDevTest.class, - RowStdDevsTest.class, - ColStdDevsTest.class, VarianceTest.class, - RowVariancesTest.class, - ColVariancesTest.class, - - FullAggregateTest.class, - FullColAggregateTest.class, - FullGroupedAggregateTest.class, - FullGroupedAggregateMatrixTest.class, - FullRowAggregateTest.class, - - PushdownSumBinaryTest.class, }) http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/10727e5d/src/test_suites/java/org/apache/sysml/test/integration/functions/append/ZPackageSuite.java ---------------------------------------------------------------------- diff --git a/src/test_suites/java/org/apache/sysml/test/integration/functions/append/ZPackageSuite.java b/src/test_suites/java/org/apache/sysml/test/integration/functions/append/ZPackageSuite.java index 6548a94..5f0842b 100644 --- a/src/test_suites/java/org/apache/sysml/test/integration/functions/append/ZPackageSuite.java +++ b/src/test_suites/java/org/apache/sysml/test/integration/functions/append/ZPackageSuite.java @@ -26,11 +26,11 @@ import org.junit.runners.Suite; * won't run two of them at once. */ @RunWith(Suite.class) @Suite.SuiteClasses({ - AppendVectorTest.class, - StringAppendTest.class, - RBindCBindMatrixTest.class, - AppendChainTest.class, - AppendMatrixTest.class + AppendChainTest.class, + AppendMatrixTest.class, + AppendVectorTest.class, + RBindCBindMatrixTest.class, + StringAppendTest.class, }) http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/10727e5d/src/test_suites/java/org/apache/sysml/test/integration/functions/binary/matrix/ZPackageSuite.java ---------------------------------------------------------------------- diff --git a/src/test_suites/java/org/apache/sysml/test/integration/functions/binary/matrix/ZPackageSuite.java b/src/test_suites/java/org/apache/sysml/test/integration/functions/binary/matrix/ZPackageSuite.java index 859b8d9..8652300 100644 --- a/src/test_suites/java/org/apache/sysml/test/integration/functions/binary/matrix/ZPackageSuite.java +++ b/src/test_suites/java/org/apache/sysml/test/integration/functions/binary/matrix/ZPackageSuite.java @@ -27,10 +27,8 @@ import org.junit.runners.Suite; @RunWith(Suite.class) @Suite.SuiteClasses({ BinUaggChainTest.class, - CentralMomentTest.class, CovarianceTest.class, - DiagMatrixMultiplicationTest.class, ElementwiseAdditionMultiplicationTest.class, ElementwiseAdditionTest.class, @@ -38,7 +36,6 @@ import org.junit.runners.Suite; ElementwiseModulusTest.class, ElementwiseMultiplicationTest.class, ElementwiseSubtractionTest.class, - MapMultChainTest.class, MapMultLimitTest.class, MatrixMultiplicationTest.class, @@ -54,7 +51,6 @@ import org.junit.runners.Suite; UaggOuterChainTest.class, UltraSparseMRMatrixMultiplicationTest.class, ZipMMSparkMatrixMultiplicationTest.class - }) http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/10727e5d/src/test_suites/java/org/apache/sysml/test/integration/functions/binary/matrix_full_other/ZPackageSuite.java ---------------------------------------------------------------------- diff --git a/src/test_suites/java/org/apache/sysml/test/integration/functions/binary/matrix_full_other/ZPackageSuite.java b/src/test_suites/java/org/apache/sysml/test/integration/functions/binary/matrix_full_other/ZPackageSuite.java index 97666de..516dc7b 100644 --- a/src/test_suites/java/org/apache/sysml/test/integration/functions/binary/matrix_full_other/ZPackageSuite.java +++ b/src/test_suites/java/org/apache/sysml/test/integration/functions/binary/matrix_full_other/ZPackageSuite.java @@ -26,18 +26,18 @@ import org.junit.runners.Suite; * won't run two of them at once. */ @RunWith(Suite.class) @Suite.SuiteClasses({ - - FullMatrixMultiplicationUltraSparseTest.class, + FullDistributedMatrixMultiplicationTest.class, FullIntegerDivisionTest.class, FullMatrixMultiplicationTest.class, - FullMatrixMultiplicationTransposeSelfTest.class, FullMatrixMultiplicationTransposeSelf2Test.class, + FullMatrixMultiplicationTransposeSelfTest.class, + FullMatrixMultiplicationUltraSparseTest.class, FullMinMaxComparisonTest.class, FullPowerTest.class, FullPPredMatrixTest.class, FullPPredScalarLeftTest.class, FullPPredScalarRightTest.class, - FullDistributedMatrixMultiplicationTest.class + MatrixMultShortLhsTest.class, }) http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/10727e5d/src/test_suites/java/org/apache/sysml/test/integration/functions/codegen/ZPackageSuite.java ---------------------------------------------------------------------- diff --git a/src/test_suites/java/org/apache/sysml/test/integration/functions/codegen/ZPackageSuite.java b/src/test_suites/java/org/apache/sysml/test/integration/functions/codegen/ZPackageSuite.java index 2aa0b3a..ce8fada 100644 --- a/src/test_suites/java/org/apache/sysml/test/integration/functions/codegen/ZPackageSuite.java +++ b/src/test_suites/java/org/apache/sysml/test/integration/functions/codegen/ZPackageSuite.java @@ -31,6 +31,7 @@ import org.junit.runners.Suite; AlgorithmL2SVM.class, AlgorithmLinregCG.class, AlgorithmMLogreg.class, + AlgorithmMSVM.class, AlgorithmPNMF.class, CellwiseTmplTest.class, CompressedCellwiseTest.class, http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/10727e5d/src/test_suites/java/org/apache/sysml/test/integration/functions/compress/ZPackageSuite.java ---------------------------------------------------------------------- diff --git a/src/test_suites/java/org/apache/sysml/test/integration/functions/compress/ZPackageSuite.java b/src/test_suites/java/org/apache/sysml/test/integration/functions/compress/ZPackageSuite.java index 4563465..a61cbbd 100644 --- a/src/test_suites/java/org/apache/sysml/test/integration/functions/compress/ZPackageSuite.java +++ b/src/test_suites/java/org/apache/sysml/test/integration/functions/compress/ZPackageSuite.java @@ -39,6 +39,7 @@ import org.junit.runners.Suite; BasicTransposeSelfLeftMatrixMultTest.class, BasicUnaryAggregateTest.class, BasicVectorMatrixMultTest.class, + CompressedL2SVM.class, CompressedLinregCG.class, CompressedSerializationTest.class, LargeCompressionTest.class, http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/10727e5d/src/test_suites/java/org/apache/sysml/test/integration/functions/data/ZPackageSuite.java ---------------------------------------------------------------------- diff --git a/src/test_suites/java/org/apache/sysml/test/integration/functions/data/ZPackageSuite.java b/src/test_suites/java/org/apache/sysml/test/integration/functions/data/ZPackageSuite.java index b3b422f..7b77e4a 100644 --- a/src/test_suites/java/org/apache/sysml/test/integration/functions/data/ZPackageSuite.java +++ b/src/test_suites/java/org/apache/sysml/test/integration/functions/data/ZPackageSuite.java @@ -28,6 +28,7 @@ import org.junit.runners.Suite; @Suite.SuiteClasses({ FullReblockTest.class, FullStringInitializeTest.class, + RandRuntimePlatformTest.class, RandTest1.class, RandTest2.class, RandTest3.class, @@ -42,8 +43,6 @@ import org.junit.runners.Suite; VariableTest.class, WriteMMTest.class, WriteTest.class, - - RandRuntimePlatformTest.class }) http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/10727e5d/src/test_suites/java/org/apache/sysml/test/integration/functions/misc/ZPackageSuite.java ---------------------------------------------------------------------- diff --git a/src/test_suites/java/org/apache/sysml/test/integration/functions/misc/ZPackageSuite.java b/src/test_suites/java/org/apache/sysml/test/integration/functions/misc/ZPackageSuite.java index 7da786d..9917bb3 100644 --- a/src/test_suites/java/org/apache/sysml/test/integration/functions/misc/ZPackageSuite.java +++ b/src/test_suites/java/org/apache/sysml/test/integration/functions/misc/ZPackageSuite.java @@ -34,10 +34,10 @@ import org.junit.runners.Suite; IfTest.class, InvalidFunctionAssignmentTest.class, InvalidFunctionSignatureTest.class, + IPAConstantFoldingScalarVariablePropagationTest.class, IPALiteralReplacementTest.class, IPAScalarRecursionTest.class, IPAScalarVariablePropagationTest.class, - IPAConstantFoldingScalarVariablePropagationTest.class, IPAUnknownRecursionTest.class, LongOverflowTest.class, NegativeLoopIncrementsTest.class, @@ -50,6 +50,7 @@ import org.junit.runners.Suite; RewriteCSETransposeScalarTest.class, RewriteCTableToRExpandTest.class, RewriteEliminateAggregatesTest.class, + RewriteFuseBinaryOpChainTest.class, RewriteFusedRandTest.class, RewriteLoopVectorization.class, RewriteMatrixMultChainOptTest.class, @@ -58,7 +59,6 @@ import org.junit.runners.Suite; RewritePushdownUaggTest.class, RewriteSimplifyRowColSumMVMultTest.class, RewriteSlicedMatrixMultTest.class, - RewriteFuseBinaryOpChainTest.class, ScalarAssignmentTest.class, ScalarFunctionTest.class, ScalarMatrixUnaryBinaryTermTest.class, http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/10727e5d/src/test_suites/java/org/apache/sysml/test/integration/functions/parfor/ZPackageSuite.java ---------------------------------------------------------------------- diff --git a/src/test_suites/java/org/apache/sysml/test/integration/functions/parfor/ZPackageSuite.java b/src/test_suites/java/org/apache/sysml/test/integration/functions/parfor/ZPackageSuite.java index c510571..976b23f 100644 --- a/src/test_suites/java/org/apache/sysml/test/integration/functions/parfor/ZPackageSuite.java +++ b/src/test_suites/java/org/apache/sysml/test/integration/functions/parfor/ZPackageSuite.java @@ -28,19 +28,19 @@ import org.junit.runners.Suite; @Suite.SuiteClasses({ ForLoopPredicateTest.class, ParForAdversarialLiteralsTest.class, + ParForBlockwiseDataPartitioningTest.class, ParForColwiseDataPartitioningTest.class, ParForDataPartitionLeftIndexingTest.class, ParForDependencyAnalysisTest.class, ParForFunctionSerializationTest.class, ParForMultipleDataPartitioningTest.class, ParForNaNResultMergeTest.class, + ParForParallelRemoteResultMergeTest.class, + ParForRepeatedOptimizationTest.class, ParForReplaceThreadIDRecompileTest.class, ParForRowwiseDataPartitioningTest.class, - - ParForParallelRemoteResultMergeTest.class, + ParForRulebasedOptimizerTest.class, ParForSerialRemoteResultMergeTest.class, - ParForRepeatedOptimizationTest.class, - ParForRulebasedOptimizerTest.class }) http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/10727e5d/src/test_suites/java/org/apache/sysml/test/integration/functions/quaternary/ZPackageSuite.java ---------------------------------------------------------------------- diff --git a/src/test_suites/java/org/apache/sysml/test/integration/functions/quaternary/ZPackageSuite.java b/src/test_suites/java/org/apache/sysml/test/integration/functions/quaternary/ZPackageSuite.java index 8b4eee0..df8ef58 100644 --- a/src/test_suites/java/org/apache/sysml/test/integration/functions/quaternary/ZPackageSuite.java +++ b/src/test_suites/java/org/apache/sysml/test/integration/functions/quaternary/ZPackageSuite.java @@ -29,8 +29,8 @@ import org.junit.runners.Suite; RewritesWeightedSigmoidTest.class, WeightedCrossEntropyTest.class, WeightedDivMatrixMultTest.class, - WeightedSquaredLossTest.class, WeightedSigmoidTest.class, + WeightedSquaredLossTest.class, WeightedUnaryMatrixMultTest.class }) http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/10727e5d/src/test_suites/java/org/apache/sysml/test/integration/functions/tensor/ZPackageSuite.java ---------------------------------------------------------------------- diff --git a/src/test_suites/java/org/apache/sysml/test/integration/functions/tensor/ZPackageSuite.java b/src/test_suites/java/org/apache/sysml/test/integration/functions/tensor/ZPackageSuite.java index c29aa53..a76c9f2 100644 --- a/src/test_suites/java/org/apache/sysml/test/integration/functions/tensor/ZPackageSuite.java +++ b/src/test_suites/java/org/apache/sysml/test/integration/functions/tensor/ZPackageSuite.java @@ -30,7 +30,8 @@ import org.junit.runners.Suite; Conv2DBackwardTest.class, Conv2DTest.class, PoolBackwardTest.class, - PoolTest.class + PoolTest.class, + ReluBackwardTest.class, }) http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/10727e5d/src/test_suites/java/org/apache/sysml/test/integration/functions/unary/scalar/ZPackageSuite.java ---------------------------------------------------------------------- diff --git a/src/test_suites/java/org/apache/sysml/test/integration/functions/unary/scalar/ZPackageSuite.java b/src/test_suites/java/org/apache/sysml/test/integration/functions/unary/scalar/ZPackageSuite.java index d391a7c..2c840e8 100644 --- a/src/test_suites/java/org/apache/sysml/test/integration/functions/unary/scalar/ZPackageSuite.java +++ b/src/test_suites/java/org/apache/sysml/test/integration/functions/unary/scalar/ZPackageSuite.java @@ -40,9 +40,9 @@ import org.junit.runners.Suite; RoundTest.class, SinTest.class, SqrtTest.class, + StopTest.class, StopTest2.class, StopTestCtrlStr.class, - StopTest.class, TanTest.class }) http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/10727e5d/src/test_suites/java/org/apache/sysml/test/integration/functions/updateinplace/ZPackageSuite.java ---------------------------------------------------------------------- diff --git a/src/test_suites/java/org/apache/sysml/test/integration/functions/updateinplace/ZPackageSuite.java b/src/test_suites/java/org/apache/sysml/test/integration/functions/updateinplace/ZPackageSuite.java new file mode 100644 index 0000000..49c43be --- /dev/null +++ b/src/test_suites/java/org/apache/sysml/test/integration/functions/updateinplace/ZPackageSuite.java @@ -0,0 +1,36 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +package org.apache.sysml.test.integration.functions.updateinplace; + +import org.junit.runner.RunWith; +import org.junit.runners.Suite; + +/** Group together the tests in this package into a single suite so that the Maven build + * won't run two of them at once. */ +@RunWith(Suite.class) +@Suite.SuiteClasses({ + UpdateInPlaceTest.class, +}) + + +/** This class is just a holder for the above JUnit annotations. */ +public class ZPackageSuite { + +}
