This is an automated email from the ASF dual-hosted git repository. mboehm7 pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/systemds.git
commit b6a18804c6d17a67355e1657f54d3b7d362c73a1 Author: Matthias Boehm <[email protected]> AuthorDate: Thu Dec 31 20:51:33 2020 +0100 [MINOR] Fix arima test (flag as thread-unsafe test to avoid inference) --- scripts/builtin/arima.dml | 2 +- .../sysds/test/functions/builtin/BuiltinArimaTest.java | 12 +++++------- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/scripts/builtin/arima.dml b/scripts/builtin/arima.dml index 56dd6a1..de0ebec 100644 --- a/scripts/builtin/arima.dml +++ b/scripts/builtin/arima.dml @@ -102,7 +102,7 @@ m_arima = function(Matrix[Double] X, Integer max_func_invoc=1000, Integer p=0, } #prediciton values for seasonal MA - parfor(i6 in seq(1,Q, 1), check=0){ + parfor(i6 in seq(1, Q, 1), check=0){ Z[s*i6+1:n,1+P+p+q+i6] = X[1:n-s*i6,] } diff --git a/src/test/java/org/apache/sysds/test/functions/builtin/BuiltinArimaTest.java b/src/test/java/org/apache/sysds/test/functions/builtin/BuiltinArimaTest.java index f6f9d2e..afa6788 100644 --- a/src/test/java/org/apache/sysds/test/functions/builtin/BuiltinArimaTest.java +++ b/src/test/java/org/apache/sysds/test/functions/builtin/BuiltinArimaTest.java @@ -24,8 +24,7 @@ import java.util.Collection; import java.util.HashMap; import org.junit.Test; -import org.apache.sysds.common.Types; -import org.apache.sysds.lops.LopProperties; +import org.apache.sysds.common.Types.ExecMode; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; import org.junit.runners.Parameterized.Parameters; @@ -37,6 +36,7 @@ import org.apache.sysds.test.TestConfiguration; import org.apache.sysds.test.TestUtils; @RunWith(value = Parameterized.class) [email protected] public class BuiltinArimaTest extends AutomatedTestBase { private final static String TEST_NAME = "arima"; private final static String TEST_DIR = "functions/builtin/"; @@ -81,7 +81,8 @@ public class BuiltinArimaTest extends AutomatedTestBase { @Test public void testArima(){ - Types.ExecMode platformOld = setExecMode(LopProperties.ExecType.CP); + ExecMode platformOld = setExecMode(ExecMode.HYBRID); + try { loadTestConfiguration(getTestConfiguration(TEST_NAME)); String HOME = SCRIPT_DIR + TEST_DIR; @@ -113,11 +114,8 @@ public class BuiltinArimaTest extends AutomatedTestBase { HashMap<CellIndex, Double> arima_model_SYSTEMDS= readDMLMatrixFromOutputDir("learnt.model"); TestUtils.compareMatrices(arima_model_R, arima_model_SYSTEMDS, tol, "arima_R", "arima_SYSTEMDS"); } - catch(Exception ex) { - ex.printStackTrace(); - } finally { - rtplatform = platformOld; + resetExecMode(platformOld); } } }
