From ce54befa16e45cd6d4d6b4f6595f6e37852805d6 Mon Sep 17 00:00:00 2001 From: Michael Bentley Date: Thu, 22 Jun 2017 11:55:26 -0700 Subject: [PATCH] Remove all mentions of QFP --- R/analyzeOpcodes.R | 2 +- db/InstallFlitDB.sh | 13 +++++----- ...ortQFPResults => create_importFLiTResults} | 2 +- db/tables.sql | 13 +++++----- inputGen/.ycm_extra_conf.py | 3 +-- inputGen/QFPHelpers.cpp | 1 - inputGen/flitHelpers.cpp | 1 + inputGen/groundtruth.cpp | 3 +-- inputGen/helper.cpp | 2 +- inputGen/helper.h | 2 +- inputGen/testbed.cpp | 3 +-- litmus-tests/disabled/SimpleCHull.cpp | 6 ++--- .../tests/DistributivityOfMultiplication.cpp | 6 ++--- litmus-tests/tests/DoHariGSBasic.cpp | 3 +-- litmus-tests/tests/DoHariGSImproved.cpp | 3 +-- litmus-tests/tests/DoMatrixMultSanity.cpp | 11 +++----- litmus-tests/tests/DoOrthoPerturbTest.cpp | 6 ++--- litmus-tests/tests/DoSimpleRotate90.cpp | 7 +++--- .../tests/DoSkewSymCPRotationTest.cpp | 7 +++--- litmus-tests/tests/FMACancel.cpp | 5 +--- litmus-tests/tests/InliningProblem.cpp | 5 +--- litmus-tests/tests/KahanSum.cpp | 4 +-- litmus-tests/tests/Paranoia.cpp | 4 +-- litmus-tests/tests/ReciprocalMath.cpp | 5 +--- litmus-tests/tests/RotateAndUnrotate.cpp | 8 +++--- litmus-tests/tests/RotateFullCircle.cpp | 7 +++--- litmus-tests/tests/ShewchukSum.cpp | 4 +-- litmus-tests/tests/SinInt.cpp | 4 +-- litmus-tests/tests/TrianglePHeron.cpp | 8 +++--- litmus-tests/tests/TrianglePSylv.cpp | 7 +++--- litmus-tests/tests/langois.cpp | 6 ++--- litmus-tests/tests/tinys.cpp | 4 +-- plotting/extractor.py | 6 ++--- plotting/stats.ipynb | 4 +-- scripts/flitcli/data/Makefile.in | 2 -- scripts/hostCollectEnviro.source | 2 +- scripts/run_all.py | 6 ++--- src/CUHelpers.cpp | 2 +- src/CUHelpers.hpp | 6 ++++- src/CUVector.hpp | 8 +++++- src/TestBase.hpp | 2 +- src/flit.cpp | 2 +- src/flit.h | 2 +- src/{QFPHelpers.cpp => flitHelpers.cpp} | 2 +- src/{QFPHelpers.hpp => flitHelpers.hpp} | 25 +++++++++---------- 45 files changed, 99 insertions(+), 135 deletions(-) rename db/psql_commands/{create_importQFPResults => create_importFLiTResults} (86%) delete mode 120000 inputGen/QFPHelpers.cpp create mode 120000 inputGen/flitHelpers.cpp rename src/{QFPHelpers.cpp => flitHelpers.cpp} (98%) rename src/{QFPHelpers.hpp => flitHelpers.hpp} (98%) diff --git a/R/analyzeOpcodes.R b/R/analyzeOpcodes.R index b4fe0c68..6cc67d06 100644 --- 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 index 98b1738b..45dfb405 100755 --- 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 b/db/psql_commands/create_importFLiTResults similarity index 86% rename from db/psql_commands/create_importQFPResults rename to db/psql_commands/create_importFLiTResults index 4486ae96..d7f5268a 100644 --- a/db/psql_commands/create_importQFPResults +++ b/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 index cb14f72a..b45c2c07 100644 --- 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 index 7437cd56..65d4b086 100644 --- 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 deleted file mode 120000 index 32e04720..00000000 --- a/inputGen/QFPHelpers.cpp +++ /dev/null @@ -1 +0,0 @@ -../src/QFPHelpers.cpp \ No newline at end of file diff --git a/inputGen/flitHelpers.cpp b/inputGen/flitHelpers.cpp new file mode 120000 index 00000000..718d8f4b --- /dev/null +++ b/inputGen/flitHelpers.cpp @@ -0,0 +1 @@ +../src/flitHelpers.cpp \ No newline at end of file diff --git a/inputGen/groundtruth.cpp b/inputGen/groundtruth.cpp index 67f0f71e..2b94223b 100644 --- a/inputGen/groundtruth.cpp +++ b/inputGen/groundtruth.cpp @@ -1,7 +1,6 @@ #include "groundtruth.h" -#include "TestBase.hpp" -#include "QFPHelpers.hpp" +#include // Only store these locally because we want multiple compiled copies namespace { diff --git a/inputGen/helper.cpp b/inputGen/helper.cpp index 5ba967ed..804c8444 100644 --- a/inputGen/helper.cpp +++ b/inputGen/helper.cpp @@ -1,6 +1,6 @@ #include "helper.h" -#include "QFPHelpers.hpp" +#include #include #include diff --git a/inputGen/helper.h b/inputGen/helper.h index e98d7ade..6381507c 100644 --- a/inputGen/helper.h +++ b/inputGen/helper.h @@ -1,7 +1,7 @@ #ifndef HELPER_H #define HELPER_H -#include "QFPHelpers.hpp" +#include #include #include diff --git a/inputGen/testbed.cpp b/inputGen/testbed.cpp index 3eb9ec22..a9b87a6f 100644 --- a/inputGen/testbed.cpp +++ b/inputGen/testbed.cpp @@ -1,7 +1,6 @@ #include "testbed.h" -#include "TestBase.hpp" -#include "QFPHelpers.hpp" +#include #include diff --git a/litmus-tests/disabled/SimpleCHull.cpp b/litmus-tests/disabled/SimpleCHull.cpp index dea20822..4995d90b 100644 --- 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 + #include #include #include diff --git a/litmus-tests/tests/DistributivityOfMultiplication.cpp b/litmus-tests/tests/DistributivityOfMultiplication.cpp index 9c2f8361..3a83c539 100644 --- 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 #include #include @@ -9,7 +7,7 @@ #include #ifdef __CUDA__ -#include "thrust/tuple.h" +#include #endif template diff --git a/litmus-tests/tests/DoHariGSBasic.cpp b/litmus-tests/tests/DoHariGSBasic.cpp index 3dd0dcba..6494363b 100644 --- a/litmus-tests/tests/DoHariGSBasic.cpp +++ b/litmus-tests/tests/DoHariGSBasic.cpp @@ -1,5 +1,4 @@ -#include "TestBase.hpp" -#include "QFPHelpers.hpp" +#include #include #include diff --git a/litmus-tests/tests/DoHariGSImproved.cpp b/litmus-tests/tests/DoHariGSImproved.cpp index 8a611cb3..30280684 100644 --- 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 #include diff --git a/litmus-tests/tests/DoMatrixMultSanity.cpp b/litmus-tests/tests/DoMatrixMultSanity.cpp index 7307493a..66b76930 100644 --- a/litmus-tests/tests/DoMatrixMultSanity.cpp +++ b/litmus-tests/tests/DoMatrixMultSanity.cpp @@ -1,13 +1,10 @@ -#include +#include + #include #include -#include - -#include "TestBase.hpp" -#include "QFPHelpers.hpp" -#include "CUHelpers.hpp" - +#include +#include template GLOBAL diff --git a/litmus-tests/tests/DoOrthoPerturbTest.cpp b/litmus-tests/tests/DoOrthoPerturbTest.cpp index bfe7ca93..b7a6a55e 100644 --- a/litmus-tests/tests/DoOrthoPerturbTest.cpp +++ b/litmus-tests/tests/DoOrthoPerturbTest.cpp @@ -1,10 +1,10 @@ -#include "TestBase.hpp" -#include "QFPHelpers.hpp" +#include -#include #include #include +#include + template GLOBAL void diff --git a/litmus-tests/tests/DoSimpleRotate90.cpp b/litmus-tests/tests/DoSimpleRotate90.cpp index c20315bd..043104ae 100644 --- a/litmus-tests/tests/DoSimpleRotate90.cpp +++ b/litmus-tests/tests/DoSimpleRotate90.cpp @@ -1,9 +1,8 @@ -#include +#include + #include -#include "TestBase.hpp" -#include "QFPHelpers.hpp" -#include "CUHelpers.hpp" +#include template GLOBAL diff --git a/litmus-tests/tests/DoSkewSymCPRotationTest.cpp b/litmus-tests/tests/DoSkewSymCPRotationTest.cpp index 56eab204..524bd2f7 100644 --- a/litmus-tests/tests/DoSkewSymCPRotationTest.cpp +++ b/litmus-tests/tests/DoSkewSymCPRotationTest.cpp @@ -1,9 +1,8 @@ -#include +#include + #include -#include "TestBase.hpp" -#include "QFPHelpers.hpp" -#include "CUHelpers.hpp" +#include template GLOBAL diff --git a/litmus-tests/tests/FMACancel.cpp b/litmus-tests/tests/FMACancel.cpp index fe9e3df3..afc48363 100644 --- 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 #include diff --git a/litmus-tests/tests/InliningProblem.cpp b/litmus-tests/tests/InliningProblem.cpp index 16821fc1..e8644eea 100644 --- 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 #include diff --git a/litmus-tests/tests/KahanSum.cpp b/litmus-tests/tests/KahanSum.cpp index fa12a80a..1afc3c31 100644 --- 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 #include #include diff --git a/litmus-tests/tests/Paranoia.cpp b/litmus-tests/tests/Paranoia.cpp index 2be72a1e..5c07ad95 100644 --- a/litmus-tests/tests/Paranoia.cpp +++ b/litmus-tests/tests/Paranoia.cpp @@ -160,9 +160,7 @@ lines */ -#include "TestBase.hpp" -#include "QFPHelpers.hpp" -#include "CUHelpers.hpp" +#include #include #include diff --git a/litmus-tests/tests/ReciprocalMath.cpp b/litmus-tests/tests/ReciprocalMath.cpp index 5a21f36f..635b5645 100644 --- a/litmus-tests/tests/ReciprocalMath.cpp +++ b/litmus-tests/tests/ReciprocalMath.cpp @@ -1,7 +1,4 @@ - -#include "TestBase.hpp" -#include "QFPHelpers.hpp" -#include "CUHelpers.hpp" +#include #include diff --git a/litmus-tests/tests/RotateAndUnrotate.cpp b/litmus-tests/tests/RotateAndUnrotate.cpp index 9ade93cd..80916b07 100644 --- a/litmus-tests/tests/RotateAndUnrotate.cpp +++ b/litmus-tests/tests/RotateAndUnrotate.cpp @@ -1,10 +1,8 @@ -#include -#include +#include -#include "TestBase.hpp" -#include "QFPHelpers.hpp" -#include "CUHelpers.hpp" +#include +#include template GLOBAL diff --git a/litmus-tests/tests/RotateFullCircle.cpp b/litmus-tests/tests/RotateFullCircle.cpp index fb26797d..a5abd6ce 100644 --- a/litmus-tests/tests/RotateFullCircle.cpp +++ b/litmus-tests/tests/RotateFullCircle.cpp @@ -1,9 +1,8 @@ -#include +#include + #include -#include "TestBase.hpp" -#include "QFPHelpers.hpp" -#include "CUHelpers.hpp" +#include template GLOBAL diff --git a/litmus-tests/tests/ShewchukSum.cpp b/litmus-tests/tests/ShewchukSum.cpp index 4c1d61d8..31a86b69 100644 --- a/litmus-tests/tests/ShewchukSum.cpp +++ b/litmus-tests/tests/ShewchukSum.cpp @@ -1,8 +1,6 @@ #include "Shewchuk.h" -#include "TestBase.hpp" -#include "QFPHelpers.hpp" -#include "CUHelpers.hpp" +#include #include #include diff --git a/litmus-tests/tests/SinInt.cpp b/litmus-tests/tests/SinInt.cpp index 91e0e6c4..ba18efee 100644 --- a/litmus-tests/tests/SinInt.cpp +++ b/litmus-tests/tests/SinInt.cpp @@ -1,8 +1,6 @@ #include "Shewchuk.h" -#include "TestBase.hpp" -#include "QFPHelpers.hpp" -#include "CUHelpers.hpp" +#include #include diff --git a/litmus-tests/tests/TrianglePHeron.cpp b/litmus-tests/tests/TrianglePHeron.cpp index e2de4c6b..61512c90 100644 --- a/litmus-tests/tests/TrianglePHeron.cpp +++ b/litmus-tests/tests/TrianglePHeron.cpp @@ -1,10 +1,8 @@ -#include -#include +#include -#include "TestBase.hpp" -#include "QFPHelpers.hpp" -#include "CUHelpers.hpp" +#include +#include template DEVICE diff --git a/litmus-tests/tests/TrianglePSylv.cpp b/litmus-tests/tests/TrianglePSylv.cpp index 9215aa68..7e8bef04 100644 --- a/litmus-tests/tests/TrianglePSylv.cpp +++ b/litmus-tests/tests/TrianglePSylv.cpp @@ -1,9 +1,8 @@ -#include +#include + #include -#include "TestBase.hpp" -#include "QFPHelpers.hpp" -#include "CUHelpers.hpp" +#include template DEVICE diff --git a/litmus-tests/tests/langois.cpp b/litmus-tests/tests/langois.cpp index 0c467a56..180efa77 100644 --- a/litmus-tests/tests/langois.cpp +++ b/litmus-tests/tests/langois.cpp @@ -2,13 +2,11 @@ // an EFT (error-free transformation) // see http://perso.ens-lyon.fr/nicolas.louvet/LaLo07b.pdf -#include "TestBase.hpp" -#include "QFPHelpers.hpp" -#include "CUHelpers.hpp" +#include -#include #include +#include //this is a dummy -- needs to be implemented //the body of a different algo in CUDA is left diff --git a/litmus-tests/tests/tinys.cpp b/litmus-tests/tests/tinys.cpp index 0ac69755..f33e8921 100644 --- a/litmus-tests/tests/tinys.cpp +++ b/litmus-tests/tests/tinys.cpp @@ -1,6 +1,4 @@ -#include "QFPHelpers.hpp" -#include "CUHelpers.hpp" -#include "TestBase.hpp" +#include #include #include diff --git a/plotting/extractor.py b/plotting/extractor.py index 8401d0e9..18d17f37 100755 --- a/plotting/extractor.py +++ b/plotting/extractor.py @@ -17,10 +17,10 @@ def connect_to_database(): 'Returns a database handle for the framework being used' - dbname = 'qfp' + dbname = 'flit' host = 'localhost' - user = 'qfp' - passwd = 'qfp123' + user = 'flit' + passwd = 'flit123' if using_pg: return pg.DB(dbname=dbname, host=host, user=user, passwd=passwd) else: diff --git a/plotting/stats.ipynb b/plotting/stats.ipynb index 4c9af7a2..2e35a964 100644 --- a/plotting/stats.ipynb +++ b/plotting/stats.ipynb @@ -4,9 +4,9 @@ "cell_type": "markdown", "metadata": {}, "source": [ - "# Statistics for QFP Test Results\n", + "# Statistics for FLiT Test Results\n", "\n", - "This file is playing around with generating statistics for the QFPC test results. It also attempts to plot.\n", + "This file is playing around with generating statistics for the FLiT test results. It also attempts to plot.\n", "\n", "$$\n", " \\int_{-\\infty}^\\infty e^{-x^2 \\sin x} dx\n", diff --git a/scripts/flitcli/data/Makefile.in b/scripts/flitcli/data/Makefile.in index bad2b0bf..49ba813e 100644 --- a/scripts/flitcli/data/Makefile.in +++ b/scripts/flitcli/data/Makefile.in @@ -68,8 +68,6 @@ CLANG_REQUIRED := --gcc-toolchain=$(GCC_TOOLCHAIN) # among other places # more comp settings, taken from here: # https://software.intel.com/sites/default/files/article/326703/fp-control-2012-08.pdf -# see psql: qfp: switch_desc for description of flags -# also, psql: qfp: #individual flags ## optls diff --git a/scripts/hostCollectEnviro.source b/scripts/hostCollectEnviro.source index 65532489..11fbadb0 100644 --- a/scripts/hostCollectEnviro.source +++ b/scripts/hostCollectEnviro.source @@ -4,6 +4,6 @@ export CORES=24 export DO_PIN=False export DB_USER=sawaya export DB_HOST=localhost -export FLIT_DIR=qfp +export FLIT_DIR=src export SLURMED=None export CUDA_ONLY=False diff --git a/scripts/run_all.py b/scripts/run_all.py index a3d02f91..cd048639 100755 --- a/scripts/run_all.py +++ b/scripts/run_all.py @@ -28,7 +28,7 @@ DBINIT = 'prepDBHost.py' db_host = hostfile.DB_HOST run_hosts = hostfile.RUN_HOSTS -FLIT_DIR = 'qfp' +FLIT_DIR = 'src' REM_ENV = {'FLIT_DIR': FLIT_DIR} SSHS = 'ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -q ' SSHL = ['ssh', '-o UserKnownHostsFile=/dev/null', '-o StrictHostKeyChecking=no', '-q'] @@ -219,11 +219,11 @@ def getPasswords(): pass -#import to database -- need to unzip and then run importqfpresults2 +#import to database -- need to unzip and then run importflitresults2 cmd = ( 'cd ~/flit_data && ' + 'for f in *.tgz; do tar xf \$f; done && ' + - 'psql flit -c \\"select importqfpresults2(\'\$(pwd)\',' + + 'psql flit -c \\"select importflitresults2(\'\$(pwd)\',' + str(run_num) + ')\\" ' ) if any(list(zip(*run_hosts))[5]): #any opcode collections diff --git a/src/CUHelpers.cpp b/src/CUHelpers.cpp index 57f96457..b5c3d674 100644 --- a/src/CUHelpers.cpp +++ b/src/CUHelpers.cpp @@ -1,5 +1,5 @@ #include "CUHelpers.hpp" -#include "QFPHelpers.hpp" +#include "flitHelpers.hpp" namespace flit { diff --git a/src/CUHelpers.hpp b/src/CUHelpers.hpp index 925ef576..2e837977 100644 --- a/src/CUHelpers.hpp +++ b/src/CUHelpers.hpp @@ -14,9 +14,13 @@ #define DEVICE __device__ #define GLOBAL __global__ #endif -#include "QFPHelpers.hpp" +#include "flitHelpers.hpp" #include "CUVector.hpp" +#include + +#include + namespace flit { // TODO: test out trying to replace csqrt() with std::sqrt() diff --git a/src/CUVector.hpp b/src/CUVector.hpp index 08bdf204..e817d208 100644 --- a/src/CUVector.hpp +++ b/src/CUVector.hpp @@ -1,6 +1,10 @@ -#pragma once +#ifndef CU_VECTOR_HPP +#define CU_VECTOR_HPP + #include "CUHelpers.hpp" +#include + //This vector class is designed to be used on a CUDA //enabled device. //This class needs the following features: @@ -218,3 +222,5 @@ class cuvector { cvs_t size() const noexcept {return vsize;} }; + +#endif // CU_VECTOR_HPP diff --git a/src/TestBase.hpp b/src/TestBase.hpp index d92c2899..aa921421 100644 --- a/src/TestBase.hpp +++ b/src/TestBase.hpp @@ -5,7 +5,7 @@ #ifndef TEST_BASE_HPP #define TEST_BASE_HPP -#include "QFPHelpers.hpp" +#include "flitHelpers.hpp" #ifdef __CUDA__ #include "CUHelpers.hpp" diff --git a/src/flit.cpp b/src/flit.cpp index 0e335ad7..8d3a1c7f 100644 --- a/src/flit.cpp +++ b/src/flit.cpp @@ -12,7 +12,7 @@ #include "flit.h" -#include "QFPHelpers.hpp" +#include "flitHelpers.hpp" #include "TestBase.hpp" void outputResults(const flit::ResultType& scores, std::ostream& out){ diff --git a/src/flit.h b/src/flit.h index c02b181f..32061712 100644 --- a/src/flit.h +++ b/src/flit.h @@ -4,7 +4,7 @@ #ifndef FLIT_H #define FLIT_H 0 -#include "QFPHelpers.hpp" +#include "flitHelpers.hpp" #include "TestBase.hpp" #ifdef __CUDA__ diff --git a/src/QFPHelpers.cpp b/src/flitHelpers.cpp similarity index 98% rename from src/QFPHelpers.cpp rename to src/flitHelpers.cpp index 7b27d8ab..3e37b7f5 100644 --- a/src/QFPHelpers.cpp +++ b/src/flitHelpers.cpp @@ -2,7 +2,7 @@ // they utilize the watch data for sensitive points // of computation. -#include "QFPHelpers.hpp" +#include "flitHelpers.hpp" #include #include diff --git a/src/QFPHelpers.hpp b/src/flitHelpers.hpp similarity index 98% rename from src/QFPHelpers.hpp rename to src/flitHelpers.hpp index a3c4888c..c806d1f2 100644 --- a/src/QFPHelpers.hpp +++ b/src/flitHelpers.hpp @@ -1,24 +1,23 @@ -// the header for QFP helpers. These classes, such as matrix and -// vector, utilize the TestBase watch data items for monitoring by -// differential debugging. +// the header for FLiT helper functions. These classes, such as matrix and +// vector, utilize the TestBase watch data items for monitoring by differential +// debugging. -#ifndef QFPHELPERS -#define QFPHELPERS +#ifndef FLIT_HELPERS_HPP +#define FLIT_HELPERS_HPP #include "InfoStream.hpp" +#include "CUHelpers.hpp" -#include +#include #include +#include +#include +#include #include #include -#include -#include -#include -#include #include - -#include "CUHelpers.hpp" +#include #ifndef Q_UNUSED #define Q_UNUSED(x) (void)x @@ -502,5 +501,5 @@ class Matrix { } // end of namespace flit -#endif +#endif // FLIT_HELPERS_HPP