You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@systemml.apache.org by de...@apache.org on 2016/12/06 21:18:49 UTC
incubator-systemml git commit: [SYSTEMML-1134] Remove unused enums
from project
Repository: incubator-systemml
Updated Branches:
refs/heads/master ca403ff11 -> 123349af1
[SYSTEMML-1134] Remove unused enums from project
Remove Hop.ExtBuiltInOp and RuntimeDataFormat.
Add TODO to investigate Expression.ExtBuiltinFunctionOp.
Closes #300.
Project: http://git-wip-us.apache.org/repos/asf/incubator-systemml/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-systemml/commit/123349af
Tree: http://git-wip-us.apache.org/repos/asf/incubator-systemml/tree/123349af
Diff: http://git-wip-us.apache.org/repos/asf/incubator-systemml/diff/123349af
Branch: refs/heads/master
Commit: 123349af1369f22f574cd283c87a2e0db49461e5
Parents: ca403ff
Author: Deron Eriksson <de...@us.ibm.com>
Authored: Tue Dec 6 13:17:14 2016 -0800
Committer: Deron Eriksson <de...@us.ibm.com>
Committed: Tue Dec 6 13:17:14 2016 -0800
----------------------------------------------------------------------
src/main/java/org/apache/sysml/hops/Hop.java | 8 ---
.../org/apache/sysml/parser/Expression.java | 4 +-
.../runtime/matrix/data/RuntimeDataFormat.java | 63 --------------------
3 files changed, 2 insertions(+), 73 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/123349af/src/main/java/org/apache/sysml/hops/Hop.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/sysml/hops/Hop.java b/src/main/java/org/apache/sysml/hops/Hop.java
index 362ee35..b363876 100644
--- a/src/main/java/org/apache/sysml/hops/Hop.java
+++ b/src/main/java/org/apache/sysml/hops/Hop.java
@@ -1103,14 +1103,6 @@ public abstract class Hop
TOSTRING
};
- /**
- * Functions that are built in, but whose execution takes place in an
- * external library
- */
- public enum ExtBuiltInOp {
- EIGEN, CHOLESKY
- };
-
public enum FileFormatTypes {
TEXT, BINARY, MM, CSV
};
http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/123349af/src/main/java/org/apache/sysml/parser/Expression.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/sysml/parser/Expression.java b/src/main/java/org/apache/sysml/parser/Expression.java
index f5c1052..23006d3 100644
--- a/src/main/java/org/apache/sysml/parser/Expression.java
+++ b/src/main/java/org/apache/sysml/parser/Expression.java
@@ -165,11 +165,11 @@ public abstract class Expression
public enum FunctCallOp {
INTERNAL, EXTERNAL
};
-
+
/**
* External built-in function operators.
*/
- public enum ExtBuiltinFunctionOp {
+ public enum ExtBuiltinFunctionOp { // TODO investigate unused enum
EIGEN, CHOLESKY
};
http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/123349af/src/main/java/org/apache/sysml/runtime/matrix/data/RuntimeDataFormat.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/sysml/runtime/matrix/data/RuntimeDataFormat.java b/src/main/java/org/apache/sysml/runtime/matrix/data/RuntimeDataFormat.java
deleted file mode 100644
index 118c21b..0000000
--- a/src/main/java/org/apache/sysml/runtime/matrix/data/RuntimeDataFormat.java
+++ /dev/null
@@ -1,63 +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.
- */
-
-
-package org.apache.sysml.runtime.matrix.data;
-
-public enum RuntimeDataFormat
-{
- Invalid(true),
- TextCell(true),
- BinaryCell(true),
- BinaryBlock(true),
- SortInput(true),
- SortOutput(true),
- WeightedPair(true),
- MatrixMarket(false);
-
-
- private boolean nativeFormat = false;
- private RuntimeDataFormat(boolean nf) {
- nativeFormat = nf;
- }
-
- public static RuntimeDataFormat parseFormat(String fmt) {
- if(fmt.equalsIgnoreCase("textcell"))
- return TextCell;
- else if(fmt.equalsIgnoreCase("binarycell"))
- return BinaryCell;
- else if(fmt.equalsIgnoreCase("binaryblock"))
- return BinaryBlock;
- else if(fmt.equalsIgnoreCase("sort_input"))
- return SortInput;
- else if(fmt.equalsIgnoreCase("sort_output"))
- return SortOutput;
- else if(fmt.equalsIgnoreCase("weightedpair"))
- return WeightedPair;
- else if(fmt.equalsIgnoreCase("matrixmarket"))
- return MatrixMarket;
- else
- return Invalid;
- }
-
- public boolean isNative() {
- return nativeFormat;
- }
-
-}