Repository: incubator-systemml Updated Branches: refs/heads/master aeb7fb6dc -> 738453466
[MINOR] Remove code for non-existent kMeansWrapper Closes #416. Project: http://git-wip-us.apache.org/repos/asf/incubator-systemml/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-systemml/commit/73845346 Tree: http://git-wip-us.apache.org/repos/asf/incubator-systemml/tree/73845346 Diff: http://git-wip-us.apache.org/repos/asf/incubator-systemml/diff/73845346 Branch: refs/heads/master Commit: 738453466c76b186df9be1a51cb50d3cba2454af Parents: aeb7fb6 Author: Deron Eriksson <[email protected]> Authored: Tue Mar 7 07:35:45 2017 -0800 Committer: Deron Eriksson <[email protected]> Committed: Tue Mar 7 07:35:45 2017 -0800 ---------------------------------------------------------------------- pom.xml | 3 -- src/test/scripts/functions/external/kMeans.dml | 41 ----------------- .../external/kMeans/kMeansWrapperOutput | 22 --------- src/test/scripts/functions/external/kMeans2.dml | 48 -------------------- .../external/kMeans2/kMeansWrapperOutput1 | 22 --------- .../external/kMeans2/kMeansWrapperOutput2 | 21 --------- 6 files changed, 157 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/73845346/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index f54b058..573ba8d 100644 --- a/pom.xml +++ b/pom.xml @@ -770,9 +770,6 @@ <!-- Compiled ptx file from nvcc --> <exclude>src/main/cpp/kernels/SystemML.ptx</exclude> <!-- Test Validation files --> - <exclude>src/test/scripts/functions/external/kMeans/kMeansWrapperOutput</exclude> - <exclude>src/test/scripts/functions/external/kMeans2/kMeansWrapperOutput1</exclude> - <exclude>src/test/scripts/functions/external/kMeans2/kMeansWrapperOutput2</exclude> <exclude>src/test/scripts/functions/external/seqMiner/FreqSeqFile</exclude> <exclude>src/test/scripts/functions/external/seqMiner/FreqSeqSupportFile</exclude> <exclude>src/test/scripts/functions/io/csv/in/transfusion_1.data</exclude> http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/73845346/src/test/scripts/functions/external/kMeans.dml ---------------------------------------------------------------------- diff --git a/src/test/scripts/functions/external/kMeans.dml b/src/test/scripts/functions/external/kMeans.dml deleted file mode 100644 index 28b7a77..0000000 --- a/src/test/scripts/functions/external/kMeans.dml +++ /dev/null @@ -1,41 +0,0 @@ -#------------------------------------------------------------- -# -# 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. -# -#------------------------------------------------------------- - - -# Note this script is externalized to customers, please do not change w/o consulting component owner. -# How to invoke this dml script kMeans.dml? -# Assume KMEANS_HOME is set to the home of the dml script -# Assume input and output directories are on hdfs as INPUT_DIR and OUTPUT_DIR -# Assume rows = 100, cols = 10, clusters = 5 -# hadoop jar SystemML.jar -f $KMEANS_HOME/kMeans.dml -args "$INPUT_DIR/M" 100 10 "$OUPUT_DIR/kcenters" - -kMeans = externalFunction(Matrix[Double] D, Integer k) -return (Matrix[Double] C) -implemented in (classname="org.apache.sysml.udf.lib.kMeansWrapper",execlocation="master") - -M = read($1, rows=$2, cols=$3, format="text"); - -k = 5; - -kcenters = kMeans(M,k) - -write(kcenters, $4, format="text"); - http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/73845346/src/test/scripts/functions/external/kMeans/kMeansWrapperOutput ---------------------------------------------------------------------- diff --git a/src/test/scripts/functions/external/kMeans/kMeansWrapperOutput b/src/test/scripts/functions/external/kMeans/kMeansWrapperOutput deleted file mode 100644 index 2e322ff..0000000 --- a/src/test/scripts/functions/external/kMeans/kMeansWrapperOutput +++ /dev/null @@ -1,22 +0,0 @@ -1 7 -0.8746686359016473 -1 8 -0.30537873102834645 -1 10 0.95853618004033 -2 1 -0.036413698676914116 -2 2 -0.03324399681552789 -2 3 -0.023042438587815395 -2 4 -0.0170957533018464 -2 5 -0.01641929728344431 -2 6 -0.0847314657855244 -2 7 -0.021767945905371393 -2 8 -0.1456122267156196 -2 9 0.038941981901104504 -2 10 0.009284577567825424 -3 1 0.1785202970014135 -3 3 0.1918293417451064 -3 8 0.15918836832620614 -3 10 -0.1382624184388047 -4 7 -0.8296844411045573 -4 9 -0.06813559878122126 -5 1 0.11071694980410667 -5 2 0.7586962781942957 -5 10 0.2507505981577969 http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/73845346/src/test/scripts/functions/external/kMeans2.dml ---------------------------------------------------------------------- diff --git a/src/test/scripts/functions/external/kMeans2.dml b/src/test/scripts/functions/external/kMeans2.dml deleted file mode 100644 index ae1edd2..0000000 --- a/src/test/scripts/functions/external/kMeans2.dml +++ /dev/null @@ -1,48 +0,0 @@ -#------------------------------------------------------------- -# -# 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. -# -#------------------------------------------------------------- - - -# Note this script is externalized to customers, please do not change w/o consulting component owner. -# How to invoke this dml script kMeans.dml? -# Assume KMEANS2_HOME is set to the home of the dml script -# Assume input and output directories are on hdfs as INPUT_DIR and OUTPUT_DIR -# Assume rows = 100, cols = 10, clusters = 5 -# hadoop jar SystemML.jar -f $KMEANS2_HOME/kMeans2.dml -args "$INPUT_DIR/M" 100 10 "$INPUT_DIR/initCenters" "$OUPUT_DIR/kcenters" "$OUTPUT_DIR/kcentersWithInit" - -kMeans = externalFunction(Matrix[Double] D, Integer k) -return (Matrix[Double] C) -implemented in (classname="org.apache.sysml.udf.lib.kMeansWrapper",execlocation="master") - -kMeansWithInit = externalFunction(Matrix[Double] D, Integer k, Matrix[Double] initK) -return (Matrix[Double] C) -implemented in (classname="org.apache.sysml.udf.lib.kMeansWrapper",execlocation="master") - -M = read($1, rows=$2, cols=$3, format="text"); -initialCenters = read($4, rows=5, cols=$3, format="text"); - -k = 5; - -kcenters = kMeans(M,k) -kcentersWithInit = kMeansWithInit(M,k,initialCenters); - -write(kcenters, $5, format="text"); -write(kcentersWithInit, $6, format="text"); - http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/73845346/src/test/scripts/functions/external/kMeans2/kMeansWrapperOutput1 ---------------------------------------------------------------------- diff --git a/src/test/scripts/functions/external/kMeans2/kMeansWrapperOutput1 b/src/test/scripts/functions/external/kMeans2/kMeansWrapperOutput1 deleted file mode 100644 index 2e322ff..0000000 --- a/src/test/scripts/functions/external/kMeans2/kMeansWrapperOutput1 +++ /dev/null @@ -1,22 +0,0 @@ -1 7 -0.8746686359016473 -1 8 -0.30537873102834645 -1 10 0.95853618004033 -2 1 -0.036413698676914116 -2 2 -0.03324399681552789 -2 3 -0.023042438587815395 -2 4 -0.0170957533018464 -2 5 -0.01641929728344431 -2 6 -0.0847314657855244 -2 7 -0.021767945905371393 -2 8 -0.1456122267156196 -2 9 0.038941981901104504 -2 10 0.009284577567825424 -3 1 0.1785202970014135 -3 3 0.1918293417451064 -3 8 0.15918836832620614 -3 10 -0.1382624184388047 -4 7 -0.8296844411045573 -4 9 -0.06813559878122126 -5 1 0.11071694980410667 -5 2 0.7586962781942957 -5 10 0.2507505981577969 http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/73845346/src/test/scripts/functions/external/kMeans2/kMeansWrapperOutput2 ---------------------------------------------------------------------- diff --git a/src/test/scripts/functions/external/kMeans2/kMeansWrapperOutput2 b/src/test/scripts/functions/external/kMeans2/kMeansWrapperOutput2 deleted file mode 100644 index bc361e2..0000000 --- a/src/test/scripts/functions/external/kMeans2/kMeansWrapperOutput2 +++ /dev/null @@ -1,21 +0,0 @@ -1 2 -0.037370786860756955 -1 8 -0.7644641902570029 -1 9 0.0646078303714191 -2 1 0.02653898815184446 -2 2 -0.02194563142732232 -2 3 0.04202974094466912 -2 4 -0.014360432773550978 -2 5 -0.01379220971809322 -2 6 -0.07117443125984049 -2 7 -0.01828507456051197 -2 8 0.050940277864385965 -2 9 0.02237401193750073 -2 10 -0.036444928743444155 -3 1 0.11071694980410667 -3 2 0.7586962781942957 -3 10 0.2507505981577969 -4 7 -0.8746686359016473 -4 8 -0.30537873102834645 -4 10 0.95853618004033 -5 7 -0.8296844411045573 -5 9 -0.06813559878122126
