From ce706c889316cb230facc5bc313be9ae69e33664 Mon Sep 17 00:00:00 2001
From: baunsgaard <baunsgaard@tugraz.at>
Date: Fri, 18 Dec 2020 10:34:13 +0100
Subject: [PATCH] merged with master

---
 scripts/perftest/MatrixTranspose.sh           | 25 -----------------
 .../perftest/scripts/transposeFromDisk.dml    | 27 -------------------
 scripts/perftest/scripts/write.dml            | 23 ----------------
 3 files changed, 75 deletions(-)
 delete mode 100644 scripts/perftest/scripts/transposeFromDisk.dml
 delete mode 100644 scripts/perftest/scripts/write.dml

diff --git a/scripts/perftest/MatrixTranspose.sh b/scripts/perftest/MatrixTranspose.sh
index 5f39e53b2bc..151d53ab6ab 100755
--- a/scripts/perftest/MatrixTranspose.sh
+++ b/scripts/perftest/MatrixTranspose.sh
@@ -92,29 +92,4 @@ perf stat -d -d -d -r $repeatScript \
 echo $LogName
 cat $LogName | grep -E '  r. |Total elapsed time|-----------| instructions |  cycles | CPUs utilized ' | tee $LogName.log
 
-###########################
-## From disk experiment:
-###########################
 
-repeatScript=2
-methodRepeat=2
-
-LogName="scripts/perftest/results/transpose-large-fromdisk.log"
-rm -f $LogName
-
-if [[ ! -f "scripts/perftest/in/transposeIn.data.mtd" ]]; then
-    systemds scripts/perftest/scripts/write.dml \
-        -config scripts/perftest/conf/std.xml \
-        -args 15000000 30 0.8 "scripts/perftest/in/transposeIn.data" \
-        >>/dev/null 2>&1
-fi
-
-perf stat -d -d -d -r $repeatScript \
-    systemds scripts/perftest/scripts/transposeFromDisk.dml \
-    -config scripts/perftest/conf/std.xml \
-    -stats \
-    -args "scripts/perftest/in/transposeIn.data" $methodRepeat \
-    >>$LogName 2>&1
-
-echo $LogName
-cat $LogName | grep -E '  r. |Total elapsed time|-----------| instructions |  cycles | CPUs utilized ' | tee $LogName.log
diff --git a/scripts/perftest/scripts/transposeFromDisk.dml b/scripts/perftest/scripts/transposeFromDisk.dml
deleted file mode 100644
index 7fcfaadf284..00000000000
--- a/scripts/perftest/scripts/transposeFromDisk.dml
+++ /dev/null
@@ -1,27 +0,0 @@
-#-------------------------------------------------------------
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-#-------------------------------------------------------------
-
-x = read($1)
-print(sum(x)) # Sum here to force read time into the sum operator
-for(i in 1:$2) {
-    res = t(x) 
-}
-print(sum(res))
\ No newline at end of file
diff --git a/scripts/perftest/scripts/write.dml b/scripts/perftest/scripts/write.dml
deleted file mode 100644
index feb5118b1a3..00000000000
--- a/scripts/perftest/scripts/write.dml
+++ /dev/null
@@ -1,23 +0,0 @@
-#-------------------------------------------------------------
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-#-------------------------------------------------------------
-
-x = rand(rows=$1, cols=$2, min= 0.0, max= 1.0, sparsity=$3, seed= 12)
-write(x,$4, format="binary")
\ No newline at end of file