Skip to content

Commit

Permalink
Remove all mentions of QFP
Browse files Browse the repository at this point in the history
  • Loading branch information
mikebentley15 committed Jun 22, 2017
1 parent 643846a commit ce54bef
Show file tree
Hide file tree
Showing 45 changed files with 99 additions and 135 deletions.
2 changes: 1 addition & 1 deletion R/analyzeOpcodes.R
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ require("RPostgreSQL")

drv <- dbDriver("PostgreSQL")

con <- dbConnect(drv, dbname = "qfp")
con <- dbConnect(drv, dbname = "flit")

#sanity test
dbExistsTable(con, "tests")
Expand Down
13 changes: 6 additions & 7 deletions db/InstallFlitDB.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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]]

$$;
Expand Down Expand Up @@ -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;")
Expand All @@ -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
Expand Down
Original file line number Diff line number Diff line change
@@ -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"]
Expand Down
13 changes: 6 additions & 7 deletions db/tables.sql
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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]]

$$;
Expand Down Expand Up @@ -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;")
Expand All @@ -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
Expand Down
3 changes: 1 addition & 2 deletions inputGen/.ycm_extra_conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,7 @@
'-x', 'c++',
'-isystem', '/usr/include',
'-isystem', '/usr/local/include',
'-I../qfpc',
'-I../qfpc/tests',
'-I../src',
]


Expand Down
1 change: 0 additions & 1 deletion inputGen/QFPHelpers.cpp

This file was deleted.

1 change: 1 addition & 0 deletions inputGen/flitHelpers.cpp
3 changes: 1 addition & 2 deletions inputGen/groundtruth.cpp
Original file line number Diff line number Diff line change
@@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion inputGen/helper.cpp
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#include "helper.h"

#include "QFPHelpers.hpp"
#include <flit.h>

#include <iostream>
#include <iomanip>
Expand Down
2 changes: 1 addition & 1 deletion inputGen/helper.h
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#ifndef HELPER_H
#define HELPER_H

#include "QFPHelpers.hpp"
#include <flit.h>

#include <type_traits>
#include <random>
Expand Down
3 changes: 1 addition & 2 deletions inputGen/testbed.cpp
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
#include "testbed.h"

#include "TestBase.hpp"
#include "QFPHelpers.hpp"
#include <flit.h>

#include <iterator>

Expand Down
6 changes: 2 additions & 4 deletions litmus-tests/disabled/SimpleCHull.cpp
Original file line number Diff line number Diff line change
@@ -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>
Expand Down
6 changes: 2 additions & 4 deletions litmus-tests/tests/DistributivityOfMultiplication.cpp
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
#include "TestBase.hpp"
#include "QFPHelpers.hpp"
#include "CUHelpers.hpp"
#include <flit.h>

#include <cmath>
#include <iomanip>
Expand All @@ -9,7 +7,7 @@
#include <tuple>

#ifdef __CUDA__
#include "thrust/tuple.h"
#include <thrust/tuple.h>
#endif

template <typename T>
Expand Down
3 changes: 1 addition & 2 deletions litmus-tests/tests/DoHariGSBasic.cpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
#include "TestBase.hpp"
#include "QFPHelpers.hpp"
#include <flit.h>

#include <cmath>
#include <typeinfo>
Expand Down
3 changes: 1 addition & 2 deletions litmus-tests/tests/DoHariGSImproved.cpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
#include "TestBase.hpp"
#include "QFPHelpers.hpp"
#include "flit.h"

#include <cmath>
#include <typeinfo>
Expand Down
11 changes: 4 additions & 7 deletions litmus-tests/tests/DoMatrixMultSanity.cpp
Original file line number Diff line number Diff line change
@@ -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
Expand Down
6 changes: 3 additions & 3 deletions litmus-tests/tests/DoOrthoPerturbTest.cpp
Original file line number Diff line number Diff line change
@@ -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
Expand Down
7 changes: 3 additions & 4 deletions litmus-tests/tests/DoSimpleRotate90.cpp
Original file line number Diff line number Diff line change
@@ -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
Expand Down
7 changes: 3 additions & 4 deletions litmus-tests/tests/DoSkewSymCPRotationTest.cpp
Original file line number Diff line number Diff line change
@@ -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
Expand Down
5 changes: 1 addition & 4 deletions litmus-tests/tests/FMACancel.cpp
Original file line number Diff line number Diff line change
@@ -1,7 +1,4 @@

#include "TestBase.hpp"
#include "QFPHelpers.hpp"
#include "CUHelpers.hpp"
#include <flit.h>

#include <vector>

Expand Down
5 changes: 1 addition & 4 deletions litmus-tests/tests/InliningProblem.cpp
Original file line number Diff line number Diff line change
@@ -1,7 +1,4 @@

#include "TestBase.hpp"
#include "QFPHelpers.hpp"
#include "CUHelpers.hpp"
#include <flit.h>

#include <vector>

Expand Down
4 changes: 1 addition & 3 deletions litmus-tests/tests/KahanSum.cpp
Original file line number Diff line number Diff line change
@@ -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>
Expand Down
4 changes: 1 addition & 3 deletions litmus-tests/tests/Paranoia.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -160,9 +160,7 @@ lines
*/

#include "TestBase.hpp"
#include "QFPHelpers.hpp"
#include "CUHelpers.hpp"
#include <flit.h>

#include <chrono>
#include <exception>
Expand Down
5 changes: 1 addition & 4 deletions litmus-tests/tests/ReciprocalMath.cpp
Original file line number Diff line number Diff line change
@@ -1,7 +1,4 @@

#include "TestBase.hpp"
#include "QFPHelpers.hpp"
#include "CUHelpers.hpp"
#include <flit.h>

#include <vector>

Expand Down
8 changes: 3 additions & 5 deletions litmus-tests/tests/RotateAndUnrotate.cpp
Original file line number Diff line number Diff line change
@@ -1,10 +1,8 @@
#include <cmath>
#include <typeinfo>
#include <flit.h>

#include "TestBase.hpp"
#include "QFPHelpers.hpp"
#include "CUHelpers.hpp"
#include <typeinfo>

#include <cmath>

template <typename T>
GLOBAL
Expand Down
7 changes: 3 additions & 4 deletions litmus-tests/tests/RotateFullCircle.cpp
Original file line number Diff line number Diff line change
@@ -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
Expand Down
4 changes: 1 addition & 3 deletions litmus-tests/tests/ShewchukSum.cpp
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
#include "Shewchuk.h"

#include "TestBase.hpp"
#include "QFPHelpers.hpp"
#include "CUHelpers.hpp"
#include <flit.h>

#include <iomanip>
#include <string>
Expand Down
4 changes: 1 addition & 3 deletions litmus-tests/tests/SinInt.cpp
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
#include "Shewchuk.h"

#include "TestBase.hpp"
#include "QFPHelpers.hpp"
#include "CUHelpers.hpp"
#include <flit.h>

#include <vector>

Expand Down
8 changes: 3 additions & 5 deletions litmus-tests/tests/TrianglePHeron.cpp
Original file line number Diff line number Diff line change
@@ -1,10 +1,8 @@
#include <cmath>
#include <typeinfo>
#include <flit.h>

#include "TestBase.hpp"
#include "QFPHelpers.hpp"
#include "CUHelpers.hpp"
#include <typeinfo>

#include <cmath>

template <typename T>
DEVICE
Expand Down
7 changes: 3 additions & 4 deletions litmus-tests/tests/TrianglePSylv.cpp
Original file line number Diff line number Diff line change
@@ -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>
DEVICE
Expand Down
Loading

0 comments on commit ce54bef

Please sign in to comment.