Remove platform dependent default config

parsa-epfl · Aug 10, 2019 · f00dc02 · f00dc02
1 parent 40dd4b2
commit f00dc02
Show file tree

Hide file tree

Showing 16 changed files with 67 additions and 89 deletions.
diff --git a/data-analytics/default.cfg b/data-analytics/default.cfg
@@ -13,9 +13,8 @@ HADOOP=zilutian/hadoop
 MASTER_IMAGE=zilutian/data-analytics 
 MASTER_CONTAINER=master
 WORKER_CONTAINER=slave
-WIKI_FILE=/home/user.3684/wiki_vol/wiki_dump.xml
+WIKI_FILE=
 
 NET=hadoop-net
 CWD=`pwd`
-OPERATIONS_FILE=operations.txt
 
diff --git a/data-analytics/user.cfg b/data-analytics/user.cfg
@@ -2,9 +2,8 @@
 
 source ../common/requirements
 
-MASTER_CPUS=1
-WORKER_CPUS=(0)
-MEASURE_TIME=3000
+MASTER_CPUS=
+WORKER_CPUS=
 
 DEV=1
 
@@ -20,5 +19,5 @@ else
     exit
 fi
 
-PERF_EVENTS=$INST,$CYCLES,$UOPS_RETIRED_U,$UOPS_RETIRED
+PERF_EVENTS=
 
diff --git a/data-caching/default.cfg b/data-caching/default.cfg
@@ -2,24 +2,20 @@
 
 source ../common/utils
 
-OUT=out #tmp folder  
+OUT=out   
 RESULTS=experiments
 PERF_LOG=$OUT/perf.txt
 CLIENT_LOG=$OUT/client-result.txt
 CLIENT_SUMMARY=$OUT/summary.txt
+UTIL_LOG=$OUT/util.txt
 
-SERVER_IMAGE=zilutian/data-caching:server-amd64 
-CLIENT_IMAGE=zilutian/data-caching:client-amd64
+SERVER_IMAGE= 
+CLIENT_IMAGE=
 
 NET=data_caching_net
 
 SERVER_CONTAINER=dc-server
 CLIENT_CONTAINER=dc-client
 
-LOCKDIR=/tmp/data-caching.lock
 CWD=`pwd`
 
