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/11/11 01:31:17 UTC
[1/2] incubator-systemml git commit: [SYSTEMML-842] Javadoc cleanup
in parser, udf, utils, and yarn packages
Repository: incubator-systemml
Updated Branches:
refs/heads/master 06c5057d3 -> 234f5af97
http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/234f5af9/src/main/java/org/apache/sysml/utils/Explain.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/sysml/utils/Explain.java b/src/main/java/org/apache/sysml/utils/Explain.java
index 12c086e..097e2b7 100644
--- a/src/main/java/org/apache/sysml/utils/Explain.java
+++ b/src/main/java/org/apache/sysml/utils/Explain.java
@@ -95,19 +95,11 @@ public class Explain
//////////////
// public explain interface
-
- /**
- *
- * @return
- */
+
public static String explainMemoryBudget() {
return explainMemoryBudget(new ExplainCounts());
}
-
- /**
- *
- * @return
- */
+
public static String explainMemoryBudget(ExplainCounts counts)
{
StringBuilder sb = new StringBuilder();
@@ -141,20 +133,12 @@ public class Explain
return sb.toString();
}
-
- /**
- *
- * @return
- */
+
public static String explainDegreeOfParallelism()
{
return explainDegreeOfParallelism(new ExplainCounts());
}
-
- /**
- *
- * @return
- */
+
public static String explainDegreeOfParallelism(ExplainCounts counts)
{
int lk = InfrastructureAnalyzer.getLocalParallelism();
@@ -192,17 +176,7 @@ public class Explain
return sb.toString();
}
-
- /**
- *
- * @param prog
- * @param rtprog
- * @param type
- * @return
- * @throws LanguageException
- * @throws DMLRuntimeException
- * @throws HopsException
- */
+
public static String explain(DMLProgram prog, Program rtprog, ExplainType type)
throws HopsException, DMLRuntimeException, LanguageException
{
@@ -223,15 +197,6 @@ public class Explain
return null;
}
-
- /**
- *
- * @param dmlp
- * @return
- * @throws LanguageException
- * @throws HopsException
- * @throws DMLRuntimeException
- */
public static String explain(DMLProgram prog)
throws HopsException, DMLRuntimeException, LanguageException
{
@@ -278,14 +243,7 @@ public class Explain
return sb.toString();
}
-
- /**
- *
- * @param rtprog
- * @return
- * @throws HopsException
- */
public static String explain( Program rtprog )
throws HopsException
{
@@ -346,79 +304,38 @@ public class Explain
return sb.toString();
}
- /**
- *
- * @param pb
- * @return
- */
public static String explain( ProgramBlock pb )
{
return explainProgramBlock(pb, 0);
}
-
- /**
- *
- * @param inst
- * @return
- */
+
public static String explain( ArrayList<Instruction> inst )
{
return explainInstructions(inst, 0);
}
-
- /**
- *
- * @param inst
- * @param level
- * @return
- */
+
public static String explain( ArrayList<Instruction> inst, int level )
{
return explainInstructions(inst, level);
}
-
- /**
- *
- * @param inst
- * @return
- */
+
public static String explain( Instruction inst )
{
return explainGenericInstruction(inst, 0);
}
-
- /**
- *
- * @param sb
- * @return
- * @throws DMLRuntimeException
- * @throws HopsException
- */
+
public static String explain( StatementBlock sb )
throws HopsException, DMLRuntimeException
{
return explainStatementBlock(sb, 0);
}
-
- /**
- *
- * @param hops
- * @return
- * @throws DMLRuntimeException
- */
+
public static String explainHops( ArrayList<Hop> hops )
throws DMLRuntimeException
{
return explainHops(hops, 0);
}
-
- /**
- *
- * @param hops
- * @param level
- * @return
- * @throws DMLRuntimeException
- */
+
public static String explainHops( ArrayList<Hop> hops, int level )
throws DMLRuntimeException
{
@@ -431,25 +348,13 @@ public class Explain
return sb.toString();
}
-
- /**
- *
- * @param hop
- * @return
- * @throws DMLRuntimeException
- */
+
public static String explain( Hop hop )
throws DMLRuntimeException
{
return explain(hop, 0);
}
-
- /**
- *
- * @param hop
- * @return
- * @throws DMLRuntimeException
- */
+
public static String explain( Hop hop, int level )
throws DMLRuntimeException
{
@@ -459,26 +364,13 @@ public class Explain
return ret;
}
-
- /**
- *
- * @param gdfnodes
- * @return
- * @throws DMLRuntimeException
- */
+
public static String explainGDFNodes( ArrayList<GDFNode> gdfnodes )
throws DMLRuntimeException
{
return explainGDFNodes(gdfnodes, 0);
}
-
- /**
- *
- * @param gdfnodes
- * @param level
- * @return
- * @throws DMLRuntimeException
- */
+
public static String explainGDFNodes( ArrayList<GDFNode> gdfnodes, int level )
throws DMLRuntimeException
{
@@ -495,8 +387,8 @@ public class Explain
* Counts the number of compiled MRJob/Spark instructions in the
* given runtime program.
*
- * @param rtprog
- * @return
+ * @param rtprog runtime program
+ * @return counts
*/
public static ExplainCounts countDistributedOperations( Program rtprog )
{
@@ -508,13 +400,7 @@ public class Explain
return counts;
}
-
- /**
- *
- * @param arg
- * @return
- * @throws DMLException
- */
+
public static ExplainType parseExplainType( String arg )
throws DMLException
{
@@ -537,12 +423,7 @@ public class Explain
return ret;
}
-
- /**
- *
- * @param level
- * @return
- */
+
public static String getIdentation( int level ) {
return createOffset(level);
}
@@ -637,12 +518,12 @@ public class Explain
}
/**
- * Do a post-order traverse through the HopDag and explain each Hop
+ * Do a post-order traverse through the Hop DAG and explain each Hop
*
- * @param hop
- * @param level
- * @return
- * @throws DMLRuntimeException
+ * @param hop high-level operator
+ * @param level offset
+ * @return string explanation of Hop DAG
+ * @throws DMLRuntimeException if DMLRuntimeException occurs
*/
private static String explainHop(Hop hop, int level)
throws DMLRuntimeException
@@ -731,10 +612,11 @@ public class Explain
* Do a post-order traverse through the GDFNode DAG and explain each GDFNode.
* Note: nodes referring to literalops are suppressed.
*
- * @param hop
- * @param level
- * @return
- * @throws DMLRuntimeException
+ * @param gnode GDF node
+ * @param level offset
+ * @param memo memoization table
+ * @return string explanation
+ * @throws DMLRuntimeException if DMLRuntimeException occurs
*/
private static String explainGDFNode(GDFNode gnode, int level, HashSet<Long> memo)
throws DMLRuntimeException
@@ -823,12 +705,6 @@ public class Explain
//////////////
// internal explain RUNTIME
- /**
- *
- * @param pb
- * @param level
- * @return
- */
private static String explainProgramBlock( ProgramBlock pb, int level )
{
StringBuilder sb = new StringBuilder();
@@ -901,13 +777,7 @@ public class Explain
return sb.toString();
}
-
- /**
- *
- * @param instSet
- * @param level
- * @return
- */
+
private static String explainInstructions( ArrayList<Instruction> instSet, int level )
{
StringBuilder sb = new StringBuilder();
@@ -924,12 +794,7 @@ public class Explain
return sb.toString();
}
-
- /**
- *
- * @param inst
- * @return
- */
+
private static String explainGenericInstruction( Instruction inst, int level )
{
String tmp = null;
@@ -946,13 +811,7 @@ public class Explain
return tmp;
}
-
- /**
- *
- * @param inst
- * @param level
- * @return
- */
+
private static String explainMRJobInstruction( MRJobInstruction inst, int level )
{
String instruction = "MR-Job[\n";
@@ -974,12 +833,7 @@ public class Explain
return instruction;
}
-
- /**
- *
- * @param mem
- * @return
- */
+
@SuppressWarnings("unused")
private static String showMem(double mem, boolean units)
{
@@ -987,12 +841,7 @@ public class Explain
return "MAX";
return OptimizerUtils.toMB(mem) + (units?"MB":"");
}
-
- /**
- *
- * @param level
- * @return
- */
+
private static String createOffset( int level )
{
StringBuilder sb = new StringBuilder();
@@ -1000,15 +849,7 @@ public class Explain
sb.append("--");
return sb.toString();
}
-
- /**
- *
- * @param rtprog
- * @param counts
- * @param MR
- * @param CP
- * @param SP
- */
+
private static void countCompiledInstructions( Program rtprog, ExplainCounts counts, boolean MR, boolean CP, boolean SP )
{
//analyze DML-bodied functions
@@ -1024,11 +865,11 @@ public class Explain
* Recursively counts the number of compiled MRJob instructions in the
* given runtime program block.
*
- * @param pb
- * @param counts
- * @param MR
- * @param CP
- * @param SP
+ * @param pb program block
+ * @param counts explain countst
+ * @param MR if true, count Hadoop instructions
+ * @param CP if true, count CP instructions
+ * @param SP if true, count Spark instructions
*/
private static void countCompiledInstructions(ProgramBlock pb, ExplainCounts counts, boolean MR, boolean CP, boolean SP)
{
@@ -1069,16 +910,7 @@ public class Explain
countCompiledInstructions(pb.getInstructions(), counts, MR, CP, SP);
}
}
-
- /**
- *
- * @param instSet
- * @param counts
- * @param MR
- * @param CP
- * @param SP
- * @return
- */
+
private static int countCompiledInstructions( ArrayList<Instruction> instSet, ExplainCounts counts, boolean MR, boolean CP, boolean SP )
{
int ret = 0;
@@ -1099,16 +931,7 @@ public class Explain
return ret;
}
-
- /**
- *
- * @param sb
- * @param fstack
- * @param lfset
- * @param level
- * @return
- * @throws HopsException
- */
+
private static String explainFunctionCallDag(StatementBlock sb, HashSet<String> fstack, HashSet<String> lfset, int level)
throws HopsException
{
http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/234f5af9/src/main/java/org/apache/sysml/utils/InstallDependencyForIntegrationTests.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/sysml/utils/InstallDependencyForIntegrationTests.java b/src/main/java/org/apache/sysml/utils/InstallDependencyForIntegrationTests.java
index 2dd6bae..d24712c 100644
--- a/src/main/java/org/apache/sysml/utils/InstallDependencyForIntegrationTests.java
+++ b/src/main/java/org/apache/sysml/utils/InstallDependencyForIntegrationTests.java
@@ -44,6 +44,8 @@ public class InstallDependencyForIntegrationTests {
/**
* Runs an R script in the old or the new way
+ *
+ * @param newWay if true, run R script the new way
*/
@SuppressWarnings("unused")
protected static void runRScript(boolean newWay) {
@@ -125,8 +127,8 @@ public class InstallDependencyForIntegrationTests {
* Prints out an R script.
* </p>
*
- * @param dmlScriptfile
- * filename of RL script
+ * @param dmlScriptFile
+ * filename of R script
*/
public static void printRScript(String dmlScriptFile) {
try {
http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/234f5af9/src/main/java/org/apache/sysml/utils/ParameterBuilder.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/sysml/utils/ParameterBuilder.java b/src/main/java/org/apache/sysml/utils/ParameterBuilder.java
index e5bbb6c..ae01bac 100644
--- a/src/main/java/org/apache/sysml/utils/ParameterBuilder.java
+++ b/src/main/java/org/apache/sysml/utils/ParameterBuilder.java
@@ -63,8 +63,8 @@ public class ParameterBuilder
PrintWriter pw = new PrintWriter(out);
String content;
Pattern unresolvedVars = Pattern.compile(_RS + ".*" + _RS);
- /**
- * sothat variables, which were not assigned, are replaced by an
+ /*
+ * so that variables, which were not assigned, are replaced by an
* empty string
*/
while ((content = in.readLine()) != null) {
http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/234f5af9/src/main/java/org/apache/sysml/utils/Statistics.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/sysml/utils/Statistics.java b/src/main/java/org/apache/sysml/utils/Statistics.java
index 2f13d09..e65ae5f 100644
--- a/src/main/java/org/apache/sysml/utils/Statistics.java
+++ b/src/main/java/org/apache/sysml/utils/Statistics.java
@@ -217,11 +217,7 @@ public class Statistics
public static void incrementTotalLix() {
lTotalLix.incrementAndGet();
}
-
- /**
- *
- * @param count
- */
+
public static void resetNoOfCompiledJobs( int count )
{
//reset both mr/sp for multiple tests within one jvm
@@ -235,11 +231,7 @@ public class Statistics
setNoOfCompiledSPInst(0);
}
}
-
- /**
- *
- * @param count
- */
+
public static void resetNoOfExecutedJobs( int count )
{
//reset both mr/sp for multiple tests within one jvm
@@ -353,7 +345,7 @@ public class Statistics
/**
* Returns the total time of run in nanoseconds.
*
- * @return
+ * @return run time in nanoseconds
*/
public static long getRunTime() {
return execEndTime - execStartTime;
@@ -394,10 +386,7 @@ public class Statistics
cudaFromDevCount.set(0);
cudaEvictionCount.set(0);
}
-
- /**
- *
- */
+
public static void resetJITCompileTime(){
jitCompileTime = -1 * getJITCompileTime();
}
@@ -409,19 +398,12 @@ public class Statistics
public static void resetJVMgcCount(){
jvmGCTime = -1 * getJVMgcCount();
}
-
- /**
- *
- */
+
public static void resetCPHeavyHitters(){
_cpInstTime.clear();
_cpInstCounts.clear();
}
-
- /**
- *
- * @param ns
- */
+
public static void setSparkCtxCreateTime(long ns) {
sparkCtxCreateTime = ns;
}
@@ -497,12 +479,7 @@ public class Statistics
{
return _cpInstTime.keySet();
}
-
- /**
- *
- * @param num
- * @return
- */
+
@SuppressWarnings("unchecked")
public static String getHeavyHitters( int num )
{
@@ -537,7 +514,7 @@ public class Statistics
/**
* Returns the total time of asynchronous JIT compilation in milliseconds.
*
- * @return
+ * @return JIT compile time
*/
public static long getJITCompileTime(){
long ret = -1; //unsupported
@@ -615,7 +592,7 @@ public class Statistics
/**
* Prints statistics.
*
- * @return
+ * @return statistics as string
*/
public static String display()
{
http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/234f5af9/src/main/java/org/apache/sysml/yarn/DMLAppMaster.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/sysml/yarn/DMLAppMaster.java b/src/main/java/org/apache/sysml/yarn/DMLAppMaster.java
index 0f10e9e..778a278 100644
--- a/src/main/java/org/apache/sysml/yarn/DMLAppMaster.java
+++ b/src/main/java/org/apache/sysml/yarn/DMLAppMaster.java
@@ -59,13 +59,7 @@ public class DMLAppMaster
Logger.getLogger("org.apache.sysml.yarn").setLevel((Level) Level.DEBUG);
}
}
-
- /**
- *
- * @param args
- * @throws YarnException
- * @throws IOException
- */
+
public void runApplicationMaster( String[] args )
throws YarnException, IOException
{
@@ -132,11 +126,7 @@ public class DMLAppMaster
LOG.debug("Unregistered the SystemML application master");
}
}
-
- /**
- *
- * @param msg
- */
+
private void writeMessageToHDFSWorkingDir(String msg)
{
//construct working directory (consistent with client)
@@ -160,8 +150,8 @@ public class DMLAppMaster
/**
* Main entrance for starting the SystemML app master.
*
- * @param args
- * @throws Exception
+ * @param args arguments
+ * @throws Exception if Exception occurs
*/
public static void main(String[] args)
throws Exception
http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/234f5af9/src/main/java/org/apache/sysml/yarn/DMLAppMasterUtils.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/sysml/yarn/DMLAppMasterUtils.java b/src/main/java/org/apache/sysml/yarn/DMLAppMasterUtils.java
index 0930475..590dc00 100644
--- a/src/main/java/org/apache/sysml/yarn/DMLAppMasterUtils.java
+++ b/src/main/java/org/apache/sysml/yarn/DMLAppMasterUtils.java
@@ -49,13 +49,6 @@ public class DMLAppMasterUtils
private static ResourceConfig _rc = null;
private static HashMap<ProgramBlock, Long> _rcMap = null;
-
- /**
- *
- * @param conf
- * @param appId
- * @return
- */
public static String constructHDFSWorkingDir(DMLConfig conf, ApplicationId appId)
{
StringBuilder sb = new StringBuilder();
@@ -65,12 +58,7 @@ public class DMLAppMasterUtils
sb.append( Lop.FILE_SEPARATOR );
return sb.toString();
}
-
- /**
- *
- * @param conf
- * @throws DMLRuntimeException
- */
+
public static void setupConfigRemoteMaxMemory(DMLConfig conf)
throws DMLRuntimeException
{
@@ -108,15 +96,7 @@ public class DMLAppMasterUtils
}
}
}
-
- /**
- *
- * @param prog
- * @throws DMLRuntimeException
- * @throws HopsException
- * @throws LopsException
- * @throws IOException
- */
+
public static void setupProgramMappingRemoteMaxMemory(Program prog)
throws DMLRuntimeException, HopsException, LopsException, IOException
{
@@ -131,11 +111,7 @@ public class DMLAppMasterUtils
}
}
}
-
- /**
- *
- * @param sb
- */
+
public static void setupProgramBlockRemoteMaxMemory(ProgramBlock pb)
{
if( DMLScript.isActiveAM() && isResourceOptimizerEnabled() )
@@ -149,12 +125,7 @@ public class DMLAppMasterUtils
}
}
}
-
- /**
- *
- * @param job
- * @param conf
- */
+
public static void setupMRJobRemoteMaxMemory(JobConf job, DMLConfig conf)
{
if( DMLScript.isActiveAM() && conf.getBooleanValue(DMLConfig.YARN_APPMASTER) )
@@ -181,24 +152,13 @@ public class DMLAppMasterUtils
}
}
}
-
- /**
- *
- * @return
- */
+
public static boolean isResourceOptimizerEnabled()
{
return ( DMLYarnClientProxy.RESOURCE_OPTIMIZER
|| OptimizerUtils.isOptLevel(OptimizationLevel.O3_LOCAL_RESOURCE_TIME_MEMORY) );
}
-
- /**
- *
- * @param args
- * @return
- * @throws DMLException
- */
protected static ArrayList<ProgramBlock> getRuntimeProgramBlocks(Program prog)
throws DMLRuntimeException
{
@@ -209,11 +169,7 @@ public class DMLAppMasterUtils
return ret;
}
-
- /**
- *
- * @param cc
- */
+
protected static void setupRemoteParallelTasks( YarnClusterConfig cc )
{
int pmap = (int) cc.getNumCores();
http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/234f5af9/src/main/java/org/apache/sysml/yarn/DMLYarnClient.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/sysml/yarn/DMLYarnClient.java b/src/main/java/org/apache/sysml/yarn/DMLYarnClient.java
index 37d42e6..dd73262 100644
--- a/src/main/java/org/apache/sysml/yarn/DMLYarnClient.java
+++ b/src/main/java/org/apache/sysml/yarn/DMLYarnClient.java
@@ -64,7 +64,7 @@ import org.apache.sysml.runtime.util.MapReduceTool;
/**
* NOTES:
* * Security: By default, submitted applications are ran as user 'yarn'.
- * In order to allow for security and relative filenames on hdfs (/user/<username>/.),
+ * In order to allow for security and relative filenames on hdfs (/user/<username>/.),
* we can configure the LinuxContainerExecutor in yarn-site.xml, which runs the
* application as the user who submits the application.
* * SystemML.jar file dependency: We need to submit the SystemML.jar along with the
@@ -120,9 +120,9 @@ public class DMLYarnClient
* Protected since only supposed to be accessed via proxy in same package.
* This is to ensure robustness in case of missing yarn libraries.
*
- * @param dmlScriptStr
- * @param conf
- * @param args
+ * @param dmlScriptStr script string
+ * @param conf dml configuration
+ * @param args arguments
*/
protected DMLYarnClient(String dmlScriptStr, DMLConfig conf, String[] args)
{
@@ -142,7 +142,8 @@ public class DMLYarnClient
* exception we fall back to run CP directly in the client process.
*
* @return true if dml program successfully executed as yarn app master
- * @throws IOException
+ * @throws IOException if IOException occurs
+ * @throws DMLScriptException if DMLScriptException occurs
*/
protected boolean launchDMLYarnAppmaster()
throws IOException, DMLScriptException
@@ -260,15 +261,7 @@ public class DMLYarnClient
return ret;
}
-
- /**
- *
- * @param appId
- * @throws ParseException
- * @throws IOException
- * @throws DMLRuntimeException
- * @throws InterruptedException
- */
+
@SuppressWarnings("deprecation")
private void copyResourcesToHdfsWorkingDir( YarnConfiguration yconf, String hdfsWD )
throws ParseException, IOException, DMLRuntimeException, InterruptedException
@@ -318,6 +311,7 @@ public class DMLYarnClient
}
/**
+ * Obtain the local jar file name from the system environment
*
* @return null if the constant does not exists
*/
@@ -357,9 +351,9 @@ public class DMLYarnClient
* jar to a temporary jar and later copy it to hdfs.
*
* @param dir
- * @return
- * @throws IOException
- * @throws InterruptedException
+ * @return jar name
+ * @throws IOException if IOException occurs
+ * @throws InterruptedException if InterruptedException occurs
*/
private String createJar( String dir )
throws IOException, InterruptedException
@@ -398,13 +392,7 @@ public class DMLYarnClient
return jarname;
}
-
- /**
- *
- * @param args
- * @param conf
- * @return
- */
+
private String constructAMCommand( String[] args, DMLConfig conf )
{
//start command
@@ -458,15 +446,7 @@ public class DMLYarnClient
return command.toString();
}
-
- /**
- *
- * @param yconf
- * @param path
- * @param lpath
- * @return
- * @throws IOException
- */
+
private Map<String, LocalResource> constructLocalResourceMap(YarnConfiguration yconf)
throws IOException
{
@@ -484,13 +464,7 @@ public class DMLYarnClient
rMap.put(DML_JAR_NAME, resource);
return rMap;
}
-
- /**
- *
- * @param yconf
- * @return
- * @throws IOException
- */
+
private Map<String, String> constructEnvionmentMap(YarnConfiguration yconf)
throws IOException
{
@@ -536,14 +510,7 @@ public class DMLYarnClient
return eMap;
}
-
- /**
- *
- * @param conf
- * @param yconf
- * @param appId
- * @return
- */
+
private String readMessageToHDFSWorkingDir(DMLConfig conf, YarnConfiguration yconf, ApplicationId appId)
{
String ret = null;
@@ -570,12 +537,7 @@ public class DMLYarnClient
return ret;
}
-
- /**
- *
- * @param heapsize
- * @return
- */
+
public static long computeMemoryAllocation( long heapsize )
{
long ret = heapsize;
http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/234f5af9/src/main/java/org/apache/sysml/yarn/DMLYarnClientProxy.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/sysml/yarn/DMLYarnClientProxy.java b/src/main/java/org/apache/sysml/yarn/DMLYarnClientProxy.java
index 37da939..2a5c329 100644
--- a/src/main/java/org/apache/sysml/yarn/DMLYarnClientProxy.java
+++ b/src/main/java/org/apache/sysml/yarn/DMLYarnClientProxy.java
@@ -62,16 +62,7 @@ public class DMLYarnClientProxy
.setLevel((Level) Level.DEBUG);
}
}
-
- /**
- *
- * @param dmlScriptStr
- * @param conf
- * @param allArgs
- * @return
- * @throws IOException
- * @throws DMLRuntimeException
- */
+
public static boolean launchDMLYarnAppmaster(String dmlScriptStr, DMLConfig conf, String[] allArgs, Program rtprog)
throws IOException, DMLRuntimeException
{
http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/234f5af9/src/main/java/org/apache/sysml/yarn/ropt/GridEnumeration.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/sysml/yarn/ropt/GridEnumeration.java b/src/main/java/org/apache/sysml/yarn/ropt/GridEnumeration.java
index a8f7bf1..d1a3877 100644
--- a/src/main/java/org/apache/sysml/yarn/ropt/GridEnumeration.java
+++ b/src/main/java/org/apache/sysml/yarn/ropt/GridEnumeration.java
@@ -43,12 +43,6 @@ public abstract class GridEnumeration
_max = max;
}
- /**
- *
- * @return
- * @throws HopsException
- * @throws DMLException
- */
public abstract ArrayList<Long> enumerateGridPoints()
throws DMLRuntimeException, HopsException;
}
http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/234f5af9/src/main/java/org/apache/sysml/yarn/ropt/GridEnumerationEqui.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/sysml/yarn/ropt/GridEnumerationEqui.java b/src/main/java/org/apache/sysml/yarn/ropt/GridEnumerationEqui.java
index fd06113..083f9ce 100644
--- a/src/main/java/org/apache/sysml/yarn/ropt/GridEnumerationEqui.java
+++ b/src/main/java/org/apache/sysml/yarn/ropt/GridEnumerationEqui.java
@@ -39,10 +39,6 @@ public class GridEnumerationEqui extends GridEnumeration
_nsteps = DEFAULT_NSTEPS;
}
- /**
- *
- * @param steps
- */
public void setNumSteps( int steps )
{
_nsteps = steps;
http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/234f5af9/src/main/java/org/apache/sysml/yarn/ropt/GridEnumerationExp.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/sysml/yarn/ropt/GridEnumerationExp.java b/src/main/java/org/apache/sysml/yarn/ropt/GridEnumerationExp.java
index fbfddd1..06a0d2c 100644
--- a/src/main/java/org/apache/sysml/yarn/ropt/GridEnumerationExp.java
+++ b/src/main/java/org/apache/sysml/yarn/ropt/GridEnumerationExp.java
@@ -39,10 +39,6 @@ public class GridEnumerationExp extends GridEnumeration
_factor = DEFAULT_FACTOR;
}
- /**
- *
- * @param steps
- */
public void setFactor( double factor )
{
_factor = factor;
http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/234f5af9/src/main/java/org/apache/sysml/yarn/ropt/GridEnumerationMemory.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/sysml/yarn/ropt/GridEnumerationMemory.java b/src/main/java/org/apache/sysml/yarn/ropt/GridEnumerationMemory.java
index 557e738..05a9d47 100644
--- a/src/main/java/org/apache/sysml/yarn/ropt/GridEnumerationMemory.java
+++ b/src/main/java/org/apache/sysml/yarn/ropt/GridEnumerationMemory.java
@@ -50,10 +50,6 @@ public class GridEnumerationMemory extends GridEnumeration
_nsteps = DEFAULT_NSTEPS;
}
- /**
- *
- * @param steps
- */
public void setNumSteps( int steps )
{
_nsteps = steps;
@@ -102,12 +98,6 @@ public class GridEnumerationMemory extends GridEnumeration
return val;
}
- /**
- *
- * @param pbs
- * @param mem
- * @throws HopsException
- */
private void getMemoryEstimates( ArrayList<ProgramBlock> pbs, ArrayList<Long> mem )
throws HopsException
{
@@ -115,12 +105,6 @@ public class GridEnumerationMemory extends GridEnumeration
getMemoryEstimates(pb, mem);
}
- /**
- *
- * @param pb
- * @param mem
- * @throws HopsException
- */
private void getMemoryEstimates( ProgramBlock pb, ArrayList<Long> mem )
throws HopsException
{
@@ -156,11 +140,6 @@ public class GridEnumerationMemory extends GridEnumeration
}
}
- /**
- *
- * @param hop
- * @param mem
- */
private void getMemoryEstimates( Hop hop, ArrayList<Long> mem )
{
if( hop.getVisited() == Hop.VisitStatus.DONE )
http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/234f5af9/src/main/java/org/apache/sysml/yarn/ropt/ResourceConfig.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/sysml/yarn/ropt/ResourceConfig.java b/src/main/java/org/apache/sysml/yarn/ropt/ResourceConfig.java
index 2ce9542..45ad782 100644
--- a/src/main/java/org/apache/sysml/yarn/ropt/ResourceConfig.java
+++ b/src/main/java/org/apache/sysml/yarn/ropt/ResourceConfig.java
@@ -56,10 +56,6 @@ public class ResourceConfig
addProgramBlocks(prog, init);
}
- /**
- *
- * @return
- */
public long getCPResource()
{
return (long)_cpres;
@@ -103,21 +99,12 @@ public class ResourceConfig
_mrres.set(i, (long)res[i][0]);
}
-
- /**
- *
- * @return
- */
public long getMaxMRResource()
{
double val = Collections.max(_mrres);
return (long)val;
}
- /**
- *
- * @return
- */
public String serialize()
{
StringBuilder ret = new StringBuilder();
@@ -154,26 +141,14 @@ public class ResourceConfig
return new ResourceConfig(cp, mr);
}
-
- /**
- *
- * @param pbs
- * @param init
- * @throws HopsException
- */
+
private void addProgramBlocks( ArrayList<ProgramBlock> pbs, long init )
throws HopsException
{
for( ProgramBlock pb : pbs )
addProgramBlock(pb, init);
}
-
- /**
- *
- * @param pb
- * @param init
- * @throws HopsException
- */
+
private void addProgramBlock( ProgramBlock pb, long init )
throws HopsException
{
http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/234f5af9/src/main/java/org/apache/sysml/yarn/ropt/ResourceOptimizer.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/sysml/yarn/ropt/ResourceOptimizer.java b/src/main/java/org/apache/sysml/yarn/ropt/ResourceOptimizer.java
index 701ba76..1544e45 100644
--- a/src/main/java/org/apache/sysml/yarn/ropt/ResourceOptimizer.java
+++ b/src/main/java/org/apache/sysml/yarn/ropt/ResourceOptimizer.java
@@ -81,16 +81,6 @@ public class ResourceOptimizer
private static long _cntCompilePB = 0;
private static long _cntCostPB = 0;
-
- /**
- *
- * @param prog
- * @param cc
- * @param cptype
- * @param mrtype
- * @return
- * @throws DMLRuntimeException
- */
public synchronized static ResourceConfig optimizeResourceConfig( ArrayList<ProgramBlock> prog, YarnClusterConfig cc, GridEnumType cptype, GridEnumType mrtype )
throws DMLRuntimeException
{
@@ -174,18 +164,7 @@ public class ResourceOptimizer
return ROpt;
}
-
- /**
- *
- * @param prog
- * @param B
- * @param rc
- * @return
- * @throws IOException
- * @throws LopsException
- * @throws HopsException
- * @throws DMLRuntimeException
- */
+
public static ArrayList<ProgramBlock> compileProgram( ArrayList<ProgramBlock> prog, ResourceConfig rc )
throws DMLRuntimeException, HopsException, LopsException, IOException
{
@@ -195,18 +174,7 @@ public class ResourceOptimizer
return B;
}
-
-
- /**
- *
- * @param prog
- * @param B
- * @return
- * @throws IOException
- * @throws LopsException
- * @throws HopsException
- * @throws DMLRuntimeException
- */
+
private static ArrayList<ProgramBlock> compileProgram( ArrayList<ProgramBlock> prog, ArrayList<ProgramBlock> B, double cp, double mr )
throws DMLRuntimeException, HopsException, LopsException, IOException
{
@@ -225,17 +193,7 @@ public class ResourceOptimizer
return B;
}
-
- /**
- *
- * @param pb
- * @param Bp
- * @return
- * @throws IOException
- * @throws LopsException
- * @throws HopsException
- * @throws DMLRuntimeException
- */
+
private static ArrayList<ProgramBlock> compileProgram( ProgramBlock pb, ArrayList<ProgramBlock> B, double cp, double mr )
throws DMLRuntimeException, HopsException, LopsException, IOException
{
@@ -303,18 +261,7 @@ public class ResourceOptimizer
return B;
}
-
-
- /**
- *
- * @param pbs
- * @param cp
- * @param memo
- * @throws DMLRuntimeException
- * @throws HopsException
- * @throws LopsException
- * @throws IOException
- */
+
private static void recompileProgramBlocks( ArrayList<ProgramBlock> pbs, long cp, double[][] memo )
throws DMLRuntimeException, HopsException, LopsException, IOException
{
@@ -325,17 +272,7 @@ public class ResourceOptimizer
recompileProgramBlock(pb, cp, mr);
}
}
-
- /**
- *
- * @param pb
- * @param cp
- * @param mr
- * @throws DMLRuntimeException
- * @throws HopsException
- * @throws LopsException
- * @throws IOException
- */
+
private static void recompileProgramBlock( ProgramBlock pb, long cp, long mr )
throws DMLRuntimeException, HopsException, LopsException, IOException
{
@@ -399,13 +336,7 @@ public class ResourceOptimizer
_cntCompilePB ++;
}
-
- /**
- *
- * @param inst
- * @return
- * @throws DMLRuntimeException
- */
+
private static ArrayList<Instruction> annotateMRJobInstructions( ArrayList<Instruction> inst, long cp, long mr )
throws DMLRuntimeException
{
@@ -442,15 +373,7 @@ public class ResourceOptimizer
return inst;
}
-
-
- /**
- *
- * @param pb
- * @return
- * @throws DMLRuntimeException
- * @throws HopsException
- */
+
private static double getProgramCosts( ProgramBlock pb )
throws DMLRuntimeException, HopsException
{
@@ -471,13 +394,7 @@ public class ResourceOptimizer
_cntCostPB ++;
return val;
}
-
-
- /**
- *
- * @param prog
- * @throws DMLRuntimeException
- */
+
private static double getProgramCosts( Program prog )
throws DMLRuntimeException
{
@@ -488,12 +405,7 @@ public class ResourceOptimizer
return val;
}
-
- /**
- *
- * @param hops
- * @param vars
- */
+
private static void collectReadVariables( ArrayList<Hop> hops, LocalVariableMap vars )
{
if( hops!=null ) {
@@ -502,12 +414,7 @@ public class ResourceOptimizer
collectReadVariables(hop, vars);
}
}
-
- /**
- *
- * @param hop
- * @param vars
- */
+
private static void collectReadVariables( Hop hop, LocalVariableMap vars )
{
if( hop == null )
@@ -532,13 +439,7 @@ public class ResourceOptimizer
hop.setVisited(Hop.VisitStatus.DONE);
}
-
- /**
- *
- * @param B
- * @return
- * @throws HopsException
- */
+
private static ArrayList<ProgramBlock> pruneProgramBlocks( ArrayList<ProgramBlock> B )
throws HopsException
{
@@ -562,13 +463,7 @@ public class ResourceOptimizer
return B;
}
-
- /**
- *
- * @param pb
- * @return
- * @throws HopsException
- */
+
private static boolean pruneHasOnlyUnknownMR( ProgramBlock pb )
throws HopsException
{
@@ -600,14 +495,7 @@ public class ResourceOptimizer
return pruneHasOnlyUnknownMR(sb.get_hops());
}
}
-
-
- /**
- *
- * @param sb
- * @return
- * @throws HopsException
- */
+
private static boolean pruneHasOnlyUnknownMR( ArrayList<Hop> hops )
throws HopsException
{
@@ -622,12 +510,7 @@ public class ResourceOptimizer
return ret;
}
-
- /**
- *
- * @param hop
- * @return
- */
+
private static boolean pruneHasOnlyUnknownMR( Hop hop )
{
if( hop == null || hop.getVisited() == Hop.VisitStatus.DONE )
@@ -658,17 +541,7 @@ public class ResourceOptimizer
return ret;
}
-
-
- /**
- *
- * @param prog
- * @param cc
- * @param type
- * @return
- * @throws DMLRuntimeException
- * @throws HopsException
- */
+
private static ArrayList<Long> enumerateGridPoints( ArrayList<ProgramBlock> prog, long min, long max, GridEnumType type )
throws DMLRuntimeException, HopsException
{
@@ -693,14 +566,7 @@ public class ResourceOptimizer
return ret;
}
-
- /**
- *
- * @param Bp
- * @param min
- * @return
- * @throws DMLRuntimeException
- */
+
private static double[][] initLocalMemoTable( ArrayList<ProgramBlock> Bp, double min )
throws DMLRuntimeException
{
@@ -719,15 +585,7 @@ public class ResourceOptimizer
return memo;
}
-
- /**
- *
- * @param B
- * @param Bp
- * @param lmemo
- * @param min
- * @return
- */
+
private static double[][] initGlobalMemoTable( ArrayList<ProgramBlock> B, ArrayList<ProgramBlock> Bp, double[][] lmemo, double min )
{
//allocate memo structure
@@ -757,10 +615,7 @@ public class ResourceOptimizer
return memo;
}
-
- /**
- *
- */
+
public static void initStatistics()
{
_cntCompilePB = 0;
http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/234f5af9/src/main/java/org/apache/sysml/yarn/ropt/YarnClusterAnalyzer.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/sysml/yarn/ropt/YarnClusterAnalyzer.java b/src/main/java/org/apache/sysml/yarn/ropt/YarnClusterAnalyzer.java
index 42fb6f5..bf25989 100644
--- a/src/main/java/org/apache/sysml/yarn/ropt/YarnClusterAnalyzer.java
+++ b/src/main/java/org/apache/sysml/yarn/ropt/YarnClusterAnalyzer.java
@@ -135,7 +135,7 @@ public class YarnClusterAnalyzer
* Gets the number of logical processors of the current node,
* including hyper-threading if enabled.
*
- * @return
+ * @return number of logical processors
*/
public static int getLocalParallelism()
{
@@ -146,7 +146,7 @@ public class YarnClusterAnalyzer
* Gets the number of cluster nodes (number of tasktrackers). If multiple tasktracker
* are started per node, each tasktracker is viewed as individual node.
*
- * @return
+ * @return number of cluster nodes
*/
public static int getRemoteParallelNodes()
{
@@ -159,7 +159,8 @@ public class YarnClusterAnalyzer
/**
* Gets the total number of available map slots.
*
- * @return
+ * @param jobLookupId hadoop job id
+ * @return total number of available map slots
*/
public static int getRemoteParallelMapTasks(long jobLookupId)
{
@@ -177,7 +178,8 @@ public class YarnClusterAnalyzer
/**
* Gets the total number of available reduce slots.
*
- * @return
+ * @param jobLookupId hadoop job id
+ * @return total number of available reduce slots
*/
public static int getRemoteParallelReduceTasks(long jobLookupId)
{
@@ -206,7 +208,8 @@ public class YarnClusterAnalyzer
/**
* Gets the totals number of parallel tasks given its max memory size.
*
- * @return
+ * @param remoteTaskJvmMemory remote task max memory size
+ * @return total number of parallel tasks given max memory size
*/
public static int getRemoteParallelTasksGivenMem(long remoteTaskJvmMemory) {
long taskPhy = getYarnPhyAllocate(ResourceOptimizer.jvmToPhy(remoteTaskJvmMemory, false));
@@ -260,17 +263,13 @@ public class YarnClusterAnalyzer
/**
* Gets the maximum memory [in bytes] of the current JVM.
*
- * @return
+ * @return the current JVM maximum memory in bytes
*/
public static long getLocalMaxMemory()
{
return _localJVMMaxMem;
}
-
- /**
- *
- * @param localMem
- */
+
public static void setLocalMaxMemory( long localMem )
{
_localJVMMaxMem = localMem;
@@ -280,7 +279,7 @@ public class YarnClusterAnalyzer
/**
* Gets the maximum memory [in bytes] of all given hadoop task memory settings.
*
- * @return
+ * @return maximum memory in bytes of all hadoop task memory settings
*/
public static long getMaximumRemoteMaxMemory()
{
@@ -298,7 +297,8 @@ public class YarnClusterAnalyzer
/**
* Gets the maximum memory [in bytes] of a hadoop map task JVM.
*
- * @return
+ * @param jobLookupId hadoop job id
+ * @return maximum memory in bytes of the hadoop map task JVM
*/
public static long getRemoteMaxMemoryMap(long jobLookupId)
{
@@ -314,7 +314,8 @@ public class YarnClusterAnalyzer
/**
* Gets the maximum memory [in bytes] of a hadoop reduce task JVM.
*
- * @return
+ * @param jobLookupId hadoop job id
+ * @return maximum memory in bytes of the hadoop reduce task JVM
*/
public static long getRemoteMaxMemoryReduce(long jobLookupId)
{
@@ -330,7 +331,8 @@ public class YarnClusterAnalyzer
/**
* Gets the maximum memory [in bytes] of a hadoop task JVM.
*
- * @return
+ * @param jobLookupId hadoop job id
+ * @return maximum memory in bytes of the hadoop task JVM
*/
public static long getSpecifiedRemoteMaxMemory(long jobLookupId)
{
@@ -374,24 +376,11 @@ public class YarnClusterAnalyzer
System.out.print(id + ",");
System.out.println();
}
-
- /**
- * Gets the maximum memory requirement [in bytes] of a given hadoop job.
- *
- * @param conf
- * @return
- */
- /*public static long getRemoteMaxMemory( JobConf job )
- {
- return (1024*1024) * Math.max(
- job.getMemoryForMapTask(),
- job.getMemoryForReduceTask() );
- }*/
-
+
/**
* Gets the maximum sort buffer memory requirement [in bytes] of a hadoop task.
*
- * @return
+ * @return maximum sort buffer memory requirement in bytes
*/
public static long getRemoteMaxMemorySortBuffer( )
{
@@ -407,7 +396,7 @@ public class YarnClusterAnalyzer
/**
* Gets the maximum local parallelism constraint.
*
- * @return
+ * @return maximum local parallelism constraint (number of logical processors)
*/
public static int getCkMaxCP()
{
@@ -418,7 +407,8 @@ public class YarnClusterAnalyzer
/**
* Gets the maximum remote parallelism constraint
*
- * @return
+ * @param jobLookupId hadoop job id
+ * @return maximum remote parallelism constraint (total number of available map slots)
*/
public static int getCkMaxMR(long jobLookupId)
{
@@ -429,7 +419,8 @@ public class YarnClusterAnalyzer
/**
* Gets the maximum memory constraint [in bytes].
*
- * @return
+ * @param jobLookupId hadoop job id
+ * @return maximum memory constraint in bytes
*/
public static long getCmMax(long jobLookupId)
{
@@ -440,7 +431,7 @@ public class YarnClusterAnalyzer
/**
* Gets the HDFS blocksize of the used cluster in bytes.
*
- * @return
+ * @return HDFS block size
*/
public static long getHDFSBlockSize()
{
@@ -450,11 +441,6 @@ public class YarnClusterAnalyzer
return _blocksize;
}
- /**
- *
- * @param javaOpts
- * @return
- */
public static long extractMaxMemoryOpt(String javaOpts)
{
long ret = -1; //mem in bytes
@@ -493,13 +479,7 @@ public class YarnClusterAnalyzer
return ret;
}
-
- /**
- *
- * @param job
- * @param key
- * @param bytes
- */
+
public static void setMaxMemoryOpt(JobConf job, String key, long bytes)
{
String javaOptsOld = job.get( key );
@@ -583,13 +563,7 @@ public class YarnClusterAnalyzer
return cc;
}
-
- /**
- *
- * @return
- * @throws YarnException
- * @throws IOException
- */
+
public static double getClusterUtilization()
throws IOException
{
@@ -628,6 +602,10 @@ public class YarnClusterAnalyzer
/**
* Analyzes properties of Yarn cluster and Hadoop configurations.
+ *
+ * @param yarnClient hadoop yarn client
+ * @param conf hadoop yarn configuration
+ * @param verbose output info to standard output
*/
public static void analyzeYarnCluster(YarnClient yarnClient, YarnConfiguration conf, boolean verbose) {
try {
@@ -727,11 +705,7 @@ public class YarnClusterAnalyzer
LOG.info(node.getNodeId() + " updated with " + resource.getMemory() + " memory and " + resource.getVirtualCores() + " cores");
}*/
}
-
- /**
- *
- * @return
- */
+
private static YarnClient createYarnClient()
{
YarnConfiguration conf = new YarnConfiguration();
http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/234f5af9/src/main/java/org/apache/sysml/yarn/ropt/YarnOptimizerUtils.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/sysml/yarn/ropt/YarnOptimizerUtils.java b/src/main/java/org/apache/sysml/yarn/ropt/YarnOptimizerUtils.java
index b9b45f7..4896658 100644
--- a/src/main/java/org/apache/sysml/yarn/ropt/YarnOptimizerUtils.java
+++ b/src/main/java/org/apache/sysml/yarn/ropt/YarnOptimizerUtils.java
@@ -31,19 +31,11 @@ public class YarnOptimizerUtils
HYBRID_MEM_EXP_GRID,
}
- /**
- *
- * @return
- */
public static double getRemoteMemBudgetMap(long jobLookupId)
{
return getRemoteMemBudgetMap(false, jobLookupId);
}
-
- /**
- *
- * @return
- */
+
public static double getRemoteMemBudgetMap(boolean substractSortBuffer, long jobLookupId)
{
double ret = YarnClusterAnalyzer.getRemoteMaxMemoryMap(jobLookupId);
@@ -51,11 +43,7 @@ public class YarnOptimizerUtils
ret -= YarnClusterAnalyzer.getRemoteMaxMemorySortBuffer();
return ret * OptimizerUtils.MEM_UTIL_FACTOR;
}
-
- /**
- *
- * @return
- */
+
public static double getRemoteMemBudgetReduce(long jobLookupId)
{
double ret = YarnClusterAnalyzer.getRemoteMaxMemoryReduce(jobLookupId);
@@ -67,8 +55,9 @@ public class YarnOptimizerUtils
* This is either just the configured value (SystemML config) or
* the minimum of configured value and available reduce slots.
*
- * @param configOnly
- * @return
+ * @param configOnly if true, return number or reducers from SystemML configuration
+ * @param jobLookupId hadoop job id
+ * @return number of reducers
*/
public static int getNumReducers(boolean configOnly, long jobLookupId)
{
@@ -78,34 +67,17 @@ public class YarnOptimizerUtils
return ret;
}
-
- /**
- *
- * @param mb
- * @return
- */
+
public static long toB( long mb )
{
return 1024 * 1024 * mb;
}
-
- /**
- *
- * @param b
- * @return
- */
+
public static long toMB( long b )
{
return b / (1024 * 1024);
}
-
- /**
- *
- * @param minAlloc
- * @param maxAlloc
- * @param numCores
- * @return
- */
+
public static long computeMinContraint( long minAlloc, long maxAlloc, long numCores )
{
return ((long)(Math.max(minAlloc, maxAlloc/numCores )/minAlloc)*minAlloc);
[2/2] incubator-systemml git commit: [SYSTEMML-842] Javadoc cleanup
in parser, udf, utils, and yarn packages
Posted by de...@apache.org.
[SYSTEMML-842] Javadoc cleanup in parser, udf, utils, and yarn packages
Remove blank comments.
Fix broken comments.
Project: http://git-wip-us.apache.org/repos/asf/incubator-systemml/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-systemml/commit/234f5af9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-systemml/tree/234f5af9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-systemml/diff/234f5af9
Branch: refs/heads/master
Commit: 234f5af97326ce116501d1eabc8c5035eae2cd59
Parents: 06c5057
Author: Deron Eriksson <de...@us.ibm.com>
Authored: Thu Nov 10 17:18:11 2016 -0800
Committer: Deron Eriksson <de...@us.ibm.com>
Committed: Thu Nov 10 17:18:11 2016 -0800
----------------------------------------------------------------------
.../org/apache/sysml/parser/AParserWrapper.java | 13 +-
.../apache/sysml/parser/BinaryExpression.java | 2 +-
.../sysml/parser/BuiltinFunctionExpression.java | 73 +-----
.../org/apache/sysml/parser/DMLProgram.java | 35 +--
.../org/apache/sysml/parser/DMLTranslator.java | 114 ++++----
.../org/apache/sysml/parser/DataExpression.java | 37 +--
.../org/apache/sysml/parser/DataIdentifier.java | 4 +-
.../org/apache/sysml/parser/Expression.java | 12 +-
.../sysml/parser/ExternalFunctionStatement.java | 3 +-
.../sysml/parser/FunctionCallIdentifier.java | 14 +-
.../sysml/parser/FunctionStatementBlock.java | 2 +-
.../apache/sysml/parser/IndexedIdentifier.java | 8 -
.../apache/sysml/parser/LanguageException.java | 12 -
.../apache/sysml/parser/OutputStatement.java | 18 +-
.../sysml/parser/ParForStatementBlock.java | 134 ++++------
.../ParameterizedBuiltinFunctionExpression.java | 51 ----
.../sysml/parser/RelationalExpression.java | 9 +-
.../java/org/apache/sysml/parser/Statement.java | 7 -
.../org/apache/sysml/parser/StatementBlock.java | 33 ---
.../parser/common/CommonSyntacticValidator.java | 37 +--
.../sysml/parser/dml/DMLParserWrapper.java | 14 +-
.../sysml/parser/pydml/PyDMLParserWrapper.java | 14 +-
.../parser/pydml/PydmlSyntacticValidator.java | 40 ++-
.../sysml/runtime/instructions/Instruction.java | 4 +-
.../java/org/apache/sysml/udf/BinaryObject.java | 4 +-
.../org/apache/sysml/udf/FunctionParameter.java | 4 +-
src/main/java/org/apache/sysml/udf/Matrix.java | 46 ++--
.../org/apache/sysml/udf/PackageFunction.java | 32 +--
src/main/java/org/apache/sysml/udf/Scalar.java | 8 +-
.../sysml/udf/lib/DynamicReadMatrixCP.java | 4 -
.../sysml/udf/lib/DynamicReadMatrixRcCP.java | 4 -
.../sysml/udf/lib/DynamicWriteMatrixCP.java | 4 -
.../org/apache/sysml/udf/lib/GatherWrapper.java | 4 +-
.../org/apache/sysml/udf/lib/OrderWrapper.java | 10 +-
.../sysml/udf/lib/PermutationMatrixWrapper.java | 8 -
.../apache/sysml/udf/lib/RemoveEmptyRows.java | 4 -
.../java/org/apache/sysml/utils/Explain.java | 261 +++----------------
.../InstallDependencyForIntegrationTests.java | 6 +-
.../apache/sysml/utils/ParameterBuilder.java | 4 +-
.../java/org/apache/sysml/utils/Statistics.java | 41 +--
.../org/apache/sysml/yarn/DMLAppMaster.java | 18 +-
.../apache/sysml/yarn/DMLAppMasterUtils.java | 56 +---
.../org/apache/sysml/yarn/DMLYarnClient.java | 70 ++---
.../apache/sysml/yarn/DMLYarnClientProxy.java | 11 +-
.../apache/sysml/yarn/ropt/GridEnumeration.java | 6 -
.../sysml/yarn/ropt/GridEnumerationEqui.java | 4 -
.../sysml/yarn/ropt/GridEnumerationExp.java | 4 -
.../sysml/yarn/ropt/GridEnumerationMemory.java | 21 --
.../apache/sysml/yarn/ropt/ResourceConfig.java | 29 +--
.../sysml/yarn/ropt/ResourceOptimizer.java | 181 ++-----------
.../sysml/yarn/ropt/YarnClusterAnalyzer.java | 90 +++----
.../sysml/yarn/ropt/YarnOptimizerUtils.java | 44 +---
52 files changed, 399 insertions(+), 1269 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/234f5af9/src/main/java/org/apache/sysml/parser/AParserWrapper.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/sysml/parser/AParserWrapper.java b/src/main/java/org/apache/sysml/parser/AParserWrapper.java
index 6ae299b..4e6ee05 100644
--- a/src/main/java/org/apache/sysml/parser/AParserWrapper.java
+++ b/src/main/java/org/apache/sysml/parser/AParserWrapper.java
@@ -46,24 +46,15 @@ public abstract class AParserWrapper
protected boolean atLeastOneWarning = false;
protected List<ParseIssue> parseIssues;
- /**
- *
- * @param fileName
- * @param dmlScript
- * @param argVals
- * @return
- * @throws ParseException
- */
public abstract DMLProgram parse(String fileName, String dmlScript, Map<String, String> argVals)
throws ParseException;
/**
- * Factory method for creating instances of AParserWrapper, for
- * simplificy fused with the abstract class.
+ * Factory method for creating parser wrappers
*
* @param pydml true if a PyDML parser is needed
- * @return
+ * @return parser wrapper
*/
public static AParserWrapper createParser(boolean pydml)
{
http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/234f5af9/src/main/java/org/apache/sysml/parser/BinaryExpression.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/sysml/parser/BinaryExpression.java b/src/main/java/org/apache/sysml/parser/BinaryExpression.java
index 0e3dba7..c2f3aec 100644
--- a/src/main/java/org/apache/sysml/parser/BinaryExpression.java
+++ b/src/main/java/org/apache/sysml/parser/BinaryExpression.java
@@ -102,7 +102,7 @@ public class BinaryExpression extends Expression
* Validate parse tree : Process Binary Expression in an assignment
* statement
*
- * @throws LanguageException
+ * @throws LanguageException if LanguageException occurs
*/
@Override
public void validateExpression(HashMap<String, DataIdentifier> ids, HashMap<String, ConstIdentifier> constVars, boolean conditional)
http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/234f5af9/src/main/java/org/apache/sysml/parser/BuiltinFunctionExpression.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/sysml/parser/BuiltinFunctionExpression.java b/src/main/java/org/apache/sysml/parser/BuiltinFunctionExpression.java
index 0ab2511..ef69a7a 100644
--- a/src/main/java/org/apache/sysml/parser/BuiltinFunctionExpression.java
+++ b/src/main/java/org/apache/sysml/parser/BuiltinFunctionExpression.java
@@ -310,8 +310,9 @@ public class BuiltinFunctionExpression extends DataIdentifier
* Validate parse tree : Process BuiltinFunction Expression in an assignment
* statement
*
- * @throws LanguageException
+ * @throws LanguageException if LanguageException occurs
*/
+ @Override
public void validateExpression(HashMap<String, DataIdentifier> ids, HashMap<String, ConstIdentifier> constVars, boolean conditional)
throws LanguageException {
@@ -1224,21 +1225,10 @@ public class BuiltinFunctionExpression extends DataIdentifier
}
}
- /**
- *
- * @param expr
- * @return
- */
private boolean isConstant(Expression expr) {
return ( expr != null && expr instanceof ConstIdentifier );
}
- /**
- *
- * @param expr
- * @return
- * @throws LanguageException
- */
private double getDoubleValue(Expression expr)
throws LanguageException
{
@@ -1334,11 +1324,6 @@ public class BuiltinFunctionExpression extends DataIdentifier
return result;
}
- /**
- *
- * @param count
- * @throws LanguageException
- */
protected void checkNumParameters(int count) //always unconditional
throws LanguageException
{
@@ -1356,11 +1341,6 @@ public class BuiltinFunctionExpression extends DataIdentifier
}
}
- /**
- *
- * @param e
- * @throws LanguageException
- */
protected void checkMatrixParam(Expression e) //always unconditional
throws LanguageException
{
@@ -1369,11 +1349,6 @@ public class BuiltinFunctionExpression extends DataIdentifier
}
}
- /**
- *
- * @param e
- * @throws LanguageException
- */
protected void checkMatrixFrameParam(Expression e) //always unconditional
throws LanguageException
{
@@ -1382,11 +1357,6 @@ public class BuiltinFunctionExpression extends DataIdentifier
}
}
- /**
- *
- * @param e
- * @throws LanguageException
- */
protected void checkMatrixScalarParam(Expression e) //always unconditional
throws LanguageException
{
@@ -1395,11 +1365,6 @@ public class BuiltinFunctionExpression extends DataIdentifier
}
}
- /**
- *
- * @param e
- * @throws LanguageException
- */
private void checkScalarParam(Expression e) //always unconditional
throws LanguageException
{
@@ -1408,11 +1373,6 @@ public class BuiltinFunctionExpression extends DataIdentifier
}
}
- /**
- *
- * @param e
- * @throws LanguageException
- */
private void checkScalarFrameParam(Expression e) //always unconditional
throws LanguageException
{
@@ -1420,13 +1380,7 @@ public class BuiltinFunctionExpression extends DataIdentifier
raiseValidateError("Expecting scalar parameter for function " + this.getOpCode(), false, LanguageErrorCodes.UNSUPPORTED_PARAMETERS);
}
}
-
- /**
- *
- * @param e
- * @param vt
- * @throws LanguageException
- */
+
private void checkValueTypeParam(Expression e, ValueType vt) //always unconditional
throws LanguageException
{
@@ -1443,11 +1397,6 @@ public class BuiltinFunctionExpression extends DataIdentifier
return (e.getOutput().getDim1() != -1 && e.getOutput().getDim2() != -1);
}
- /**
- *
- * @param e
- * @throws LanguageException
- */
private void check1DMatrixParam(Expression e) //always unconditional
throws LanguageException
{
@@ -1461,24 +1410,12 @@ public class BuiltinFunctionExpression extends DataIdentifier
}
}
- /**
- *
- * @param expr1
- * @param expr2
- * @throws LanguageException
- */
private void checkMatchingDimensions(Expression expr1, Expression expr2)
throws LanguageException
{
checkMatchingDimensions(expr1, expr2, false);
}
- /**
- *
- * @param expr1
- * @param expr2
- * @throws LanguageException
- */
private void checkMatchingDimensions(Expression expr1, Expression expr2, boolean allowsMV)
throws LanguageException
{
@@ -1501,10 +1438,6 @@ public class BuiltinFunctionExpression extends DataIdentifier
}
}
- /**
- *
- * @throws LanguageException
- */
private void checkMatchingDimensionsQuantile()
throws LanguageException
{
http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/234f5af9/src/main/java/org/apache/sysml/parser/DMLProgram.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/sysml/parser/DMLProgram.java b/src/main/java/org/apache/sysml/parser/DMLProgram.java
index 12a8369..d6a0deb 100644
--- a/src/main/java/org/apache/sysml/parser/DMLProgram.java
+++ b/src/main/java/org/apache/sysml/parser/DMLProgram.java
@@ -84,7 +84,7 @@ public class DMLProgram
*
* @param fkey function key as concatenation of namespace and function name
* (see DMLProgram.constructFunctionKey)
- * @return
+ * @return function statement block
*/
public FunctionStatementBlock getFunctionStatementBlock(String fkey) {
String[] tmp = splitFunctionKey(fkey);
@@ -212,16 +212,6 @@ public class DMLProgram
return rtprog ;
}
- /**
- *
- * @param prog
- * @param sb
- * @param config
- * @return
- * @throws IOException
- * @throws LopsException
- * @throws DMLRuntimeException
- */
public ProgramBlock createRuntimeProgramBlock(Program prog, StatementBlock sb, DMLConfig config)
throws IOException, LopsException, DMLRuntimeException
{
@@ -667,9 +657,9 @@ public class DMLProgram
* Determines if the given program block includes a RMVAR or RMFILEVAR
* instruction for the given varName.
*
- * @param pb
- * @param varName
- * @return
+ * @param pb program block
+ * @param varName variable name
+ * @return true if program block contains remove instruction for variable
*/
private boolean rContainsRMInstruction(ProgramBlock pb, String varName)
{
@@ -724,9 +714,9 @@ public class DMLProgram
* the list of instructions, while for complex program blocks it is added to
* the end of the list of exit instructions.
*
- * @param pb
- * @param inst
- * @throws DMLRuntimeException
+ * @param pb program block
+ * @param inst instruction
+ * @throws DMLRuntimeException if DMLRuntimeException occurs
*/
private void addCleanupInstruction( ProgramBlock pb, Instruction inst )
throws DMLRuntimeException
@@ -767,22 +757,11 @@ public class DMLProgram
}
}
- /**
- *
- * @param fnamespace
- * @param fname
- * @return
- */
public static String constructFunctionKey(String fnamespace, String fname)
{
return fnamespace + Program.KEY_DELIM + fname;
}
- /**
- *
- * @param fkey
- * @return
- */
public static String[] splitFunctionKey(String fkey)
{
return fkey.split(Program.KEY_DELIM);
http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/234f5af9/src/main/java/org/apache/sysml/parser/DMLTranslator.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/sysml/parser/DMLTranslator.java b/src/main/java/org/apache/sysml/parser/DMLTranslator.java
index f3cb0b1..6a3050e 100644
--- a/src/main/java/org/apache/sysml/parser/DMLTranslator.java
+++ b/src/main/java/org/apache/sysml/parser/DMLTranslator.java
@@ -88,8 +88,10 @@ public class DMLTranslator
/**
* Validate parse tree
*
- * @throws LanguageException
- * @throws IOException
+ * @param dmlp dml program
+ * @throws LanguageException if LanguageException occurs
+ * @throws ParseException if ParseException occurs
+ * @throws IOException if IOException occurs
*/
public void validateParseTree(DMLProgram dmlp)
throws LanguageException, ParseException, IOException
@@ -224,7 +226,9 @@ public class DMLTranslator
/**
* Construct Hops from parse tree
*
- * @throws ParseException
+ * @param dmlp dml program
+ * @throws ParseException if ParseException occurs
+ * @throws LanguageException if LanguageException occurs
*/
public void constructHops(DMLProgram dmlp)
throws ParseException, LanguageException
@@ -245,14 +249,7 @@ public class DMLTranslator
constructHops(current);
}
}
-
- /**
- *
- * @param dmlp
- * @throws ParseException
- * @throws LanguageException
- * @throws HopsException
- */
+
public void rewriteHopsDAG(DMLProgram dmlp)
throws ParseException, LanguageException, HopsException
{
@@ -296,13 +293,7 @@ public class DMLTranslator
constructLops(current);
}
}
-
- /**
- *
- * @param sb
- * @throws HopsException
- * @throws LopsException
- */
+
public void constructLops(StatementBlock sb)
throws HopsException, LopsException
{
@@ -1220,9 +1211,9 @@ public class DMLTranslator
/**
* Constructs Hops for a given ForStatementBlock or ParForStatementBlock, respectively.
*
- * @param sb
- * @throws ParseException
- * @throws LanguageException
+ * @param sb for statement block
+ * @throws ParseException if ParseException occurs
+ * @throws LanguageException if LanguageException occurs
*/
public void constructHopsForForControlBlock(ForStatementBlock sb)
throws ParseException, LanguageException
@@ -1362,8 +1353,8 @@ public class DMLTranslator
*
* Method used for both ForStatementBlock and ParForStatementBlock.
*
- * @param passedSB
- * @throws ParseException
+ * @param fsb for statement block
+ * @throws ParseException if ParseException occurs
*/
public void constructHopsForIterablePredicate(ForStatementBlock fsb)
throws ParseException
@@ -1444,7 +1435,11 @@ public class DMLTranslator
* Construct Hops from parse tree : Process Expression in an assignment
* statement
*
- * @throws ParseException
+ * @param source source expression
+ * @param target data identifier
+ * @param hops map of high-level operators
+ * @return high-level operator
+ * @throws ParseException if ParseException occurs
*/
private Hop processExpression(Expression source, DataIdentifier target, HashMap<String, Hop> hops) throws ParseException {
if (source.getKind() == Expression.Kind.BinaryOp) {
@@ -1532,10 +1527,10 @@ public class DMLTranslator
/**
* Constructs the Hops for arbitrary expressions that eventually evaluate to an INT scalar.
*
- * @param source
- * @param hops
- * @return
- * @throws ParseException
+ * @param source source expression
+ * @param hops map of high-level operators
+ * @return high-level operator
+ * @throws ParseException if ParseException occurs
*/
private Hop processTempIntExpression( Expression source, HashMap<String, Hop> hops )
throws ParseException
@@ -1704,7 +1699,11 @@ public class DMLTranslator
* Construct Hops from parse tree : Process Binary Expression in an
* assignment statement
*
- * @throws ParseException
+ * @param source binary expression
+ * @param target data identifier
+ * @param hops map of high-level operators
+ * @return high-level operator
+ * @throws ParseException if ParseException occurs
*/
private Hop processBinaryExpression(BinaryExpression source, DataIdentifier target, HashMap<String, Hop> hops)
throws ParseException
@@ -1794,14 +1793,6 @@ public class DMLTranslator
return currBop;
}
- /**
- *
- * @param source
- * @param target
- * @param hops
- * @return
- * @throws ParseException
- */
private Hop processBooleanExpression(BooleanExpression source, DataIdentifier target, HashMap<String, Hop> hops)
throws ParseException
{
@@ -1898,14 +1889,6 @@ public class DMLTranslator
return new ParameterizedBuiltinOp(name, dt, vt, ParameterizedBuiltinFunctionExpression.pbHopMap.get(op), paramHops);
}
- /**
- *
- * @param source
- * @param targetList
- * @param hops
- * @return
- * @throws ParseException
- */
private Hop processMultipleReturnParameterizedBuiltinFunctionExpression(ParameterizedBuiltinFunctionExpression source, ArrayList<DataIdentifier> targetList,
HashMap<String, Hop> hops) throws ParseException
{
@@ -1950,8 +1933,12 @@ public class DMLTranslator
* Construct Hops from parse tree : Process ParameterizedBuiltinFunction Expression in an
* assignment statement
*
- * @throws ParseException
- * @throws HopsException
+ * @param source parameterized built-in function
+ * @param target data identifier
+ * @param hops map of high-level operators
+ * @return high-level operator
+ * @throws ParseException if ParseException occurs
+ * @throws HopsException if HopsException occurs
*/
private Hop processParameterizedBuiltinFunctionExpression(ParameterizedBuiltinFunctionExpression source, DataIdentifier target,
HashMap<String, Hop> hops) throws ParseException, HopsException {
@@ -2073,8 +2060,12 @@ public class DMLTranslator
* Construct Hops from parse tree : Process ParameterizedExpression in a
* read/write/rand statement
*
- * @throws ParseException
- * @throws HopsException
+ * @param source data expression
+ * @param target data identifier
+ * @param hops map of high-level operators
+ * @return high-level operator
+ * @throws ParseException if ParseException occurs
+ * @throws HopsException if HopsException occurs
*/
private Hop processDataExpression(DataExpression source, DataIdentifier target,
HashMap<String, Hop> hops) throws ParseException, HopsException {
@@ -2157,6 +2148,12 @@ public class DMLTranslator
* Construct HOps from parse tree: process BuiltinFunction Expressions in
* MultiAssignment Statements. For all other builtin function expressions,
* <code>processBuiltinFunctionExpression()</code> is used.
+ *
+ * @param source built-in function expression
+ * @param targetList list of data identifiers
+ * @param hops map of high-level operators
+ * @return high-level operator
+ * @throws ParseException if ParseException occurs
*/
private Hop processMultipleReturnBuiltinFunctionExpression(BuiltinFunctionExpression source, ArrayList<DataIdentifier> targetList,
HashMap<String, Hop> hops) throws ParseException {
@@ -2215,8 +2212,12 @@ public class DMLTranslator
* Construct Hops from parse tree : Process BuiltinFunction Expression in an
* assignment statement
*
- * @throws ParseException
- * @throws HopsException
+ * @param source built-in function expression
+ * @param target data identifier
+ * @param hops map of high-level operators
+ * @return high-level operator
+ * @throws ParseException if ParseException occurs
+ * @throws HopsException if HopsException occurs
*/
private Hop processBuiltinFunctionExpression(BuiltinFunctionExpression source, DataIdentifier target,
HashMap<String, Hop> hops) throws ParseException, HopsException {
@@ -2961,12 +2962,6 @@ public class DMLTranslator
h.setColsInBlock(source.getColsInBlock());
}
- /**
- *
- * @param prog
- * @param pWrites
- * @throws LanguageException
- */
private boolean prepareReadAfterWrite( DMLProgram prog, HashMap<String, DataIdentifier> pWrites )
throws LanguageException
{
@@ -2985,11 +2980,6 @@ public class DMLTranslator
return ret;
}
- /**
- *
- * @param sb
- * @param pWrites
- */
private boolean prepareReadAfterWrite( StatementBlock sb, HashMap<String, DataIdentifier> pWrites )
{
boolean ret = false;
http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/234f5af9/src/main/java/org/apache/sysml/parser/DataExpression.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/sysml/parser/DataExpression.java b/src/main/java/org/apache/sysml/parser/DataExpression.java
index 7bd1c22..f70c1b9 100644
--- a/src/main/java/org/apache/sysml/parser/DataExpression.java
+++ b/src/main/java/org/apache/sysml/parser/DataExpression.java
@@ -547,10 +547,6 @@ public class DataExpression extends DataIdentifier
/**
* Validate parse tree : Process Data Expression in an assignment
* statement
- *
- * @throws LanguageException
- * @throws ParseException
- * @throws IOException
*/
@Override
public void validateExpression(HashMap<String, DataIdentifier> ids, HashMap<String, ConstIdentifier> currConstVars, boolean conditional)
@@ -1687,11 +1683,7 @@ public class DataExpression extends DataIdentifier
}
return;
}
-
- /**
- *
- * @param currConstVars
- */
+
private void performConstantPropagationRand( HashMap<String, ConstIdentifier> currConstVars )
{
//here, we propagate constants for all rand parameters that are required during validate.
@@ -1700,11 +1692,7 @@ public class DataExpression extends DataIdentifier
//replace data identifiers with const identifiers
performConstantPropagation(currConstVars, paramNamesForEval);
}
-
- /**
- *
- * @param currConstVars
- */
+
private void performConstantPropagationReadWrite( HashMap<String, ConstIdentifier> currConstVars )
{
//here, we propagate constants for all read/write parameters that are required during validate.
@@ -1713,12 +1701,7 @@ public class DataExpression extends DataIdentifier
//replace data identifiers with const identifiers
performConstantPropagation(currConstVars, paramNamesForEval);
}
-
- /**
- *
- * @param currConstVars
- * @param paramNames
- */
+
private void performConstantPropagation( HashMap<String, ConstIdentifier> currConstVars, String[] paramNames )
{
for( String paramName : paramNames )
@@ -1912,12 +1895,6 @@ public class DataExpression extends DataIdentifier
}
}
- /**
- *
- * @param filename
- * @return
- * @throws LanguageException
- */
public JSONObject readMetadataFile(String filename, boolean conditional)
throws LanguageException
{
@@ -2159,10 +2136,6 @@ public class DataExpression extends DataIdentifier
// Therefore, one need not actually read the data to infer the format.
}
- /**
- *
- * @return
- */
public boolean isCSVReadWithUnknownSize()
{
boolean ret = false;
@@ -2182,10 +2155,6 @@ public class DataExpression extends DataIdentifier
return ret;
}
- /**
- *
- * @return
- */
public boolean isRead()
{
return (_opcode == DataOp.READ);
http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/234f5af9/src/main/java/org/apache/sysml/parser/DataIdentifier.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/sysml/parser/DataIdentifier.java b/src/main/java/org/apache/sysml/parser/DataIdentifier.java
index 5538d89..41dffe8 100644
--- a/src/main/java/org/apache/sysml/parser/DataIdentifier.java
+++ b/src/main/java/org/apache/sysml/parser/DataIdentifier.java
@@ -138,7 +138,9 @@ public class DataIdentifier extends Identifier
/**
* Method to specify if an expression returns multiple outputs.
* This method must be overridden by all child classes.
- * @return
+ *
+ * @return true if expression returns multiple outputs
+ * @throws LanguageException if LanguageException occurs
*/
public boolean multipleReturns() throws LanguageException {
throw new LanguageException("multipleReturns() must be overridden in the subclass.");
http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/234f5af9/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 bf6b5b9..da30e64 100644
--- a/src/main/java/org/apache/sysml/parser/Expression.java
+++ b/src/main/java/org/apache/sysml/parser/Expression.java
@@ -290,7 +290,7 @@ public abstract class Expression
/**
* Convert string value to relational operator.
*
- * @param val String value ('<', '<=', '>', '>=', '==', '!=')
+ * @param val String value ('<', '<=', '>', '>=', '==', '!=')
* @return Relational operator ({@code RelationalOp.LESS}, {@code RelationalOp.LESSEQUAL},
* {@code RelationalOp.GREATER}, {@code RelationalOp.GREATEREQUAL}, {@code RelationalOp.EQUAL},
* {@code RelationalOp.NOTEQUAL}).
@@ -388,7 +388,7 @@ public abstract class Expression
* @param expression2 Second expression
* @param cast Whether a cast should potentially be performed
* @return The data type ({@link DataType})
- * @throws LanguageException
+ * @throws LanguageException if LanguageException occurs
*/
public static DataType computeDataType(Expression expression1, Expression expression2, boolean cast) throws LanguageException {
return computeDataType(expression1.getOutput(), expression2.getOutput(), cast);
@@ -403,7 +403,7 @@ public abstract class Expression
* @param identifier2 Second identifier
* @param cast Whether a cast should potentially be performed
* @return The data type ({@link DataType})
- * @throws LanguageException
+ * @throws LanguageException if LanguageException occurs
*/
public static DataType computeDataType(Identifier identifier1, Identifier identifier2, boolean cast) throws LanguageException {
DataType d1 = identifier1.getDataType();
@@ -436,7 +436,7 @@ public abstract class Expression
* @param expression2 Second expression
* @param cast Whether a cast should potentially be performed
* @return The value type ({@link ValueType})
- * @throws LanguageException
+ * @throws LanguageException if LanguageException occurs
*/
public static ValueType computeValueType(Expression expression1, Expression expression2, boolean cast) throws LanguageException {
return computeValueType(expression1.getOutput(), expression2.getOutput(), cast);
@@ -452,7 +452,7 @@ public abstract class Expression
* @param identifier2 Second identifier
* @param cast Whether a cast should potentially be performed
* @return The value type ({@link ValueType})
- * @throws LanguageException
+ * @throws LanguageException if LanguageException occurs
*/
public static ValueType computeValueType(Identifier identifier1, Identifier identifier2, boolean cast) throws LanguageException {
ValueType v1 = identifier1.getValueType();
@@ -510,7 +510,7 @@ public abstract class Expression
* Throw a LanguageException with the message.
*
* @param message the error message
- * @throws LanguageException
+ * @throws LanguageException if LanguageException occurs
*/
public void raiseValidateError( String message ) throws LanguageException {
raiseValidateError(message, false, null);
http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/234f5af9/src/main/java/org/apache/sysml/parser/ExternalFunctionStatement.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/sysml/parser/ExternalFunctionStatement.java b/src/main/java/org/apache/sysml/parser/ExternalFunctionStatement.java
index 4e41dfa..c0a3f31 100644
--- a/src/main/java/org/apache/sysml/parser/ExternalFunctionStatement.java
+++ b/src/main/java/org/apache/sysml/parser/ExternalFunctionStatement.java
@@ -73,7 +73,8 @@ public class ExternalFunctionStatement extends FunctionStatement
/**
* Validates all attributes and attribute values.
*
- * @throws LanguageException
+ * @param sb statement block
+ * @throws LanguageException if LanguageException occurs
*/
public void validateParameters(StatementBlock sb) //always unconditional
throws LanguageException
http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/234f5af9/src/main/java/org/apache/sysml/parser/FunctionCallIdentifier.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/sysml/parser/FunctionCallIdentifier.java b/src/main/java/org/apache/sysml/parser/FunctionCallIdentifier.java
index 05911dc..297c8ba 100644
--- a/src/main/java/org/apache/sysml/parser/FunctionCallIdentifier.java
+++ b/src/main/java/org/apache/sysml/parser/FunctionCallIdentifier.java
@@ -32,9 +32,9 @@ public class FunctionCallIdentifier extends DataIdentifier
private String _namespace; // namespace of the function being called (null if current namespace is to be used)
/**
- * setFunctionName: sets the function namespace (if specified) and name
- * @param functionName the (optional) namespace information and name of function. If both namespace and name are specified, they are concatinated with "::"
- * @throws ParseException
+ * sets the function namespace (if specified) and name
+ *
+ * @param functionName the (optional) namespace information and name of function. If both namespace and name are specified, they are concatenated with "::"
*/
public void setFunctionName(String functionName) {
_name = functionName;
@@ -97,7 +97,13 @@ public class FunctionCallIdentifier extends DataIdentifier
*
* NOTE: this does not override the normal validateExpression because it needs to pass dmlp!
*
- * @throws LanguageException
+ * @param dmlp dml program
+ * @param ids map of data identifiers
+ * @param constVars map of constant identifiers
+ * @param conditional if true, display warning for 'raiseValidateError'; if false, throw LanguageException
+ * for 'raiseValidateError'
+ * @throws LanguageException if LanguageException occurs
+ * @throws IOException if IOException occurs
*/
public void validateExpression(DMLProgram dmlp, HashMap<String, DataIdentifier> ids, HashMap<String, ConstIdentifier> constVars, boolean conditional)
throws LanguageException, IOException
http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/234f5af9/src/main/java/org/apache/sysml/parser/FunctionStatementBlock.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/sysml/parser/FunctionStatementBlock.java b/src/main/java/org/apache/sysml/parser/FunctionStatementBlock.java
index 5850d45..cd2bea7 100644
--- a/src/main/java/org/apache/sysml/parser/FunctionStatementBlock.java
+++ b/src/main/java/org/apache/sysml/parser/FunctionStatementBlock.java
@@ -42,7 +42,7 @@ public class FunctionStatementBlock extends StatementBlock
* default values start, they keep going to the right
*
* 2) The other parameters for External Functions
- * @throws IOException
+ *
*/
@Override
public VariableSet validate(DMLProgram dmlProg, VariableSet ids, HashMap<String,ConstIdentifier> constVars, boolean conditional)
http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/234f5af9/src/main/java/org/apache/sysml/parser/IndexedIdentifier.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/sysml/parser/IndexedIdentifier.java b/src/main/java/org/apache/sysml/parser/IndexedIdentifier.java
index db0bd18..11110b5 100644
--- a/src/main/java/org/apache/sysml/parser/IndexedIdentifier.java
+++ b/src/main/java/org/apache/sysml/parser/IndexedIdentifier.java
@@ -71,14 +71,6 @@ public class IndexedIdentifier extends DataIdentifier
_origDim2 = -1L;
}
- /**
- *
- * @param ids
- * @param currConstVars
- * @param conditional
- * @return
- * @throws LanguageException
- */
public IndexPair calculateIndexedDimensions(HashMap<String,DataIdentifier> ids, HashMap<String, ConstIdentifier> currConstVars, boolean conditional)
throws LanguageException
{
http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/234f5af9/src/main/java/org/apache/sysml/parser/LanguageException.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/sysml/parser/LanguageException.java b/src/main/java/org/apache/sysml/parser/LanguageException.java
index 9149d4d..8ef06f1 100644
--- a/src/main/java/org/apache/sysml/parser/LanguageException.java
+++ b/src/main/java/org/apache/sysml/parser/LanguageException.java
@@ -29,30 +29,18 @@ public class LanguageException extends DMLException
private static final long serialVersionUID = 1L;
- /**
- * @see java.lang.Exception#Exception()
- */
public LanguageException() {
super();
}
- /**
- * @see java.lang.Exception#Exception(String)
- */
public LanguageException(String message) {
super(message);
}
- /**
- * @see java.lang.Exception#Exception(Throwable)
- */
public LanguageException(Throwable cause) {
super(cause);
}
- /**
- * @see java.lang.Exception#Exception(String, Throwable)
- */
public LanguageException(String message, Throwable cause) {
super(message, cause);
}
http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/234f5af9/src/main/java/org/apache/sysml/parser/OutputStatement.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/sysml/parser/OutputStatement.java b/src/main/java/org/apache/sysml/parser/OutputStatement.java
index 5cb66e1..aac1b11 100644
--- a/src/main/java/org/apache/sysml/parser/OutputStatement.java
+++ b/src/main/java/org/apache/sysml/parser/OutputStatement.java
@@ -59,16 +59,16 @@ public class OutputStatement extends Statement
}
/**
- * Called by the parser (both javacc and antlr).
+ * Called by the parser.
*
- * @param fname
- * @param fci
- * @param filename
- * @param blp
- * @param bcp
- * @param elp
- * @param ecp
- * @throws DMLParseException
+ * @param fname function name
+ * @param fci function call identifier
+ * @param filename file name
+ * @param blp beginning line position
+ * @param bcp beginning column position
+ * @param elp ending line position
+ * @param ecp ending column position
+ * @throws LanguageException if LanguageException occurs
*/
public OutputStatement(String fname, FunctionCallIdentifier fci,
String filename, int blp, int bcp, int elp, int ecp)
http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/234f5af9/src/main/java/org/apache/sysml/parser/ParForStatementBlock.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/sysml/parser/ParForStatementBlock.java b/src/main/java/org/apache/sysml/parser/ParForStatementBlock.java
index fb5a8eb..627f1d4 100644
--- a/src/main/java/org/apache/sysml/parser/ParForStatementBlock.java
+++ b/src/main/java/org/apache/sysml/parser/ParForStatementBlock.java
@@ -393,11 +393,6 @@ public class ParForStatementBlock extends ForStatementBlock
return vs;
}
- /**
- *
- * @param sb
- * @return
- */
public ArrayList<String> getReadOnlyParentVars()
{
ArrayList<String> ret = new ArrayList<String>();
@@ -418,8 +413,8 @@ public class ParForStatementBlock extends ForStatementBlock
* Row-wise or column wise partitioning is only suggested if we see pure row-wise or
* column-wise access patterns.
*
- * @param var
- * @return
+ * @param var variables
+ * @return partition format
*/
public PDataPartitionFormat determineDataPartitionFormat(String var)
{
@@ -467,10 +462,10 @@ public class ParForStatementBlock extends ForStatementBlock
* This method recursively determines candidates for output,data,anti dependencies.
* Candidates are defined as writes to non-local variables.
*
- * @param asb
- * @param C
- * @param sCount
- * @throws LanguageException
+ * @param asb list of statement blocks
+ * @param C set of candidates
+ * @param sCount statement count
+ * @throws LanguageException if LanguageException occurs
*/
private void rDetermineCandidates(ArrayList<StatementBlock> asb, HashSet<Candidate> C, Integer sCount)
throws LanguageException
@@ -533,9 +528,10 @@ public class ParForStatementBlock extends ForStatementBlock
* This method recursively determines partitioning candidates for input variables.
* Candidates are defined as index reads of non-local variables.
*
- * @param asb
- * @param C
- * @throws LanguageException
+ * @param var variables
+ * @param asb list of statement blocks
+ * @param C list of partition formats
+ * @throws LanguageException if LanguageException occurs
*/
private void rDeterminePartitioningCandidates(String var, ArrayList<StatementBlock> asb, List<PDataPartitionFormat> C)
throws LanguageException
@@ -586,13 +582,7 @@ public class ParForStatementBlock extends ForStatementBlock
}
}
}
-
- /**
- *
- * @param var
- * @param datsRead
- * @param C
- */
+
private void rDeterminePartitioningCandidates(String var, List<DataIdentifier> datsRead, List<PDataPartitionFormat> C)
{
if( datsRead != null )
@@ -687,12 +677,12 @@ public class ParForStatementBlock extends ForStatementBlock
* (undetected dependency) but potentially false positives (misdetected dependency) can appear.
*
*
- * @param c
- * @param cdt
- * @param asb
- * @param sCount
- * @param dep
- * @throws LanguageException
+ * @param c candidate
+ * @param cdt candidate data type
+ * @param asb list of statement blocks
+ * @param sCount statement count
+ * @param dep array of boolean potential output dependencies
+ * @throws LanguageException if LanguageException occurs
*/
private void rCheckCandidates(Candidate c, DataType cdt, ArrayList<StatementBlock> asb,
Integer sCount, boolean[] dep)
@@ -851,9 +841,9 @@ public class ParForStatementBlock extends ForStatementBlock
/**
* Get all target/source DataIdentifiers of the given statement.
*
- * @param s
- * @param target
- * @return
+ * @param s statement
+ * @param target if true, get targets
+ * @return list of data identifiers
*/
private List<DataIdentifier> getDataIdentifiers(Statement s, boolean target)
{
@@ -988,12 +978,6 @@ public class ParForStatementBlock extends ForStatementBlock
return ret;
}
- /**
- *
- * @param sbs
- * @param flag
- * @throws LanguageException
- */
private void rDetermineBounds( ArrayList<StatementBlock> sbs, boolean flag )
throws LanguageException
{
@@ -1004,10 +988,9 @@ public class ParForStatementBlock extends ForStatementBlock
/**
* Determines the lower/upper bounds of all nested for/parfor indexes.
*
- * @param sbs
+ * @param sb statement block
* @param flag indicates that method is already in subtree of THIS.
- * @return
- * @throws LanguageException
+ * @throws LanguageException if LanguageException occurs
*/
private void rDetermineBounds( StatementBlock sb, boolean flag )
throws LanguageException
@@ -1102,12 +1085,6 @@ public class ParForStatementBlock extends ForStatementBlock
}
}
- /**
- *
- * @param cParent
- * @param cChild
- * @return
- */
private boolean rIsParent( ArrayList<StatementBlock> cParent, StatementBlock cChild)
{
for( StatementBlock sb : cParent )
@@ -1116,13 +1093,7 @@ public class ParForStatementBlock extends ForStatementBlock
return false;
}
-
- /**
- *
- * @param cParent
- * @param cChild
- * @return
- */
+
private boolean rIsParent( StatementBlock cParent, StatementBlock cChild)
{
boolean ret = false;
@@ -1168,10 +1139,10 @@ public class ParForStatementBlock extends ForStatementBlock
* dynamic lower, upper, and increment expressions, and (2) therefore potentially large
* overheads in the general case.
*
- * @param dat1
- * @param dat2
- * @return
- * @throws LanguageException
+ * @param dat1 data identifier 1
+ * @param dat2 data identifier 2
+ * @return true if "anti or data dependency"
+ * @throws LanguageException if LanguageException occurs
*/
private boolean runBanerjeeGCDTest(DataIdentifier dat1, DataIdentifier dat2)
throws LanguageException
@@ -1344,9 +1315,9 @@ public class ParForStatementBlock extends ForStatementBlock
* Runs a constant check for a single data identifier (target of assignment). If constant, then every
* iteration writes to the same cell.
*
- * @param dat1
- * @return
- * @throws LanguageException
+ * @param dat1 data identifier
+ * @return true if dependency
+ * @throws LanguageException if LanguageException occurs
*/
private boolean runConstantCheck(DataIdentifier dat1)
throws LanguageException
@@ -1393,10 +1364,10 @@ public class ParForStatementBlock extends ForStatementBlock
* Runs an equality check for two data identifiers. If equal, there there are no
* inter-iteration (loop-carried) but only intra-iteration dependencies.
*
- * @param dat1
- * @param dat2
- * @return
- * @throws LanguageException
+ * @param dat1 data identifier 1
+ * @param dat2 data identifier 2
+ * @return true if equal data identifiers
+ * @throws LanguageException if LanguageException occurs
*/
private boolean runEqualsCheck(DataIdentifier dat1, DataIdentifier dat2)
throws LanguageException
@@ -1456,9 +1427,9 @@ public class ParForStatementBlock extends ForStatementBlock
* This is the Euclid's algorithm for GCD (greatest common denominator),
* required for the GCD test.
*
- * @param a
- * @param b
- * @return
+ * @param a first value
+ * @param b second value
+ * @return greatest common denominator
*/
private long determineGCD(long a, long b)
{
@@ -1472,9 +1443,9 @@ public class ParForStatementBlock extends ForStatementBlock
* Creates or reuses a linear function for a given data identifier, where identifiers with equal
* names and matrix subscripts result in exactly the same linear function.
*
- * @param dat
- * @return
- * @throws LanguageException
+ * @param dat data identifier
+ * @return linear function
+ * @throws LanguageException if LanguageException occurs
*/
private LinearFunction getLinearFunction(DataIdentifier dat)
throws LanguageException
@@ -1761,8 +1732,8 @@ public class ParForStatementBlock extends ForStatementBlock
* where data identifiers with equal name and matrix subscripts results in equal
* functionIDs.
*
- * @param dat
- * @return
+ * @param dat indexed identifier
+ * @return string function id
*/
private String getFunctionID( IndexedIdentifier dat )
{
@@ -1793,7 +1764,7 @@ public class ParForStatementBlock extends ForStatementBlock
/**
* Removes all zero intercepts created by recursive computation.
*
- * @param f1
+ * @param f1 linear function
*/
private void cleanupFunction( LinearFunction f1 )
{
@@ -1812,8 +1783,8 @@ public class ParForStatementBlock extends ForStatementBlock
* Simply verification check of created linear functions, mainly used for
* robustness purposes.
*
- * @param f1
- * @throws LanguageException
+ * @param f1 linear function
+ * @throws LanguageException if LanguageException occurs
*/
private void verifyFunction(LinearFunction f1)
throws LanguageException
@@ -1844,8 +1815,8 @@ public class ParForStatementBlock extends ForStatementBlock
* Tries to obtain consistent linear functions by forcing the same variable ordering for
* efficient comparison: f2 is modified in a way that it matches the sequence of variables in f1.
*
- * @param f1
- * @param f2
+ * @param f1 linear function 1
+ * @param f2 linear function 2
*/
private void forceConsistency(LinearFunction f1, LinearFunction f2)
{
@@ -1890,9 +1861,9 @@ public class ParForStatementBlock extends ForStatementBlock
* Recursively creates a linear function for a single BinaryExpression, where PLUS, MINUS, MULT
* are allowed as operators.
*
- * @param be
- * @return
- * @throws LanguageException
+ * @param be binary expression
+ * @return linear function
+ * @throws LanguageException if LanguageException occurs
*/
private LinearFunction rParseBinaryExpression(BinaryExpression be)
throws LanguageException
@@ -1988,11 +1959,6 @@ public class ParForStatementBlock extends ForStatementBlock
return ret;
}
- /**
- *
- * @param expr
- * @return
- */
private Long parseLongConstant(Expression expr)
{
Long ret = null;
http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/234f5af9/src/main/java/org/apache/sysml/parser/ParameterizedBuiltinFunctionExpression.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/sysml/parser/ParameterizedBuiltinFunctionExpression.java b/src/main/java/org/apache/sysml/parser/ParameterizedBuiltinFunctionExpression.java
index cce1d77..438c90a 100644
--- a/src/main/java/org/apache/sysml/parser/ParameterizedBuiltinFunctionExpression.java
+++ b/src/main/java/org/apache/sysml/parser/ParameterizedBuiltinFunctionExpression.java
@@ -183,8 +183,6 @@ public class ParameterizedBuiltinFunctionExpression extends DataIdentifier
/**
* Validate parse tree : Process BuiltinFunction Expression in an assignment
* statement
- *
- * @throws LanguageException
*/
@Override
public void validateExpression(HashMap<String, DataIdentifier> ids, HashMap<String, ConstIdentifier> constVars, boolean conditional)
@@ -379,12 +377,6 @@ public class ParameterizedBuiltinFunctionExpression extends DataIdentifier
output.setDimensions(-1, -1);
}
- /**
- *
- * @param output
- * @param conditional
- * @throws LanguageException
- */
private void validateTransformDecode(DataIdentifier output, boolean conditional)
throws LanguageException
{
@@ -401,12 +393,6 @@ public class ParameterizedBuiltinFunctionExpression extends DataIdentifier
output.setDimensions(-1, -1);
}
- /**
- *
- * @param output
- * @param conditional
- * @throws LanguageException
- */
private void validateTransformMeta(DataIdentifier output, boolean conditional)
throws LanguageException
{
@@ -422,12 +408,6 @@ public class ParameterizedBuiltinFunctionExpression extends DataIdentifier
output.setDimensions(-1, -1);
}
- /**
- *
- * @param output
- * @param conditional
- * @throws LanguageException
- */
private void validateTransformEncode(DataIdentifier output1, DataIdentifier output2, boolean conditional)
throws LanguageException
{
@@ -558,12 +538,6 @@ public class ParameterizedBuiltinFunctionExpression extends DataIdentifier
}
- /**
- *
- * @param output
- * @param conditional
- * @throws LanguageException
- */
private void validateGroupedAgg(DataIdentifier output, boolean conditional)
throws LanguageException
{
@@ -753,12 +727,6 @@ public class ParameterizedBuiltinFunctionExpression extends DataIdentifier
return;
}
- /**
- *
- * @param output
- * @param conditional
- * @throws LanguageException
- */
private void validateCastAsString(DataIdentifier output, boolean conditional)
throws LanguageException
{
@@ -784,15 +752,6 @@ public class ParameterizedBuiltinFunctionExpression extends DataIdentifier
output.setDimensions(0, 0);
}
-
- /**
- *
- * @param fname
- * @param pname
- * @param dt
- * @param conditional
- * @throws LanguageException
- */
private void checkDataType( String fname, String pname, DataType dt, boolean conditional )
throws LanguageException
{
@@ -802,17 +761,7 @@ public class ParameterizedBuiltinFunctionExpression extends DataIdentifier
else if( data.getOutput().getDataType() != dt )
raiseValidateError("Input to "+fname+"::"+pname+" must be of type '"+dt.toString()+"'. It is of type '"+data.getOutput().getDataType()+"'.", conditional, LanguageErrorCodes.INVALID_PARAMETERS);
}
-
- /**
- *
- * @param fname
- * @param pname
- * @param dt
- * @param vt
- * @param conditional
- * @throws LanguageException
- */
private void checkDataValueType( String fname, String pname, DataType dt, ValueType vt, boolean conditional )
throws LanguageException
{
http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/234f5af9/src/main/java/org/apache/sysml/parser/RelationalExpression.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/sysml/parser/RelationalExpression.java b/src/main/java/org/apache/sysml/parser/RelationalExpression.java
index 9dd18a2..19e16ab 100644
--- a/src/main/java/org/apache/sysml/parser/RelationalExpression.java
+++ b/src/main/java/org/apache/sysml/parser/RelationalExpression.java
@@ -96,8 +96,7 @@ public class RelationalExpression extends Expression
}
/**
- * Validate parse tree : Process Relational Expression
- * @throws LanguageException
+ * Validate parse tree : Process Relational Expression
*/
@Override
public void validateExpression(HashMap<String,DataIdentifier> ids, HashMap<String, ConstIdentifier> constVars, boolean conditional)
@@ -172,8 +171,10 @@ public class RelationalExpression extends Expression
/**
* This is same as the function from BuiltinFunctionExpression which is called by ppred
- * @param expr1
- * @param expr2
+ *
+ * @param expr1 expression 1
+ * @param expr2 expression 2
+ * @param allowsMV ?
* @throws LanguageException
*/
private void checkMatchingDimensions(Expression expr1, Expression expr2, boolean allowsMV)
http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/234f5af9/src/main/java/org/apache/sysml/parser/Statement.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/sysml/parser/Statement.java b/src/main/java/org/apache/sysml/parser/Statement.java
index 532dbfa..8268796 100644
--- a/src/main/java/org/apache/sysml/parser/Statement.java
+++ b/src/main/java/org/apache/sysml/parser/Statement.java
@@ -140,13 +140,6 @@ public abstract class Statement
raiseValidateError(msg, conditional, null);
}
- /**
- *
- * @param msg
- * @param conditional
- * @param code
- * @throws LanguageException
- */
public void raiseValidateError( String msg, boolean conditional, String errorCode )
throws LanguageException
{
http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/234f5af9/src/main/java/org/apache/sysml/parser/StatementBlock.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/sysml/parser/StatementBlock.java b/src/main/java/org/apache/sysml/parser/StatementBlock.java
index 62278eb..af085d5 100644
--- a/src/main/java/org/apache/sysml/parser/StatementBlock.java
+++ b/src/main/java/org/apache/sysml/parser/StatementBlock.java
@@ -92,9 +92,6 @@ public class StatementBlock extends LiveVariableAnalysis
}
- /**
- * replace statement
- */
public void replaceStatement(int index, Statement passedStmt){
this._statements.set(index, passedStmt);
@@ -246,12 +243,6 @@ public class StatementBlock extends LiveVariableAnalysis
}
- /**
- *
- * @param fblock
- * @param prog
- * @return
- */
private boolean rIsInlineableFunction( FunctionStatementBlock fblock, DMLProgram prog )
{
boolean ret = true;
@@ -533,17 +524,6 @@ public class StatementBlock extends LiveVariableAnalysis
return newStatements;
}
- /**
- *
- * @param dmlProg
- * @param ids
- * @param constVars
- * @param conditional
- * @return
- * @throws LanguageException
- * @throws ParseException
- * @throws IOException
- */
public VariableSet validate(DMLProgram dmlProg, VariableSet ids, HashMap<String, ConstIdentifier> constVars, boolean conditional)
throws LanguageException, ParseException, IOException
{
@@ -971,25 +951,12 @@ public class StatementBlock extends LiveVariableAnalysis
///////////////////////////////////////////////////////////////
// validate error handling (consistent for all expressions)
- /**
- *
- * @param msg
- * @param conditional
- * @throws LanguageException
- */
public void raiseValidateError( String msg, boolean conditional )
throws LanguageException
{
raiseValidateError(msg, conditional, null);
}
- /**
- *
- * @param msg
- * @param conditional
- * @param code
- * @throws LanguageException
- */
public void raiseValidateError( String msg, boolean conditional, String errorCode )
throws LanguageException
{
http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/234f5af9/src/main/java/org/apache/sysml/parser/common/CommonSyntacticValidator.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/sysml/parser/common/CommonSyntacticValidator.java b/src/main/java/org/apache/sysml/parser/common/CommonSyntacticValidator.java
index 83f7823..bcdeffd 100644
--- a/src/main/java/org/apache/sysml/parser/common/CommonSyntacticValidator.java
+++ b/src/main/java/org/apache/sysml/parser/common/CommonSyntacticValidator.java
@@ -51,7 +51,6 @@ import org.apache.sysml.parser.PrintStatement;
import org.apache.sysml.parser.RelationalExpression;
import org.apache.sysml.parser.Statement;
import org.apache.sysml.parser.StringIdentifier;
-import org.apache.sysml.parser.dml.DmlParser.BuiltinFunctionExpressionContext;
import org.apache.sysml.parser.dml.DmlSyntacticValidator;
import org.apache.sysml.parser.pydml.PydmlSyntacticValidator;
@@ -580,36 +579,38 @@ public abstract class CommonSyntacticValidator {
/**
* Converts PyDML/DML built in functions to a common format for the runtime.
- * @param ctx
+ * @param ctx antlr rule context
* @param namespace Namespace of the function
* @param functionName Name of the builtin function
* @param paramExpression Array of parameter names and values
* @param fnName Token of the built in function identifier
- * @return
+ * @return common syntax format for runtime
*/
protected abstract ConvertedDMLSyntax convertToDMLSyntax(ParserRuleContext ctx, String namespace, String functionName, ArrayList<ParameterExpression> paramExpression,
Token fnName);
/**
- * Function overridden for DML & PyDML that handles any language specific builtin functions
- * @param ctx
- * @param functionName
- * @param paramExpressions
- * @return instance of {@link Expression}
+ * Function overridden for DML & PyDML that handles any language specific builtin functions
+ * @param ctx antlr rule context
+ * @param functionName Name of the builtin function
+ * @param paramExpressions Array of parameter names and values
+ * @return instance of {@link Expression}
*/
protected abstract Expression handleLanguageSpecificFunction(ParserRuleContext ctx, String functionName, ArrayList<ParameterExpression> paramExpressions);
/** Checks for builtin functions and does Action 'f'.
- * <br/>
+ * <p>
* Constructs the
* appropriate {@link AssignmentStatement} from
- * {@link CommonSyntacticValidator#functionCallAssignmentStatementHelper(ParserRuleContext, Set, Set, Expression, StatementInfo, Token, Token, String, String, ArrayList, boolean)
+ * {@link CommonSyntacticValidator#functionCallAssignmentStatementHelper(ParserRuleContext, Set, Set, Expression, StatementInfo, Token, Token, String, String, ArrayList, boolean)}
* or Assign to {@link Expression} from
- * {@link DmlSyntacticValidator#exitBuiltinFunctionExpression(BuiltinFunctionExpressionContext)}
- *
- * @param ctx
- * @param functionName
- * @param paramExpressions
+ * DmlSyntacticValidator's exitBuiltinFunctionExpression(BuiltinFunctionExpressionContext).
+ * </p>
+ *
+ * @param ctx antlr rule context
+ * @param functionName Name of the builtin function
+ * @param paramExpressions Array of parameter names and values
+ * @param f action to perform
* @return true if a builtin function was found
*/
protected boolean buildForBuiltInFunction(ParserRuleContext ctx, String functionName, ArrayList<ParameterExpression> paramExpressions, Action f) {
@@ -724,7 +725,7 @@ public abstract class CommonSyntacticValidator {
/**
* To allow for different actions in
- * {@link CommonSyntacticValidator#functionCallAssignmentStatementHelper(ParserRuleContext, Set, Set, Expression, StatementInfo, Token, Token, String, String, ArrayList)}
+ * {@link CommonSyntacticValidator#functionCallAssignmentStatementHelper(ParserRuleContext, Set, Set, Expression, StatementInfo, Token, Token, String, String, ArrayList, boolean)}
*/
public static interface Action {
public void execute(Expression e);
@@ -743,8 +744,8 @@ public abstract class CommonSyntacticValidator {
/**
* Indicates if the given data type string is a valid data type.
*
- * @param datatype
- * @param start
+ * @param datatype data type (matrix, frame, or scalar)
+ * @param start antlr token
*/
protected void checkValidDataType(String datatype, Token start) {
boolean validMatrixType =
http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/234f5af9/src/main/java/org/apache/sysml/parser/dml/DMLParserWrapper.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/sysml/parser/dml/DMLParserWrapper.java b/src/main/java/org/apache/sysml/parser/dml/DMLParserWrapper.java
index 25c6c6d..9c070d8 100644
--- a/src/main/java/org/apache/sysml/parser/dml/DMLParserWrapper.java
+++ b/src/main/java/org/apache/sysml/parser/dml/DMLParserWrapper.java
@@ -77,11 +77,11 @@ public class DMLParserWrapper extends AParserWrapper
/**
* Parses the passed file with command line parameters. You can either pass both (local file) or just dmlScript (hdfs) or just file name (import command)
- * @param fileName either full path or null --> only used for better error handling
- * @param dmlScript required
- * @param argVals
- * @return
- * @throws ParseException
+ * @param fileName either full path or null --> only used for better error handling
+ * @param dmlScript script file contents
+ * @param argVals script arguments
+ * @return dml program, or null if error
+ * @throws ParseException if ParseException occurs
*/
@Override
public DMLProgram parse(String fileName, String dmlScript, Map<String,String> argVals) throws ParseException {
@@ -96,8 +96,8 @@ public class DMLParserWrapper extends AParserWrapper
* @param dmlScript script file contents
* @param sourceNamespace namespace from source statement
* @param argVals script arguments
- * @return null if at least one error
- * @throws ParseException
+ * @return dml program, or null if at least one error
+ * @throws ParseException if ParseException occurs
*/
public DMLProgram doParse(String fileName, String dmlScript, String sourceNamespace, Map<String,String> argVals) throws ParseException {
DMLProgram dmlPgm = null;
http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/234f5af9/src/main/java/org/apache/sysml/parser/pydml/PyDMLParserWrapper.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/sysml/parser/pydml/PyDMLParserWrapper.java b/src/main/java/org/apache/sysml/parser/pydml/PyDMLParserWrapper.java
index e98df38..2799bc4 100644
--- a/src/main/java/org/apache/sysml/parser/pydml/PyDMLParserWrapper.java
+++ b/src/main/java/org/apache/sysml/parser/pydml/PyDMLParserWrapper.java
@@ -61,11 +61,11 @@ public class PyDMLParserWrapper extends AParserWrapper
/**
* Parses the passed file with command line parameters. You can either pass both (local file) or just dmlScript (hdfs) or just file name (import command)
- * @param fileName either full path or null --> only used for better error handling
- * @param dmlScript required
- * @param argVals
- * @return
- * @throws ParseException
+ * @param fileName either full path or null --> only used for better error handling
+ * @param dmlScript script file contents
+ * @param argVals script arguments
+ * @return dml program, or null if error
+ * @throws ParseException if ParseException occurs
*/
@Override
public DMLProgram parse(String fileName, String dmlScript, Map<String,String> argVals) throws ParseException {
@@ -80,8 +80,8 @@ public class PyDMLParserWrapper extends AParserWrapper
* @param dmlScript script file contents
* @param sourceNamespace namespace from source statement
* @param argVals script arguments
- * @return null if at least one error
- * @throws ParseException
+ * @return dml program, or null if at least one error
+ * @throws ParseException if ParseException occurs
*/
public DMLProgram doParse(String fileName, String dmlScript, String sourceNamespace, Map<String,String> argVals) throws ParseException {
DMLProgram dmlPgm = null;
http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/234f5af9/src/main/java/org/apache/sysml/parser/pydml/PydmlSyntacticValidator.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/sysml/parser/pydml/PydmlSyntacticValidator.java b/src/main/java/org/apache/sysml/parser/pydml/PydmlSyntacticValidator.java
index b7626dc..cc886cd 100644
--- a/src/main/java/org/apache/sysml/parser/pydml/PydmlSyntacticValidator.java
+++ b/src/main/java/org/apache/sysml/parser/pydml/PydmlSyntacticValidator.java
@@ -19,6 +19,14 @@
package org.apache.sysml.parser.pydml;
+import java.io.File;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
import org.antlr.v4.runtime.ParserRuleContext;
import org.antlr.v4.runtime.Token;
import org.antlr.v4.runtime.tree.ErrorNode;
@@ -58,8 +66,6 @@ import org.apache.sysml.parser.common.CommonSyntacticValidator;
import org.apache.sysml.parser.common.CustomErrorListener;
import org.apache.sysml.parser.common.ExpressionInfo;
import org.apache.sysml.parser.common.StatementInfo;
-import org.apache.sysml.parser.dml.DmlParser.MatrixMulExpressionContext;
-import org.apache.sysml.parser.dml.DmlSyntacticValidator;
import org.apache.sysml.parser.pydml.PydmlParser.AddSubExpressionContext;
import org.apache.sysml.parser.pydml.PydmlParser.AssignmentStatementContext;
import org.apache.sysml.parser.pydml.PydmlParser.AtomicExpressionContext;
@@ -110,14 +116,6 @@ import org.apache.sysml.parser.pydml.PydmlParser.UnaryExpressionContext;
import org.apache.sysml.parser.pydml.PydmlParser.ValueDataTypeCheckContext;
import org.apache.sysml.parser.pydml.PydmlParser.WhileStatementContext;
-import java.io.File;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
/**
* TODO: Refactor duplicated parser code dml/pydml (entire package).
*
@@ -438,9 +436,9 @@ public class PydmlSyntacticValidator extends CommonSyntacticValidator implements
* Increment lower indices by 1 when translating from PyDML
* (0-based indexing) to DML (1-based indexing).
*
- * @param expr
- * @param ctx
- * @return
+ * @param expr expression
+ * @param ctx antlr rule context
+ * @return expression
*/
private Expression incrementByOne(Expression expr, ParserRuleContext ctx) {
// Addition and subtraction operator same as DML
@@ -575,7 +573,7 @@ public class PydmlSyntacticValidator extends CommonSyntacticValidator implements
// -----------------------------------------------------------------
/** Similar to the "axis" argument in numpy.
- * @param ctx
+ * @param ctx parameter expression
* @return 0 (along rows), 1 (along column) or -1 (for error)
*/
private int getAxis(ParameterExpression ctx) {
@@ -653,12 +651,12 @@ public class PydmlSyntacticValidator extends CommonSyntacticValidator implements
/**
* Check function name, namespace, parameters (#params & possible values) and produce useful messages/hints
- * @param ctx
- * @param namespace
- * @param functionName
- * @param paramExpression
- * @param fnName
- * @return
+ * @param ctx antlr rule context
+ * @param namespace Namespace of the function
+ * @param functionName Name of the builtin function
+ * @param paramExpression Array of parameter names and values
+ * @param fnName Token of the builtin function identifier
+ * @return common syntax format for runtime
*/
private ConvertedDMLSyntax convertPythonBuiltinFunctionToDMLSyntax(ParserRuleContext ctx, String namespace, String functionName, ArrayList<ParameterExpression> paramExpression,
Token fnName) {
@@ -1094,7 +1092,7 @@ public class PydmlSyntacticValidator extends CommonSyntacticValidator implements
* For Pydml, matrix multiply is invoked using dot (A, B). This is taken from numpy.dot
* For Dml, it is invoked using "%*%". The dot function call in pydml is converted to a
* {@link BinaryExpression} equivalent to what is done in
- * {@link DmlSyntacticValidator#exitMatrixMulExpression(MatrixMulExpressionContext)}
+ * DmlSyntacticValidator's exitMatrixMulExpression(MatrixMulExpressionContext).
*/
@Override
protected Expression handleLanguageSpecificFunction(ParserRuleContext ctx, String functionName, ArrayList<ParameterExpression> paramExpression){
http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/234f5af9/src/main/java/org/apache/sysml/runtime/instructions/Instruction.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/sysml/runtime/instructions/Instruction.java b/src/main/java/org/apache/sysml/runtime/instructions/Instruction.java
index c02c64f..7676317 100644
--- a/src/main/java/org/apache/sysml/runtime/instructions/Instruction.java
+++ b/src/main/java/org/apache/sysml/runtime/instructions/Instruction.java
@@ -215,8 +215,8 @@ public abstract class Instruction
/**
* This method should be used to execute the instruction.
*
- * @param ec
- * @throws DMLRuntimeException
+ * @param ec execution context
+ * @throws DMLRuntimeException if DMLRuntimeException occurs
*/
public abstract void processInstruction(ExecutionContext ec)
throws DMLRuntimeException;
http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/234f5af9/src/main/java/org/apache/sysml/udf/BinaryObject.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/sysml/udf/BinaryObject.java b/src/main/java/org/apache/sysml/udf/BinaryObject.java
index ba87c4e..8fb2f8f 100644
--- a/src/main/java/org/apache/sysml/udf/BinaryObject.java
+++ b/src/main/java/org/apache/sysml/udf/BinaryObject.java
@@ -33,7 +33,7 @@ public class BinaryObject extends FunctionParameter
/**
* constructor that takes object as param
*
- * @param o
+ * @param o object
*/
public BinaryObject(Object o) {
super( FunctionParameterType.Object );
@@ -43,7 +43,7 @@ public class BinaryObject extends FunctionParameter
/**
* Method to retrieve object.
*
- * @return
+ * @return object
*/
public Object getObject() {
return _o;
http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/234f5af9/src/main/java/org/apache/sysml/udf/FunctionParameter.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/sysml/udf/FunctionParameter.java b/src/main/java/org/apache/sysml/udf/FunctionParameter.java
index 58e486b..a45065c 100644
--- a/src/main/java/org/apache/sysml/udf/FunctionParameter.java
+++ b/src/main/java/org/apache/sysml/udf/FunctionParameter.java
@@ -46,7 +46,7 @@ public abstract class FunctionParameter implements Serializable
/**
* Constructor to set type
*
- * @param type
+ * @param type function parameter type
*/
public FunctionParameter(FunctionParameterType type) {
_type = type;
@@ -55,7 +55,7 @@ public abstract class FunctionParameter implements Serializable
/**
* Method to get type
*
- * @return
+ * @return function parameter type
*/
public FunctionParameterType getType() {
return _type;
http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/234f5af9/src/main/java/org/apache/sysml/udf/Matrix.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/sysml/udf/Matrix.java b/src/main/java/org/apache/sysml/udf/Matrix.java
index 98f1d4b..0dcbb54 100644
--- a/src/main/java/org/apache/sysml/udf/Matrix.java
+++ b/src/main/java/org/apache/sysml/udf/Matrix.java
@@ -62,9 +62,9 @@ public class Matrix extends FunctionParameter
* with a default filename of ExternalFunctionProgramBlockCP and hence, should only
* be used by CP external functions.
*
- * @param rows
- * @param cols
- * @param vType
+ * @param rows number of rows
+ * @param cols number of columns
+ * @param vType value type
*/
public Matrix(long rows, long cols, ValueType vType) {
this( ExternalFunctionProgramBlockCP.DEFAULT_FILENAME,
@@ -75,10 +75,10 @@ public class Matrix extends FunctionParameter
* Constructor that takes matrix file path, num rows, num cols, and matrix
* value type as parameters.
*
- * @param path
- * @param rows
- * @param cols
- * @param vType
+ * @param path file path
+ * @param rows number of rows
+ * @param cols number of columns
+ * @param vType value type
*/
public Matrix(String path, long rows, long cols, ValueType vType) {
super(FunctionParameterType.Matrix);
@@ -101,7 +101,7 @@ public class Matrix extends FunctionParameter
/**
* Method to get file path for matrix.
*
- * @return
+ * @return file path
*/
public String getFilePath() {
return _filePath;
@@ -110,7 +110,7 @@ public class Matrix extends FunctionParameter
/**
* Method to get the number of rows in the matrix.
*
- * @return
+ * @return number of rows
*/
public long getNumRows() {
return _rows;
@@ -119,7 +119,7 @@ public class Matrix extends FunctionParameter
/**
* Method to get the number of cols in the matrix.
*
- * @return
+ * @return number of columns
*/
public long getNumCols() {
@@ -129,7 +129,7 @@ public class Matrix extends FunctionParameter
/**
* Method to get value type for this matrix.
*
- * @return
+ * @return value type
*/
public ValueType getValueType() {
return _vType;
@@ -140,9 +140,9 @@ public class Matrix extends FunctionParameter
* user knows the matrix fits in memory. We are using the dense
* representation.
*
- * @return
- * @throws DMLRuntimeException
- * @throws IOException
+ * @return matrix as two-dimensional double array
+ * @throws DMLRuntimeException if DMLRuntimeException occurs
+ * @throws IOException if IOException occurs
*/
public double[][] getMatrixAsDoubleArray()
throws DMLRuntimeException, IOException
@@ -169,9 +169,9 @@ public class Matrix extends FunctionParameter
* user knows the matrix fits in memory. We are using the dense
* representation.
*
- * @return
- * @throws IOException
- * @throws DMLRuntimeException
+ * @param data matrix as 2-dimensional double array
+ * @throws IOException if IOException occurs
+ * @throws DMLRuntimeException if DMLRuntimeException occurs
*/
public void setMatrixDoubleArray(double[][] data /*, OutputInfo oinfo, InputInfo iinfo*/)
throws IOException, DMLRuntimeException
@@ -185,9 +185,9 @@ public class Matrix extends FunctionParameter
* user knows the matrix fits in memory. We are using the dense
* representation.
*
- * @return
- * @throws IOException
- * @throws DMLRuntimeException
+ * @param data matrix as double array
+ * @throws IOException if IOException occurs
+ * @throws DMLRuntimeException if DMLRuntimeException occurs
*/
public void setMatrixDoubleArray(double[] data /*, OutputInfo oinfo, InputInfo iinfo*/)
throws IOException, DMLRuntimeException
@@ -201,8 +201,10 @@ public class Matrix extends FunctionParameter
* user knows the matrix fits in memory. We are using the dense
* representation.
*
- * @return
- * @throws IOException
+ * @param mb matrix block
+ * @param oinfo output info
+ * @param iinfo input info
+ * @throws IOException if IOException occurs
*/
public void setMatrixDoubleArray(MatrixBlock mb, OutputInfo oinfo, InputInfo iinfo)
throws IOException
http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/234f5af9/src/main/java/org/apache/sysml/udf/PackageFunction.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/sysml/udf/PackageFunction.java b/src/main/java/org/apache/sysml/udf/PackageFunction.java
index 3c01553..44ff86b 100644
--- a/src/main/java/org/apache/sysml/udf/PackageFunction.java
+++ b/src/main/java/org/apache/sysml/udf/PackageFunction.java
@@ -52,7 +52,7 @@ public abstract class PackageFunction implements Serializable
/**
* Method to get the number of inputs to this package function.
*
- * @return
+ * @return number of inputs
*/
public final int getNumFunctionInputs() {
if (_function_inputs == null)
@@ -64,8 +64,8 @@ public abstract class PackageFunction implements Serializable
/**
* Method to get a specific input to this package function.
*
- * @param pos
- * @return
+ * @param pos input position
+ * @return function parameter
*/
public final FunctionParameter getFunctionInput(int pos) {
if (_function_inputs == null || _function_inputs.size() <= pos)
@@ -78,7 +78,7 @@ public abstract class PackageFunction implements Serializable
* Method to get the number of outputs of this package function. This method
* should be implemented in the user's function.
*
- * @return
+ * @return number of outputs
*/
public abstract int getNumFunctionOutputs();
@@ -86,15 +86,15 @@ public abstract class PackageFunction implements Serializable
* Method to get a specific output of this package function. This method
* should be implemented in the user's function.
*
- * @param pos
- * @return
+ * @param pos function position
+ * @return function parameter
*/
public abstract FunctionParameter getFunctionOutput(int pos);
/**
* Method to set the number of inputs for this package function
*
- * @param numInputs
+ * @param numInputs number of inputs
*/
public final void setNumFunctionInputs(int numInputs) {
if (_function_inputs == null)
@@ -111,8 +111,8 @@ public abstract class PackageFunction implements Serializable
/**
* Method to set a specific input for this package function
*
- * @param input
- * @param pos
+ * @param input function parameter input
+ * @param pos input position
*/
public final void setInput(FunctionParameter input, int pos) {
if (_function_inputs == null || _function_inputs.size() <= pos)
@@ -125,7 +125,7 @@ public abstract class PackageFunction implements Serializable
/**
* Method to set the configuration file for this function.
*
- * @param fName
+ * @param fName configuration file name
*/
public final void setConfiguration(String fName) {
_configurationFile = fName;
@@ -134,24 +134,16 @@ public abstract class PackageFunction implements Serializable
/**
* Method to get the configuration file name
*
- * @return
+ * @return configuration file name
*/
public final String getConfiguration() {
return _configurationFile;
}
-
- /**
- *
- * @param dir
- */
+
public void setBaseDir(String dir) {
_baseDir = dir;
}
- /**
- *
- * @return
- */
public String getBaseDir() {
return _baseDir;
}
http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/234f5af9/src/main/java/org/apache/sysml/udf/Scalar.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/sysml/udf/Scalar.java b/src/main/java/org/apache/sysml/udf/Scalar.java
index 7be664f..a738da5 100644
--- a/src/main/java/org/apache/sysml/udf/Scalar.java
+++ b/src/main/java/org/apache/sysml/udf/Scalar.java
@@ -41,8 +41,8 @@ public class Scalar extends FunctionParameter
/**
* Constructor to setup a scalar object.
*
- * @param t
- * @param val
+ * @param t scalar value type
+ * @param val value
*/
public Scalar(ScalarValueType t, String val) {
super(FunctionParameterType.Scalar);
@@ -53,7 +53,7 @@ public class Scalar extends FunctionParameter
/**
* Method to get type of scalar.
*
- * @return
+ * @return scalar value type
*/
public ScalarValueType getScalarType() {
return _sType;
@@ -62,7 +62,7 @@ public class Scalar extends FunctionParameter
/**
* Method to get value for scalar.
*
- * @return
+ * @return scalar value
*/
public String getValue() {
return _value;
http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/234f5af9/src/main/java/org/apache/sysml/udf/lib/DynamicReadMatrixCP.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/sysml/udf/lib/DynamicReadMatrixCP.java b/src/main/java/org/apache/sysml/udf/lib/DynamicReadMatrixCP.java
index c386021..793e9de 100644
--- a/src/main/java/org/apache/sysml/udf/lib/DynamicReadMatrixCP.java
+++ b/src/main/java/org/apache/sysml/udf/lib/DynamicReadMatrixCP.java
@@ -30,10 +30,6 @@ import org.apache.sysml.udf.PackageFunction;
import org.apache.sysml.udf.Scalar;
import org.apache.sysml.udf.Matrix.ValueType;
-/**
- *
- *
- */
public class DynamicReadMatrixCP extends PackageFunction
{
http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/234f5af9/src/main/java/org/apache/sysml/udf/lib/DynamicReadMatrixRcCP.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/sysml/udf/lib/DynamicReadMatrixRcCP.java b/src/main/java/org/apache/sysml/udf/lib/DynamicReadMatrixRcCP.java
index 6077885..188d337 100644
--- a/src/main/java/org/apache/sysml/udf/lib/DynamicReadMatrixRcCP.java
+++ b/src/main/java/org/apache/sysml/udf/lib/DynamicReadMatrixRcCP.java
@@ -31,10 +31,6 @@ import org.apache.sysml.udf.Scalar;
import org.apache.sysml.udf.Matrix.ValueType;
import org.apache.sysml.udf.Scalar.ScalarValueType;
-/**
- *
- *
- */
public class DynamicReadMatrixRcCP extends PackageFunction
{
http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/234f5af9/src/main/java/org/apache/sysml/udf/lib/DynamicWriteMatrixCP.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/sysml/udf/lib/DynamicWriteMatrixCP.java b/src/main/java/org/apache/sysml/udf/lib/DynamicWriteMatrixCP.java
index 1674a2e..96ba4d9 100644
--- a/src/main/java/org/apache/sysml/udf/lib/DynamicWriteMatrixCP.java
+++ b/src/main/java/org/apache/sysml/udf/lib/DynamicWriteMatrixCP.java
@@ -30,10 +30,6 @@ import org.apache.sysml.udf.PackageFunction;
import org.apache.sysml.udf.Scalar;
import org.apache.sysml.udf.Scalar.ScalarValueType;
-/**
- *
- *
- */
@Deprecated
public class DynamicWriteMatrixCP extends PackageFunction
{
http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/234f5af9/src/main/java/org/apache/sysml/udf/lib/GatherWrapper.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/sysml/udf/lib/GatherWrapper.java b/src/main/java/org/apache/sysml/udf/lib/GatherWrapper.java
index 748d120..63786b8 100644
--- a/src/main/java/org/apache/sysml/udf/lib/GatherWrapper.java
+++ b/src/main/java/org/apache/sysml/udf/lib/GatherWrapper.java
@@ -28,14 +28,14 @@ import org.apache.sysml.udf.Matrix.ValueType;
/**
* Wrapper class for conversions of bit vectors to condensed position vectors.
* The semantics are equivalent to the following dml snippet:
- * # bitvector into position vector, e.g., 1011 -> 1034
+ * # bitvector into position vector, e.g., 1011 -> 1034
* Bv = seq(1,nrow(B)) * B;
* # gather positions into condensed vector
* V = removeEmpty(target=Bv, margin="rows");
*
* Note that the inverse operation would be a scatter that can be implemented
* via the following dml snippet:
- * # position vector into bit vector, e.g., 1034 -> 1011
+ * # position vector into bit vector, e.g., 1034 -> 1011
* B = table( V, 1 );
*/
public class GatherWrapper extends PackageFunction
http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/234f5af9/src/main/java/org/apache/sysml/udf/lib/OrderWrapper.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/sysml/udf/lib/OrderWrapper.java b/src/main/java/org/apache/sysml/udf/lib/OrderWrapper.java
index cca6c4d..8686ddc 100644
--- a/src/main/java/org/apache/sysml/udf/lib/OrderWrapper.java
+++ b/src/main/java/org/apache/sysml/udf/lib/OrderWrapper.java
@@ -83,10 +83,6 @@ public class OrderWrapper extends PackageFunction
}
}
- /**
- *
- *
- */
private static class AscRowComparator implements Comparator<double[]>
{
private int _col = -1;
@@ -102,11 +98,7 @@ public class OrderWrapper extends PackageFunction
return (arg0[_col] < arg1[_col] ? -1 : (arg0[_col] == arg1[_col] ? 0 : 1));
}
}
-
- /**
- *
- *
- */
+
private static class DescRowComparator implements Comparator<double[]>
{
private int _col = -1;
http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/234f5af9/src/main/java/org/apache/sysml/udf/lib/PermutationMatrixWrapper.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/sysml/udf/lib/PermutationMatrixWrapper.java b/src/main/java/org/apache/sysml/udf/lib/PermutationMatrixWrapper.java
index c4ce0c6..845d92e 100644
--- a/src/main/java/org/apache/sysml/udf/lib/PermutationMatrixWrapper.java
+++ b/src/main/java/org/apache/sysml/udf/lib/PermutationMatrixWrapper.java
@@ -116,10 +116,6 @@ public class PermutationMatrixWrapper extends PackageFunction
}
}
- /**
- *
- *
- */
private static class AscRowComparator implements Comparator<double[]> {
private int _col = -1;
@@ -134,10 +130,6 @@ public class PermutationMatrixWrapper extends PackageFunction
}
}
- /**
- *
- *
- */
private static class DescRowComparator implements Comparator<double[]> {
private int _col = -1;
http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/234f5af9/src/main/java/org/apache/sysml/udf/lib/RemoveEmptyRows.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/sysml/udf/lib/RemoveEmptyRows.java b/src/main/java/org/apache/sysml/udf/lib/RemoveEmptyRows.java
index 046b7b2..b45d225 100644
--- a/src/main/java/org/apache/sysml/udf/lib/RemoveEmptyRows.java
+++ b/src/main/java/org/apache/sysml/udf/lib/RemoveEmptyRows.java
@@ -42,10 +42,6 @@ import org.apache.sysml.udf.Matrix;
import org.apache.sysml.udf.PackageFunction;
import org.apache.sysml.udf.Matrix.ValueType;
-/**
- *
- *
- */
@Deprecated
public class RemoveEmptyRows extends PackageFunction
{