This is an automated email from the ASF dual-hosted git repository.
arnabp20 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/systemds.git
The following commit(s) were added to refs/heads/master by this push:
new cc6bffd [SYSTEMDS-335] Rename lineage cache eviction policies
cc6bffd is described below
commit cc6bffd37e3d6a7275807bef9292950d9b52fd2c
Author: arnabp <ar...@tugraz.at>
AuthorDate: Fri Jul 17 13:06:35 2020 +0200
[SYSTEMDS-335] Rename lineage cache eviction policies
This patch renames WEIGHTED policy to COSTNSIZE.
---
src/main/java/org/apache/sysds/api/DMLOptions.java | 2 +-
.../java/org/apache/sysds/runtime/lineage/LineageCacheConfig.java | 4 ++--
.../apache/sysds/test/functions/lineage/CacheEvictionTest.java | 8 ++++----
3 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/src/main/java/org/apache/sysds/api/DMLOptions.java b/src/main/java/org/apache/sysds/api/DMLOptions.java
index 5d8b360..fe95510 100644
--- a/src/main/java/org/apache/sysds/api/DMLOptions.java
+++ b/src/main/java/org/apache/sysds/api/DMLOptions.java
@@ -132,7 +132,7 @@ public class DMLOptions {
else if (lineageType.equalsIgnoreCase("policy_lru"))
dmlOptions.linCachePolicy = LineageCachePolicy.LRU;
else if (lineageType.equalsIgnoreCase("policy_weighted"))
- dmlOptions.linCachePolicy = LineageCachePolicy.WEIGHTED;
+ dmlOptions.linCachePolicy = LineageCachePolicy.COSTNSIZE;
else if (lineageType.equalsIgnoreCase("policy_hybrid"))
dmlOptions.linCachePolicy = LineageCachePolicy.HYBRID;
else
diff --git a/src/main/java/org/apache/sysds/runtime/lineage/LineageCacheConfig.java b/src/main/java/org/apache/sysds/runtime/lineage/LineageCacheConfig.java
index 924c5f2..f17e055 100644
--- a/src/main/java/org/apache/sysds/runtime/lineage/LineageCacheConfig.java
+++ b/src/main/java/org/apache/sysds/runtime/lineage/LineageCacheConfig.java
@@ -116,7 +116,7 @@ public class LineageCacheConfig
public enum LineageCachePolicy {
LRU,
- WEIGHTED,
+ COSTNSIZE,
HYBRID;
}
@@ -219,7 +219,7 @@ public class LineageCacheConfig
case LRU:
WEIGHTS[0] = 0; WEIGHTS[1] = 1;
break;
- case WEIGHTED:
+ case COSTNSIZE:
WEIGHTS[0] = 1; WEIGHTS[1] = 0;
break;
case HYBRID:
diff --git a/src/test/java/org/apache/sysds/test/functions/lineage/CacheEvictionTest.java b/src/test/java/org/apache/sysds/test/functions/lineage/CacheEvictionTest.java
index 417d0a9..dd8d4d8 100644
--- a/src/test/java/org/apache/sysds/test/functions/lineage/CacheEvictionTest.java
+++ b/src/test/java/org/apache/sysds/test/functions/lineage/CacheEvictionTest.java
@@ -103,19 +103,19 @@ public class CacheEvictionTest extends AutomatedTestBase {
long hitCount_lru = LineageCacheStatistics.getInstHits();
long evictedCount_lru = LineageCacheStatistics.getMemDeletes();
- // Weighted scheme (computationTime/Size)
+ // costnsize scheme (computationTime/Size)
proArgs.clear();
proArgs.add("-stats");
proArgs.add("-lineage");
proArgs.add(ReuseCacheType.REUSE_FULL.name().toLowerCase());
- proArgs.add("policy_weighted");
+ proArgs.add("policy_costnsize");
proArgs.add("-args");
proArgs.add(String.valueOf(cacheSize));
proArgs.add(output("R"));
programArgs = proArgs.toArray(new String[proArgs.size()]);
Lineage.resetInternalState();
runTest(true, EXCEPTION_NOT_EXPECTED, null, -1);
- HashMap<MatrixValue.CellIndex, Double> R_weighted= readDMLMatrixFromHDFS("R");
+ HashMap<MatrixValue.CellIndex, Double> R_costnsize= readDMLMatrixFromHDFS("R");
long expCount_wt = Statistics.getCPHeavyHitterCount("exp");
long hitCount_wt = LineageCacheStatistics.getInstHits();
long evictedCount_wt = LineageCacheStatistics.getMemDeletes();
@@ -123,7 +123,7 @@ public class CacheEvictionTest extends AutomatedTestBase {
// Compare results
Lineage.setLinReuseNone();
- TestUtils.compareMatrices(R_lru, R_weighted, 1e-6, "LRU", "Weighted");
+ TestUtils.compareMatrices(R_lru, R_costnsize, 1e-6, "LRU", "costnsize");
// Compare reused instructions
Assert.assertTrue(expCount_lru > expCount_wt);