-NUM_SERVERS=${#SERVER_CPUS[@]}
-SERVER_PIDS=""
-SERVER_CPUS_STR=$(cvt_cpu)
-
diff --git a/data-caching/user.cfg b/data-caching/user.cfg
@@ -1,13 +1,12 @@
 #!/bin/bash 
 source ../common/requirements
 
-SERVER_CPUS=(0,2,4,6,8,10)
-CLIENT_CPUS=1,3,5,7,9,11,13,15,17,19,21,23
+SERVER_CPUS=
+CLIENT_CPUS=
 
-#MEASURE_TIME=100
-DATASET_SCALE=20
-WORKER_NUM=12
-SERVER_NUM=6
+DATASET_SCALE=
+WORKER_NUM=
+SERVER_NUM=
 RPS_FILE=rps.txt
 DEV=1
 
@@ -21,5 +20,5 @@ else
     exit
 fi
 
-PERF_EVENTS=$INST,$CYCLES,$UOPS_RETIRED_U,$UOPS_RETIRED
+PERF_EVENTS=
 
diff --git a/data-serving/default.cfg b/data-serving/default.cfg
@@ -7,19 +7,18 @@ RESULTS=experiments
 PERF_LOG=$OUT/perf.txt
 CLIENT_LOG=$OUT/client-result.txt
 OPERATIONS=$OUT/operations.txt
+UTIL_LOG=$OUT/util.txt
 
-THREADS=64
 THREADS_LOAD=50
-MULTIPLIER=100
+MULTIPLIER=1000
 OPERATIONS_FILE=operations.txt
 
-CLIENT_IMAGE=zilutian/data-serving-client-v2
-SERVER_IMAGE=zilutian/data-serving:server-amd64
+CLIENT_IMAGE=
+SERVER_IMAGE=
 
 CLIENT_CONTAINER=cassandra-client
 SERVER_CONTAINER=cassandra-server
 
 HOSTNAME=cassandra-server
 NET=serving_network 
 
-LOCKDIR=/tmp/web-search.lock
diff --git a/data-serving/user.cfg b/data-serving/user.cfg
@@ -1,14 +1,14 @@
 #!/bin/bash 
 source ../common/requirements
 
-CLIENT_CPUS=0
-SERVER_CPUS=1
+CLIENT_CPUS=
+SERVER_CPUS=
 SERVER_MEMORY=20g
 
 LOAD=1 #valid: 1(true), 0(false) 
 
 RECORDS=1000000
-WARMUP=10 #operations for warmup 
+WARMUP=50000 #operations for warmup 
 DEV=1
 
 PLAT=$(get_platform)
@@ -21,5 +21,5 @@ else
     exit
 fi
 
-PERF_EVENTS=$INST,$CYCLES,$UOPS_RETIRED_U,$UOPS_RETIRED
+PERF_EVENTS=
 
diff --git a/graph-analytics/default.cfg b/graph-analytics/default.cfg
@@ -22,9 +22,4 @@ WORKER_CONTAINER=spark-worker
 CLIENT_CONTAINER=client
 DATASET_CONTAINER=graph-analytics-data
 
-LOCKDIR=/tmp/graph-analytics.lock
-LOCKDIR_RUN=/tmp/graph-analytics-run.lock 
-NUM_WORKERS=${#WORKER_CPUS[@]}
-WORKER_PIDS=""
-WORKER_CPUS_STR=$(cvt_cpu)
-
+LOCKDIR_RUN=/tmp/graph-analytics-run.lock
diff --git a/graph-analytics/user.cfg b/graph-analytics/user.cfg
@@ -1,16 +1,15 @@
 #!/bin/bash 
 source ../common/requirements
 
-MASTER_CPUS=0
-WORKER_CPUS=(2) #An array, comma separated for mul. workers
-CLIENT_CPUS=30
+MASTER_CPUS=
+WORKER_CPUS= 
+CLIENT_CPUS=
 
-DRIVER_MEM=1g
-EXECUTOR_MEM=4g
+DRIVER_MEM=
+EXECUTOR_MEM=
 
 DEV=1
-MEASURE=master
-REPEAT=3
+REPEAT=1
 
 PLAT=$(get_platform)
 if [[ $PLAT = "x86" ]]; then
@@ -22,6 +21,4 @@ else
     exit
 fi
 
-PERF_EVENTS=$INST,$CYCLES,$UOPS_RETIRED_U,$UOPS_RETIRED
-
-# sudo perf stat -e $PERF_EVENTS sleep 5
+PERF_EVENTS=
diff --git a/in-memory-analytics/default.cfg b/in-memory-analytics/default.cfg
@@ -6,9 +6,13 @@ OUT=out #tmp folder
 RESULTS=experiments
 PERF_LOG=$OUT/perf.txt
 CLIENT_LOG=$OUT/client-result.txt
+CLIENT_LOG2=$OUT/client-result2.txt
+CLIENT_SUMMARY=$OUT/client-summary.txt
+UTIL_LOG=$OUT/util.txt
+WORKER_LOG=$OUT/worker-log.txt
 
 SPARK=zilutian/spark
-CLIENT_IMAGE=zilutian/in-memory-analytics:amd64
+CLIENT_IMAGE=
 DATASET_IMAGE=cloudsuite/movielens-dataset
 
 HOSTNAME=spark-master
@@ -20,8 +24,3 @@ CLIENT_CONTAINER=client
 DATASET_CONTAINER=in-memory-analytics-data
 
 LOCKDIR=/tmp/in-memory-analytics.lock
-
-NUM_WORKERS=${#WORKER_CPUS[@]}
-WORKER_PIDS=""
-WORKER_CPUS_STR=$(cvt_cpu)
-SERVER_CPUS="$MASTER_CPUS,$WORKER_CPUS_STR"
diff --git a/in-memory-analytics/user.cfg b/in-memory-analytics/user.cfg
@@ -1,14 +1,13 @@
 #!/bin/bash 
 source ../common/requirements
 
-MASTER_CPUS=0
-WORKER_CPUS=(4) #An array, comma separated for mul. workers
-CLIENT_CPUS=3
-DATASET_SEL=small #valid: small, large 
+MASTER_CPUS=
+WORKER_CPUS=
+CLIENT_CPUS=
+DATASET_SEL=large #valid: small, large 
 
 DEV=1
-MEASURE=master
-REPEAT=5
+REPEAT=1
 
 PLAT=$(get_platform)
 if [[ $PLAT = "x86" ]]; then 
@@ -20,6 +19,4 @@ else
     exit 
 fi 
 
-PERF_EVENTS=$INST,$CYCLES,$UOPS_RETIRED_U,$UOPS_RETIRED
-
-# sudo perf stat -e $PERF_EVENTS sleep 5
+PERF_EVENTS=
diff --git a/media-streaming/default.cfg b/media-streaming/default.cfg
@@ -7,15 +7,15 @@ RESULTS=experiments
 PERF_LOG=$OUT/perf.txt
 CLIENT_LOG=$OUT/client-result.txt
 CLIENT_SUMMARY=$OUT/summary.txt
+UTIL_LOG=$OUT/util.txt
 
 CLIENT_CONTAINER=media_streaming_client
 SERVER_CONTAINER=media_streaming_server
 DATASET_CONTAINER=media_streaming_dataset
 
-CLIENT_IMAGE=zilutian/media-streaming:client-amd64
-SERVER_IMAGE=zilutian/media-streaming:server-amd64
+CLIENT_IMAGE=
+SERVER_IMAGE=
 DATASET_IMAGE=cloudsuite/media-streaming:dataset 
 
 NET=media_streaming_net
 CWD=`pwd`
-OPERATIONS_FILE=operations.txt
diff --git a/media-streaming/user.cfg b/media-streaming/user.cfg
@@ -2,22 +2,19 @@
 
 source ../common/requirements
 
-SERVER_CPUS=0
-CLIENT_CPUS=1
-#MEASURE_TIME=200
+SERVER_CPUS=
+CLIENT_CPUS=
 DEV=1
 
 PLAT=$(get_platform)
 if [[ $PLAT = "x86" ]]; then
     source ../common/events_x86
-#    JAVA_HOME=/usr/lib/jvm/java-8-openjdk-amd64
 elif [[ $PLAT = "aarch64" ]]; then
     source ../common/events_aarch64
-#    JAVA_HOME=/usr/lib/jvm/java-8-openjdk-arm64 
 else
     echo "Platform unsupported"
     exit
 fi
 
-PERF_EVENTS=$INST,$CYCLES,$UOPS_RETIRED_U,$UOPS_RETIRED
+PERF_EVENTS=
 
diff --git a/web-search/default.cfg b/web-search/default.cfg
@@ -6,12 +6,13 @@ OUT=out
 RESULTS=experiments 
 PERF_LOG=$OUT/perf.txt
 CLIENT_LOG=$OUT/client-result.txt
+UTIL_LOG=$OUT/util.txt
 
 CLIENT_CONTAINER=web_search_client
 SERVER_CONTAINER=web_search_server
 
-CLIENT_IMAGE=zilutian/web-search-client:amd64 
-SERVER_IMAGE=zilutian/web-search-server:amd64 
+CLIENT_IMAGE= 
+SERVER_IMAGE= 
 NET=search_network
 
 OPERATIONS_FILE=load.txt

diff --git a/web-search/user.cfg b/web-search/user.cfg
@@ -1,8 +1,8 @@
 #!/bin/bash 
 source ../common/requirements
 
-SERVER_CPUS=0
-CLIENT_CPUS=1
+SERVER_CPUS=
+CLIENT_CPUS=
 
 SERVER_MEMORY=25g
 SOLR_MEM=20g
@@ -11,10 +11,10 @@ RAMPTIME=30
 STEADYTIME=20
 STOPTIME=20
 
-LOCAL_INDEX_VOL=/mnt/parsafiler1/vol2/datasets/ztian
+LOCAL_INDEX_VOL=
 
 DEV=1
-START_SERVER=0 # 1: true, 0: false  
+START_SERVER=1 # 1: true, 0: false  
 
 PLAT=$(get_platform)
 if [[ $PLAT = "x86" ]]; then
@@ -28,7 +28,7 @@ else
     exit
 fi
 
-PERF_EVENTS=$INST,$CYCLES,$UOPS_RETIRED_U,$UOPS_RETIRED
+PERF_EVENTS=
 
 if [[ ! -d $LOCAL_INDEX_VOL ]]; then 
     echo "Local index directory not found!"

diff --git a/web-serving/default.cfg b/web-serving/default.cfg
@@ -5,6 +5,7 @@ source ../common/utils
 OUT=out
 RESULTS=experiments 
 PERF_LOG=$OUT/perf.txt
+UTIL_LOG=$OUT/util.txt
 CLIENT_LOG=$OUT/client-result.txt
 CLIENT_SUMMARY=$OUT/summary.txt
 
@@ -13,12 +14,12 @@ SERVER_CONTAINER=web_serving_server
 DB_CONTAINER=ws_mysql_server
 CACHING_CONTAINER=ws_memcache_server
 
-CLIENT_IMAGE=zilutian/web-serving:faban-client-amd64
-SERVER_IMAGE=zilutian/web-serving:web-server-amd64
-DB_IMAGE=zilutian/web-serving:db-server-amd64
+CLIENT_IMAGE=
+SERVER_IMAGE=
+DB_IMAGE=
 CACHING_IMAGE=zilutian/memcached
 
 NET=host
-HOST_IP=192.168.9.145
+HOST_IP=
 CWD=`pwd`
-# OPERATIONS_FILE=
+OPERATIONS_FILE=user_nums.txt
diff --git a/web-serving/user.cfg b/web-serving/user.cfg
@@ -2,13 +2,12 @@
 
 source ../common/requirements
 
-SERVER_CPUS=0
-CLIENT_CPUS=1
-DB_CPUS=3
-CACHING_CPUS=5
-# MEASURE_TIME=100
+SERVER_CPUS=
+CLIENT_CPUS=
+DB_CPUS=
+CACHING_CPUS=
 
-USER_NUM=100
+USER_NUM=
 
 DEV=1
 
@@ -24,5 +23,5 @@ else
     exit
 fi
 
-PERF_EVENTS=$INST,$CYCLES,$UOPS_RETIRED_U,$UOPS_RETIRED
+PERF_EVENTS=