Merge pull request #62 from PRUNERS/issue_61-qfp

Remove all mentions of QFP
PRUNERS · Jun 22, 2017 · 17fb934 · 17fb934
2 parents 643846a + 9006f98
commit 17fb934
Show file tree

Hide file tree

Showing 45 changed files with 126 additions and 162 deletions.
diff --git a/R/analyzeOpcodes.R b/R/analyzeOpcodes.R
@@ -3,7 +3,7 @@ require("RPostgreSQL")
 
 drv <- dbDriver("PostgreSQL")
 
-con <- dbConnect(drv, dbname = "qfp")
+con <- dbConnect(drv, dbname = "flit")
 
                                         #sanity test
 dbExistsTable(con, "tests")

diff --git a/db/InstallFlitDB.sh b/db/InstallFlitDB.sh
@@ -928,7 +928,6 @@ CREATE FUNCTION createtimeplot(run integer, prec text[], compilers text[], optls
     AS $$
 from plpy import spiexceptions
 from sys import path
-path.append('/home/sawaya/temp/qfp/db/python')
 import matplotlib.pyplot as plt
 import matplotlib.cm as cm
 import numpy as np
@@ -1027,14 +1026,14 @@ plpy.execute(query)
 query = ("SELECT MAX(index) from runs")
 res = plpy.execute(query)
 run = res[0]['max']
-query = ("SELECT importqfpresults2('" + path + "', " +
+query = ("SELECT importflitresults2('" + path + "', " +
          str(run) + ")")
 res = plpy.execute(query)
 query = ("SELECT importopcoderesults('" + path + "/pins'," +
          str(run) + ")")
 res2 = plpy.execute(query)
 
-return [res[0]['importqfpresults2'][0],res[0]['importqfpresults2'][1],
+return [res[0]['importflitresults2'][0],res[0]['importflitresults2'][1],
         res2[0]['importopcoderesults'][0],res2[0]['importopcoderesults'][1]]
 
 $$;
@@ -1170,10 +1169,10 @@ $$;
 
 
 --
--- Name: importqfpresults(text); Type: FUNCTION; Schema: public; Owner: -
+-- Name: importflitresults(text); Type: FUNCTION; Schema: public; Owner: -
 --
 
-CREATE FUNCTION importqfpresults(path text) RETURNS integer
+CREATE FUNCTION importflitresults(path text) RETURNS integer
     LANGUAGE plpython3u
     AS $$
    r = ("SELECT MAX(index)as index from runs;")
@@ -1193,10 +1192,10 @@ $$;
 
 
 --
--- Name: importqfpresults2(text, integer); Type: FUNCTION; Schema: public; Owner: -
+-- Name: importflitresults2(text, integer); Type: FUNCTION; Schema: public; Owner: -
 --
 
-CREATE FUNCTION importqfpresults2(path text, run integer) RETURNS integer[]
+CREATE FUNCTION importflitresults2(path text, run integer) RETURNS integer[]
     LANGUAGE plpython3u
     AS $$
 import glob

diff --git a/db/psql_commands/create_importQFPResults → db/psql_commands/create_importFLiTResults b/db/psql_commands/create_importQFPResults → db/psql_commands/create_importFLiTResults
@@ -1,5 +1,5 @@
 
-CREATE OR REPLACE FUNCTION importQFPResults(path text) RETURNS integer as $$
+CREATE OR REPLACE FUNCTION importFLiTResults(path text) RETURNS integer as $$
    r = ("SELECT MAX(index)as index from runs;")
    res = plpy.execute(r)
    run = res[0]["index"]

diff --git a/db/tables.sql b/db/tables.sql
@@ -269,7 +269,6 @@ CREATE FUNCTION createtimeplot(run integer, prec text[], compilers text[], optls
     AS $$
 from plpy import spiexceptions
 from sys import path
-path.append('/home/sawaya/temp/qfp/db/python')
 import matplotlib.pyplot as plt
 import matplotlib.cm as cm
 import numpy as np
@@ -368,14 +367,14 @@ plpy.execute(query)
 query = ("SELECT MAX(index) from runs")
 res = plpy.execute(query)
 run = res[0]['max']
-query = ("SELECT importqfpresults2('" + path + "', " +
+query = ("SELECT importflitresults2('" + path + "', " +
          str(run) + ")")
 res = plpy.execute(query)
 query = ("SELECT importopcoderesults('" + path + "/pins'," +
          str(run) + ")")
 res2 = plpy.execute(query)
 
-return [res[0]['importqfpresults2'][0],res[0]['importqfpresults2'][1],
+return [res[0]['importflitresults2'][0],res[0]['importflitresults2'][1],
         res2[0]['importopcoderesults'][0],res2[0]['importopcoderesults'][1]]
 
 $$;
@@ -511,10 +510,10 @@ $$;
 
 
 --
--- Name: importqfpresults(text); Type: FUNCTION; Schema: public; Owner: -
+-- Name: importflitresults(text); Type: FUNCTION; Schema: public; Owner: -
 --
 
-CREATE FUNCTION importqfpresults(path text) RETURNS integer
+CREATE FUNCTION importflitresults(path text) RETURNS integer
     LANGUAGE plpython3u
     AS $$
    r = ("SELECT MAX(index)as index from runs;")
@@ -534,10 +533,10 @@ $$;
 
 
 --
--- Name: importqfpresults2(text, integer); Type: FUNCTION; Schema: public; Owner: -
+-- Name: importflitresults2(text, integer); Type: FUNCTION; Schema: public; Owner: -
 --
 
-CREATE FUNCTION importqfpresults2(path text, run integer) RETURNS integer[]
+CREATE FUNCTION importflitresults2(path text, run integer) RETURNS integer[]
     LANGUAGE plpython3u
     AS $$
 import glob

diff --git a/inputGen/.ycm_extra_conf.py b/inputGen/.ycm_extra_conf.py
@@ -32,8 +32,7 @@
     '-x', 'c++',
     '-isystem', '/usr/include',
     '-isystem', '/usr/local/include',
-    '-I../qfpc',
-    '-I../qfpc/tests',
+    '-I../src',
     ]
 
 

diff --git a/inputGen/QFPHelpers.cpp b/inputGen/QFPHelpers.cpp
diff --git a/inputGen/flitHelpers.cpp b/inputGen/flitHelpers.cpp
@@ -0,0 +1 @@
+../src/flitHelpers.cpp
diff --git a/inputGen/groundtruth.cpp b/inputGen/groundtruth.cpp
@@ -1,7 +1,6 @@
 #include "groundtruth.h"
 
-#include "TestBase.hpp"
-#include "QFPHelpers.hpp"
+#include <flit.h>
 
 // Only store these locally because we want multiple compiled copies
 namespace {

diff --git a/inputGen/helper.cpp b/inputGen/helper.cpp
@@ -1,6 +1,6 @@
 #include "helper.h"
 
-#include "QFPHelpers.hpp"
+#include <flit.h>
 
 #include <iostream>
 #include <iomanip>
@@ -19,7 +19,7 @@ class FmtRestore {
 
 void printTestVal(const std::string &funcName, float val) {
   FmtRestore restorer(std::cout);
-  Q_UNUSED(restorer);
+  FLIT_UNUSED(restorer);
 
   auto intval = flit::as_int(val);
   std::cout << funcName << ":     0x"
@@ -31,7 +31,7 @@ void printTestVal(const std::string &funcName, float val) {
 
 void printTestVal(const std::string &funcName, double val) {
   FmtRestore restorer(std::cout);
-  Q_UNUSED(restorer);
+  FLIT_UNUSED(restorer);
 
   auto intval = flit::as_int(val);
   std::cout << funcName << ":     0x"
@@ -43,7 +43,7 @@ void printTestVal(const std::string &funcName, double val) {
 
 void printTestVal(const std::string &funcName, long double val) {
   FmtRestore restorer(std::cout);
-  Q_UNUSED(restorer);
+  FLIT_UNUSED(restorer);
 
   auto intval = flit::as_int(val);
   uint64_t lhalf = static_cast<uint64_t>((intval >> 64)) & 0xFFFFL;

diff --git a/inputGen/helper.h b/inputGen/helper.h
@@ -1,7 +1,7 @@
 #ifndef HELPER_H
 #define HELPER_H
 
-#include "QFPHelpers.hpp"
+#include <flit.h>
 
 #include <type_traits>
 #include <random>

diff --git a/inputGen/testbed.cpp b/inputGen/testbed.cpp
@@ -1,7 +1,6 @@
 #include "testbed.h"
 
-#include "TestBase.hpp"
-#include "QFPHelpers.hpp"
+#include <flit.h>
 
 #include <iterator>
 

diff --git a/litmus-tests/disabled/SimpleCHull.cpp b/litmus-tests/disabled/SimpleCHull.cpp
@@ -1,9 +1,7 @@
-#include "TestBase.hpp"
-#include "QFPHelpers.hpp"
-
-//#define SCH_LIB
 #include "simple_convex_hull.h"
 
+#include <flit.h>
+
 #include <cmath>
 #include <cstdio>
 #include <typeinfo>
@@ -21,7 +19,7 @@ class SimpleCHull: public flit::TestBase<T> {
 
   virtual flit::ResultType::mapped_type
   run_impl(const flit::TestInput<T>& ti) {
-    Q_UNUSED(ti);
+    FLIT_UNUSED(ti);
     CHullEdges.clear();
     PointList.clear();
     ReadInputs(fopen("data/random_input", "r"));

diff --git a/litmus-tests/tests/DistributivityOfMultiplication.cpp b/litmus-tests/tests/DistributivityOfMultiplication.cpp
@@ -1,6 +1,4 @@
-#include "TestBase.hpp"
-#include "QFPHelpers.hpp"
-#include "CUHelpers.hpp"
+#include <flit.h>
 
 #include <cmath>
 #include <iomanip>
@@ -9,7 +7,7 @@
 #include <tuple>
 
 #ifdef __CUDA__
-#include "thrust/tuple.h"
+#include <thrust/tuple.h>
 #endif
 
 template <typename T>

diff --git a/litmus-tests/tests/DoHariGSBasic.cpp b/litmus-tests/tests/DoHariGSBasic.cpp
@@ -1,5 +1,4 @@
-#include "TestBase.hpp"
-#include "QFPHelpers.hpp"
+#include <flit.h>
 
 #include <cmath>
 #include <typeinfo>

diff --git a/litmus-tests/tests/DoHariGSImproved.cpp b/litmus-tests/tests/DoHariGSImproved.cpp
@@ -1,5 +1,4 @@
-#include "TestBase.hpp"
-#include "QFPHelpers.hpp"
+#include "flit.h"
 
 #include <cmath>
 #include <typeinfo>

diff --git a/litmus-tests/tests/DoMatrixMultSanity.cpp b/litmus-tests/tests/DoMatrixMultSanity.cpp
@@ -1,13 +1,10 @@
-#include <cmath>
+#include <flit.h>
+
 #include <functional>
 #include <typeinfo>
 
-#include <stdio.h>
-
-#include "TestBase.hpp"
-#include "QFPHelpers.hpp"
-#include "CUHelpers.hpp"
-
+#include <cmath>
+#include <cstdio>
 
 template <typename T>
 GLOBAL

diff --git a/litmus-tests/tests/DoOrthoPerturbTest.cpp b/litmus-tests/tests/DoOrthoPerturbTest.cpp
@@ -1,10 +1,10 @@
-#include "TestBase.hpp"
-#include "QFPHelpers.hpp"
+#include <flit.h>
 
-#include <cmath>
 #include <typeinfo>
 #include <iomanip>
 
+#include <cmath>
+
 template <typename T>
 GLOBAL
 void

diff --git a/litmus-tests/tests/DoSimpleRotate90.cpp b/litmus-tests/tests/DoSimpleRotate90.cpp
@@ -1,9 +1,8 @@
-#include <cmath>
+#include <flit.h>
+
 #include <typeinfo>
 
-#include "TestBase.hpp"
-#include "QFPHelpers.hpp"
-#include "CUHelpers.hpp"
+#include <cmath>
 
 template <typename T>
 GLOBAL

diff --git a/litmus-tests/tests/DoSkewSymCPRotationTest.cpp b/litmus-tests/tests/DoSkewSymCPRotationTest.cpp
@@ -1,9 +1,8 @@
-#include <cmath>
+#include <flit.h>
+
 #include <typeinfo>
 
-#include "TestBase.hpp"
-#include "QFPHelpers.hpp"
-#include "CUHelpers.hpp"
+#include <cmath>
 
 template <typename T>
 GLOBAL

diff --git a/litmus-tests/tests/FMACancel.cpp b/litmus-tests/tests/FMACancel.cpp
@@ -1,7 +1,4 @@
-
-#include "TestBase.hpp"
-#include "QFPHelpers.hpp"
-#include "CUHelpers.hpp"
+#include <flit.h>
 
 #include <vector>
 

diff --git a/litmus-tests/tests/InliningProblem.cpp b/litmus-tests/tests/InliningProblem.cpp
@@ -1,7 +1,4 @@
-
-#include "TestBase.hpp"
-#include "QFPHelpers.hpp"
-#include "CUHelpers.hpp"
+#include <flit.h>
 
 #include <vector>
 

diff --git a/litmus-tests/tests/KahanSum.cpp b/litmus-tests/tests/KahanSum.cpp
@@ -1,9 +1,7 @@
 #include "Kahan.h"
 #include "Shewchuk.h"
 
-#include "TestBase.hpp"
-#include "QFPHelpers.hpp"
-#include "CUHelpers.hpp"
+#include <flit.h>
 
 #include <iomanip>
 #include <iostream>