From f7c2c0cadce06d180e9c0b2faa52ad9e8ea8406d Mon Sep 17 00:00:00 2001 From: Jozsef Bakosi Date: Fri, 20 Jul 2018 15:05:52 -0600 Subject: [PATCH 01/19] Split off Base unit tests to their own compilation unit --- src/Main/UnitTest.C | 111 +++++++----------- src/NoWarning/migrated_base.def.h | 35 ++++++ src/UnitTest/CMakeLists.txt | 3 +- src/UnitTest/TUTConfig.h | 22 ++++ .../{migrated.ci => migrated_base.ci} | 13 +- src/UnitTest/migrated_inciter.ci | 24 ++++ src/UnitTest/tests/Base/MigratedTypes.h | 4 +- src/UnitTest/tests/TestBase.C | 33 ++++++ src/UnitTest/tutsuite.ci | 2 +- 9 files changed, 163 insertions(+), 84 deletions(-) create mode 100644 src/NoWarning/migrated_base.def.h create mode 100644 src/UnitTest/TUTConfig.h rename src/UnitTest/{migrated.ci => migrated_base.ci} (82%) create mode 100644 src/UnitTest/migrated_inciter.ci create mode 100644 src/UnitTest/tests/TestBase.C diff --git a/src/Main/UnitTest.C b/src/Main/UnitTest.C index 32e4714f988..0e6877e8ced 100644 --- a/src/Main/UnitTest.C +++ b/src/Main/UnitTest.C @@ -41,79 +41,53 @@ #include "UnitTestPrint.h" #include "UnitTestDriver.h" #include "UnitTest/CmdLine/Parser.h" - -namespace tut { - -//! \brief Maximum number of tests in every test group to attempt to run -//! \details If any of the unit test groups have more tests than this number, -//! this should be increased. All test groups included below will use this -//! value to override the default template argument for tut::test_group<>. -const int MAX_TESTS_IN_GROUP = 80; - -} // tut:: - -// // Unit test groups to be tested. Each file defines a different test group. -#include "tests/Base/TestFactory.h" -#include "tests/Base/TestTimer.h" -#include "tests/Base/TestPUPUtil.h" - -#include "tests/Base/TestFlip_map.h" -#include "tests/Base/TestHas.h" -#include "tests/Base/TestData.h" -#include "tests/Base/TestPrint.h" -#include "tests/Base/TestTaggedTuple.h" -#include "tests/Base/TestException.h" -#include "tests/Base/TestExceptionMPI.h" -#include "tests/Base/TestReader.h" -#include "tests/Base/TestStrConvUtil.h" -#include "tests/Base/TestWriter.h" -#include "tests/Base/TestProcessControl.h" -#include "tests/Base/TestVector.h" -#include "tests/Base/TestContainerUtil.h" - -#include "tests/Control/TestSystemComponents.h" -#include "tests/Control/TestControl.h" -#include "tests/Control/TestFileParser.h" -#include "tests/Control/TestStringParser.h" -#include "tests/Control/TestToggle.h" -#ifdef HAS_MKL - #include "tests/Control/Options/TestMKLUniformMethod.h" - #include "tests/Control/Options/TestMKLGaussianMethod.h" - #include "tests/Control/Options/TestMKLBetaMethod.h" - #include "tests/Control/Options/TestMKLGammaMethod.h" -#endif -#include "tests/Control/Options/TestRNG.h" - -#include "tests/IO/TestMesh.h" -#include "tests/IO/TestExodusIIMeshReader.h" -#include "tests/IO/TestMeshReader.h" - -#include "tests/Mesh/TestDerivedData.h" -#include "tests/Mesh/TestReorder.h" -#include "tests/Mesh/TestGradients.h" -#include "tests/Mesh/TestAround.h" - -#include "tests/RNG/TestRNG.h" -#ifdef HAS_MKL - #include "tests/RNG/TestMKLRNG.h" -#endif -#ifdef HAS_RNGSSE2 -#include "tests/RNG/TestRNGSSE.h" -#endif -#include "tests/RNG/TestRandom123.h" - -#include "tests/LoadBalance/TestLoadDistributor.h" -#include "tests/LoadBalance/TestLinearMap.h" -#include "tests/LoadBalance/TestUnsMeshMap.h" +#include "TUTConfig.h" + +// Unit test groups to be tested. Each file defines a different test group. + +// #include "tests/Control/TestSystemComponents.h" +// #include "tests/Control/TestControl.h" +// #include "tests/Control/TestFileParser.h" +// #include "tests/Control/TestStringParser.h" +// #include "tests/Control/TestToggle.h" +// #ifdef HAS_MKL +// #include "tests/Control/Options/TestMKLUniformMethod.h" +// #include "tests/Control/Options/TestMKLGaussianMethod.h" +// #include "tests/Control/Options/TestMKLBetaMethod.h" +// #include "tests/Control/Options/TestMKLGammaMethod.h" +// #endif +// #include "tests/Control/Options/TestRNG.h" +// +// #include "tests/IO/TestMesh.h" +// #include "tests/IO/TestExodusIIMeshReader.h" +// #include "tests/IO/TestMeshReader.h" +// +// #include "tests/Mesh/TestDerivedData.h" +// #include "tests/Mesh/TestReorder.h" +// #include "tests/Mesh/TestGradients.h" +// #include "tests/Mesh/TestAround.h" +// +// #include "tests/RNG/TestRNG.h" +// #ifdef HAS_MKL +// #include "tests/RNG/TestMKLRNG.h" +// #endif +// #ifdef HAS_RNGSSE2 +// #include "tests/RNG/TestRNGSSE.h" +// #endif +// #include "tests/RNG/TestRandom123.h" +// +// #include "tests/LoadBalance/TestLoadDistributor.h" +// #include "tests/LoadBalance/TestLinearMap.h" +// #include "tests/LoadBalance/TestUnsMeshMap.h" + +// #include "tests/Inciter/TestScheme.h" +// #include "tests/Inciter/AMR/TestError.h" #if defined(__clang__) #pragma clang diagnostic push #pragma clang diagnostic ignored "-Wmissing-variable-declarations" #endif -#include "tests/Inciter/TestScheme.h" -#include "tests/Inciter/AMR/TestError.h" - //! \brief Charm handle to the main proxy, facilitates call-back to finalize, //! etc., must be in global scope, unique per executable CProxy_Main mainProxy; @@ -433,8 +407,5 @@ int main( int argc, char **argv ) { stop( mpipass ); } -#include "NoWarning/charmchild.def.h" -#include "NoWarning/charmtimer.def.h" -#include "NoWarning/migrated.def.h" #include "NoWarning/testarray.def.h" #include "NoWarning/unittest.def.h" diff --git a/src/NoWarning/migrated_base.def.h b/src/NoWarning/migrated_base.def.h new file mode 100644 index 00000000000..bee920b288c --- /dev/null +++ b/src/NoWarning/migrated_base.def.h @@ -0,0 +1,35 @@ +// ***************************************************************************** +/*! + \file src/NoWarning/migrated_base.def.h + \copyright 2012-2015, J. Bakosi, 2016-2018, Los Alamos National Security, LLC. + \brief Include migrated_base.def.h with turning off specific compiler + warnings +*/ +// ***************************************************************************** +#ifndef nowarning_migrated_base_def_h +#define nowarning_migrated_base_def_h + +#include "Macro.h" + +#if defined(__clang__) + #pragma clang diagnostic push + #pragma clang diagnostic ignored "-Wold-style-cast" + #pragma clang diagnostic ignored "-Wsign-conversion" + #pragma clang diagnostic ignored "-Wshorten-64-to-32" + #pragma clang diagnostic ignored "-Wunused-variable" + #pragma clang diagnostic ignored "-Wcast-qual" +#elif defined(STRICT_GNUC) + #pragma GCC diagnostic push + #pragma GCC diagnostic ignored "-Wcast-qual" + #pragma GCC diagnostic ignored "-Wunused-variable" +#endif + +#include "../UnitTest/migrated_base.def.h" + +#if defined(__clang__) + #pragma clang diagnostic pop +#elif defined(STRICT_GNUC) + #pragma GCC diagnostic pop +#endif + +#endif // nowarning_migrated_base_def_h diff --git a/src/UnitTest/CMakeLists.txt b/src/UnitTest/CMakeLists.txt index 3ffa017165c..7c1fb39ab48 100644 --- a/src/UnitTest/CMakeLists.txt +++ b/src/UnitTest/CMakeLists.txt @@ -9,12 +9,13 @@ add_library(UnitTest Assessment.C TUTSuite.C TUTTest.C + tests/TestBase.C ) addCharmModule( "tuttest" "UnitTest" ) addCharmModule( "tutsuite" "UnitTest" ) addCharmModule( "charmchild" "UnitTest" ) -addCharmModule( "migrated" "UnitTest" ) +addCharmModule( "migrated_base" "UnitTest" ) addCharmModule( "charmtimer" "UnitTest" ) addCharmModule( "testarray" "UnitTest" ) diff --git a/src/UnitTest/TUTConfig.h b/src/UnitTest/TUTConfig.h new file mode 100644 index 00000000000..04ed3ab5503 --- /dev/null +++ b/src/UnitTest/TUTConfig.h @@ -0,0 +1,22 @@ +// ***************************************************************************** +/*! + \file src/UnitTest/TUTConfig.h + \copyright 2012-2015, J. Bakosi, 2016-2018, Los Alamos National Security, LLC. + \brief Template Unit Test unit test configuration for all tests + \details Template Unit Test unit test configuration for all tests. +*/ +// ***************************************************************************** +#ifndef TUTConfig_h +#define TUTConfig_h + +namespace tut { + +//! \brief Maximum number of tests in every test group to attempt to run +//! \details If any of the unit test groups have more tests than this number, +//! this should be increased. All test groups use this value to override the +//! default template argument for tut::test_group<>. +const int MAX_TESTS_IN_GROUP = 80; + +} // tut:: + +#endif // TUTConfig_h diff --git a/src/UnitTest/migrated.ci b/src/UnitTest/migrated_base.ci similarity index 82% rename from src/UnitTest/migrated.ci rename to src/UnitTest/migrated_base.ci index 4999e0662a3..ccff955cbca 100644 --- a/src/UnitTest/migrated.ci +++ b/src/UnitTest/migrated_base.ci @@ -1,16 +1,15 @@ // ***************************************************************************** /*! - \file src/UnitTest/migrated.ci + \file src/UnitTest/migrated_base.ci \copyright 2012-2015, J. Bakosi, 2016-2018, Los Alamos National Security, LLC. \brief Charm++ module interface file for migrated test chare Migrated - \details Charm++ module interface file for migrated test chare Migrated + \details Charm++ module interface file for migrated test chare Migrated. */ // ***************************************************************************** -module migrated { +module migrated_base { include "tests/Base/MigratedTypes.h"; - include "Scheme.h"; namespace tut { @@ -31,12 +30,6 @@ module migrated { entry Migrated( charm::Variant v, double value ); } - chare Receiver { - entry Receiver( const inciter::Scheme& s, - int expected, - std::string label ); - } - } // tut:: } diff --git a/src/UnitTest/migrated_inciter.ci b/src/UnitTest/migrated_inciter.ci new file mode 100644 index 00000000000..d1cf2a0e739 --- /dev/null +++ b/src/UnitTest/migrated_inciter.ci @@ -0,0 +1,24 @@ +// ***************************************************************************** +/*! + \file src/UnitTest/migrated_inciter.ci + \copyright 2012-2015, J. Bakosi, 2016-2018, Los Alamos National Security, LLC. + \brief Charm++ module interface file for migrated test chare Receiver + \details Charm++ module interface file for migrated test chare Receiver. +*/ +// ***************************************************************************** + +module migrated { + + include "Scheme.h"; + + namespace tut { + + chare Receiver { + entry Receiver( const inciter::Scheme& s, + int expected, + std::string label ); + } + + } // tut:: + +} diff --git a/src/UnitTest/tests/Base/MigratedTypes.h b/src/UnitTest/tests/Base/MigratedTypes.h index 8279177c48a..ac96010cf41 100644 --- a/src/UnitTest/tests/Base/MigratedTypes.h +++ b/src/UnitTest/tests/Base/MigratedTypes.h @@ -2,8 +2,8 @@ /*! \file src/UnitTest/tests/Base/MigratedTypes.h \copyright 2012-2015, J. Bakosi, 2016-2018, Los Alamos National Security, LLC. - \brief Type definitions for unit tests of Charm++ migrated data - \details Type definitions for unit tests of Charm++ migrated data + \brief Type definitions for unit tests of Charm++ migrated data in Base + \details Type definitions for unit tests of Charm++ migrated data in Base. */ // ***************************************************************************** #ifndef test_MigratedTypes_h diff --git a/src/UnitTest/tests/TestBase.C b/src/UnitTest/tests/TestBase.C new file mode 100644 index 00000000000..ddb497f9e50 --- /dev/null +++ b/src/UnitTest/tests/TestBase.C @@ -0,0 +1,33 @@ +// ***************************************************************************** +/*! + \file src/UnitTest/tests/TestBase.C + \copyright 2012-2015, J. Bakosi, 2016-2018, Los Alamos National Security, LLC. + \brief Unit tess for directory Base + \details Unit test for directory Base. +*/ +// ***************************************************************************** + +#include "TUTConfig.h" + +#include "NoWarning/tutsuite.decl.h" + +#include "tests/Base/TestFactory.h" +#include "tests/Base/TestTimer.h" +#include "tests/Base/TestPUPUtil.h" +#include "tests/Base/TestFlip_map.h" +#include "tests/Base/TestHas.h" +#include "tests/Base/TestData.h" +#include "tests/Base/TestPrint.h" +#include "tests/Base/TestTaggedTuple.h" +#include "tests/Base/TestException.h" +#include "tests/Base/TestExceptionMPI.h" +#include "tests/Base/TestReader.h" +#include "tests/Base/TestStrConvUtil.h" +#include "tests/Base/TestWriter.h" +#include "tests/Base/TestProcessControl.h" +#include "tests/Base/TestVector.h" +#include "tests/Base/TestContainerUtil.h" + +#include "NoWarning/charmchild.def.h" +#include "NoWarning/charmtimer.def.h" +#include "NoWarning/migrated_base.def.h" diff --git a/src/UnitTest/tutsuite.ci b/src/UnitTest/tutsuite.ci index 0b354fbb2e0..de2982849c3 100644 --- a/src/UnitTest/tutsuite.ci +++ b/src/UnitTest/tutsuite.ci @@ -21,7 +21,7 @@ module tutsuite { // TUTSuite spawns chares defined in the modules defined below as extern. If // this is not included, Charm++ generates bad code and valgrind detects // memory errors as chares are fired up from unit tests inside TUTSuite. - extern module migrated; + extern module migrated_base; extern module charmchild; extern module charmtimer; extern module linearmap; From 250d8bf443e5d6620637ef80060c35ed712cf042 Mon Sep 17 00:00:00 2001 From: Jozsef Bakosi Date: Fri, 20 Jul 2018 15:13:37 -0600 Subject: [PATCH 02/19] Split off Inciter unit tests to their own compilation unit --- src/Main/UnitTest.C | 3 --- .../{migrated.def.h => migrated_inciter.def.h} | 12 ++++++------ src/NoWarning/tutsuite.decl.h | 1 + src/UnitTest/CMakeLists.txt | 4 +++- src/UnitTest/migrated_inciter.ci | 2 +- src/UnitTest/tests/Inciter/TestScheme.h | 6 ++++++ src/UnitTest/tests/TestInciter.C | 17 +++++++++++++++++ src/UnitTest/tutsuite.ci | 1 + 8 files changed, 35 insertions(+), 11 deletions(-) rename src/NoWarning/{migrated.def.h => migrated_inciter.def.h} (75%) create mode 100644 src/UnitTest/tests/TestInciter.C diff --git a/src/Main/UnitTest.C b/src/Main/UnitTest.C index 0e6877e8ced..382db67867a 100644 --- a/src/Main/UnitTest.C +++ b/src/Main/UnitTest.C @@ -80,9 +80,6 @@ // #include "tests/LoadBalance/TestLinearMap.h" // #include "tests/LoadBalance/TestUnsMeshMap.h" -// #include "tests/Inciter/TestScheme.h" -// #include "tests/Inciter/AMR/TestError.h" - #if defined(__clang__) #pragma clang diagnostic push #pragma clang diagnostic ignored "-Wmissing-variable-declarations" diff --git a/src/NoWarning/migrated.def.h b/src/NoWarning/migrated_inciter.def.h similarity index 75% rename from src/NoWarning/migrated.def.h rename to src/NoWarning/migrated_inciter.def.h index 26e4a0e30e3..136c13c94e3 100644 --- a/src/NoWarning/migrated.def.h +++ b/src/NoWarning/migrated_inciter.def.h @@ -1,13 +1,13 @@ // ***************************************************************************** /*! - \file src/NoWarning/migrated.def.h + \file src/NoWarning/migrated_inciter.def.h \copyright 2012-2015, J. Bakosi, 2016-2018, Los Alamos National Security, LLC. - \brief Include migrated.def.h with turning off specific compiler + \brief Include migrated_inciter.def.h with turning off specific compiler warnings */ // ***************************************************************************** -#ifndef nowarning_migrated_def_h -#define nowarning_migrated_def_h +#ifndef nowarning_migrated_inciter_def_h +#define nowarning_migrated_inciter_def_h #include "Macro.h" @@ -24,7 +24,7 @@ #pragma GCC diagnostic ignored "-Wunused-variable" #endif -#include "../UnitTest/migrated.def.h" +#include "../UnitTest/migrated_inciter.def.h" #if defined(__clang__) #pragma clang diagnostic pop @@ -32,4 +32,4 @@ #pragma GCC diagnostic pop #endif -#endif // nowarning_migrated_def_h +#endif // nowarning_migrated_inciter_def_h diff --git a/src/NoWarning/tutsuite.decl.h b/src/NoWarning/tutsuite.decl.h index 30fbf652d0a..c7610dce065 100644 --- a/src/NoWarning/tutsuite.decl.h +++ b/src/NoWarning/tutsuite.decl.h @@ -16,6 +16,7 @@ #pragma clang diagnostic ignored "-Wundef" #pragma clang diagnostic ignored "-Wheader-hygiene" #pragma clang diagnostic ignored "-Wdocumentation" + #pragma clang diagnostic ignored "-Wdocumentation-unknown-command" #pragma clang diagnostic ignored "-Wold-style-cast" #pragma clang diagnostic ignored "-Wunused-parameter" #pragma clang diagnostic ignored "-Wunused-variable" diff --git a/src/UnitTest/CMakeLists.txt b/src/UnitTest/CMakeLists.txt index 7c1fb39ab48..cfa932bc3fd 100644 --- a/src/UnitTest/CMakeLists.txt +++ b/src/UnitTest/CMakeLists.txt @@ -10,14 +10,16 @@ add_library(UnitTest TUTSuite.C TUTTest.C tests/TestBase.C + tests/TestInciter.C ) addCharmModule( "tuttest" "UnitTest" ) addCharmModule( "tutsuite" "UnitTest" ) addCharmModule( "charmchild" "UnitTest" ) -addCharmModule( "migrated_base" "UnitTest" ) addCharmModule( "charmtimer" "UnitTest" ) addCharmModule( "testarray" "UnitTest" ) +addCharmModule( "migrated_base" "UnitTest" ) +addCharmModule( "migrated_inciter" "UnitTest" ) # Add extra dependency of UnitTest on unittestCharmModule. This is required as a # dependency of UnitTest, TUTSuite, refers to the main Charm++ proxy defined in diff --git a/src/UnitTest/migrated_inciter.ci b/src/UnitTest/migrated_inciter.ci index d1cf2a0e739..ee2058a68d6 100644 --- a/src/UnitTest/migrated_inciter.ci +++ b/src/UnitTest/migrated_inciter.ci @@ -7,7 +7,7 @@ */ // ***************************************************************************** -module migrated { +module migrated_inciter { include "Scheme.h"; diff --git a/src/UnitTest/tests/Inciter/TestScheme.h b/src/UnitTest/tests/Inciter/TestScheme.h index 04f7240989b..58685162837 100644 --- a/src/UnitTest/tests/Inciter/TestScheme.h +++ b/src/UnitTest/tests/Inciter/TestScheme.h @@ -15,6 +15,12 @@ #include "Scheme.h" +namespace unittest { + +extern CProxy_TUTSuite g_suiteProxy; + +} // unittest:: + namespace tut { //! All tests in group inherited from this base diff --git a/src/UnitTest/tests/TestInciter.C b/src/UnitTest/tests/TestInciter.C new file mode 100644 index 00000000000..0bf16a5bb8f --- /dev/null +++ b/src/UnitTest/tests/TestInciter.C @@ -0,0 +1,17 @@ +// ***************************************************************************** +/*! + \file src/UnitTest/tests/TestInciter.C + \copyright 2012-2015, J. Bakosi, 2016-2018, Los Alamos National Security, LLC. + \brief Unit tess for directory Inciter + \details Unit test for directory Inciter. +*/ +// ***************************************************************************** + +#include "TUTConfig.h" + +#include "NoWarning/tutsuite.decl.h" + +#include "tests/Inciter/TestScheme.h" +#include "tests/Inciter/AMR/TestError.h" + +#include "NoWarning/migrated_inciter.def.h" diff --git a/src/UnitTest/tutsuite.ci b/src/UnitTest/tutsuite.ci index de2982849c3..3441dc05e76 100644 --- a/src/UnitTest/tutsuite.ci +++ b/src/UnitTest/tutsuite.ci @@ -22,6 +22,7 @@ module tutsuite { // this is not included, Charm++ generates bad code and valgrind detects // memory errors as chares are fired up from unit tests inside TUTSuite. extern module migrated_base; + extern module migrated_inciter; extern module charmchild; extern module charmtimer; extern module linearmap; From c2bf112a1591f01853548d8ef5fc3c62926ce7a5 Mon Sep 17 00:00:00 2001 From: Jozsef Bakosi Date: Fri, 20 Jul 2018 15:21:43 -0600 Subject: [PATCH 03/19] Split off Control unit tests to their own compilation unit --- src/Main/UnitTest.C | 13 ---------- src/UnitTest/CMakeLists.txt | 1 + src/UnitTest/tests/Control/TestFileParser.h | 1 + src/UnitTest/tests/TestControl.C | 27 +++++++++++++++++++++ 4 files changed, 29 insertions(+), 13 deletions(-) create mode 100644 src/UnitTest/tests/TestControl.C diff --git a/src/Main/UnitTest.C b/src/Main/UnitTest.C index 382db67867a..753615410db 100644 --- a/src/Main/UnitTest.C +++ b/src/Main/UnitTest.C @@ -45,19 +45,6 @@ // Unit test groups to be tested. Each file defines a different test group. -// #include "tests/Control/TestSystemComponents.h" -// #include "tests/Control/TestControl.h" -// #include "tests/Control/TestFileParser.h" -// #include "tests/Control/TestStringParser.h" -// #include "tests/Control/TestToggle.h" -// #ifdef HAS_MKL -// #include "tests/Control/Options/TestMKLUniformMethod.h" -// #include "tests/Control/Options/TestMKLGaussianMethod.h" -// #include "tests/Control/Options/TestMKLBetaMethod.h" -// #include "tests/Control/Options/TestMKLGammaMethod.h" -// #endif -// #include "tests/Control/Options/TestRNG.h" -// // #include "tests/IO/TestMesh.h" // #include "tests/IO/TestExodusIIMeshReader.h" // #include "tests/IO/TestMeshReader.h" diff --git a/src/UnitTest/CMakeLists.txt b/src/UnitTest/CMakeLists.txt index cfa932bc3fd..ac9fd3bcf5a 100644 --- a/src/UnitTest/CMakeLists.txt +++ b/src/UnitTest/CMakeLists.txt @@ -11,6 +11,7 @@ add_library(UnitTest TUTTest.C tests/TestBase.C tests/TestInciter.C + tests/TestControl.C ) addCharmModule( "tuttest" "UnitTest" ) diff --git a/src/UnitTest/tests/Control/TestFileParser.h b/src/UnitTest/tests/Control/TestFileParser.h index ed6477cff8b..2fd56bdca35 100644 --- a/src/UnitTest/tests/Control/TestFileParser.h +++ b/src/UnitTest/tests/Control/TestFileParser.h @@ -12,6 +12,7 @@ #include "NoWarning/tut.h" #include "FileParser.h" +#include "Print.h" namespace unittest { diff --git a/src/UnitTest/tests/TestControl.C b/src/UnitTest/tests/TestControl.C new file mode 100644 index 00000000000..66604b37879 --- /dev/null +++ b/src/UnitTest/tests/TestControl.C @@ -0,0 +1,27 @@ +// ***************************************************************************** +/*! + \file src/UnitTest/tests/TestControl.C + \copyright 2012-2015, J. Bakosi, 2016-2018, Los Alamos National Security, LLC. + \brief Unit tess for directory Control + \details Unit test for directory Control. +*/ +// ***************************************************************************** + +#include "TUTConfig.h" + +#include "NoWarning/tutsuite.decl.h" + +#include "tests/Control/TestSystemComponents.h" +#include "tests/Control/TestControl.h" +#include "tests/Control/TestFileParser.h" +#include "tests/Control/TestStringParser.h" +#include "tests/Control/TestToggle.h" + +#ifdef HAS_MKL + #include "tests/Control/Options/TestMKLUniformMethod.h" + #include "tests/Control/Options/TestMKLGaussianMethod.h" + #include "tests/Control/Options/TestMKLBetaMethod.h" + #include "tests/Control/Options/TestMKLGammaMethod.h" +#endif + +#include "tests/Control/Options/TestRNG.h" From 8f387d80be3a6095bdb1d697fe39016f5e0208ea Mon Sep 17 00:00:00 2001 From: Jozsef Bakosi Date: Fri, 20 Jul 2018 15:25:21 -0600 Subject: [PATCH 04/19] Split off IO unit tests to their own compilation unit --- src/Main/UnitTest.C | 6 ------ src/UnitTest/CMakeLists.txt | 1 + src/UnitTest/tests/IO/TestExodusIIMeshReader.h | 1 - src/UnitTest/tests/IO/TestMeshReader.h | 1 - src/UnitTest/tests/TestIO.C | 16 ++++++++++++++++ 5 files changed, 17 insertions(+), 8 deletions(-) create mode 100644 src/UnitTest/tests/TestIO.C diff --git a/src/Main/UnitTest.C b/src/Main/UnitTest.C index 753615410db..601d2e8b2aa 100644 --- a/src/Main/UnitTest.C +++ b/src/Main/UnitTest.C @@ -43,12 +43,6 @@ #include "UnitTest/CmdLine/Parser.h" #include "TUTConfig.h" -// Unit test groups to be tested. Each file defines a different test group. - -// #include "tests/IO/TestMesh.h" -// #include "tests/IO/TestExodusIIMeshReader.h" -// #include "tests/IO/TestMeshReader.h" -// // #include "tests/Mesh/TestDerivedData.h" // #include "tests/Mesh/TestReorder.h" // #include "tests/Mesh/TestGradients.h" diff --git a/src/UnitTest/CMakeLists.txt b/src/UnitTest/CMakeLists.txt index ac9fd3bcf5a..b7585a2bd8f 100644 --- a/src/UnitTest/CMakeLists.txt +++ b/src/UnitTest/CMakeLists.txt @@ -12,6 +12,7 @@ add_library(UnitTest tests/TestBase.C tests/TestInciter.C tests/TestControl.C + tests/TestIO.C ) addCharmModule( "tuttest" "UnitTest" ) diff --git a/src/UnitTest/tests/IO/TestExodusIIMeshReader.h b/src/UnitTest/tests/IO/TestExodusIIMeshReader.h index 62c10e27a7c..9767fa6f4c7 100644 --- a/src/UnitTest/tests/IO/TestExodusIIMeshReader.h +++ b/src/UnitTest/tests/IO/TestExodusIIMeshReader.h @@ -14,7 +14,6 @@ #include "NoWarning/tut.h" -#include "Init.h" #include "UnsMesh.h" #include "TUTUtil.h" #include "QuinoaConfig.h" diff --git a/src/UnitTest/tests/IO/TestMeshReader.h b/src/UnitTest/tests/IO/TestMeshReader.h index fd6994cec68..02c79493a4f 100644 --- a/src/UnitTest/tests/IO/TestMeshReader.h +++ b/src/UnitTest/tests/IO/TestMeshReader.h @@ -14,7 +14,6 @@ #include "NoWarning/tut.h" -#include "Init.h" #include "QuinoaConfig.h" #include "MeshReader.h" #include "ContainerUtil.h" diff --git a/src/UnitTest/tests/TestIO.C b/src/UnitTest/tests/TestIO.C new file mode 100644 index 00000000000..151849828a7 --- /dev/null +++ b/src/UnitTest/tests/TestIO.C @@ -0,0 +1,16 @@ +// ***************************************************************************** +/*! + \file src/UnitTest/tests/TestIO.C + \copyright 2012-2015, J. Bakosi, 2016-2018, Los Alamos National Security, LLC. + \brief Unit tess for directory IO + \details Unit test for directory IO. +*/ +// ***************************************************************************** + +#include "TUTConfig.h" + +#include "NoWarning/tutsuite.decl.h" + +#include "tests/IO/TestMesh.h" +#include "tests/IO/TestExodusIIMeshReader.h" +#include "tests/IO/TestMeshReader.h" From d0dad4d86c90d0640b4bf1f55ddb7c9150b99f8c Mon Sep 17 00:00:00 2001 From: Jozsef Bakosi Date: Fri, 20 Jul 2018 15:30:38 -0600 Subject: [PATCH 05/19] Split off Mesh unit tests to their own compilation unit --- src/Main/UnitTest.C | 5 ----- src/UnitTest/CMakeLists.txt | 1 + src/UnitTest/tests/Mesh/TestDerivedData.h | 2 ++ src/UnitTest/tests/TestMesh.C | 17 +++++++++++++++++ 4 files changed, 20 insertions(+), 5 deletions(-) create mode 100644 src/UnitTest/tests/TestMesh.C diff --git a/src/Main/UnitTest.C b/src/Main/UnitTest.C index 601d2e8b2aa..a0dc9d3f85b 100644 --- a/src/Main/UnitTest.C +++ b/src/Main/UnitTest.C @@ -43,11 +43,6 @@ #include "UnitTest/CmdLine/Parser.h" #include "TUTConfig.h" -// #include "tests/Mesh/TestDerivedData.h" -// #include "tests/Mesh/TestReorder.h" -// #include "tests/Mesh/TestGradients.h" -// #include "tests/Mesh/TestAround.h" -// // #include "tests/RNG/TestRNG.h" // #ifdef HAS_MKL // #include "tests/RNG/TestMKLRNG.h" diff --git a/src/UnitTest/CMakeLists.txt b/src/UnitTest/CMakeLists.txt index b7585a2bd8f..8d983bdcba9 100644 --- a/src/UnitTest/CMakeLists.txt +++ b/src/UnitTest/CMakeLists.txt @@ -13,6 +13,7 @@ add_library(UnitTest tests/TestInciter.C tests/TestControl.C tests/TestIO.C + tests/TestMesh.C ) addCharmModule( "tuttest" "UnitTest" ) diff --git a/src/UnitTest/tests/Mesh/TestDerivedData.h b/src/UnitTest/tests/Mesh/TestDerivedData.h index c897f4d1375..06a4d706482 100644 --- a/src/UnitTest/tests/Mesh/TestDerivedData.h +++ b/src/UnitTest/tests/Mesh/TestDerivedData.h @@ -115,6 +115,8 @@ #include "NoWarning/tut.h" #include "DerivedData.h" +#include "Reorder.h" +#include "ExodusIIMeshReader.h" namespace tut { diff --git a/src/UnitTest/tests/TestMesh.C b/src/UnitTest/tests/TestMesh.C new file mode 100644 index 00000000000..87000455cfc --- /dev/null +++ b/src/UnitTest/tests/TestMesh.C @@ -0,0 +1,17 @@ +// ***************************************************************************** +/*! + \file src/UnitTest/tests/TestMesh.C + \copyright 2012-2015, J. Bakosi, 2016-2018, Los Alamos National Security, LLC. + \brief Unit tess for directory Mesh + \details Unit test for directory Mesh. +*/ +// ***************************************************************************** + +#include "TUTConfig.h" + +#include "NoWarning/tutsuite.decl.h" + +#include "tests/Mesh/TestDerivedData.h" +#include "tests/Mesh/TestReorder.h" +#include "tests/Mesh/TestGradients.h" +#include "tests/Mesh/TestAround.h" From 039915ca4729da89c40053b0ca7c9d6d81c2371d Mon Sep 17 00:00:00 2001 From: Jozsef Bakosi Date: Fri, 20 Jul 2018 15:36:17 -0600 Subject: [PATCH 06/19] Split off RNG unit tests to their own compilation unit --- src/Main/UnitTest.C | 9 --------- src/NoWarning/mkl_vsl_types.h | 28 ++++++++++++++++++++++++++++ src/RNG/MKLRNG.h | 3 ++- src/UnitTest/CMakeLists.txt | 1 + src/UnitTest/tests/RNG/TestRNG.h | 2 +- src/UnitTest/tests/TestRNG.C | 24 ++++++++++++++++++++++++ 6 files changed, 56 insertions(+), 11 deletions(-) create mode 100644 src/NoWarning/mkl_vsl_types.h create mode 100644 src/UnitTest/tests/TestRNG.C diff --git a/src/Main/UnitTest.C b/src/Main/UnitTest.C index a0dc9d3f85b..89c24fcc062 100644 --- a/src/Main/UnitTest.C +++ b/src/Main/UnitTest.C @@ -43,15 +43,6 @@ #include "UnitTest/CmdLine/Parser.h" #include "TUTConfig.h" -// #include "tests/RNG/TestRNG.h" -// #ifdef HAS_MKL -// #include "tests/RNG/TestMKLRNG.h" -// #endif -// #ifdef HAS_RNGSSE2 -// #include "tests/RNG/TestRNGSSE.h" -// #endif -// #include "tests/RNG/TestRandom123.h" -// // #include "tests/LoadBalance/TestLoadDistributor.h" // #include "tests/LoadBalance/TestLinearMap.h" // #include "tests/LoadBalance/TestUnsMeshMap.h" diff --git a/src/NoWarning/mkl_vsl_types.h b/src/NoWarning/mkl_vsl_types.h new file mode 100644 index 00000000000..20b1a64ab47 --- /dev/null +++ b/src/NoWarning/mkl_vsl_types.h @@ -0,0 +1,28 @@ +// ***************************************************************************** +/*! + \file src/NoWarning/mkl_vsl_types.h + \copyright 2012-2015, J. Bakosi, 2016-2018, Los Alamos National Security, LLC. + \brief Include mkl_vsl_types.h with turning off specific compiler warnings +*/ +// ***************************************************************************** +#ifndef nowarning_mkl_vsl_types_h +#define nowarning_mkl_vsl_types_h + +#include "Macro.h" + +#ifdef HAS_MKL + +#if defined(__clang__) + #pragma clang diagnostic push + #pragma clang diagnostic ignored "-Wreserved-id-macro" +#endif + +#include + +#if defined(__clang__) + #pragma clang diagnostic pop +#endif + +#endif // HAS_MKL + +#endif // nowarning_mkl_vsl_types_h diff --git a/src/RNG/MKLRNG.h b/src/RNG/MKLRNG.h index 0bcb1cc3833..aab3e815970 100644 --- a/src/RNG/MKLRNG.h +++ b/src/RNG/MKLRNG.h @@ -9,9 +9,10 @@ #ifndef MKLRNG_h #define MKLRNG_h -#include +#include "NoWarning/mkl_vsl.h" #include "Exception.h" +#include "Make_unique.h" namespace tk { diff --git a/src/UnitTest/CMakeLists.txt b/src/UnitTest/CMakeLists.txt index 8d983bdcba9..dd74672d4a7 100644 --- a/src/UnitTest/CMakeLists.txt +++ b/src/UnitTest/CMakeLists.txt @@ -14,6 +14,7 @@ add_library(UnitTest tests/TestControl.C tests/TestIO.C tests/TestMesh.C + tests/TestRNG.C ) addCharmModule( "tuttest" "UnitTest" ) diff --git a/src/UnitTest/tests/RNG/TestRNG.h b/src/UnitTest/tests/RNG/TestRNG.h index 6fd4639b1a9..98dec19be37 100644 --- a/src/UnitTest/tests/RNG/TestRNG.h +++ b/src/UnitTest/tests/RNG/TestRNG.h @@ -19,7 +19,7 @@ #include "NoWarning/philox.h" #ifdef HAS_MKL - #include + #include "NoWarning/mkl_vsl_types.h" #include "MKLRNG.h" #endif diff --git a/src/UnitTest/tests/TestRNG.C b/src/UnitTest/tests/TestRNG.C new file mode 100644 index 00000000000..ca37b53ffa3 --- /dev/null +++ b/src/UnitTest/tests/TestRNG.C @@ -0,0 +1,24 @@ +// ***************************************************************************** +/*! + \file src/UnitTest/tests/TestRNG.C + \copyright 2012-2015, J. Bakosi, 2016-2018, Los Alamos National Security, LLC. + \brief Unit tess for directory RNG + \details Unit test for directory RNG. +*/ +// ***************************************************************************** + +#include "TUTConfig.h" + +#include "NoWarning/tutsuite.decl.h" + +#include "tests/RNG/TestRNG.h" + +#ifdef HAS_MKL + #include "tests/RNG/TestMKLRNG.h" +#endif + +#ifdef HAS_RNGSSE2 +#include "tests/RNG/TestRNGSSE.h" +#endif + +#include "tests/RNG/TestRandom123.h" From 1740ebc454864ce8f9424cefa7d6c48564d29154 Mon Sep 17 00:00:00 2001 From: Jozsef Bakosi Date: Fri, 20 Jul 2018 15:41:12 -0600 Subject: [PATCH 07/19] Split off LoadBalance unit tests to their own compilation unit --- src/Main/UnitTest.C | 6 ------ src/UnitTest/CMakeLists.txt | 1 + src/UnitTest/tests/TestLoadBalance.C | 20 ++++++++++++++++++++ 3 files changed, 21 insertions(+), 6 deletions(-) create mode 100644 src/UnitTest/tests/TestLoadBalance.C diff --git a/src/Main/UnitTest.C b/src/Main/UnitTest.C index 89c24fcc062..341da82a9bc 100644 --- a/src/Main/UnitTest.C +++ b/src/Main/UnitTest.C @@ -37,16 +37,11 @@ #include "Assessment.h" #include "ProcessException.h" #include "UnitTest/CmdLine/CmdLine.h" -#include "TestArray.h" #include "UnitTestPrint.h" #include "UnitTestDriver.h" #include "UnitTest/CmdLine/Parser.h" #include "TUTConfig.h" -// #include "tests/LoadBalance/TestLoadDistributor.h" -// #include "tests/LoadBalance/TestLinearMap.h" -// #include "tests/LoadBalance/TestUnsMeshMap.h" - #if defined(__clang__) #pragma clang diagnostic push #pragma clang diagnostic ignored "-Wmissing-variable-declarations" @@ -371,5 +366,4 @@ int main( int argc, char **argv ) { stop( mpipass ); } -#include "NoWarning/testarray.def.h" #include "NoWarning/unittest.def.h" diff --git a/src/UnitTest/CMakeLists.txt b/src/UnitTest/CMakeLists.txt index dd74672d4a7..48d7984d105 100644 --- a/src/UnitTest/CMakeLists.txt +++ b/src/UnitTest/CMakeLists.txt @@ -15,6 +15,7 @@ add_library(UnitTest tests/TestIO.C tests/TestMesh.C tests/TestRNG.C + tests/TestLoadBalance.C ) addCharmModule( "tuttest" "UnitTest" ) diff --git a/src/UnitTest/tests/TestLoadBalance.C b/src/UnitTest/tests/TestLoadBalance.C new file mode 100644 index 00000000000..d1fdf34a8bb --- /dev/null +++ b/src/UnitTest/tests/TestLoadBalance.C @@ -0,0 +1,20 @@ +// ***************************************************************************** +/*! + \file src/UnitTest/tests/TestLoadBalance.C + \copyright 2012-2015, J. Bakosi, 2016-2018, Los Alamos National Security, LLC. + \brief Unit tess for directory LoadBalance + \details Unit test for directory LoadBalance. +*/ +// ***************************************************************************** + +#include "TUTConfig.h" + +#include "NoWarning/tutsuite.decl.h" + +#include "TestArray.h" + +#include "tests/LoadBalance/TestLoadDistributor.h" +#include "tests/LoadBalance/TestLinearMap.h" +#include "tests/LoadBalance/TestUnsMeshMap.h" + +#include "NoWarning/testarray.def.h" From d91f017c8b9adad86aeb207bc348c056e11d5582 Mon Sep 17 00:00:00 2001 From: Jozsef Bakosi Date: Sat, 21 Jul 2018 07:26:08 -0600 Subject: [PATCH 08/19] Clean up includes for unit tests --- src/Base/Variant.h | 1 + src/NoWarning/linearmap.decl.h | 1 + src/NoWarning/testarray.decl.h | 34 +++++++++++++++++++ src/RNG/MKLRNG.h | 1 + src/UnitTest/TestArray.h | 2 ++ src/UnitTest/tests/Base/TestFactory.h | 2 ++ .../tests/Control/TestSystemComponents.h | 1 + src/UnitTest/tests/Inciter/TestScheme.h | 2 ++ .../tests/LoadBalance/TestLoadDistributor.h | 1 + src/UnitTest/tests/TestBase.C | 2 -- src/UnitTest/tests/TestControl.C | 2 -- src/UnitTest/tests/TestIO.C | 2 -- src/UnitTest/tests/TestInciter.C | 2 -- src/UnitTest/tests/TestLoadBalance.C | 4 --- src/UnitTest/tests/TestMesh.C | 2 -- src/UnitTest/tests/TestRNG.C | 4 +-- 16 files changed, 46 insertions(+), 17 deletions(-) create mode 100644 src/NoWarning/testarray.decl.h diff --git a/src/Base/Variant.h b/src/Base/Variant.h index fd4ee9d898a..3eed60c861f 100644 --- a/src/Base/Variant.h +++ b/src/Base/Variant.h @@ -10,6 +10,7 @@ #define Variant_h #include "NoWarning/variant.h" +#include "NoWarning/charm++.h" namespace tk { diff --git a/src/NoWarning/linearmap.decl.h b/src/NoWarning/linearmap.decl.h index 8587fb90107..53793ecc499 100644 --- a/src/NoWarning/linearmap.decl.h +++ b/src/NoWarning/linearmap.decl.h @@ -16,6 +16,7 @@ #pragma clang diagnostic ignored "-Wundef" #pragma clang diagnostic ignored "-Wheader-hygiene" #pragma clang diagnostic ignored "-Wdocumentation" + #pragma clang diagnostic ignored "-Wdocumentation-unknown-command" #pragma clang diagnostic ignored "-Wunused-parameter" #pragma clang diagnostic ignored "-Wunused-variable" #pragma clang diagnostic ignored "-Wold-style-cast" diff --git a/src/NoWarning/testarray.decl.h b/src/NoWarning/testarray.decl.h new file mode 100644 index 00000000000..4bec0493c1c --- /dev/null +++ b/src/NoWarning/testarray.decl.h @@ -0,0 +1,34 @@ +// ***************************************************************************** +/*! + \file src/NoWarning/testarray.decl.h + \copyright 2012-2015, J. Bakosi, 2016-2018, Los Alamos National Security, LLC. + \brief Include testarray.decl.h with turning off specific compiler + warnings +*/ +// ***************************************************************************** +#ifndef nowarning_testarray_decl_h +#define nowarning_testarray_decl_h + +#include "Macro.h" + +#if defined(__clang__) + #pragma clang diagnostic push + #pragma clang diagnostic ignored "-Wreserved-id-macro" + #pragma clang diagnostic ignored "-Wzero-as-null-pointer-constant" + #pragma clang diagnostic ignored "-Wunused-parameter" + #pragma clang diagnostic ignored "-Wshorten-64-to-32" + #pragma clang diagnostic ignored "-Wold-style-cast" +#elif defined(STRICT_GNUC) + #pragma GCC diagnostic push + #pragma GCC diagnostic ignored "-Wunused-parameter" +#endif + +#include "../UnitTest/testarray.decl.h" + +#if defined(__clang__) + #pragma clang diagnostic pop +#elif defined(STRICT_GNUC) + #pragma GCC diagnostic pop +#endif + +#endif // nowarning_testarray_decl_h diff --git a/src/RNG/MKLRNG.h b/src/RNG/MKLRNG.h index aab3e815970..1c9852eb5f5 100644 --- a/src/RNG/MKLRNG.h +++ b/src/RNG/MKLRNG.h @@ -13,6 +13,7 @@ #include "Exception.h" #include "Make_unique.h" +#include "Keywords.h" namespace tk { diff --git a/src/UnitTest/TestArray.h b/src/UnitTest/TestArray.h index b619b4b1596..05d40e8063d 100644 --- a/src/UnitTest/TestArray.h +++ b/src/UnitTest/TestArray.h @@ -9,6 +9,8 @@ #ifndef TestArray_h #define TestArray_h +#include "NoWarning/testarray.decl.h" + namespace tut { //! Charm++ chare array definition for testing arrays diff --git a/src/UnitTest/tests/Base/TestFactory.h b/src/UnitTest/tests/Base/TestFactory.h index 1d5dbd97ba5..8f1a295a805 100644 --- a/src/UnitTest/tests/Base/TestFactory.h +++ b/src/UnitTest/tests/Base/TestFactory.h @@ -17,6 +17,8 @@ #include "Make_unique.h" #include "Factory.h" +#include "NoWarning/tutsuite.decl.h" + namespace unittest { extern CProxy_TUTSuite g_suiteProxy; diff --git a/src/UnitTest/tests/Control/TestSystemComponents.h b/src/UnitTest/tests/Control/TestSystemComponents.h index 964ff1365da..d2c17a3d6f9 100644 --- a/src/UnitTest/tests/Control/TestSystemComponents.h +++ b/src/UnitTest/tests/Control/TestSystemComponents.h @@ -17,6 +17,7 @@ #include "SystemComponents.h" #include "TaggedTuple.h" #include "Tags.h" +#include "Control.h" namespace tut { diff --git a/src/UnitTest/tests/Inciter/TestScheme.h b/src/UnitTest/tests/Inciter/TestScheme.h index 58685162837..bef676d3c67 100644 --- a/src/UnitTest/tests/Inciter/TestScheme.h +++ b/src/UnitTest/tests/Inciter/TestScheme.h @@ -13,6 +13,8 @@ #include "NoWarning/tut.h" +#include "NoWarning/tutsuite.decl.h" + #include "Scheme.h" namespace unittest { diff --git a/src/UnitTest/tests/LoadBalance/TestLoadDistributor.h b/src/UnitTest/tests/LoadBalance/TestLoadDistributor.h index 05bf3ebffd9..b734be6480d 100644 --- a/src/UnitTest/tests/LoadBalance/TestLoadDistributor.h +++ b/src/UnitTest/tests/LoadBalance/TestLoadDistributor.h @@ -12,6 +12,7 @@ #include "NoWarning/tut.h" #include "LoadDistributor.h" +#include "Exception.h" namespace unittest { diff --git a/src/UnitTest/tests/TestBase.C b/src/UnitTest/tests/TestBase.C index ddb497f9e50..9369b581be4 100644 --- a/src/UnitTest/tests/TestBase.C +++ b/src/UnitTest/tests/TestBase.C @@ -9,8 +9,6 @@ #include "TUTConfig.h" -#include "NoWarning/tutsuite.decl.h" - #include "tests/Base/TestFactory.h" #include "tests/Base/TestTimer.h" #include "tests/Base/TestPUPUtil.h" diff --git a/src/UnitTest/tests/TestControl.C b/src/UnitTest/tests/TestControl.C index 66604b37879..02b1dd868bb 100644 --- a/src/UnitTest/tests/TestControl.C +++ b/src/UnitTest/tests/TestControl.C @@ -9,8 +9,6 @@ #include "TUTConfig.h" -#include "NoWarning/tutsuite.decl.h" - #include "tests/Control/TestSystemComponents.h" #include "tests/Control/TestControl.h" #include "tests/Control/TestFileParser.h" diff --git a/src/UnitTest/tests/TestIO.C b/src/UnitTest/tests/TestIO.C index 151849828a7..8856c38ca19 100644 --- a/src/UnitTest/tests/TestIO.C +++ b/src/UnitTest/tests/TestIO.C @@ -9,8 +9,6 @@ #include "TUTConfig.h" -#include "NoWarning/tutsuite.decl.h" - #include "tests/IO/TestMesh.h" #include "tests/IO/TestExodusIIMeshReader.h" #include "tests/IO/TestMeshReader.h" diff --git a/src/UnitTest/tests/TestInciter.C b/src/UnitTest/tests/TestInciter.C index 0bf16a5bb8f..c9f67ea7ea4 100644 --- a/src/UnitTest/tests/TestInciter.C +++ b/src/UnitTest/tests/TestInciter.C @@ -9,8 +9,6 @@ #include "TUTConfig.h" -#include "NoWarning/tutsuite.decl.h" - #include "tests/Inciter/TestScheme.h" #include "tests/Inciter/AMR/TestError.h" diff --git a/src/UnitTest/tests/TestLoadBalance.C b/src/UnitTest/tests/TestLoadBalance.C index d1fdf34a8bb..3c7ff4b4807 100644 --- a/src/UnitTest/tests/TestLoadBalance.C +++ b/src/UnitTest/tests/TestLoadBalance.C @@ -9,10 +9,6 @@ #include "TUTConfig.h" -#include "NoWarning/tutsuite.decl.h" - -#include "TestArray.h" - #include "tests/LoadBalance/TestLoadDistributor.h" #include "tests/LoadBalance/TestLinearMap.h" #include "tests/LoadBalance/TestUnsMeshMap.h" diff --git a/src/UnitTest/tests/TestMesh.C b/src/UnitTest/tests/TestMesh.C index 87000455cfc..daf3860b047 100644 --- a/src/UnitTest/tests/TestMesh.C +++ b/src/UnitTest/tests/TestMesh.C @@ -9,8 +9,6 @@ #include "TUTConfig.h" -#include "NoWarning/tutsuite.decl.h" - #include "tests/Mesh/TestDerivedData.h" #include "tests/Mesh/TestReorder.h" #include "tests/Mesh/TestGradients.h" diff --git a/src/UnitTest/tests/TestRNG.C b/src/UnitTest/tests/TestRNG.C index ca37b53ffa3..8a267b7886c 100644 --- a/src/UnitTest/tests/TestRNG.C +++ b/src/UnitTest/tests/TestRNG.C @@ -9,8 +9,6 @@ #include "TUTConfig.h" -#include "NoWarning/tutsuite.decl.h" - #include "tests/RNG/TestRNG.h" #ifdef HAS_MKL @@ -18,7 +16,7 @@ #endif #ifdef HAS_RNGSSE2 -#include "tests/RNG/TestRNGSSE.h" + #include "tests/RNG/TestRNGSSE.h" #endif #include "tests/RNG/TestRandom123.h" From ff5d8f61566a2b31d95417f32406275bdc8a6d99 Mon Sep 17 00:00:00 2001 From: Jozsef Bakosi Date: Sun, 22 Jul 2018 19:42:56 -0600 Subject: [PATCH 09/19] Break up unit tests into even more translation units Instead of including multiple groups of unit tests via include files into the main unit test harness translation unit, this commits breaks up every group of unit tests into its own translation unit, thus increasing the potential for parallel compilation. Benchmark usign 36 cores indicates an increase in build performance of 2X in debug with clang, 3X in release with gnu, measuring the build of the unittest harness executable only: old: clang/debug:develop$ time ninja unittest [72/72] Linking CXX executable Main/unittest real 0m59.600s user 4m12.360s sys 0m11.720s gnu/release:develop$ time ninja unittest [72/72] Linking CXX executable Main/unittest real 1m30.254s user 4m19.080s sys 0m15.624s new: clang/debug:unittest$ time ninja unittest [115/115] Linking CXX executable Main/unittest real 0m28.627s user 10m16.528s sys 0m26.748s gnu/release:unittest$ time ninja unittest [115/115] Linking CXX executable Main/unittest real 0m27.180s user 9m39.188s sys 0m39.148s --- src/CMakeLists.txt | 1 + src/Control/Options/MKLBetaMethod.h | 2 +- src/Control/Options/MKLGammaMethod.h | 4 +- src/Control/Options/MKLGaussianMethod.h | 4 +- src/Control/Options/MKLUniformMethod.h | 2 +- src/Control/Options/RNG.h | 4 +- src/DiffEq/OrnsteinUhlenbeck.h | 4 +- src/DiffEq/WrightFisher.h | 4 +- src/NoWarning/H5Part.h | 1 - src/NoWarning/HYPRE_parcsr_ls.h | 1 - src/NoWarning/TFile.h | 1 - src/NoWarning/TTree.h | 1 - src/NoWarning/Zoltan2_MeshAdapter.h | 1 - src/NoWarning/Zoltan2_PartitioningProblem.h | 1 - src/NoWarning/beta_distribution.h | 1 - src/NoWarning/bind.h | 1 - src/NoWarning/charm++.h | 1 - src/NoWarning/charm.h | 1 - src/NoWarning/charmchild.def.h | 2 - src/NoWarning/dg.decl.h | 1 - src/NoWarning/diagcg.decl.h | 1 - src/NoWarning/discretization.decl.h | 1 - src/NoWarning/distfct.decl.h | 1 - src/NoWarning/distributor.decl.h | 1 - src/NoWarning/exodusII.h | 1 - src/NoWarning/fileconv.decl.h | 1 - src/NoWarning/format.h | 1 - src/NoWarning/inciter.decl.h | 1 - src/NoWarning/integrator.decl.h | 1 - src/NoWarning/lapacke.h | 24 --- src/NoWarning/linearmap.decl.h | 1 - src/NoWarning/matcg.decl.h | 1 - src/NoWarning/meshconv.decl.h | 1 - src/NoWarning/mkl_lapacke.h | 24 --- src/NoWarning/mkl_vsl.h | 28 ---- src/NoWarning/mkl_vsl_types.h | 28 ---- src/NoWarning/mpi-interoperate.h | 1 - src/NoWarning/mpi.h | 1 - src/NoWarning/optional.h | 1 - src/NoWarning/particlewriter.decl.h | 1 - src/NoWarning/partitioner.decl.h | 1 - src/NoWarning/philox.h | 1 - src/NoWarning/pup.h | 1 - src/NoWarning/pup_stl.h | 1 - src/NoWarning/refiner.decl.h | 1 - src/NoWarning/replace.h | 1 - src/NoWarning/rngtest.decl.h | 2 - src/NoWarning/solver.decl.h | 1 - src/NoWarning/sorter.decl.h | 1 - src/NoWarning/testarray.decl.h | 24 ++- src/NoWarning/testarray.def.h | 1 + src/NoWarning/testu01.decl.h | 1 - src/NoWarning/testu01suite.decl.h | 1 - src/NoWarning/threefry.h | 1 - src/NoWarning/transporter.decl.h | 1 - src/NoWarning/tutsuite.decl.h | 1 - src/NoWarning/tuttest.decl.h | 1 - src/NoWarning/uniform.h | 1 - src/NoWarning/unittest.decl.h | 1 - src/NoWarning/unsmeshmap.decl.h | 2 +- src/NoWarning/value_factory.h | 1 - src/NoWarning/variant.h | 1 - src/NoWarning/walker.decl.h | 1 - src/RNG/MKLRNG.h | 2 +- src/UnitTest/CMakeLists.txt | 61 ++++++- src/UnitTest/TestArray.h | 6 +- ...estContainerUtil.h => TestContainerUtil.C} | 7 +- .../tests/Base/{TestData.h => TestData.C} | 7 +- .../Base/{TestException.h => TestException.C} | 16 +- ...{TestExceptionMPI.h => TestExceptionMPI.C} | 7 +- .../Base/{TestFactory.h => TestFactory.C} | 8 +- .../Base/{TestFlip_map.h => TestFlip_map.C} | 8 +- .../tests/Base/{TestHas.h => TestHas.C} | 7 +- .../Base/{TestPUPUtil.h => TestPUPUtil.C} | 10 +- .../tests/Base/{TestPrint.h => TestPrint.C} | 7 +- ...tProcessControl.h => TestProcessControl.C} | 8 +- .../tests/Base/{TestReader.h => TestReader.C} | 7 +- .../{TestStrConvUtil.h => TestStrConvUtil.C} | 7 +- .../{TestTaggedTuple.h => TestTaggedTuple.C} | 7 +- .../tests/Base/{TestTimer.h => TestTimer.C} | 9 +- .../tests/Base/{TestVector.h => TestVector.C} | 8 +- .../tests/Base/{TestWriter.h => TestWriter.C} | 7 +- ...estMKLBetaMethod.h => TestMKLBetaMethod.C} | 7 +- ...tMKLGammaMethod.h => TestMKLGammaMethod.C} | 7 +- ...ussianMethod.h => TestMKLGaussianMethod.C} | 7 +- ...UniformMethod.h => TestMKLUniformMethod.C} | 7 +- .../Control/Options/{TestRNG.h => TestRNG.C} | 7 +- .../Control/{TestControl.h => TestControl.C} | 8 +- .../{TestFileParser.h => TestFileParser.C} | 7 +- ...{TestStringParser.h => TestStringParser.C} | 7 +- ...temComponents.h => TestSystemComponents.C} | 7 +- .../Control/{TestToggle.h => TestToggle.C} | 7 +- ...IMeshReader.h => TestExodusIIMeshReader.C} | 8 +- .../tests/IO/{TestMesh.h => TestMesh.C} | 7 +- .../IO/{TestMeshReader.h => TestMeshReader.C} | 7 +- .../Inciter/AMR/{TestError.h => TestError.C} | 7 +- .../Inciter/{TestScheme.h => TestScheme.C} | 8 +- .../{TestLinearMap.h => TestLinearMap.C} | 7 +- ...oadDistributor.h => TestLoadDistributor.C} | 7 +- .../{TestUnsMeshMap.h => TestUnsMeshMap.C} | 7 +- .../tests/Mesh/{TestAround.h => TestAround.C} | 9 +- .../{TestDerivedData.h => TestDerivedData.C} | 7 +- .../Mesh/{TestGradients.h => TestGradients.C} | 9 +- .../Mesh/{TestReorder.h => TestReorder.C} | 7 +- .../tests/RNG/{TestMKLRNG.h => TestMKLRNG.C} | 8 +- src/UnitTest/tests/RNG/TestRNG.C | 155 ++++++++++++++++++ src/UnitTest/tests/RNG/TestRNG.h | 124 +------------- .../tests/RNG/{TestRNGSSE.h => TestRNGSSE.C} | 8 +- .../RNG/{TestRandom123.h => TestRandom123.C} | 8 +- src/UnitTest/tests/TestBase.C | 31 ---- src/UnitTest/tests/TestControl.C | 25 --- src/UnitTest/tests/TestIO.C | 14 -- src/UnitTest/tests/TestInciter.C | 15 -- src/UnitTest/tests/TestLoadBalance.C | 16 -- src/UnitTest/tests/TestMesh.C | 15 -- src/UnitTest/tests/TestRNG.C | 22 --- 116 files changed, 368 insertions(+), 639 deletions(-) delete mode 100644 src/NoWarning/lapacke.h delete mode 100644 src/NoWarning/mkl_lapacke.h delete mode 100644 src/NoWarning/mkl_vsl.h delete mode 100644 src/NoWarning/mkl_vsl_types.h rename src/UnitTest/tests/Base/{TestContainerUtil.h => TestContainerUtil.C} (98%) rename src/UnitTest/tests/Base/{TestData.h => TestData.C} (99%) rename src/UnitTest/tests/Base/{TestException.h => TestException.C} (94%) rename src/UnitTest/tests/Base/{TestExceptionMPI.h => TestExceptionMPI.C} (96%) rename src/UnitTest/tests/Base/{TestFactory.h => TestFactory.C} (99%) rename src/UnitTest/tests/Base/{TestFlip_map.h => TestFlip_map.C} (92%) rename src/UnitTest/tests/Base/{TestHas.h => TestHas.C} (98%) rename src/UnitTest/tests/Base/{TestPUPUtil.h => TestPUPUtil.C} (99%) rename src/UnitTest/tests/Base/{TestPrint.h => TestPrint.C} (98%) rename src/UnitTest/tests/Base/{TestProcessControl.h => TestProcessControl.C} (89%) rename src/UnitTest/tests/Base/{TestReader.h => TestReader.C} (97%) rename src/UnitTest/tests/Base/{TestStrConvUtil.h => TestStrConvUtil.C} (95%) rename src/UnitTest/tests/Base/{TestTaggedTuple.h => TestTaggedTuple.C} (97%) rename src/UnitTest/tests/Base/{TestTimer.h => TestTimer.C} (98%) rename src/UnitTest/tests/Base/{TestVector.h => TestVector.C} (96%) rename src/UnitTest/tests/Base/{TestWriter.h => TestWriter.C} (92%) rename src/UnitTest/tests/Control/Options/{TestMKLBetaMethod.h => TestMKLBetaMethod.C} (97%) rename src/UnitTest/tests/Control/Options/{TestMKLGammaMethod.h => TestMKLGammaMethod.C} (97%) rename src/UnitTest/tests/Control/Options/{TestMKLGaussianMethod.h => TestMKLGaussianMethod.C} (97%) rename src/UnitTest/tests/Control/Options/{TestMKLUniformMethod.h => TestMKLUniformMethod.C} (97%) rename src/UnitTest/tests/Control/Options/{TestRNG.h => TestRNG.C} (97%) rename src/UnitTest/tests/Control/{TestControl.h => TestControl.C} (99%) rename src/UnitTest/tests/Control/{TestFileParser.h => TestFileParser.C} (97%) rename src/UnitTest/tests/Control/{TestStringParser.h => TestStringParser.C} (92%) rename src/UnitTest/tests/Control/{TestSystemComponents.h => TestSystemComponents.C} (97%) rename src/UnitTest/tests/Control/{TestToggle.h => TestToggle.C} (98%) rename src/UnitTest/tests/IO/{TestExodusIIMeshReader.h => TestExodusIIMeshReader.C} (99%) rename src/UnitTest/tests/IO/{TestMesh.h => TestMesh.C} (98%) rename src/UnitTest/tests/IO/{TestMeshReader.h => TestMeshReader.C} (98%) rename src/UnitTest/tests/Inciter/AMR/{TestError.h => TestError.C} (98%) rename src/UnitTest/tests/Inciter/{TestScheme.h => TestScheme.C} (97%) rename src/UnitTest/tests/LoadBalance/{TestLinearMap.h => TestLinearMap.C} (94%) rename src/UnitTest/tests/LoadBalance/{TestLoadDistributor.h => TestLoadDistributor.C} (98%) rename src/UnitTest/tests/LoadBalance/{TestUnsMeshMap.h => TestUnsMeshMap.C} (98%) rename src/UnitTest/tests/Mesh/{TestAround.h => TestAround.C} (99%) rename src/UnitTest/tests/Mesh/{TestDerivedData.h => TestDerivedData.C} (99%) rename src/UnitTest/tests/Mesh/{TestGradients.h => TestGradients.C} (98%) rename src/UnitTest/tests/Mesh/{TestReorder.h => TestReorder.C} (99%) rename src/UnitTest/tests/RNG/{TestMKLRNG.h => TestMKLRNG.C} (98%) create mode 100644 src/UnitTest/tests/RNG/TestRNG.C rename src/UnitTest/tests/RNG/{TestRNGSSE.h => TestRNGSSE.C} (99%) rename src/UnitTest/tests/RNG/{TestRandom123.h => TestRandom123.C} (98%) delete mode 100644 src/UnitTest/tests/TestBase.C delete mode 100644 src/UnitTest/tests/TestControl.C delete mode 100644 src/UnitTest/tests/TestIO.C delete mode 100644 src/UnitTest/tests/TestInciter.C delete mode 100644 src/UnitTest/tests/TestLoadBalance.C delete mode 100644 src/UnitTest/tests/TestMesh.C delete mode 100644 src/UnitTest/tests/TestRNG.C diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 3933f1669fa..6d907b283fd 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -187,6 +187,7 @@ if ("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang") # clang-specific settings add_compiler_flag("-Wno-unknown-pragmas") add_compiler_flag("-Wno-unused-command-line-argument") add_compiler_flag("-Wno-disabled-macro-expansion") + add_compiler_flag("-Wno-reserved-id-macro") # Linker flags for clang set(CMAKE_SHARED_LIBRARY_LINK_CXX_FLAGS) # clear link flags diff --git a/src/Control/Options/MKLBetaMethod.h b/src/Control/Options/MKLBetaMethod.h index 4b5afcf559a..a5b49770ffd 100644 --- a/src/Control/Options/MKLBetaMethod.h +++ b/src/Control/Options/MKLBetaMethod.h @@ -13,7 +13,7 @@ #include -#include "NoWarning/mkl_vsl.h" +#include #include "Toggle.h" #include "Keywords.h" diff --git a/src/Control/Options/MKLGammaMethod.h b/src/Control/Options/MKLGammaMethod.h index 685c303db7c..e88d803d2e9 100644 --- a/src/Control/Options/MKLGammaMethod.h +++ b/src/Control/Options/MKLGammaMethod.h @@ -11,9 +11,9 @@ #include -#include +#include -#include "NoWarning/mkl_vsl.h" +#include #include "Toggle.h" #include "Keywords.h" diff --git a/src/Control/Options/MKLGaussianMethod.h b/src/Control/Options/MKLGaussianMethod.h index ecb4c418101..87fc45cbfb2 100644 --- a/src/Control/Options/MKLGaussianMethod.h +++ b/src/Control/Options/MKLGaussianMethod.h @@ -11,9 +11,9 @@ #include -#include +#include -#include "NoWarning/mkl_vsl.h" +#include #include "Toggle.h" #include "Keywords.h" diff --git a/src/Control/Options/MKLUniformMethod.h b/src/Control/Options/MKLUniformMethod.h index f826d071890..64005da36f2 100644 --- a/src/Control/Options/MKLUniformMethod.h +++ b/src/Control/Options/MKLUniformMethod.h @@ -13,7 +13,7 @@ #include -#include "NoWarning/mkl_vsl.h" +#include #include "Toggle.h" #include "Keywords.h" diff --git a/src/Control/Options/RNG.h b/src/Control/Options/RNG.h index 5b0bc948d1f..501822383e7 100644 --- a/src/Control/Options/RNG.h +++ b/src/Control/Options/RNG.h @@ -13,12 +13,12 @@ #include +#include + #include "NoWarning/append.h" #include "QuinoaConfig.h" -#include "NoWarning/mkl_vsl.h" - #include "Toggle.h" #include "Keywords.h" #include "Options/RNGSSESeqLen.h" diff --git a/src/DiffEq/OrnsteinUhlenbeck.h b/src/DiffEq/OrnsteinUhlenbeck.h index 5bb20170abf..ca0eda3d477 100644 --- a/src/DiffEq/OrnsteinUhlenbeck.h +++ b/src/DiffEq/OrnsteinUhlenbeck.h @@ -52,9 +52,9 @@ #include "QuinoaConfig.h" #ifdef HAS_MKL - #include "NoWarning/mkl_lapacke.h" + #include #else - #include "NoWarning/lapacke.h" + #include #endif #include "InitPolicy.h" diff --git a/src/DiffEq/WrightFisher.h b/src/DiffEq/WrightFisher.h index 6ac91d17c6b..dbc85d18998 100644 --- a/src/DiffEq/WrightFisher.h +++ b/src/DiffEq/WrightFisher.h @@ -19,9 +19,9 @@ #include "QuinoaConfig.h" #ifdef HAS_MKL - #include "NoWarning/mkl_lapacke.h" + #include #else - #include "NoWarning/lapacke.h" + #include #endif #include "Macro.h" diff --git a/src/NoWarning/H5Part.h b/src/NoWarning/H5Part.h index 27ba846c735..a3642494734 100644 --- a/src/NoWarning/H5Part.h +++ b/src/NoWarning/H5Part.h @@ -12,7 +12,6 @@ #if defined(__clang__) #pragma clang diagnostic push - #pragma clang diagnostic ignored "-Wreserved-id-macro" #pragma clang diagnostic ignored "-Wold-style-cast" #pragma clang diagnostic ignored "-Wsign-conversion" #pragma clang diagnostic ignored "-Wdeprecated" diff --git a/src/NoWarning/HYPRE_parcsr_ls.h b/src/NoWarning/HYPRE_parcsr_ls.h index 184b4289376..a65b84336e8 100644 --- a/src/NoWarning/HYPRE_parcsr_ls.h +++ b/src/NoWarning/HYPRE_parcsr_ls.h @@ -13,7 +13,6 @@ #if defined(__clang__) #pragma clang diagnostic push - #pragma clang diagnostic ignored "-Wreserved-id-macro" #pragma clang diagnostic ignored "-Wold-style-cast" #pragma clang diagnostic ignored "-Wcast-align" #pragma clang diagnostic ignored "-Wdeprecated" diff --git a/src/NoWarning/TFile.h b/src/NoWarning/TFile.h index 5ae90b84f8d..6b6485b4b5d 100644 --- a/src/NoWarning/TFile.h +++ b/src/NoWarning/TFile.h @@ -12,7 +12,6 @@ #if defined(__clang__) #pragma clang diagnostic push - #pragma clang diagnostic ignored "-Wreserved-id-macro" #pragma clang diagnostic ignored "-Wold-style-cast" #pragma clang diagnostic ignored "-Wextra-semi" #pragma clang diagnostic ignored "-Wsign-conversion" diff --git a/src/NoWarning/TTree.h b/src/NoWarning/TTree.h index 4e9e7f999fb..be866ec82fe 100644 --- a/src/NoWarning/TTree.h +++ b/src/NoWarning/TTree.h @@ -15,7 +15,6 @@ #pragma clang diagnostic ignored "-Wextra-semi" #pragma clang diagnostic ignored "-Wconversion" #pragma clang diagnostic ignored "-Wold-style-cast" - #pragma clang diagnostic ignored "-Wreserved-id-macro" #pragma clang diagnostic ignored "-Wzero-as-null-pointer-constant" #elif defined(__INTEL_COMPILER) #pragma warning( push ) diff --git a/src/NoWarning/Zoltan2_MeshAdapter.h b/src/NoWarning/Zoltan2_MeshAdapter.h index 24185f66405..0421e6a777a 100644 --- a/src/NoWarning/Zoltan2_MeshAdapter.h +++ b/src/NoWarning/Zoltan2_MeshAdapter.h @@ -13,7 +13,6 @@ #if defined(__clang__) #pragma clang diagnostic push - #pragma clang diagnostic ignored "-Wreserved-id-macro" #pragma clang diagnostic ignored "-Wcovered-switch-default" #pragma clang diagnostic ignored "-Wunused-parameter" #pragma clang diagnostic ignored "-Wdocumentation" diff --git a/src/NoWarning/Zoltan2_PartitioningProblem.h b/src/NoWarning/Zoltan2_PartitioningProblem.h index 83f4d53adc8..cfabe14aeb0 100644 --- a/src/NoWarning/Zoltan2_PartitioningProblem.h +++ b/src/NoWarning/Zoltan2_PartitioningProblem.h @@ -13,7 +13,6 @@ #if defined(__clang__) #pragma clang diagnostic push - #pragma clang diagnostic ignored "-Wreserved-id-macro" #pragma clang diagnostic ignored "-Wextra-semi" #pragma clang diagnostic ignored "-Wunused-parameter" #pragma clang diagnostic ignored "-Wsign-conversion" diff --git a/src/NoWarning/beta_distribution.h b/src/NoWarning/beta_distribution.h index dd9a9563ae9..41186b79cc2 100644 --- a/src/NoWarning/beta_distribution.h +++ b/src/NoWarning/beta_distribution.h @@ -15,7 +15,6 @@ #pragma clang diagnostic push #pragma clang diagnostic ignored "-Wdocumentation-unknown-command" #pragma clang diagnostic ignored "-Wfloat-equal" - #pragma clang diagnostic ignored "-Wreserved-id-macro" #pragma clang diagnostic ignored "-Wsign-conversion" #pragma clang diagnostic ignored "-Wshorten-64-to-32" #elif defined(STRICT_GNUC) diff --git a/src/NoWarning/bind.h b/src/NoWarning/bind.h index dad8ec27f98..75e52b39f22 100644 --- a/src/NoWarning/bind.h +++ b/src/NoWarning/bind.h @@ -14,7 +14,6 @@ #if defined(__clang__) #pragma clang diagnostic push #pragma clang diagnostic ignored "-Wdocumentation-unknown-command" - #pragma clang diagnostic ignored "-Wreserved-id-macro" #endif #include diff --git a/src/NoWarning/charm++.h b/src/NoWarning/charm++.h index 2af7dac08a4..9bd0b09593c 100644 --- a/src/NoWarning/charm++.h +++ b/src/NoWarning/charm++.h @@ -14,7 +14,6 @@ #pragma clang diagnostic push #pragma clang diagnostic ignored "-Wconversion" #pragma clang diagnostic ignored "-Wundef" - #pragma clang diagnostic ignored "-Wreserved-id-macro" #pragma clang diagnostic ignored "-Wdocumentation" #pragma clang diagnostic ignored "-Wdocumentation-unknown-command" #pragma clang diagnostic ignored "-Wold-style-cast" diff --git a/src/NoWarning/charm.h b/src/NoWarning/charm.h index 6be7fd96156..7aa75a032b2 100644 --- a/src/NoWarning/charm.h +++ b/src/NoWarning/charm.h @@ -13,7 +13,6 @@ #if defined(__clang__) #pragma clang diagnostic push #pragma clang diagnostic ignored "-Wconversion" - #pragma clang diagnostic ignored "-Wreserved-id-macro" #pragma clang diagnostic ignored "-Wundef" #pragma clang diagnostic ignored "-Wdocumentation" #pragma clang diagnostic ignored "-Wdocumentation-unknown-command" diff --git a/src/NoWarning/charmchild.def.h b/src/NoWarning/charmchild.def.h index 3e492933878..4634a288323 100644 --- a/src/NoWarning/charmchild.def.h +++ b/src/NoWarning/charmchild.def.h @@ -16,13 +16,11 @@ #pragma clang diagnostic ignored "-Wold-style-cast" #pragma clang diagnostic ignored "-Wsign-conversion" #pragma clang diagnostic ignored "-Wshorten-64-to-32" - #pragma clang diagnostic ignored "-Wunused-parameter" #pragma clang diagnostic ignored "-Wunused-variable" #pragma clang diagnostic ignored "-Wcast-qual" #elif defined(STRICT_GNUC) #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wcast-qual" - #pragma GCC diagnostic ignored "-Wunused-parameter" #pragma GCC diagnostic ignored "-Wunused-variable" #endif diff --git a/src/NoWarning/dg.decl.h b/src/NoWarning/dg.decl.h index c47666015a1..80111501fb3 100644 --- a/src/NoWarning/dg.decl.h +++ b/src/NoWarning/dg.decl.h @@ -12,7 +12,6 @@ #if defined(__clang__) #pragma clang diagnostic push - #pragma clang diagnostic ignored "-Wreserved-id-macro" #pragma clang diagnostic ignored "-Wunused-parameter" #pragma clang diagnostic ignored "-Wold-style-cast" #pragma clang diagnostic ignored "-Wshorten-64-to-32" diff --git a/src/NoWarning/diagcg.decl.h b/src/NoWarning/diagcg.decl.h index a02640cbcff..b7a6e247e0b 100644 --- a/src/NoWarning/diagcg.decl.h +++ b/src/NoWarning/diagcg.decl.h @@ -12,7 +12,6 @@ #if defined(__clang__) #pragma clang diagnostic push - #pragma clang diagnostic ignored "-Wreserved-id-macro" #pragma clang diagnostic ignored "-Wunused-parameter" #pragma clang diagnostic ignored "-Wold-style-cast" #pragma clang diagnostic ignored "-Wextra-semi" diff --git a/src/NoWarning/discretization.decl.h b/src/NoWarning/discretization.decl.h index 99f4ed96c1e..1285b16b98d 100644 --- a/src/NoWarning/discretization.decl.h +++ b/src/NoWarning/discretization.decl.h @@ -13,7 +13,6 @@ #if defined(__clang__) #pragma clang diagnostic push - #pragma clang diagnostic ignored "-Wreserved-id-macro" #pragma clang diagnostic ignored "-Wundef" #pragma clang diagnostic ignored "-Wdocumentation" #pragma clang diagnostic ignored "-Wdocumentation-unknown-command" diff --git a/src/NoWarning/distfct.decl.h b/src/NoWarning/distfct.decl.h index 26d419fb7aa..c37394c9442 100644 --- a/src/NoWarning/distfct.decl.h +++ b/src/NoWarning/distfct.decl.h @@ -12,7 +12,6 @@ #if defined(__clang__) #pragma clang diagnostic push - #pragma clang diagnostic ignored "-Wreserved-id-macro" #pragma clang diagnostic ignored "-Wunused-parameter" #pragma clang diagnostic ignored "-Wshorten-64-to-32" #pragma clang diagnostic ignored "-Wold-style-cast" diff --git a/src/NoWarning/distributor.decl.h b/src/NoWarning/distributor.decl.h index add4b960dcf..17e24daf35c 100644 --- a/src/NoWarning/distributor.decl.h +++ b/src/NoWarning/distributor.decl.h @@ -15,7 +15,6 @@ #pragma clang diagnostic push #pragma clang diagnostic ignored "-Wold-style-cast" #pragma clang diagnostic ignored "-Wunused-parameter" - #pragma clang diagnostic ignored "-Wreserved-id-macro" #pragma clang diagnostic ignored "-Wundef" #pragma clang diagnostic ignored "-Wheader-hygiene" #pragma clang diagnostic ignored "-Wdocumentation" diff --git a/src/NoWarning/exodusII.h b/src/NoWarning/exodusII.h index 025ecca714e..a7a5b93d9e4 100644 --- a/src/NoWarning/exodusII.h +++ b/src/NoWarning/exodusII.h @@ -12,7 +12,6 @@ #if defined(__clang__) #pragma clang diagnostic push - #pragma clang diagnostic ignored "-Wreserved-id-macro" #pragma clang diagnostic ignored "-Wold-style-cast" #pragma clang diagnostic ignored "-Wsign-conversion" #pragma clang diagnostic ignored "-Wdeprecated" diff --git a/src/NoWarning/fileconv.decl.h b/src/NoWarning/fileconv.decl.h index cf4acd6fb28..5a4a207777d 100644 --- a/src/NoWarning/fileconv.decl.h +++ b/src/NoWarning/fileconv.decl.h @@ -13,7 +13,6 @@ #if defined(__clang__) #pragma clang diagnostic push - #pragma clang diagnostic ignored "-Wreserved-id-macro" #pragma clang diagnostic ignored "-Wundef" #pragma clang diagnostic ignored "-Wheader-hygiene" #pragma clang diagnostic ignored "-Wdocumentation" diff --git a/src/NoWarning/format.h b/src/NoWarning/format.h index 1f15d44d906..847c338e34a 100644 --- a/src/NoWarning/format.h +++ b/src/NoWarning/format.h @@ -13,7 +13,6 @@ #if defined(__clang__) #pragma clang diagnostic push - #pragma clang diagnostic ignored "-Wreserved-id-macro" #pragma clang diagnostic ignored "-Wdeprecated" #pragma clang diagnostic ignored "-Wold-style-cast" #pragma clang diagnostic ignored "-Wsign-conversion" diff --git a/src/NoWarning/inciter.decl.h b/src/NoWarning/inciter.decl.h index 07795567955..0ad61053010 100644 --- a/src/NoWarning/inciter.decl.h +++ b/src/NoWarning/inciter.decl.h @@ -13,7 +13,6 @@ #if defined(__clang__) #pragma clang diagnostic push - #pragma clang diagnostic ignored "-Wreserved-id-macro" #pragma clang diagnostic ignored "-Wextra-semi" #pragma clang diagnostic ignored "-Wunused-variable" #pragma clang diagnostic ignored "-Wunused-parameter" diff --git a/src/NoWarning/integrator.decl.h b/src/NoWarning/integrator.decl.h index 9fcf0243d1e..e947a6ad052 100644 --- a/src/NoWarning/integrator.decl.h +++ b/src/NoWarning/integrator.decl.h @@ -13,7 +13,6 @@ #if defined(__clang__) #pragma clang diagnostic push - #pragma clang diagnostic ignored "-Wreserved-id-macro" #pragma clang diagnostic ignored "-Wundef" #pragma clang diagnostic ignored "-Wheader-hygiene" #pragma clang diagnostic ignored "-Wdocumentation" diff --git a/src/NoWarning/lapacke.h b/src/NoWarning/lapacke.h deleted file mode 100644 index eb863ed10af..00000000000 --- a/src/NoWarning/lapacke.h +++ /dev/null @@ -1,24 +0,0 @@ -// ***************************************************************************** -/*! - \file src/NoWarning/lapacke.h - \copyright 2012-2015, J. Bakosi, 2016-2018, Los Alamos National Security, LLC. - \brief Include lapacke.h with turning off specific compiler warnings -*/ -// ***************************************************************************** -#ifndef nowarning_lapacke_h -#define nowarning_lapacke_h - -#include "Macro.h" - -#if defined(__clang__) - #pragma clang diagnostic push - #pragma clang diagnostic ignored "-Wreserved-id-macro" -#endif - -#include - -#if defined(__clang__) - #pragma clang diagnostic pop -#endif - -#endif // nowarning_lapacke_h diff --git a/src/NoWarning/linearmap.decl.h b/src/NoWarning/linearmap.decl.h index 53793ecc499..22b86bc8f68 100644 --- a/src/NoWarning/linearmap.decl.h +++ b/src/NoWarning/linearmap.decl.h @@ -12,7 +12,6 @@ #if defined(__clang__) #pragma clang diagnostic push - #pragma clang diagnostic ignored "-Wreserved-id-macro" #pragma clang diagnostic ignored "-Wundef" #pragma clang diagnostic ignored "-Wheader-hygiene" #pragma clang diagnostic ignored "-Wdocumentation" diff --git a/src/NoWarning/matcg.decl.h b/src/NoWarning/matcg.decl.h index 9390d46695e..2f9fd2bf2b0 100644 --- a/src/NoWarning/matcg.decl.h +++ b/src/NoWarning/matcg.decl.h @@ -12,7 +12,6 @@ #if defined(__clang__) #pragma clang diagnostic push - #pragma clang diagnostic ignored "-Wreserved-id-macro" #pragma clang diagnostic ignored "-Wunused-parameter" #pragma clang diagnostic ignored "-Wold-style-cast" #pragma clang diagnostic ignored "-Wextra-semi" diff --git a/src/NoWarning/meshconv.decl.h b/src/NoWarning/meshconv.decl.h index f873f60a522..a8387f7106f 100644 --- a/src/NoWarning/meshconv.decl.h +++ b/src/NoWarning/meshconv.decl.h @@ -13,7 +13,6 @@ #if defined(__clang__) #pragma clang diagnostic push - #pragma clang diagnostic ignored "-Wreserved-id-macro" #pragma clang diagnostic ignored "-Wundef" #pragma clang diagnostic ignored "-Wheader-hygiene" #pragma clang diagnostic ignored "-Wdocumentation" diff --git a/src/NoWarning/mkl_lapacke.h b/src/NoWarning/mkl_lapacke.h deleted file mode 100644 index 8d42d7635c5..00000000000 --- a/src/NoWarning/mkl_lapacke.h +++ /dev/null @@ -1,24 +0,0 @@ -// ***************************************************************************** -/*! - \file src/NoWarning/mkl_lapacke.h - \copyright 2012-2015, J. Bakosi, 2016-2018, Los Alamos National Security, LLC. - \brief Include mkl_lapacke.h with turning off specific compiler warnings -*/ -// ***************************************************************************** -#ifndef nowarning_mkl_lapacke_h -#define nowarning_mkl_lapacke_h - -#include "Macro.h" - -#if defined(__clang__) - #pragma clang diagnostic push - #pragma clang diagnostic ignored "-Wreserved-id-macro" -#endif - -#include - -#if defined(__clang__) - #pragma clang diagnostic pop -#endif - -#endif // nowarning_mkl_lapacke_h diff --git a/src/NoWarning/mkl_vsl.h b/src/NoWarning/mkl_vsl.h deleted file mode 100644 index cba1378cd98..00000000000 --- a/src/NoWarning/mkl_vsl.h +++ /dev/null @@ -1,28 +0,0 @@ -// ***************************************************************************** -/*! - \file src/NoWarning/mkl_vsl.h - \copyright 2012-2015, J. Bakosi, 2016-2018, Los Alamos National Security, LLC. - \brief Include mkl_vsl.h with turning off specific compiler warnings -*/ -// ***************************************************************************** -#ifndef nowarning_mkl_vsl_h -#define nowarning_mkl_vsl_h - -#include "Macro.h" - -#ifdef HAS_MKL - -#if defined(__clang__) - #pragma clang diagnostic push - #pragma clang diagnostic ignored "-Wreserved-id-macro" -#endif - -#include - -#if defined(__clang__) - #pragma clang diagnostic pop -#endif - -#endif // HAS_MKL - -#endif // nowarning_mkl_vsl_h diff --git a/src/NoWarning/mkl_vsl_types.h b/src/NoWarning/mkl_vsl_types.h deleted file mode 100644 index 20b1a64ab47..00000000000 --- a/src/NoWarning/mkl_vsl_types.h +++ /dev/null @@ -1,28 +0,0 @@ -// ***************************************************************************** -/*! - \file src/NoWarning/mkl_vsl_types.h - \copyright 2012-2015, J. Bakosi, 2016-2018, Los Alamos National Security, LLC. - \brief Include mkl_vsl_types.h with turning off specific compiler warnings -*/ -// ***************************************************************************** -#ifndef nowarning_mkl_vsl_types_h -#define nowarning_mkl_vsl_types_h - -#include "Macro.h" - -#ifdef HAS_MKL - -#if defined(__clang__) - #pragma clang diagnostic push - #pragma clang diagnostic ignored "-Wreserved-id-macro" -#endif - -#include - -#if defined(__clang__) - #pragma clang diagnostic pop -#endif - -#endif // HAS_MKL - -#endif // nowarning_mkl_vsl_types_h diff --git a/src/NoWarning/mpi-interoperate.h b/src/NoWarning/mpi-interoperate.h index d8478d71b68..f2b02a95f85 100644 --- a/src/NoWarning/mpi-interoperate.h +++ b/src/NoWarning/mpi-interoperate.h @@ -12,7 +12,6 @@ #if defined(__clang__) #pragma clang diagnostic push - #pragma clang diagnostic ignored "-Wreserved-id-macro" #pragma clang diagnostic ignored "-Wundef" #pragma clang diagnostic ignored "-Wheader-hygiene" #pragma clang diagnostic ignored "-Wdocumentation" diff --git a/src/NoWarning/mpi.h b/src/NoWarning/mpi.h index b5c8e9bc14e..f42313dc1a6 100644 --- a/src/NoWarning/mpi.h +++ b/src/NoWarning/mpi.h @@ -12,7 +12,6 @@ #if defined(__clang__) #pragma clang diagnostic push - #pragma clang diagnostic ignored "-Wreserved-id-macro" #pragma clang diagnostic ignored "-Wold-style-cast" #pragma clang diagnostic ignored "-Wsign-conversion" #pragma clang diagnostic ignored "-Wdeprecated" diff --git a/src/NoWarning/optional.h b/src/NoWarning/optional.h index 79c3a1b686f..5a15582eba4 100644 --- a/src/NoWarning/optional.h +++ b/src/NoWarning/optional.h @@ -13,7 +13,6 @@ #if defined(__clang__) #pragma clang diagnostic push - #pragma clang diagnostic ignored "-Wreserved-id-macro" #pragma clang diagnostic ignored "-Wundef" #elif defined(STRICT_GNUC) #pragma GCC diagnostic push diff --git a/src/NoWarning/particlewriter.decl.h b/src/NoWarning/particlewriter.decl.h index 0a7f00090b9..86f3898510b 100644 --- a/src/NoWarning/particlewriter.decl.h +++ b/src/NoWarning/particlewriter.decl.h @@ -13,7 +13,6 @@ #if defined(__clang__) #pragma clang diagnostic push - #pragma clang diagnostic ignored "-Wreserved-id-macro" #pragma clang diagnostic ignored "-Wunused-parameter" #pragma clang diagnostic ignored "-Wunused-private-field" #pragma clang diagnostic ignored "-Wsign-conversion" diff --git a/src/NoWarning/partitioner.decl.h b/src/NoWarning/partitioner.decl.h index dc342d374f3..e182580de78 100644 --- a/src/NoWarning/partitioner.decl.h +++ b/src/NoWarning/partitioner.decl.h @@ -12,7 +12,6 @@ #include "Macro.h" #if defined(__clang__) - #pragma clang diagnostic ignored "-Wreserved-id-macro" #pragma clang diagnostic ignored "-Wunused-parameter" #pragma clang diagnostic ignored "-Wold-style-cast" #pragma clang diagnostic ignored "-Wextra-semi" diff --git a/src/NoWarning/philox.h b/src/NoWarning/philox.h index be82aca60dd..69bdbfec03e 100644 --- a/src/NoWarning/philox.h +++ b/src/NoWarning/philox.h @@ -13,7 +13,6 @@ #if defined(__clang__) #pragma clang diagnostic push - #pragma clang diagnostic ignored "-Wreserved-id-macro" #pragma clang diagnostic ignored "-Wold-style-cast" #pragma clang diagnostic ignored "-Wextra-semi" #pragma clang diagnostic ignored "-Wexpansion-to-defined" diff --git a/src/NoWarning/pup.h b/src/NoWarning/pup.h index 690aa1c4b23..8ab7659680d 100644 --- a/src/NoWarning/pup.h +++ b/src/NoWarning/pup.h @@ -13,7 +13,6 @@ #if defined(__clang__) #pragma clang diagnostic push #pragma clang diagnostic ignored "-Wconversion" - #pragma clang diagnostic ignored "-Wreserved-id-macro" #pragma clang diagnostic ignored "-Wdocumentation" #pragma clang diagnostic ignored "-Wundef" #pragma clang diagnostic ignored "-Wpadded" diff --git a/src/NoWarning/pup_stl.h b/src/NoWarning/pup_stl.h index 2b4d8df0c6a..bfb5c3370fa 100644 --- a/src/NoWarning/pup_stl.h +++ b/src/NoWarning/pup_stl.h @@ -12,7 +12,6 @@ #if defined(__clang__) #pragma clang diagnostic push - #pragma clang diagnostic ignored "-Wreserved-id-macro" #pragma clang diagnostic ignored "-Wold-style-cast" #pragma clang diagnostic ignored "-Wsign-conversion" #pragma clang diagnostic ignored "-Wshorten-64-to-32" diff --git a/src/NoWarning/refiner.decl.h b/src/NoWarning/refiner.decl.h index 08a70d635a3..665cbbf9800 100644 --- a/src/NoWarning/refiner.decl.h +++ b/src/NoWarning/refiner.decl.h @@ -12,7 +12,6 @@ #if defined(__clang__) #pragma clang diagnostic push - #pragma clang diagnostic ignored "-Wreserved-id-macro" #pragma clang diagnostic ignored "-Wundef" #pragma clang diagnostic ignored "-Wdocumentation" #pragma clang diagnostic ignored "-Wdocumentation-unknown-command" diff --git a/src/NoWarning/replace.h b/src/NoWarning/replace.h index 8ca79706c7e..b3f9793da45 100644 --- a/src/NoWarning/replace.h +++ b/src/NoWarning/replace.h @@ -13,7 +13,6 @@ #if defined(__clang__) #pragma clang diagnostic push - #pragma clang diagnostic ignored "-Wreserved-id-macro" #pragma clang diagnostic ignored "-Wold-style-cast" #pragma clang diagnostic ignored "-Wdocumentation" #elif defined(STRICT_GNUC) diff --git a/src/NoWarning/rngtest.decl.h b/src/NoWarning/rngtest.decl.h index 22eae58c907..31a5c84f696 100644 --- a/src/NoWarning/rngtest.decl.h +++ b/src/NoWarning/rngtest.decl.h @@ -14,9 +14,7 @@ #pragma clang diagnostic push #pragma clang diagnostic ignored "-Wunused-parameter" #pragma clang diagnostic ignored "-Wextra-semi" - #pragma clang diagnostic ignored "-Wreserved-id-macro" #pragma clang diagnostic ignored "-Wold-style-cast" - #pragma clang diagnostic ignored "-Wreserved-id-macro" #pragma clang diagnostic ignored "-Wzero-as-null-pointer-constant" #elif defined(STRICT_GNUC) #pragma GCC diagnostic push diff --git a/src/NoWarning/solver.decl.h b/src/NoWarning/solver.decl.h index 3416e5dd8b4..9b5c99e85da 100644 --- a/src/NoWarning/solver.decl.h +++ b/src/NoWarning/solver.decl.h @@ -12,7 +12,6 @@ #if defined(__clang__) #pragma clang diagnostic push - #pragma clang diagnostic ignored "-Wreserved-id-macro" #pragma clang diagnostic ignored "-Wunused-parameter" #pragma clang diagnostic ignored "-Wold-style-cast" #pragma clang diagnostic ignored "-Wextra-semi" diff --git a/src/NoWarning/sorter.decl.h b/src/NoWarning/sorter.decl.h index 08d91a7b455..eb8846444f6 100644 --- a/src/NoWarning/sorter.decl.h +++ b/src/NoWarning/sorter.decl.h @@ -12,7 +12,6 @@ #if defined(__clang__) #pragma clang diagnostic push - #pragma clang diagnostic ignored "-Wreserved-id-macro" #pragma clang diagnostic ignored "-Wzero-as-null-pointer-constant" #pragma clang diagnostic ignored "-Wold-style-cast" #pragma clang diagnostic ignored "-Wshorten-64-to-32" diff --git a/src/NoWarning/testarray.decl.h b/src/NoWarning/testarray.decl.h index 4bec0493c1c..587660184c0 100644 --- a/src/NoWarning/testarray.decl.h +++ b/src/NoWarning/testarray.decl.h @@ -13,11 +13,33 @@ #if defined(__clang__) #pragma clang diagnostic push - #pragma clang diagnostic ignored "-Wreserved-id-macro" #pragma clang diagnostic ignored "-Wzero-as-null-pointer-constant" #pragma clang diagnostic ignored "-Wunused-parameter" #pragma clang diagnostic ignored "-Wshorten-64-to-32" #pragma clang diagnostic ignored "-Wold-style-cast" + #pragma clang diagnostic ignored "-Wundef" + #pragma clang diagnostic ignored "-Wundefined-func-template" + #pragma clang diagnostic ignored "-Wdocumentation" + #pragma clang diagnostic ignored "-Wdocumentation-unknown-command" + #pragma clang diagnostic ignored "-Wconversion" + #pragma clang diagnostic ignored "-Wsign-conversion" + #pragma clang diagnostic ignored "-Wsign-compare" + #pragma clang diagnostic ignored "-Wcast-qual" + #pragma clang diagnostic ignored "-Wcast-align" + #pragma clang diagnostic ignored "-Wextra-semi" + #pragma clang diagnostic ignored "-Wheader-hygiene" + #pragma clang diagnostic ignored "-Wdouble-promotion" + #pragma clang diagnostic ignored "-Wunused-private-field" + #pragma clang diagnostic ignored "-Wfloat-equal" + #pragma clang diagnostic ignored "-Wshadow" + #pragma clang diagnostic ignored "-Wshadow-field" + #pragma clang diagnostic ignored "-Wshadow-field-in-constructor" + #pragma clang diagnostic ignored "-Wnon-virtual-dtor" + #pragma clang diagnostic ignored "-Wmissing-noreturn" + #pragma clang diagnostic ignored "-Wdeprecated" + #pragma clang diagnostic ignored "-Wcovered-switch-default" + #pragma clang diagnostic ignored "-Woverloaded-virtual" + #pragma clang diagnostic ignored "-Wswitch-enum" #elif defined(STRICT_GNUC) #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wunused-parameter" diff --git a/src/NoWarning/testarray.def.h b/src/NoWarning/testarray.def.h index bd6b63f7b93..f8157311e5c 100644 --- a/src/NoWarning/testarray.def.h +++ b/src/NoWarning/testarray.def.h @@ -20,6 +20,7 @@ #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wunused-parameter" #pragma GCC diagnostic ignored "-Wunused-variable" + #pragma GCC diagnostic ignored "-Wsuggest-attribute=noreturn" #endif #include "../UnitTest/testarray.def.h" diff --git a/src/NoWarning/testu01.decl.h b/src/NoWarning/testu01.decl.h index a1536946d92..57095d817dd 100644 --- a/src/NoWarning/testu01.decl.h +++ b/src/NoWarning/testu01.decl.h @@ -12,7 +12,6 @@ #if defined(__clang__) #pragma clang diagnostic push - #pragma clang diagnostic ignored "-Wreserved-id-macro" #pragma clang diagnostic ignored "-Wunused-parameter" #pragma clang diagnostic ignored "-Wextra-semi" #pragma clang diagnostic ignored "-Wold-style-cast" diff --git a/src/NoWarning/testu01suite.decl.h b/src/NoWarning/testu01suite.decl.h index 8d4aea6af48..6af4f4f3f82 100644 --- a/src/NoWarning/testu01suite.decl.h +++ b/src/NoWarning/testu01suite.decl.h @@ -13,7 +13,6 @@ #if defined(__clang__) #pragma clang diagnostic push - #pragma clang diagnostic ignored "-Wreserved-id-macro" #pragma clang diagnostic ignored "-Wextra-semi" #pragma clang diagnostic ignored "-Wunused-parameter" #pragma clang diagnostic ignored "-Wold-style-cast" diff --git a/src/NoWarning/threefry.h b/src/NoWarning/threefry.h index b87f15a9cbf..258c1052ed1 100644 --- a/src/NoWarning/threefry.h +++ b/src/NoWarning/threefry.h @@ -13,7 +13,6 @@ #if defined(__clang__) #pragma clang diagnostic push - #pragma clang diagnostic ignored "-Wreserved-id-macro" #pragma clang diagnostic ignored "-Wold-style-cast" #pragma clang diagnostic ignored "-Wsign-conversion" #pragma clang diagnostic ignored "-Wdocumentation-unknown-command" diff --git a/src/NoWarning/transporter.decl.h b/src/NoWarning/transporter.decl.h index 96dc1feeffe..760571e6b83 100644 --- a/src/NoWarning/transporter.decl.h +++ b/src/NoWarning/transporter.decl.h @@ -13,7 +13,6 @@ #if defined(__clang__) #pragma clang diagnostic push - #pragma clang diagnostic ignored "-Wreserved-id-macro" #pragma clang diagnostic ignored "-Wundef" #pragma clang diagnostic ignored "-Wheader-hygiene" #pragma clang diagnostic ignored "-Wdocumentation" diff --git a/src/NoWarning/tutsuite.decl.h b/src/NoWarning/tutsuite.decl.h index c7610dce065..d22bd519b23 100644 --- a/src/NoWarning/tutsuite.decl.h +++ b/src/NoWarning/tutsuite.decl.h @@ -12,7 +12,6 @@ #if defined(__clang__) #pragma clang diagnostic push - #pragma clang diagnostic ignored "-Wreserved-id-macro" #pragma clang diagnostic ignored "-Wundef" #pragma clang diagnostic ignored "-Wheader-hygiene" #pragma clang diagnostic ignored "-Wdocumentation" diff --git a/src/NoWarning/tuttest.decl.h b/src/NoWarning/tuttest.decl.h index b779e833c47..e7b4fb52988 100644 --- a/src/NoWarning/tuttest.decl.h +++ b/src/NoWarning/tuttest.decl.h @@ -17,7 +17,6 @@ #pragma clang diagnostic ignored "-Wheader-hygiene" #pragma clang diagnostic ignored "-Wextra-semi" #pragma clang diagnostic ignored "-Wcovered-switch-default" - #pragma clang diagnostic ignored "-Wreserved-id-macro" #pragma clang diagnostic ignored "-Wundef" #pragma clang diagnostic ignored "-Wdocumentation" #pragma clang diagnostic ignored "-Wdocumentation-unknown-command" diff --git a/src/NoWarning/uniform.h b/src/NoWarning/uniform.h index 3e7a85c4e19..3d487b7be58 100644 --- a/src/NoWarning/uniform.h +++ b/src/NoWarning/uniform.h @@ -13,7 +13,6 @@ #if defined(__clang__) #pragma clang diagnostic push - #pragma clang diagnostic ignored "-Wreserved-id-macro" #pragma clang diagnostic ignored "-Wundef" #endif diff --git a/src/NoWarning/unittest.decl.h b/src/NoWarning/unittest.decl.h index 01a506134fe..f8912d763b3 100644 --- a/src/NoWarning/unittest.decl.h +++ b/src/NoWarning/unittest.decl.h @@ -12,7 +12,6 @@ #if defined(__clang__) #pragma clang diagnostic push - #pragma clang diagnostic ignored "-Wreserved-id-macro" #pragma clang diagnostic ignored "-Wextra-semi" #pragma clang diagnostic ignored "-Wold-style-cast" #pragma clang diagnostic ignored "-Wunused-parameter" diff --git a/src/NoWarning/unsmeshmap.decl.h b/src/NoWarning/unsmeshmap.decl.h index 460a747c7ed..9117dd47ecb 100644 --- a/src/NoWarning/unsmeshmap.decl.h +++ b/src/NoWarning/unsmeshmap.decl.h @@ -13,10 +13,10 @@ #if defined(__clang__) #pragma clang diagnostic push - #pragma clang diagnostic ignored "-Wreserved-id-macro" #pragma clang diagnostic ignored "-Wundef" #pragma clang diagnostic ignored "-Wheader-hygiene" #pragma clang diagnostic ignored "-Wdocumentation" + #pragma clang diagnostic ignored "-Wdocumentation-unknown-command" #pragma clang diagnostic ignored "-Wunused-parameter" #pragma clang diagnostic ignored "-Wold-style-cast" #pragma clang diagnostic ignored "-Wunused-variable" diff --git a/src/NoWarning/value_factory.h b/src/NoWarning/value_factory.h index e42b1f83c8d..1c4ca61b2a1 100644 --- a/src/NoWarning/value_factory.h +++ b/src/NoWarning/value_factory.h @@ -13,7 +13,6 @@ #if defined(__clang__) #pragma clang diagnostic push - #pragma clang diagnostic ignored "-Wreserved-id-macro" #pragma clang diagnostic ignored "-Wsign-conversion" #elif defined(STRICT_GNUC) #pragma GCC diagnostic push diff --git a/src/NoWarning/variant.h b/src/NoWarning/variant.h index 0d064b8fa84..eb5b3c07b29 100644 --- a/src/NoWarning/variant.h +++ b/src/NoWarning/variant.h @@ -13,7 +13,6 @@ #if defined(__clang__) #pragma clang diagnostic push - #pragma clang diagnostic ignored "-Wreserved-id-macro" #pragma clang diagnostic ignored "-Wdocumentation-unknown-command" #pragma clang diagnostic ignored "-Wold-style-cast" #pragma clang diagnostic ignored "-Wundef" diff --git a/src/NoWarning/walker.decl.h b/src/NoWarning/walker.decl.h index 6b3f4c2ebe0..0ce94fb6d04 100644 --- a/src/NoWarning/walker.decl.h +++ b/src/NoWarning/walker.decl.h @@ -12,7 +12,6 @@ #if defined(__clang__) #pragma clang diagnostic push - #pragma clang diagnostic ignored "-Wreserved-id-macro" #pragma clang diagnostic ignored "-Wextra-semi" #pragma clang diagnostic ignored "-Wunused-parameter" #pragma clang diagnostic ignored "-Wold-style-cast" diff --git a/src/RNG/MKLRNG.h b/src/RNG/MKLRNG.h index 1c9852eb5f5..50d6f73f80a 100644 --- a/src/RNG/MKLRNG.h +++ b/src/RNG/MKLRNG.h @@ -9,7 +9,7 @@ #ifndef MKLRNG_h #define MKLRNG_h -#include "NoWarning/mkl_vsl.h" +#include #include "Exception.h" #include "Make_unique.h" diff --git a/src/UnitTest/CMakeLists.txt b/src/UnitTest/CMakeLists.txt index 48d7984d105..617ab8817f4 100644 --- a/src/UnitTest/CMakeLists.txt +++ b/src/UnitTest/CMakeLists.txt @@ -5,17 +5,64 @@ project(UnitTest CXX) # Include function for adding Charm++ modules include(charm) +if (HAS_MKL) + set(TestMKLBetaMethod "tests/Control/Options/TestMKLBetaMethod.C") + set(TestMKLGammaMethod "tests/Control/Options/TestMKLGammaMethod.C") + set(TestMKLGaussianMethod "tests/Control/Options/TestMKLGaussianMethod.C") + set(TestMKLUniformMethod "tests/Control/Options/TestMKLUniformMethod.C") + set(TestMKLRNG "tests/RNG/TestMKLRNG.C") +endif() + +if(HAS_RNGSSE2) + set(TestRNGSSE "tests/RNG/TestRNGSSE.C") +endif() + add_library(UnitTest Assessment.C TUTSuite.C TUTTest.C - tests/TestBase.C - tests/TestInciter.C - tests/TestControl.C - tests/TestIO.C - tests/TestMesh.C - tests/TestRNG.C - tests/TestLoadBalance.C + tests/Base/TestContainerUtil.C + tests/Base/TestData.C + tests/Base/TestException.C + tests/Base/TestExceptionMPI.C + tests/Base/TestFactory.C + tests/Base/TestFlip_map.C + tests/Base/TestHas.C + tests/Base/TestPrint.C + tests/Base/TestProcessControl.C + tests/Base/TestPUPUtil.C + tests/Base/TestReader.C + tests/Base/TestStrConvUtil.C + tests/Base/TestTaggedTuple.C + tests/Base/TestTimer.C + tests/Base/TestVector.C + tests/Base/TestWriter.C + ${TestMKLUniformMethod} + ${TestMKLGaussianMethod} + ${TestMKLBetaMethod} + ${TestMKLGammaMethod} + tests/Control/Options/TestRNG.C + tests/Control/TestControl.C + tests/Control/TestFileParser.C + tests/Control/TestStringParser.C + tests/Control/TestSystemComponents.C + tests/Control/TestToggle.C + tests/Inciter/TestScheme.C + tests/Inciter/AMR/TestError.C + tests/IO/TestExodusIIMeshReader.C + tests/IO/TestMesh.C + tests/IO/TestMeshReader.C + tests/LoadBalance/TestLinearMap.C + tests/LoadBalance/TestLoadDistributor.C + tests/LoadBalance/TestUnsMeshMap.C + tests/Mesh/TestAround.C + tests/Mesh/TestDerivedData.C + tests/Mesh/TestGradients.C + tests/Mesh/TestReorder.C + ${TestMKLRNG} + ${TestRNGSSE} + tests/RNG/TestRNG.C + tests/RNG/TestRandom123.C ) addCharmModule( "tuttest" "UnitTest" ) diff --git a/src/UnitTest/TestArray.h b/src/UnitTest/TestArray.h index 05d40e8063d..2eb06b5d96c 100644 --- a/src/UnitTest/TestArray.h +++ b/src/UnitTest/TestArray.h @@ -14,11 +14,7 @@ namespace tut { //! Charm++ chare array definition for testing arrays -class TestArray : public CBase_TestArray { - public: - explicit TestArray() {} - explicit TestArray( CkMigrateMessage* ) {} -}; +class TestArray : public CBase_TestArray {}; } // tut:: diff --git a/src/UnitTest/tests/Base/TestContainerUtil.h b/src/UnitTest/tests/Base/TestContainerUtil.C similarity index 98% rename from src/UnitTest/tests/Base/TestContainerUtil.h rename to src/UnitTest/tests/Base/TestContainerUtil.C index 5f4b2eb756d..6034cf4fd63 100644 --- a/src/UnitTest/tests/Base/TestContainerUtil.h +++ b/src/UnitTest/tests/Base/TestContainerUtil.C @@ -1,13 +1,11 @@ // ***************************************************************************** /*! - \file src/UnitTest/tests/Base/TestContainerUtil.h + \file src/UnitTest/tests/Base/TestContainerUtil.C \copyright 2012-2015, J. Bakosi, 2016-2018, Los Alamos National Security, LLC. \brief Unit tests for Base/ContainerUtil.h \details Unit tests for Base/ContainerUtil.h */ // ***************************************************************************** -#ifndef test_ContainerUtil_h -#define test_ContainerUtil_h #include #include @@ -18,6 +16,7 @@ #include "NoWarning/tut.h" +#include "TUTConfig.h" #include "ContainerUtil.h" #include "StatCtr.h" @@ -308,5 +307,3 @@ void ContainerUtil_object::test< 9 >() { } } // tut:: - -#endif // test_ContainerUtil_h diff --git a/src/UnitTest/tests/Base/TestData.h b/src/UnitTest/tests/Base/TestData.C similarity index 99% rename from src/UnitTest/tests/Base/TestData.h rename to src/UnitTest/tests/Base/TestData.C index 71b44471668..659006a49fa 100644 --- a/src/UnitTest/tests/Base/TestData.h +++ b/src/UnitTest/tests/Base/TestData.C @@ -1,13 +1,11 @@ // ***************************************************************************** /*! - \file src/UnitTest/tests/Base/TestData.h + \file src/UnitTest/tests/Base/TestData.C \copyright 2012-2015, J. Bakosi, 2016-2018, Los Alamos National Security, LLC. \brief Unit tests for Base/Data.h \details Unit tests for Base/Data.h */ // ***************************************************************************** -#ifndef test_Data_h -#define test_Data_h #include #include @@ -15,6 +13,7 @@ #include "NoWarning/tut.h" +#include "TUTConfig.h" #include "Data.h" #include "TUTUtil.h" @@ -1883,5 +1882,3 @@ void Data_object::test< 41 >() { } } // tut:: - -#endif // test_Data_h diff --git a/src/UnitTest/tests/Base/TestException.h b/src/UnitTest/tests/Base/TestException.C similarity index 94% rename from src/UnitTest/tests/Base/TestException.h rename to src/UnitTest/tests/Base/TestException.C index 8716d40d065..143a3e15163 100644 --- a/src/UnitTest/tests/Base/TestException.h +++ b/src/UnitTest/tests/Base/TestException.C @@ -1,16 +1,15 @@ // ***************************************************************************** /*! - \file src/UnitTest/tests/Base/TestException.h + \file src/UnitTest/tests/Base/TestException.C \copyright 2012-2015, J. Bakosi, 2016-2018, Los Alamos National Security, LLC. \brief Unit tests for Base/Exception.h \details Unit tests for Base/Exception.h */ // ***************************************************************************** -#ifndef test_Exception_h -#define test_Exception_h #include "NoWarning/tut.h" +#include "TUTConfig.h" #include "Exception.h" #include "ProcessControl.h" @@ -51,6 +50,11 @@ void Exception_object::test< 2 >() { "exception" ) ); } +#if defined(__clang__) + #pragma clang diagnostic push + #pragma clang diagnostic ignored "-Wunreachable-code" +#endif + //! Test Throw macro template<> template<> void Exception_object::test< 3 >() { @@ -65,6 +69,10 @@ void Exception_object::test< 3 >() { } } +#if defined(__clang__) + #pragma clang diagnostic pop +#endif + //! Test that Assert macro throws if condition is false template<> template<> void Exception_object::test< 4 >() { @@ -158,5 +166,3 @@ void Exception_object::test< 7 >() { // } } // tut:: - -#endif // test_Exception_h diff --git a/src/UnitTest/tests/Base/TestExceptionMPI.h b/src/UnitTest/tests/Base/TestExceptionMPI.C similarity index 96% rename from src/UnitTest/tests/Base/TestExceptionMPI.h rename to src/UnitTest/tests/Base/TestExceptionMPI.C index 4f762a9a344..0c7e5c1c7ca 100644 --- a/src/UnitTest/tests/Base/TestExceptionMPI.h +++ b/src/UnitTest/tests/Base/TestExceptionMPI.C @@ -1,16 +1,15 @@ // ***************************************************************************** /*! - \file src/UnitTest/tests/Base/TestExceptionMPI.h + \file src/UnitTest/tests/Base/TestExceptionMPI.C \copyright 2012-2015, J. Bakosi, 2016-2018, Los Alamos National Security, LLC. \brief Unit tests for Base/TestExceptionMPI.h \details Unit tests for Base/TestExceptionMPI.h */ // ***************************************************************************** -#ifndef test_ExceptionMPI_h -#define test_ExceptionMPI_h #include "NoWarning/tut.h" +#include "TUTConfig.h" #include "ExceptionMPI.h" namespace tut { @@ -134,5 +133,3 @@ void ExceptionMPI_object::test< 6 >() { #endif } // tut:: - -#endif // test_ExceptionMPI_h diff --git a/src/UnitTest/tests/Base/TestFactory.h b/src/UnitTest/tests/Base/TestFactory.C similarity index 99% rename from src/UnitTest/tests/Base/TestFactory.h rename to src/UnitTest/tests/Base/TestFactory.C index 8f1a295a805..3226709bf3f 100644 --- a/src/UnitTest/tests/Base/TestFactory.h +++ b/src/UnitTest/tests/Base/TestFactory.C @@ -1,23 +1,23 @@ // ***************************************************************************** /*! - \file src/UnitTest/tests/Base/TestFactory.h + \file src/UnitTest/tests/Base/TestFactory.C \copyright 2012-2015, J. Bakosi, 2016-2018, Los Alamos National Security, LLC. \brief Unit tests for Base/Factory.h \details Unit tests for Base/Factory.h */ // ***************************************************************************** -#ifndef test_Factory_h -#define test_Factory_h #include #include "NoWarning/tut.h" +#include "TUTConfig.h" #include "Macro.h" #include "Make_unique.h" #include "Factory.h" #include "NoWarning/tutsuite.decl.h" +#include "charmchild.decl.h" namespace unittest { @@ -523,4 +523,4 @@ void Factory_object::test< 14 >() { } // tut:: -#endif // test_Factory_h +#include "NoWarning/charmchild.def.h" diff --git a/src/UnitTest/tests/Base/TestFlip_map.h b/src/UnitTest/tests/Base/TestFlip_map.C similarity index 92% rename from src/UnitTest/tests/Base/TestFlip_map.h rename to src/UnitTest/tests/Base/TestFlip_map.C index 24bee249cae..183b66448eb 100644 --- a/src/UnitTest/tests/Base/TestFlip_map.h +++ b/src/UnitTest/tests/Base/TestFlip_map.C @@ -1,17 +1,17 @@ // ***************************************************************************** /*! - \file src/UnitTest/tests/Base/TestFlip_map.h + \file src/UnitTest/tests/Base/TestFlip_map.C \copyright 2012-2015, J. Bakosi, 2016-2018, Los Alamos National Security, LLC. \brief Unit tests for Base/Flip_map.h \details Unit tests for Base/Flip_map.h */ // ***************************************************************************** -#ifndef test_Flip_map_h -#define test_Flip_map_h #include "NoWarning/tut.h" +#include "TUTConfig.h" #include "Flip_map.h" +#include "Types.h" namespace tut { @@ -56,5 +56,3 @@ void Flip_map_object::test< 2 >() { } } // tut:: - -#endif // test_Flip_map_h diff --git a/src/UnitTest/tests/Base/TestHas.h b/src/UnitTest/tests/Base/TestHas.C similarity index 98% rename from src/UnitTest/tests/Base/TestHas.h rename to src/UnitTest/tests/Base/TestHas.C index 477396b756a..8f82808bf84 100644 --- a/src/UnitTest/tests/Base/TestHas.h +++ b/src/UnitTest/tests/Base/TestHas.C @@ -1,18 +1,17 @@ // ***************************************************************************** /*! - \file src/UnitTest/tests/Base/TestHas.h + \file src/UnitTest/tests/Base/TestHas.C \copyright 2012-2015, J. Bakosi, 2016-2018, Los Alamos National Security, LLC. \brief Unit tests for Base/Has.h \details Unit tests for Base/Has.h */ // ***************************************************************************** -#ifndef test_Has_h -#define test_Has_h #include #include "NoWarning/tut.h" +#include "TUTConfig.h" #include "Has.h" namespace tut { @@ -165,5 +164,3 @@ void Has_object::test< 12 >() { } } // tut:: - -#endif // test_Has_h diff --git a/src/UnitTest/tests/Base/TestPUPUtil.h b/src/UnitTest/tests/Base/TestPUPUtil.C similarity index 99% rename from src/UnitTest/tests/Base/TestPUPUtil.h rename to src/UnitTest/tests/Base/TestPUPUtil.C index 5bd95133512..adbcdf07a3c 100644 --- a/src/UnitTest/tests/Base/TestPUPUtil.h +++ b/src/UnitTest/tests/Base/TestPUPUtil.C @@ -1,19 +1,21 @@ // ***************************************************************************** /*! - \file src/UnitTest/tests/Base/TestPUPUtil.h + \file src/UnitTest/tests/Base/TestPUPUtil.C \copyright 2012-2015, J. Bakosi, 2016-2018, Los Alamos National Security, LLC. \brief Unit tests for Base/PUPUtil.h \details Unit tests for Base/PUPUtil.h */ // ***************************************************************************** -#ifndef test_PUPUtil_h -#define test_PUPUtil_h #include "NoWarning/tut.h" +#include "TUTConfig.h" #include "PUPUtil.h" #include "tests/Base/MigratedTypes.h" +#include "NoWarning/tutsuite.decl.h" +#include "migrated_base.decl.h" + namespace unittest { extern CProxy_TUTSuite g_suiteProxy; @@ -961,4 +963,4 @@ void PUPUtil_object::test< 14 >() { } // tut:: -#endif // test_PUPUtil_h +#include "NoWarning/migrated_base.def.h" diff --git a/src/UnitTest/tests/Base/TestPrint.h b/src/UnitTest/tests/Base/TestPrint.C similarity index 98% rename from src/UnitTest/tests/Base/TestPrint.h rename to src/UnitTest/tests/Base/TestPrint.C index c5ed341aa34..3a9fa3b9200 100644 --- a/src/UnitTest/tests/Base/TestPrint.h +++ b/src/UnitTest/tests/Base/TestPrint.C @@ -1,16 +1,15 @@ // ***************************************************************************** /*! - \file src/UnitTest/tests/Base/TestPrint.h + \file src/UnitTest/tests/Base/TestPrint.C \copyright 2012-2015, J. Bakosi, 2016-2018, Los Alamos National Security, LLC. \brief Unit tests for Base/Print.h \details Unit tests for Base/Print.h */ // ***************************************************************************** -#ifndef test_Print_h -#define test_Print_h #include "NoWarning/tut.h" +#include "TUTConfig.h" #include "Print.h" #include "RNGTest/Options/Battery.h" #include "UnitTest/CmdLine/CmdLine.h" @@ -325,5 +324,3 @@ void Print_object::test< 29 >() { } } // tut:: - -#endif // test_Print_h diff --git a/src/UnitTest/tests/Base/TestProcessControl.h b/src/UnitTest/tests/Base/TestProcessControl.C similarity index 89% rename from src/UnitTest/tests/Base/TestProcessControl.h rename to src/UnitTest/tests/Base/TestProcessControl.C index f549ab9e1a5..52bb90f7969 100644 --- a/src/UnitTest/tests/Base/TestProcessControl.h +++ b/src/UnitTest/tests/Base/TestProcessControl.C @@ -1,16 +1,16 @@ // ***************************************************************************** /*! - \file src/UnitTest/tests/Base/TestProcessControl.h + \file src/UnitTest/tests/Base/TestProcessControl.C \copyright 2012-2015, J. Bakosi, 2016-2018, Los Alamos National Security, LLC. \brief Unit tests for Base/ProcessControl.h \details Unit tests for Base/ProcessControl.h */ // ***************************************************************************** -#ifndef test_ProcessControl_h -#define test_ProcessControl_h #include "NoWarning/tut.h" +#include "TUTConfig.h" +#include "Exception.h" #include "ProcessControl.h" namespace tut { @@ -46,5 +46,3 @@ void ProcessControl_object::test< 1 >() { } } // tut:: - -#endif // test_ProcessControl_h diff --git a/src/UnitTest/tests/Base/TestReader.h b/src/UnitTest/tests/Base/TestReader.C similarity index 97% rename from src/UnitTest/tests/Base/TestReader.h rename to src/UnitTest/tests/Base/TestReader.C index b5ac4aaca96..effa4d157cf 100644 --- a/src/UnitTest/tests/Base/TestReader.h +++ b/src/UnitTest/tests/Base/TestReader.C @@ -1,16 +1,15 @@ // ***************************************************************************** /*! - \file src/UnitTest/tests/Base/TestReader.h + \file src/UnitTest/tests/Base/TestReader.C \copyright 2012-2015, J. Bakosi, 2016-2018, Los Alamos National Security, LLC. \brief Unit tests for Base/Reader \details Unit tests for Base/Reader */ // ***************************************************************************** -#ifndef test_Reader_h -#define test_Reader_h #include "NoWarning/tut.h" +#include "TUTConfig.h" #include "Reader.h" namespace unittest { @@ -124,5 +123,3 @@ void Reader_object::test< 5 >() { } } // tut:: - -#endif // test_Reader_h diff --git a/src/UnitTest/tests/Base/TestStrConvUtil.h b/src/UnitTest/tests/Base/TestStrConvUtil.C similarity index 95% rename from src/UnitTest/tests/Base/TestStrConvUtil.h rename to src/UnitTest/tests/Base/TestStrConvUtil.C index 1c757d67ed8..1151ffae1cb 100644 --- a/src/UnitTest/tests/Base/TestStrConvUtil.h +++ b/src/UnitTest/tests/Base/TestStrConvUtil.C @@ -1,16 +1,15 @@ // ***************************************************************************** /*! - \file src/UnitTest/tests/Base/TestStrConvUtil.h + \file src/UnitTest/tests/Base/TestStrConvUtil.C \copyright 2012-2015, J. Bakosi, 2016-2018, Los Alamos National Security, LLC. \brief Unit tests for Base/StrConvUtil.h \details Unit tests for Base/StrConvUtil.h */ // ***************************************************************************** -#ifndef test_StrConvUtil_h -#define test_StrConvUtil_h #include "NoWarning/tut.h" +#include "TUTConfig.h" #include "StrConvUtil.h" namespace tut { @@ -94,5 +93,3 @@ void StrConvUtil_object::test< 4 >() { } } // tut:: - -#endif // test_StrConvUtil_h diff --git a/src/UnitTest/tests/Base/TestTaggedTuple.h b/src/UnitTest/tests/Base/TestTaggedTuple.C similarity index 97% rename from src/UnitTest/tests/Base/TestTaggedTuple.h rename to src/UnitTest/tests/Base/TestTaggedTuple.C index 2f6dc175456..ee98ce598fc 100644 --- a/src/UnitTest/tests/Base/TestTaggedTuple.h +++ b/src/UnitTest/tests/Base/TestTaggedTuple.C @@ -1,16 +1,15 @@ // ***************************************************************************** /*! - \file src/UnitTest/tests/Base/TestTaggedTuple.h + \file src/UnitTest/tests/Base/TestTaggedTuple.C \copyright 2012-2015, J. Bakosi, 2016-2018, Los Alamos National Security, LLC. \brief Unit tests for Base/TaggedTuple.h \details Unit tests for Base/TaggedTuple.h */ // ***************************************************************************** -#ifndef test_TaggedTuple_h -#define test_TaggedTuple_h #include "NoWarning/tut.h" +#include "TUTConfig.h" #include "TaggedTuple.h" namespace tut { @@ -135,5 +134,3 @@ void TaggedTuple_object::test< 7 >() { } } // tut:: - -#endif // test_TaggedTuple_h diff --git a/src/UnitTest/tests/Base/TestTimer.h b/src/UnitTest/tests/Base/TestTimer.C similarity index 98% rename from src/UnitTest/tests/Base/TestTimer.h rename to src/UnitTest/tests/Base/TestTimer.C index 90e2ae24b29..04c555b5048 100644 --- a/src/UnitTest/tests/Base/TestTimer.h +++ b/src/UnitTest/tests/Base/TestTimer.C @@ -1,21 +1,22 @@ // ***************************************************************************** /*! - \file src/UnitTest/tests/Base/TestTimer.h + \file src/UnitTest/tests/Base/TestTimer.C \copyright 2012-2015, J. Bakosi, 2016-2018, Los Alamos National Security, LLC. \brief Unit tests for Base/Timer.h \details Unit tests for Base/Timer.h */ // ***************************************************************************** -#ifndef test_Timer_h -#define test_Timer_h #include #include "NoWarning/tut.h" +#include "TUTConfig.h" #include "Timer.h" #include "ContainerUtil.h" +#include "NoWarning/tutsuite.decl.h" + namespace unittest { extern CProxy_TUTSuite g_suiteProxy; @@ -229,4 +230,4 @@ void Timer_object::test< 8 >() { } // tut:: -#endif // test_Timer_h +#include "NoWarning/charmtimer.def.h" diff --git a/src/UnitTest/tests/Base/TestVector.h b/src/UnitTest/tests/Base/TestVector.C similarity index 96% rename from src/UnitTest/tests/Base/TestVector.h rename to src/UnitTest/tests/Base/TestVector.C index 0b8ed875d2c..71b05ddeb54 100644 --- a/src/UnitTest/tests/Base/TestVector.h +++ b/src/UnitTest/tests/Base/TestVector.C @@ -1,19 +1,19 @@ // ***************************************************************************** /*! - \file src/UnitTest/tests/Base/TestVector.h + \file src/UnitTest/tests/Base/TestVector.C \copyright 2012-2015, J. Bakosi, 2016-2018, Los Alamos National Security, LLC. \brief Unit tests for Base/Vector.h \details Unit tests for Base/Vector.h */ // ***************************************************************************** -#ifndef test_Vector_h -#define test_Vector_h #include #include "NoWarning/tut.h" +#include "TUTConfig.h" #include "Vector.h" +#include "Types.h" namespace tut { @@ -95,5 +95,3 @@ void Vector_object::test< 4 >() { } } // tut:: - -#endif // test_Vector_h diff --git a/src/UnitTest/tests/Base/TestWriter.h b/src/UnitTest/tests/Base/TestWriter.C similarity index 92% rename from src/UnitTest/tests/Base/TestWriter.h rename to src/UnitTest/tests/Base/TestWriter.C index d6d8a594554..5fe5e617b64 100644 --- a/src/UnitTest/tests/Base/TestWriter.h +++ b/src/UnitTest/tests/Base/TestWriter.C @@ -1,16 +1,15 @@ // ***************************************************************************** /*! - \file src/UnitTest/tests/Base/TestWriter.h + \file src/UnitTest/tests/Base/TestWriter.C \copyright 2012-2015, J. Bakosi, 2016-2018, Los Alamos National Security, LLC. \brief Unit tests for Base/Writer \details Unit tests for Base/Writer */ // ***************************************************************************** -#ifndef test_Writer_h -#define test_Writer_h #include "NoWarning/tut.h" +#include "TUTConfig.h" #include "Writer.h" namespace unittest { @@ -58,5 +57,3 @@ void Writer_object::test< 2 >() { } } // tut:: - -#endif // test_Writer_h diff --git a/src/UnitTest/tests/Control/Options/TestMKLBetaMethod.h b/src/UnitTest/tests/Control/Options/TestMKLBetaMethod.C similarity index 97% rename from src/UnitTest/tests/Control/Options/TestMKLBetaMethod.h rename to src/UnitTest/tests/Control/Options/TestMKLBetaMethod.C index 1d428d76bc6..d7d538496dc 100644 --- a/src/UnitTest/tests/Control/Options/TestMKLBetaMethod.h +++ b/src/UnitTest/tests/Control/Options/TestMKLBetaMethod.C @@ -1,16 +1,15 @@ // ***************************************************************************** /*! - \file src/UnitTest/tests/Control/Options/TestMKLBetaMethod.h + \file src/UnitTest/tests/Control/Options/TestMKLBetaMethod.C \copyright 2012-2015, J. Bakosi, 2016-2018, Los Alamos National Security, LLC. \brief Unit tests for Control/Options/MKLBetaMethod \details Unit tests for Control/Options/MKLBetaMethod */ // ***************************************************************************** -#ifndef test_MKLBetaMethod_h -#define test_MKLBetaMethod_h #include "NoWarning/tut.h" +#include "TUTConfig.h" #include "Options/MKLBetaMethod.h" namespace tut { @@ -114,5 +113,3 @@ void MKLBetaMethod_object::test< 6 >() { } } // tut:: - -#endif // test_MKLBetaMethod_h diff --git a/src/UnitTest/tests/Control/Options/TestMKLGammaMethod.h b/src/UnitTest/tests/Control/Options/TestMKLGammaMethod.C similarity index 97% rename from src/UnitTest/tests/Control/Options/TestMKLGammaMethod.h rename to src/UnitTest/tests/Control/Options/TestMKLGammaMethod.C index 1395a8377c1..4c784685be1 100644 --- a/src/UnitTest/tests/Control/Options/TestMKLGammaMethod.h +++ b/src/UnitTest/tests/Control/Options/TestMKLGammaMethod.C @@ -1,16 +1,15 @@ // ***************************************************************************** /*! - \file src/UnitTest/tests/Control/Options/TestMKLGammaMethod.h + \file src/UnitTest/tests/Control/Options/TestMKLGammaMethod.C \copyright 2016-2018, Los Alamos National Security, LLC. \brief Unit tests for Control/Options/MKLGammaMethod \details Unit tests for Control/Options/MKLGammaMethod */ // ***************************************************************************** -#ifndef test_MKLGammaMethod_h -#define test_MKLGammaMethod_h #include "NoWarning/tut.h" +#include "TUTConfig.h" #include "Options/MKLGammaMethod.h" namespace tut { @@ -114,5 +113,3 @@ void MKLGammaMethod_object::test< 6 >() { } } // tut:: - -#endif // test_MKLGammaMethod_h diff --git a/src/UnitTest/tests/Control/Options/TestMKLGaussianMethod.h b/src/UnitTest/tests/Control/Options/TestMKLGaussianMethod.C similarity index 97% rename from src/UnitTest/tests/Control/Options/TestMKLGaussianMethod.h rename to src/UnitTest/tests/Control/Options/TestMKLGaussianMethod.C index fea803f21d4..af6f0433270 100644 --- a/src/UnitTest/tests/Control/Options/TestMKLGaussianMethod.h +++ b/src/UnitTest/tests/Control/Options/TestMKLGaussianMethod.C @@ -1,16 +1,15 @@ // ***************************************************************************** /*! - \file src/UnitTest/tests/Control/Options/TestMKLGaussianMethod.h + \file src/UnitTest/tests/Control/Options/TestMKLGaussianMethod.C \copyright 2012-2015, J. Bakosi, 2016-2018, Los Alamos National Security, LLC. \brief Unit tests for Control/Options/MKLGaussianMethod \details Unit tests for Control/Options/MKLGaussianMethod */ // ***************************************************************************** -#ifndef test_MKLGaussianMethod_h -#define test_MKLGaussianMethod_h #include "NoWarning/tut.h" +#include "TUTConfig.h" #include "Options/MKLGaussianMethod.h" namespace tut { @@ -115,5 +114,3 @@ void MKLGaussianMethod_object::test< 6 >() { } } // tut:: - -#endif // test_MKLGaussianMethod_h diff --git a/src/UnitTest/tests/Control/Options/TestMKLUniformMethod.h b/src/UnitTest/tests/Control/Options/TestMKLUniformMethod.C similarity index 97% rename from src/UnitTest/tests/Control/Options/TestMKLUniformMethod.h rename to src/UnitTest/tests/Control/Options/TestMKLUniformMethod.C index bda88f02e5b..938a399f6e4 100644 --- a/src/UnitTest/tests/Control/Options/TestMKLUniformMethod.h +++ b/src/UnitTest/tests/Control/Options/TestMKLUniformMethod.C @@ -1,16 +1,15 @@ // ***************************************************************************** /*! - \file src/UnitTest/tests/Control/Options/TestMKLUniformMethod.h + \file src/UnitTest/tests/Control/Options/TestMKLUniformMethod.C \copyright 2012-2015, J. Bakosi, 2016-2018, Los Alamos National Security, LLC. \brief Unit tests for Control/Options/MKLUniformMethod \details Unit tests for Control/Options/MKLUniformMethod */ // ***************************************************************************** -#ifndef test_MKLUniformMethod_h -#define test_MKLUniformMethod_h #include "NoWarning/tut.h" +#include "TUTConfig.h" #include "Options/MKLUniformMethod.h" namespace tut { @@ -115,5 +114,3 @@ void MKLUniformMethod_object::test< 6 >() { } } // tut:: - -#endif // test_MKLUniformMethod_h diff --git a/src/UnitTest/tests/Control/Options/TestRNG.h b/src/UnitTest/tests/Control/Options/TestRNG.C similarity index 97% rename from src/UnitTest/tests/Control/Options/TestRNG.h rename to src/UnitTest/tests/Control/Options/TestRNG.C index 30fc7b5a26d..b89c84ab8b5 100644 --- a/src/UnitTest/tests/Control/Options/TestRNG.h +++ b/src/UnitTest/tests/Control/Options/TestRNG.C @@ -1,16 +1,15 @@ // ***************************************************************************** /*! - \file src/UnitTest/tests/Control/Options/TestRNG.h + \file src/UnitTest/tests/Control/Options/TestRNG.C \copyright 2012-2015, J. Bakosi, 2016-2018, Los Alamos National Security, LLC. \brief Unit tests for Control/Options/RNG \details Unit tests for Control/Options/RNG */ // ***************************************************************************** -#ifndef test_RNGOptions_h -#define test_RNGOptions_h #include "NoWarning/tut.h" +#include "TUTConfig.h" #include "Options/RNG.h" #include "RNGParam.h" #include "QuinoaConfig.h" @@ -193,5 +192,3 @@ void RNGOptions_object::test< 13 >() { #endif } // tut:: - -#endif // test_RNGOptions_h diff --git a/src/UnitTest/tests/Control/TestControl.h b/src/UnitTest/tests/Control/TestControl.C similarity index 99% rename from src/UnitTest/tests/Control/TestControl.h rename to src/UnitTest/tests/Control/TestControl.C index 51c3a1a7496..65c37411389 100644 --- a/src/UnitTest/tests/Control/TestControl.h +++ b/src/UnitTest/tests/Control/TestControl.C @@ -1,17 +1,17 @@ // ***************************************************************************** /*! - \file src/UnitTest/tests/Control/TestControl.h + \file src/UnitTest/tests/Control/TestControl.C \copyright 2012-2015, J. Bakosi, 2016-2018, Los Alamos National Security, LLC. \brief Unit tests for Control/Control \details Unit tests for Control/Control */ // ***************************************************************************** -#ifndef test_Control_h -#define test_Control_h #include "NoWarning/tut.h" +#include "TUTConfig.h" #include "Control.h" +#include "Types.h" namespace tut { @@ -398,5 +398,3 @@ void Control_object::test< 14 >() { } } // tut:: - -#endif // test_Control_h diff --git a/src/UnitTest/tests/Control/TestFileParser.h b/src/UnitTest/tests/Control/TestFileParser.C similarity index 97% rename from src/UnitTest/tests/Control/TestFileParser.h rename to src/UnitTest/tests/Control/TestFileParser.C index 2fd56bdca35..8c629eaaeb2 100644 --- a/src/UnitTest/tests/Control/TestFileParser.h +++ b/src/UnitTest/tests/Control/TestFileParser.C @@ -1,16 +1,15 @@ // ***************************************************************************** /*! - \file src/UnitTest/tests/Control/TestFileParser.h + \file src/UnitTest/tests/Control/TestFileParser.C \copyright 2012-2015, J. Bakosi, 2016-2018, Los Alamos National Security, LLC. \brief Unit tests for Control/FileParser \details Unit tests for Control/FileParser */ // ***************************************************************************** -#ifndef test_FileParser_h -#define test_FileParser_h #include "NoWarning/tut.h" +#include "TUTConfig.h" #include "FileParser.h" #include "Print.h" @@ -181,5 +180,3 @@ void FileParser_object::test< 7 >() { } } // tut:: - -#endif // test_FileParser_h diff --git a/src/UnitTest/tests/Control/TestStringParser.h b/src/UnitTest/tests/Control/TestStringParser.C similarity index 92% rename from src/UnitTest/tests/Control/TestStringParser.h rename to src/UnitTest/tests/Control/TestStringParser.C index 9f8fae011e7..860462490e6 100644 --- a/src/UnitTest/tests/Control/TestStringParser.h +++ b/src/UnitTest/tests/Control/TestStringParser.C @@ -1,16 +1,15 @@ // ***************************************************************************** /*! - \file src/UnitTest/tests/Control/TestStringParser.h + \file src/UnitTest/tests/Control/TestStringParser.C \copyright 2012-2015, J. Bakosi, 2016-2018, Los Alamos National Security, LLC. \brief Unit tests for Control/StringParser \details Unit tests for Control/StringParser */ // ***************************************************************************** -#ifndef test_StringParser_h -#define test_StringParser_h #include "NoWarning/tut.h" +#include "TUTConfig.h" #include "StringParser.h" namespace tut { @@ -61,5 +60,3 @@ void StringParser_object::test< 2 >() { } } // tut:: - -#endif // test_StringParser_h diff --git a/src/UnitTest/tests/Control/TestSystemComponents.h b/src/UnitTest/tests/Control/TestSystemComponents.C similarity index 97% rename from src/UnitTest/tests/Control/TestSystemComponents.h rename to src/UnitTest/tests/Control/TestSystemComponents.C index d2c17a3d6f9..b0ddd2e7e07 100644 --- a/src/UnitTest/tests/Control/TestSystemComponents.h +++ b/src/UnitTest/tests/Control/TestSystemComponents.C @@ -1,19 +1,18 @@ // ***************************************************************************** /*! - \file src/UnitTest/tests/Control/TestSystemComponents.h + \file src/UnitTest/tests/Control/TestSystemComponents.C \copyright 2012-2015, J. Bakosi, 2016-2018, Los Alamos National Security, LLC. \brief Unit tests for Control/SystemComponents \details Unit tests for Control/SystemComponents */ // ***************************************************************************** -#ifndef test_SystemComponents_h -#define test_SystemComponents_h #include #include #include "NoWarning/tut.h" +#include "TUTConfig.h" #include "SystemComponents.h" #include "TaggedTuple.h" #include "Tags.h" @@ -228,5 +227,3 @@ void SystemComponents_object::test< 5 >() { } // tut:: - -#endif // test_SystemComponents_h diff --git a/src/UnitTest/tests/Control/TestToggle.h b/src/UnitTest/tests/Control/TestToggle.C similarity index 98% rename from src/UnitTest/tests/Control/TestToggle.h rename to src/UnitTest/tests/Control/TestToggle.C index 0ca733e87ec..e2fa9899d71 100644 --- a/src/UnitTest/tests/Control/TestToggle.h +++ b/src/UnitTest/tests/Control/TestToggle.C @@ -1,16 +1,15 @@ // ***************************************************************************** /*! - \file src/UnitTest/tests/Control/TestToggle.h + \file src/UnitTest/tests/Control/TestToggle.C \copyright 2012-2015, J. Bakosi, 2016-2018, Los Alamos National Security, LLC. \brief Unit tests for Control/Toggle \details Unit tests for Control/Toggle */ // ***************************************************************************** -#ifndef test_Toggle_h -#define test_Toggle_h #include "NoWarning/tut.h" +#include "TUTConfig.h" #include "Toggle.h" namespace tut { @@ -228,5 +227,3 @@ void Toggle_object::test< 12 >() { } } // tut:: - -#endif // test_Toggle_h diff --git a/src/UnitTest/tests/IO/TestExodusIIMeshReader.h b/src/UnitTest/tests/IO/TestExodusIIMeshReader.C similarity index 99% rename from src/UnitTest/tests/IO/TestExodusIIMeshReader.h rename to src/UnitTest/tests/IO/TestExodusIIMeshReader.C index 9767fa6f4c7..8559e7c7567 100644 --- a/src/UnitTest/tests/IO/TestExodusIIMeshReader.h +++ b/src/UnitTest/tests/IO/TestExodusIIMeshReader.C @@ -1,23 +1,23 @@ // ***************************************************************************** /*! - \file src/UnitTest/tests/IO/TestExodusIIMeshReader.h + \file src/UnitTest/tests/IO/TestExodusIIMeshReader.C \copyright 2012-2015, J. Bakosi, 2016-2018, Los Alamos National Security, LLC. \brief Unit tests for the ExodusII unstructured-mesh reader \details Unit tests for the ExodusII unstructured-mesh reader */ // ***************************************************************************** -#ifndef test_ExodusIIMeshReader_h -#define test_ExodusIIMeshReader_h #include #include #include "NoWarning/tut.h" +#include "TUTConfig.h" #include "UnsMesh.h" #include "TUTUtil.h" #include "QuinoaConfig.h" #include "ExodusIIMeshReader.h" +#include "Reorder.h" namespace tut { @@ -1792,5 +1792,3 @@ void ExodusIIMeshReader_object::test< 9 >() { } } // tut:: - -#endif // test_ExodusIIMeshReader_h diff --git a/src/UnitTest/tests/IO/TestMesh.h b/src/UnitTest/tests/IO/TestMesh.C similarity index 98% rename from src/UnitTest/tests/IO/TestMesh.h rename to src/UnitTest/tests/IO/TestMesh.C index 42a021540ca..3dbffcdb11d 100644 --- a/src/UnitTest/tests/IO/TestMesh.h +++ b/src/UnitTest/tests/IO/TestMesh.C @@ -1,16 +1,15 @@ // ***************************************************************************** /*! - \file src/UnitTest/tests/IO/TestMesh.h + \file src/UnitTest/tests/IO/TestMesh.C \copyright 2012-2015, J. Bakosi, 2016-2018, Los Alamos National Security, LLC. \brief Unit tests for unstructured-mesh reader and writers in IO \details Unit tests for unstructured-mesh reader and writers in IO */ // ***************************************************************************** -#ifndef test_Mesh_h -#define test_Mesh_h #include "NoWarning/tut.h" +#include "TUTConfig.h" #include "MeshDetect.h" #include "Reorder.h" #include "DerivedData.h" @@ -209,5 +208,3 @@ void Mesh_object::test< 4 >() { } } // tut:: - -#endif // test_Mesh_h diff --git a/src/UnitTest/tests/IO/TestMeshReader.h b/src/UnitTest/tests/IO/TestMeshReader.C similarity index 98% rename from src/UnitTest/tests/IO/TestMeshReader.h rename to src/UnitTest/tests/IO/TestMeshReader.C index 02c79493a4f..954bb982b49 100644 --- a/src/UnitTest/tests/IO/TestMeshReader.h +++ b/src/UnitTest/tests/IO/TestMeshReader.C @@ -1,19 +1,18 @@ // ***************************************************************************** /*! - \file src/UnitTest/tests/IO/TestMeshReader.h + \file src/UnitTest/tests/IO/TestMeshReader.C \copyright 2016-2018, Los Alamos National Security, LLC. \brief Unit tests for MeshReader polymorphic interface \details Unit tests for MeshReader polymorphic interface */ // ***************************************************************************** -#ifndef test_MeshReader_h -#define test_MeshReader_h #include #include #include "NoWarning/tut.h" +#include "TUTConfig.h" #include "QuinoaConfig.h" #include "MeshReader.h" #include "ContainerUtil.h" @@ -267,5 +266,3 @@ void MeshReader_object::test< 6 >() { } } // tut:: - -#endif // test_MeshReader_h diff --git a/src/UnitTest/tests/Inciter/AMR/TestError.h b/src/UnitTest/tests/Inciter/AMR/TestError.C similarity index 98% rename from src/UnitTest/tests/Inciter/AMR/TestError.h rename to src/UnitTest/tests/Inciter/AMR/TestError.C index f66f4498bbe..1f5686aa668 100644 --- a/src/UnitTest/tests/Inciter/AMR/TestError.h +++ b/src/UnitTest/tests/Inciter/AMR/TestError.C @@ -1,6 +1,6 @@ // ***************************************************************************** /*! - \file src/UnitTest/tests/Inciter/AMR/TestError.h + \file src/UnitTest/tests/Inciter/AMR/TestError.C \copyright 2012-2015, J. Bakosi, 2016-2017, Los Alamos National Security, LLC. \brief Unit tests for AMR error indicators in Inciter/AMR/Error.h \details Unit tests for AMR error indicators in Inciter/AMR/Error.h. All @@ -59,13 +59,12 @@ */ // ***************************************************************************** -#ifndef test_AMRError_h -#define test_AMRError_h #include #include "NoWarning/tut.h" +#include "TUTConfig.h" #include "Types.h" #include "Fields.h" #include "Reorder.h" @@ -231,5 +230,3 @@ void AMRError_object::test< 2 >() { } } // tut:: - -#endif // test_AMRError_h diff --git a/src/UnitTest/tests/Inciter/TestScheme.h b/src/UnitTest/tests/Inciter/TestScheme.C similarity index 97% rename from src/UnitTest/tests/Inciter/TestScheme.h rename to src/UnitTest/tests/Inciter/TestScheme.C index bef676d3c67..712e4e4047b 100644 --- a/src/UnitTest/tests/Inciter/TestScheme.h +++ b/src/UnitTest/tests/Inciter/TestScheme.C @@ -1,19 +1,19 @@ // ***************************************************************************** /*! - \file src/UnitTest/tests/Inciter/TestScheme.h + \file src/UnitTest/tests/Inciter/TestScheme.C \copyright 2012-2015, J. Bakosi, 2016-2018, Los Alamos National Security, LLC. \brief Unit tests for Inciter/Scheme.h \details Unit tests for Inciter/Scheme.h */ // ***************************************************************************** -#ifndef test_Scheme_h -#define test_Scheme_h #include #include "NoWarning/tut.h" +#include "TUTConfig.h" #include "NoWarning/tutsuite.decl.h" +#include "migrated_inciter.decl.h" #include "Scheme.h" @@ -157,4 +157,4 @@ void Scheme_object::test< 5 >() { } // tut:: -#endif // test_Scheme_h +#include "NoWarning/migrated_inciter.def.h" diff --git a/src/UnitTest/tests/LoadBalance/TestLinearMap.h b/src/UnitTest/tests/LoadBalance/TestLinearMap.C similarity index 94% rename from src/UnitTest/tests/LoadBalance/TestLinearMap.h rename to src/UnitTest/tests/LoadBalance/TestLinearMap.C index 622b8e7f19d..55174b5f8ec 100644 --- a/src/UnitTest/tests/LoadBalance/TestLinearMap.h +++ b/src/UnitTest/tests/LoadBalance/TestLinearMap.C @@ -1,16 +1,15 @@ // ***************************************************************************** /*! - \file src/UnitTest/tests/LoadBalance/TestLinearMap.h + \file src/UnitTest/tests/LoadBalance/TestLinearMap.C \copyright 2012-2015, J. Bakosi, 2016-2018, Los Alamos National Security, LLC. \brief Unit tests for LoadBalance/LinearMap \details Unit tests for LoadBalance/LinearMap */ // ***************************************************************************** -#ifndef test_LinearMap_h -#define test_LinearMap_h #include "NoWarning/tut.h" +#include "TUTConfig.h" #include "LinearMap.h" #include "TestArray.h" @@ -86,4 +85,4 @@ void LinearMap_object::test< 3 >() { } // tut:: -#endif // test_LinearMap_h +#include "NoWarning/testarray.def.h" diff --git a/src/UnitTest/tests/LoadBalance/TestLoadDistributor.h b/src/UnitTest/tests/LoadBalance/TestLoadDistributor.C similarity index 98% rename from src/UnitTest/tests/LoadBalance/TestLoadDistributor.h rename to src/UnitTest/tests/LoadBalance/TestLoadDistributor.C index b734be6480d..a2231fda958 100644 --- a/src/UnitTest/tests/LoadBalance/TestLoadDistributor.h +++ b/src/UnitTest/tests/LoadBalance/TestLoadDistributor.C @@ -1,16 +1,15 @@ // ***************************************************************************** /*! - \file src/UnitTest/tests/LoadBalance/TestLoadDistributor.h + \file src/UnitTest/tests/LoadBalance/TestLoadDistributor.C \copyright 2012-2015, J. Bakosi, 2016-2018, Los Alamos National Security, LLC. \brief Unit tests for LoadBalance/LoadDistributor \details Unit tests for LoadBalance/LoadDistributor */ // ***************************************************************************** -#ifndef test_LoadDistributor_h -#define test_LoadDistributor_h #include "NoWarning/tut.h" +#include "TUTConfig.h" #include "LoadDistributor.h" #include "Exception.h" @@ -160,5 +159,3 @@ void LoadDistributor_object::test< 7 >() { #endif } // tut:: - -#endif // test_LoadDistributor_h diff --git a/src/UnitTest/tests/LoadBalance/TestUnsMeshMap.h b/src/UnitTest/tests/LoadBalance/TestUnsMeshMap.C similarity index 98% rename from src/UnitTest/tests/LoadBalance/TestUnsMeshMap.h rename to src/UnitTest/tests/LoadBalance/TestUnsMeshMap.C index 3cd12e1156a..9477c835878 100644 --- a/src/UnitTest/tests/LoadBalance/TestUnsMeshMap.h +++ b/src/UnitTest/tests/LoadBalance/TestUnsMeshMap.C @@ -1,16 +1,15 @@ // ***************************************************************************** /*! - \file src/UnitTest/tests/LoadBalance/TestUnsMeshMap.h + \file src/UnitTest/tests/LoadBalance/TestUnsMeshMap.C \copyright 2012-2015, J. Bakosi, 2016-2018, Los Alamos National Security, LLC. \brief Unit tests for LoadBalance/UnsMeshMap \details Unit tests for LoadBalance/UnsMeshMap */ // ***************************************************************************** -#ifndef test_UnsMeshMap_h -#define test_UnsMeshMap_h #include "NoWarning/tut.h" +#include "TUTConfig.h" #include "UnsMeshMap.h" #include "TestArray.h" @@ -178,5 +177,3 @@ void UnsMeshMap_object::test< 5 >() { } } // tut:: - -#endif // test_UnsMeshMap_h diff --git a/src/UnitTest/tests/Mesh/TestAround.h b/src/UnitTest/tests/Mesh/TestAround.C similarity index 99% rename from src/UnitTest/tests/Mesh/TestAround.h rename to src/UnitTest/tests/Mesh/TestAround.C index 01155ad300e..cc28fde4875 100644 --- a/src/UnitTest/tests/Mesh/TestAround.h +++ b/src/UnitTest/tests/Mesh/TestAround.C @@ -1,17 +1,18 @@ // ***************************************************************************** /*! - \file src/UnitTest/tests/Mesh/TestAround.h + \file src/UnitTest/tests/Mesh/TestAround.C \copyright 2012-2015, J. Bakosi, 2016-2018, Los Alamos National Security, LLC. \brief Unit tests for Mesh/Around \details Unit tests for Mesh/Around. */ // ***************************************************************************** -#ifndef test_Around_h -#define test_Around_h #include "NoWarning/tut.h" +#include "TUTConfig.h" #include "Around.h" +#include "Reorder.h" +#include "DerivedData.h" namespace tut { @@ -910,5 +911,3 @@ void Around_object::test< 12 >() { } } // tut:: - -#endif // test_Around_h diff --git a/src/UnitTest/tests/Mesh/TestDerivedData.h b/src/UnitTest/tests/Mesh/TestDerivedData.C similarity index 99% rename from src/UnitTest/tests/Mesh/TestDerivedData.h rename to src/UnitTest/tests/Mesh/TestDerivedData.C index 06a4d706482..052a6a6cf9b 100644 --- a/src/UnitTest/tests/Mesh/TestDerivedData.h +++ b/src/UnitTest/tests/Mesh/TestDerivedData.C @@ -1,6 +1,6 @@ // ***************************************************************************** /*! - \file src/UnitTest/tests/Mesh/TestDerivedData.h + \file src/UnitTest/tests/Mesh/TestDerivedData.C \copyright 2012-2015, J. Bakosi, 2016-2018, Los Alamos National Security, LLC. \brief Unit tests for Mesh/DerivedData \details Unit tests for Mesh/DerivedData. All unit tests start from simple @@ -109,11 +109,10 @@ \endcode */ // ***************************************************************************** -#ifndef test_DerivedData_h -#define test_DerivedData_h #include "NoWarning/tut.h" +#include "TUTConfig.h" #include "DerivedData.h" #include "Reorder.h" #include "ExodusIIMeshReader.h" @@ -3501,5 +3500,3 @@ void DerivedData_object::test< 70 >() { #endif } // tut:: - -#endif // test_DerivedData_h diff --git a/src/UnitTest/tests/Mesh/TestGradients.h b/src/UnitTest/tests/Mesh/TestGradients.C similarity index 98% rename from src/UnitTest/tests/Mesh/TestGradients.h rename to src/UnitTest/tests/Mesh/TestGradients.C index 70cb0aee984..302de088591 100644 --- a/src/UnitTest/tests/Mesh/TestGradients.h +++ b/src/UnitTest/tests/Mesh/TestGradients.C @@ -1,6 +1,6 @@ // ***************************************************************************** /*! - \file src/UnitTest/tests/Mesh/TestGradients.h + \file src/UnitTest/tests/Mesh/TestGradients.C \copyright 2012-2015, J. Bakosi, 2016-2017, Los Alamos National Security, LLC. \brief Unit tests for Mesh/Gradients \details Unit tests for Mesh/Gradients. All unit tests start from simple @@ -58,15 +58,16 @@ \endcode */ // ***************************************************************************** -#ifndef test_Gradients_h -#define test_Gradients_h #include +#include "TUTConfig.h" #include "NoWarning/tut.h" #include "Gradients.h" #include "Fields.h" +#include "Reorder.h" +#include "DerivedData.h" namespace tut { @@ -292,5 +293,3 @@ void Gradients_object::test< 2 >() { } } // tut:: - -#endif // test_DerivedData_h diff --git a/src/UnitTest/tests/Mesh/TestReorder.h b/src/UnitTest/tests/Mesh/TestReorder.C similarity index 99% rename from src/UnitTest/tests/Mesh/TestReorder.h rename to src/UnitTest/tests/Mesh/TestReorder.C index 2712fb4017c..3699603119f 100644 --- a/src/UnitTest/tests/Mesh/TestReorder.h +++ b/src/UnitTest/tests/Mesh/TestReorder.C @@ -1,6 +1,6 @@ // ***************************************************************************** /*! - \file src/UnitTest/tests/Mesh/TestReorder.h + \file src/UnitTest/tests/Mesh/TestReorder.C \copyright 2012-2015, J. Bakosi, 2016-2018, Los Alamos National Security, LLC. \brief Unit tests for Mesh/Reorder \details Unit tests for Mesh/Reorder. All unit tests start from simple mesh @@ -109,11 +109,10 @@ \endcode */ // ***************************************************************************** -#ifndef test_Reorder_h -#define test_Reorder_h #include "NoWarning/tut.h" +#include "TUTConfig.h" #include "Reorder.h" #include "DerivedData.h" @@ -513,5 +512,3 @@ void Reorder_object::test< 13 >() { #endif } // tut:: - -#endif // test_Reorder_h diff --git a/src/UnitTest/tests/RNG/TestMKLRNG.h b/src/UnitTest/tests/RNG/TestMKLRNG.C similarity index 98% rename from src/UnitTest/tests/RNG/TestMKLRNG.h rename to src/UnitTest/tests/RNG/TestMKLRNG.C index 09a84a893b6..92e92f4da92 100644 --- a/src/UnitTest/tests/RNG/TestMKLRNG.h +++ b/src/UnitTest/tests/RNG/TestMKLRNG.C @@ -1,17 +1,17 @@ // ***************************************************************************** /*! - \file src/UnitTest/tests/RNG/TestMKLRNG.h + \file src/UnitTest/tests/RNG/TestMKLRNG.C \copyright 2012-2015, J. Bakosi, 2016-2018, Los Alamos National Security, LLC. \brief Unit tests for RNG/MKLRNG.h \details Unit tests for RNG/MKLRNG.h */ // ***************************************************************************** -#ifndef test_MKLRNG_h -#define test_MKLRNG_h #include "NoWarning/tut.h" +#include "TUTConfig.h" #include "MKLRNG.h" +#include "TestRNG.h" namespace tut { @@ -315,5 +315,3 @@ void MKLRNG_object::test< 23 >() { #endif } // tut:: - -#endif // test_MKLRNG_h diff --git a/src/UnitTest/tests/RNG/TestRNG.C b/src/UnitTest/tests/RNG/TestRNG.C new file mode 100644 index 00000000000..d7f6eed86b4 --- /dev/null +++ b/src/UnitTest/tests/RNG/TestRNG.C @@ -0,0 +1,155 @@ +// ***************************************************************************** +/*! + \file src/UnitTest/tests/RNG/TestRNG.C + \copyright 2012-2015, J. Bakosi, 2016-2018, Los Alamos National Security, LLC. + \brief Unit tests for RNG/RNG.h + \details Unit tests for RNG/RNG.h +*/ +// ***************************************************************************** + +#include "NoWarning/tut.h" + +#include "TUTConfig.h" +#include "QuinoaConfig.h" + +#include "NoWarning/threefry.h" +#include "NoWarning/philox.h" + +#ifdef HAS_MKL + #include + #include "MKLRNG.h" +#endif + +#ifdef HAS_RNGSSE2 + #include + #include + #include + #include + #include + #include + #include + #include + #include + #include + #include + #include "RNGSSE.h" +#endif + +#include "Random123.h" +#include "TestRNG.h" + +namespace tut { + +//! Test group shortcuts +using RNG_group = test_group< RNG_common, MAX_TESTS_IN_GROUP >; +using RNG_object = RNG_group::object; + +//! Define test group +static RNG_group RNG( "RNG/RNG" ); + +//! Test definitions for group + +//! Test constructor taking an object modeling Concept in tk::RNG +template<> template<> +void RNG_object::test< 1 >() { + set_test_name( "ctor( rng() ) & nthreads()" ); + for (const auto& r : rngs) + ensure_equals( "nthreads() via polymorphic tk::RNG call incorrect", + r.nthreads(), 4 ); +} + +//! \brief Test constructor taking a function pointer to a constructor of an +//! object modeling Concept in tk::RNG +template<> template<> +void RNG_object::test< 2 >() { + set_test_name( "ctor( std::function(rng) )" ); + + std::vector< tk::RNG > v; + + #ifdef HAS_MKL + add< tk::MKLRNG >( v, 4, VSL_BRNG_MCG31 ); + #endif + + #ifdef HAS_RNGSSE2 + add< tk::RNGSSE< gm19_state, unsigned, gm19_generate_ > > + ( v, 4, gm19_init_sequence_ ); + add< tk::RNGSSE< gm29_state, unsigned, gm29_generate_ > > + ( v, 4, gm29_init_short_sequence_ ); + add< tk::RNGSSE< gm31_state, unsigned, gm31_generate_ > > + ( v, 4, gm31_init_short_sequence_ ); + add< tk::RNGSSE< gm55_state, unsigned long long, gm55_generate_ > > + ( v, 4, gm55_init_short_sequence_ ); + add< tk::RNGSSE< gm61_state, unsigned long long, gm61_generate_ > > + ( v, 4, gm61_init_sequence_ ); + add< tk::RNGSSE< gq58x1_state, unsigned, gq58x1_generate_ > > + ( v, 4, gq58x1_init_short_sequence_ ); + add< tk::RNGSSE< gq58x3_state, unsigned, gq58x3_generate_ > > + ( v, 4, gq58x3_init_short_sequence_ ); + add< tk::RNGSSE< gq58x4_state, unsigned, gq58x4_generate_ > > + ( v, 4, gq58x4_init_short_sequence_ ); + add< tk::RNGSSE< mt19937_state, unsigned long long, mt19937_generate_ > > + ( v, 4, mt19937_init_sequence_ ); + add< tk::RNGSSE< lfsr113_state, unsigned long long, lfsr113_generate_ > > + ( v, 4, lfsr113_init_long_sequence_ ); + add< tk::RNGSSE< mrg32k3a_state, unsigned long long, mrg32k3a_generate_ > > + ( v, 4, mrg32k3a_init_sequence_ ); + #endif + + add< tk::Random123< r123::Threefry2x64 > >( v, 4 ); + add< tk::Random123< r123::Philox2x64 > >( v, 4 ); + + for (const auto& r : v) + ensure_equals( "nthreads() via polymorphic tk::RNG call incorrect", + r.nthreads(), 4 ); +} + +//! Test Gaussian generator statistics via polymorphic call in tk::RNG +template<> template<> +void RNG_object::test< 3 >() { + set_test_name( "Gaussian from 4 emulated streams" ); + for (const auto& r : rngs) test_gaussian( r ); +} + +//! Test beta generator statistics via polymorphic call in tk::RNG +template<> template<> +void RNG_object::test< 4 >() { + set_test_name( "beta from 4 emulated streams" ); + for (const auto& r : rngs) test_beta( r ); +} + +//! Test uniform generator statistics via polymorphic call in tk::RNG +template<> template<> +void RNG_object::test< 5 >() { + set_test_name( "uniform from 4 emulated streams" ); + for (const auto& r : rngs) test_uniform( r ); +} + +//! Test copy constructor +template<> template<> +void RNG_object::test< 6 >() { + set_test_name( "copy constructor" ); + for (const auto& r : rngs) test_copy_ctor( r ); +} + +//! Test move constructor +template<> template<> +void RNG_object::test< 7 >() { + set_test_name( "move constructor" ); + for (const auto& r : rngs) test_move_ctor( r ); +} + +//! Test copy assignment +template<> template<> +void RNG_object::test< 8 >() { + set_test_name( "copy assignment" ); + for (const auto& r : rngs) test_copy_assignment( r ); +} + +//! Test move assignment +template<> template<> +void RNG_object::test< 9 >() { + set_test_name( "move assignment" ); + for (const auto& r : rngs) test_move_assignment( r ); +} + +} // tut:: diff --git a/src/UnitTest/tests/RNG/TestRNG.h b/src/UnitTest/tests/RNG/TestRNG.h index 98dec19be37..5d495631427 100644 --- a/src/UnitTest/tests/RNG/TestRNG.h +++ b/src/UnitTest/tests/RNG/TestRNG.h @@ -2,24 +2,22 @@ /*! \file src/UnitTest/tests/RNG/TestRNG.h \copyright 2012-2015, J. Bakosi, 2016-2018, Los Alamos National Security, LLC. - \brief Unit tests for RNG/RNG.h - \details Unit tests for RNG/RNG.h + \brief Reused test code for unit testing random number generators + \details Reused test code for unit testing random number generators */ // ***************************************************************************** -#ifndef test_RNG_h -#define test_RNG_h #include #include -#include "NoWarning/tut.h" + #include "QuinoaConfig.h" #include "NoWarning/threefry.h" #include "NoWarning/philox.h" #ifdef HAS_MKL - #include "NoWarning/mkl_vsl_types.h" + #include #include "MKLRNG.h" #endif @@ -238,118 +236,4 @@ struct RNG_common { std::vector< tk::RNG > rngs; }; -//! Test group shortcuts -using RNG_group = test_group< RNG_common, MAX_TESTS_IN_GROUP >; -using RNG_object = RNG_group::object; - -//! Define test group -static RNG_group RNG( "RNG/RNG" ); - -//! Test definitions for group - -//! Test constructor taking an object modeling Concept in tk::RNG -template<> template<> -void RNG_object::test< 1 >() { - set_test_name( "ctor( rng() ) & nthreads()" ); - for (const auto& r : rngs) - ensure_equals( "nthreads() via polymorphic tk::RNG call incorrect", - r.nthreads(), 4 ); -} - -//! \brief Test constructor taking a function pointer to a constructor of an -//! object modeling Concept in tk::RNG -template<> template<> -void RNG_object::test< 2 >() { - set_test_name( "ctor( std::function(rng) )" ); - - std::vector< tk::RNG > v; - - #ifdef HAS_MKL - add< tk::MKLRNG >( v, 4, VSL_BRNG_MCG31 ); - #endif - - #ifdef HAS_RNGSSE2 - add< tk::RNGSSE< gm19_state, unsigned, gm19_generate_ > > - ( v, 4, gm19_init_sequence_ ); - add< tk::RNGSSE< gm29_state, unsigned, gm29_generate_ > > - ( v, 4, gm29_init_short_sequence_ ); - add< tk::RNGSSE< gm31_state, unsigned, gm31_generate_ > > - ( v, 4, gm31_init_short_sequence_ ); - add< tk::RNGSSE< gm55_state, unsigned long long, gm55_generate_ > > - ( v, 4, gm55_init_short_sequence_ ); - add< tk::RNGSSE< gm61_state, unsigned long long, gm61_generate_ > > - ( v, 4, gm61_init_sequence_ ); - add< tk::RNGSSE< gq58x1_state, unsigned, gq58x1_generate_ > > - ( v, 4, gq58x1_init_short_sequence_ ); - add< tk::RNGSSE< gq58x3_state, unsigned, gq58x3_generate_ > > - ( v, 4, gq58x3_init_short_sequence_ ); - add< tk::RNGSSE< gq58x4_state, unsigned, gq58x4_generate_ > > - ( v, 4, gq58x4_init_short_sequence_ ); - add< tk::RNGSSE< mt19937_state, unsigned long long, mt19937_generate_ > > - ( v, 4, mt19937_init_sequence_ ); - add< tk::RNGSSE< lfsr113_state, unsigned long long, lfsr113_generate_ > > - ( v, 4, lfsr113_init_long_sequence_ ); - add< tk::RNGSSE< mrg32k3a_state, unsigned long long, mrg32k3a_generate_ > > - ( v, 4, mrg32k3a_init_sequence_ ); - #endif - - add< tk::Random123< r123::Threefry2x64 > >( v, 4 ); - add< tk::Random123< r123::Philox2x64 > >( v, 4 ); - - for (const auto& r : v) - ensure_equals( "nthreads() via polymorphic tk::RNG call incorrect", - r.nthreads(), 4 ); -} - -//! Test Gaussian generator statistics via polymorphic call in tk::RNG -template<> template<> -void RNG_object::test< 3 >() { - set_test_name( "Gaussian from 4 emulated streams" ); - for (const auto& r : rngs) test_gaussian( r ); -} - -//! Test beta generator statistics via polymorphic call in tk::RNG -template<> template<> -void RNG_object::test< 4 >() { - set_test_name( "beta from 4 emulated streams" ); - for (const auto& r : rngs) test_beta( r ); -} - -//! Test uniform generator statistics via polymorphic call in tk::RNG -template<> template<> -void RNG_object::test< 5 >() { - set_test_name( "uniform from 4 emulated streams" ); - for (const auto& r : rngs) test_uniform( r ); -} - -//! Test copy constructor -template<> template<> -void RNG_object::test< 6 >() { - set_test_name( "copy constructor" ); - for (const auto& r : rngs) test_copy_ctor( r ); -} - -//! Test move constructor -template<> template<> -void RNG_object::test< 7 >() { - set_test_name( "move constructor" ); - for (const auto& r : rngs) test_move_ctor( r ); -} - -//! Test copy assignment -template<> template<> -void RNG_object::test< 8 >() { - set_test_name( "copy assignment" ); - for (const auto& r : rngs) test_copy_assignment( r ); -} - -//! Test move assignment -template<> template<> -void RNG_object::test< 9 >() { - set_test_name( "move assignment" ); - for (const auto& r : rngs) test_move_assignment( r ); -} - } // tut:: - -#endif // test_RNG_h diff --git a/src/UnitTest/tests/RNG/TestRNGSSE.h b/src/UnitTest/tests/RNG/TestRNGSSE.C similarity index 99% rename from src/UnitTest/tests/RNG/TestRNGSSE.h rename to src/UnitTest/tests/RNG/TestRNGSSE.C index 340b4ad4960..4b4554c4cdb 100644 --- a/src/UnitTest/tests/RNG/TestRNGSSE.h +++ b/src/UnitTest/tests/RNG/TestRNGSSE.C @@ -1,13 +1,11 @@ // ***************************************************************************** /*! - \file src/UnitTest/tests/RNG/TestRNGSSE.h + \file src/UnitTest/tests/RNG/TestRNGSSE.C \copyright 2012-2015, J. Bakosi, 2016-2018, Los Alamos National Security, LLC. \brief Unit tests for RNG/RNGSSE.h \details Unit tests for RNG/RNGSSE.h */ // ***************************************************************************** -#ifndef test_RNGSSE_h -#define test_RNGSSE_h #include "NoWarning/tut.h" @@ -23,7 +21,9 @@ #include #include +#include "TUTConfig.h" #include "RNGSSE.h" +#include "TestRNG.h" namespace tut { @@ -994,5 +994,3 @@ void RNGSSE_object::test< 78 >() { } } // tut:: - -#endif // test_RNGSSE_h diff --git a/src/UnitTest/tests/RNG/TestRandom123.h b/src/UnitTest/tests/RNG/TestRandom123.C similarity index 98% rename from src/UnitTest/tests/RNG/TestRandom123.h rename to src/UnitTest/tests/RNG/TestRandom123.C index 1540b512985..361a2fa990f 100644 --- a/src/UnitTest/tests/RNG/TestRandom123.h +++ b/src/UnitTest/tests/RNG/TestRandom123.C @@ -1,20 +1,20 @@ // ***************************************************************************** /*! - \file src/UnitTest/tests/RNG/TestRandom123.h + \file src/UnitTest/tests/RNG/TestRandom123.C \copyright 2012-2015, J. Bakosi, 2016-2018, Los Alamos National Security, LLC. \brief Unit tests for RNG/Random123.h \details Unit tests for RNG/Random123.h */ // ***************************************************************************** -#ifndef test_Random123_h -#define test_Random123_h #include "NoWarning/tut.h" #include "NoWarning/threefry.h" #include "NoWarning/philox.h" +#include "TUTConfig.h" #include "Random123.h" +#include "TestRNG.h" namespace tut { @@ -255,5 +255,3 @@ void Random123_object::test< 21 >() { } } // tut:: - -#endif // test_Random123_h diff --git a/src/UnitTest/tests/TestBase.C b/src/UnitTest/tests/TestBase.C deleted file mode 100644 index 9369b581be4..00000000000 --- a/src/UnitTest/tests/TestBase.C +++ /dev/null @@ -1,31 +0,0 @@ -// ***************************************************************************** -/*! - \file src/UnitTest/tests/TestBase.C - \copyright 2012-2015, J. Bakosi, 2016-2018, Los Alamos National Security, LLC. - \brief Unit tess for directory Base - \details Unit test for directory Base. -*/ -// ***************************************************************************** - -#include "TUTConfig.h" - -#include "tests/Base/TestFactory.h" -#include "tests/Base/TestTimer.h" -#include "tests/Base/TestPUPUtil.h" -#include "tests/Base/TestFlip_map.h" -#include "tests/Base/TestHas.h" -#include "tests/Base/TestData.h" -#include "tests/Base/TestPrint.h" -#include "tests/Base/TestTaggedTuple.h" -#include "tests/Base/TestException.h" -#include "tests/Base/TestExceptionMPI.h" -#include "tests/Base/TestReader.h" -#include "tests/Base/TestStrConvUtil.h" -#include "tests/Base/TestWriter.h" -#include "tests/Base/TestProcessControl.h" -#include "tests/Base/TestVector.h" -#include "tests/Base/TestContainerUtil.h" - -#include "NoWarning/charmchild.def.h" -#include "NoWarning/charmtimer.def.h" -#include "NoWarning/migrated_base.def.h" diff --git a/src/UnitTest/tests/TestControl.C b/src/UnitTest/tests/TestControl.C deleted file mode 100644 index 02b1dd868bb..00000000000 --- a/src/UnitTest/tests/TestControl.C +++ /dev/null @@ -1,25 +0,0 @@ -// ***************************************************************************** -/*! - \file src/UnitTest/tests/TestControl.C - \copyright 2012-2015, J. Bakosi, 2016-2018, Los Alamos National Security, LLC. - \brief Unit tess for directory Control - \details Unit test for directory Control. -*/ -// ***************************************************************************** - -#include "TUTConfig.h" - -#include "tests/Control/TestSystemComponents.h" -#include "tests/Control/TestControl.h" -#include "tests/Control/TestFileParser.h" -#include "tests/Control/TestStringParser.h" -#include "tests/Control/TestToggle.h" - -#ifdef HAS_MKL - #include "tests/Control/Options/TestMKLUniformMethod.h" - #include "tests/Control/Options/TestMKLGaussianMethod.h" - #include "tests/Control/Options/TestMKLBetaMethod.h" - #include "tests/Control/Options/TestMKLGammaMethod.h" -#endif - -#include "tests/Control/Options/TestRNG.h" diff --git a/src/UnitTest/tests/TestIO.C b/src/UnitTest/tests/TestIO.C deleted file mode 100644 index 8856c38ca19..00000000000 --- a/src/UnitTest/tests/TestIO.C +++ /dev/null @@ -1,14 +0,0 @@ -// ***************************************************************************** -/*! - \file src/UnitTest/tests/TestIO.C - \copyright 2012-2015, J. Bakosi, 2016-2018, Los Alamos National Security, LLC. - \brief Unit tess for directory IO - \details Unit test for directory IO. -*/ -// ***************************************************************************** - -#include "TUTConfig.h" - -#include "tests/IO/TestMesh.h" -#include "tests/IO/TestExodusIIMeshReader.h" -#include "tests/IO/TestMeshReader.h" diff --git a/src/UnitTest/tests/TestInciter.C b/src/UnitTest/tests/TestInciter.C deleted file mode 100644 index c9f67ea7ea4..00000000000 --- a/src/UnitTest/tests/TestInciter.C +++ /dev/null @@ -1,15 +0,0 @@ -// ***************************************************************************** -/*! - \file src/UnitTest/tests/TestInciter.C - \copyright 2012-2015, J. Bakosi, 2016-2018, Los Alamos National Security, LLC. - \brief Unit tess for directory Inciter - \details Unit test for directory Inciter. -*/ -// ***************************************************************************** - -#include "TUTConfig.h" - -#include "tests/Inciter/TestScheme.h" -#include "tests/Inciter/AMR/TestError.h" - -#include "NoWarning/migrated_inciter.def.h" diff --git a/src/UnitTest/tests/TestLoadBalance.C b/src/UnitTest/tests/TestLoadBalance.C deleted file mode 100644 index 3c7ff4b4807..00000000000 --- a/src/UnitTest/tests/TestLoadBalance.C +++ /dev/null @@ -1,16 +0,0 @@ -// ***************************************************************************** -/*! - \file src/UnitTest/tests/TestLoadBalance.C - \copyright 2012-2015, J. Bakosi, 2016-2018, Los Alamos National Security, LLC. - \brief Unit tess for directory LoadBalance - \details Unit test for directory LoadBalance. -*/ -// ***************************************************************************** - -#include "TUTConfig.h" - -#include "tests/LoadBalance/TestLoadDistributor.h" -#include "tests/LoadBalance/TestLinearMap.h" -#include "tests/LoadBalance/TestUnsMeshMap.h" - -#include "NoWarning/testarray.def.h" diff --git a/src/UnitTest/tests/TestMesh.C b/src/UnitTest/tests/TestMesh.C deleted file mode 100644 index daf3860b047..00000000000 --- a/src/UnitTest/tests/TestMesh.C +++ /dev/null @@ -1,15 +0,0 @@ -// ***************************************************************************** -/*! - \file src/UnitTest/tests/TestMesh.C - \copyright 2012-2015, J. Bakosi, 2016-2018, Los Alamos National Security, LLC. - \brief Unit tess for directory Mesh - \details Unit test for directory Mesh. -*/ -// ***************************************************************************** - -#include "TUTConfig.h" - -#include "tests/Mesh/TestDerivedData.h" -#include "tests/Mesh/TestReorder.h" -#include "tests/Mesh/TestGradients.h" -#include "tests/Mesh/TestAround.h" diff --git a/src/UnitTest/tests/TestRNG.C b/src/UnitTest/tests/TestRNG.C deleted file mode 100644 index 8a267b7886c..00000000000 --- a/src/UnitTest/tests/TestRNG.C +++ /dev/null @@ -1,22 +0,0 @@ -// ***************************************************************************** -/*! - \file src/UnitTest/tests/TestRNG.C - \copyright 2012-2015, J. Bakosi, 2016-2018, Los Alamos National Security, LLC. - \brief Unit tess for directory RNG - \details Unit test for directory RNG. -*/ -// ***************************************************************************** - -#include "TUTConfig.h" - -#include "tests/RNG/TestRNG.h" - -#ifdef HAS_MKL - #include "tests/RNG/TestMKLRNG.h" -#endif - -#ifdef HAS_RNGSSE2 - #include "tests/RNG/TestRNGSSE.h" -#endif - -#include "tests/RNG/TestRandom123.h" From a03b790dfca1fdb033b71c61bb5f6f33e62cd143 Mon Sep 17 00:00:00 2001 From: Jozsef Bakosi Date: Sun, 22 Jul 2018 20:43:42 -0600 Subject: [PATCH 10/19] Make MKL include conditional on MKL --- src/Control/Options/RNG.h | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/Control/Options/RNG.h b/src/Control/Options/RNG.h index 501822383e7..480c6987483 100644 --- a/src/Control/Options/RNG.h +++ b/src/Control/Options/RNG.h @@ -13,11 +13,13 @@ #include -#include +#include "QuinoaConfig.h" -#include "NoWarning/append.h" +#ifdef HAS_MKL + #include +#endif -#include "QuinoaConfig.h" +#include "NoWarning/append.h" #include "Toggle.h" #include "Keywords.h" From 48e50e89d2102a4aaa5bfc049fb61e7f22be2662 Mon Sep 17 00:00:00 2001 From: Jozsef Bakosi Date: Mon, 23 Jul 2018 09:58:03 -0600 Subject: [PATCH 11/19] Reorder unittest link line --- src/Main/CMakeLists.txt | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/src/Main/CMakeLists.txt b/src/Main/CMakeLists.txt index 4f4e0fa78b3..9955d679fe4 100644 --- a/src/Main/CMakeLists.txt +++ b/src/Main/CMakeLists.txt @@ -47,17 +47,18 @@ config_executable(${UNITTEST_EXECUTABLE}) target_link_libraries(${UNITTEST_EXECUTABLE} Base Config - NativeMeshIO - ExodusIIMeshIO - ${OMEGAHMESHIO} - HyperMeshIO - MeshDetect - Mesh RNG - LoadBalance MeshRefinement UnitTest UnitTestControl + LoadBalance + Mesh + MeshDetect + NativeMeshIO + MeshRefinement + ExodusIIMeshIO + HyperMeshIO + ${OMEGAHMESHIO} ${PUGIXML_LIBRARIES} ${SEACASExodus_LIBRARIES} ${RNGSSE2_LIBRARIES} From 98ddbc617be556823e26c54e475bb671256a0f0b Mon Sep 17 00:00:00 2001 From: Jozsef Bakosi Date: Mon, 23 Jul 2018 10:06:34 -0600 Subject: [PATCH 12/19] Locally ignore compiler warnings --- src/NoWarning/pup_stl.h | 1 + src/UnitTest/tests/RNG/TestRNG.h | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/NoWarning/pup_stl.h b/src/NoWarning/pup_stl.h index bfb5c3370fa..93a450eeb96 100644 --- a/src/NoWarning/pup_stl.h +++ b/src/NoWarning/pup_stl.h @@ -31,6 +31,7 @@ #pragma GCC diagnostic ignored "-Wunused-parameter" #pragma GCC diagnostic ignored "-Wmaybe-uninitialized" #pragma GCC diagnostic ignored "-Wshadow" + #pragma GCC diagnostic ignored "-Wmissing-field-initializers" #endif #include diff --git a/src/UnitTest/tests/RNG/TestRNG.h b/src/UnitTest/tests/RNG/TestRNG.h index 5d495631427..bb1b88e94f4 100644 --- a/src/UnitTest/tests/RNG/TestRNG.h +++ b/src/UnitTest/tests/RNG/TestRNG.h @@ -9,7 +9,7 @@ #include -#include +#include "NoWarning/value_factory.hpp" #include "QuinoaConfig.h" From 006b889b09b6f115d74df2c003516f110e8f626c Mon Sep 17 00:00:00 2001 From: Jozsef Bakosi Date: Mon, 23 Jul 2018 10:07:24 -0600 Subject: [PATCH 13/19] Fix typo --- src/UnitTest/tests/RNG/TestRNG.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/UnitTest/tests/RNG/TestRNG.h b/src/UnitTest/tests/RNG/TestRNG.h index bb1b88e94f4..334857882a4 100644 --- a/src/UnitTest/tests/RNG/TestRNG.h +++ b/src/UnitTest/tests/RNG/TestRNG.h @@ -9,7 +9,7 @@ #include -#include "NoWarning/value_factory.hpp" +#include "NoWarning/value_factory.h" #include "QuinoaConfig.h" From e84d8ed9aef82cf8d66c3ad764f8a46fc12f15b5 Mon Sep 17 00:00:00 2001 From: Jozsef Bakosi Date: Tue, 24 Jul 2018 15:33:27 -0600 Subject: [PATCH 14/19] Move unittest definitions to the unittest executable This way when the unit tests register themselves with the global singleton runner, defined in UnitTest.C, using an external reference to the runner in the tut include, at link time, all objects that reference the runner will be visible to the linker in a single step, when linking the unittest executable. Previously the tests, now appearing in multiple compilation units were bundled up into a library which in turn was linked in when creating the executable. While this two-step rpocess worked fine with dynamic linking, static linking, using an intermediate static library, the linker failed to find the same global runner between the executable link and the library. --- src/Main/CMakeLists.txt | 55 +++++++++++++++++++++++++++++++++++++ src/UnitTest/CMakeLists.txt | 54 ------------------------------------ 2 files changed, 55 insertions(+), 54 deletions(-) diff --git a/src/Main/CMakeLists.txt b/src/Main/CMakeLists.txt index 48d20568a71..40043bce1ee 100644 --- a/src/Main/CMakeLists.txt +++ b/src/Main/CMakeLists.txt @@ -37,9 +37,64 @@ if (HAS_OMEGA_H) endif() ## UnitTest executable ######################################################## + +if (HAS_MKL) + set(TestMKLBetaMethod "tests/Control/Options/TestMKLBetaMethod.C") + set(TestMKLGammaMethod "tests/Control/Options/TestMKLGammaMethod.C") + set(TestMKLGaussianMethod "tests/Control/Options/TestMKLGaussianMethod.C") + set(TestMKLUniformMethod "tests/Control/Options/TestMKLUniformMethod.C") + set(TestMKLRNG "tests/RNG/TestMKLRNG.C") +endif() + +if(HAS_RNGSSE2) + set(TestRNGSSE "tests/RNG/TestRNGSSE.C") +endif() + add_executable(${UNITTEST_EXECUTABLE} UnitTestDriver.C UnitTest.C + ../UnitTest/tests/Base/TestContainerUtil.C + ../UnitTest/tests/Base/TestData.C + ../UnitTest/tests/Base/TestException.C + ../UnitTest/tests/Base/TestExceptionMPI.C + ../UnitTest/tests/Base/TestFactory.C + ../UnitTest/tests/Base/TestFlip_map.C + ../UnitTest/tests/Base/TestHas.C + ../UnitTest/tests/Base/TestPrint.C + ../UnitTest/tests/Base/TestProcessControl.C + ../UnitTest/tests/Base/TestPUPUtil.C + ../UnitTest/tests/Base/TestReader.C + ../UnitTest/tests/Base/TestStrConvUtil.C + ../UnitTest/tests/Base/TestTaggedTuple.C + ../UnitTest/tests/Base/TestTimer.C + ../UnitTest/tests/Base/TestVector.C + ../UnitTest/tests/Base/TestWriter.C + ../UnitTest/${TestMKLUniformMethod} + ../UnitTest/${TestMKLGaussianMethod} + ../UnitTest/${TestMKLBetaMethod} + ../UnitTest/${TestMKLGammaMethod} + ../UnitTest/tests/Control/Options/TestRNG.C + ../UnitTest/tests/Control/TestControl.C + ../UnitTest/tests/Control/TestFileParser.C + ../UnitTest/tests/Control/TestStringParser.C + ../UnitTest/tests/Control/TestSystemComponents.C + ../UnitTest/tests/Control/TestToggle.C + ../UnitTest/tests/Inciter/TestScheme.C + ../UnitTest/tests/Inciter/AMR/TestError.C + ../UnitTest/tests/IO/TestExodusIIMeshReader.C + ../UnitTest/tests/IO/TestMesh.C + ../UnitTest/tests/IO/TestMeshReader.C + ../UnitTest/tests/LoadBalance/TestLinearMap.C + ../UnitTest/tests/LoadBalance/TestLoadDistributor.C + ../UnitTest/tests/LoadBalance/TestUnsMeshMap.C + ../UnitTest/tests/Mesh/TestAround.C + ../UnitTest/tests/Mesh/TestDerivedData.C + ../UnitTest/tests/Mesh/TestGradients.C + ../UnitTest/tests/Mesh/TestReorder.C + ../UnitTest/${TestMKLRNG} + ../UnitTest/${TestRNGSSE} + ../UnitTest/tests/RNG/TestRNG.C + ../UnitTest/tests/RNG/TestRandom123.C ) config_executable(${UNITTEST_EXECUTABLE}) diff --git a/src/UnitTest/CMakeLists.txt b/src/UnitTest/CMakeLists.txt index 617ab8817f4..ca451c9cad9 100644 --- a/src/UnitTest/CMakeLists.txt +++ b/src/UnitTest/CMakeLists.txt @@ -5,64 +5,10 @@ project(UnitTest CXX) # Include function for adding Charm++ modules include(charm) -if (HAS_MKL) - set(TestMKLBetaMethod "tests/Control/Options/TestMKLBetaMethod.C") - set(TestMKLGammaMethod "tests/Control/Options/TestMKLGammaMethod.C") - set(TestMKLGaussianMethod "tests/Control/Options/TestMKLGaussianMethod.C") - set(TestMKLUniformMethod "tests/Control/Options/TestMKLUniformMethod.C") - set(TestMKLRNG "tests/RNG/TestMKLRNG.C") -endif() - -if(HAS_RNGSSE2) - set(TestRNGSSE "tests/RNG/TestRNGSSE.C") -endif() - add_library(UnitTest Assessment.C TUTSuite.C TUTTest.C - tests/Base/TestContainerUtil.C - tests/Base/TestData.C - tests/Base/TestException.C - tests/Base/TestExceptionMPI.C - tests/Base/TestFactory.C - tests/Base/TestFlip_map.C - tests/Base/TestHas.C - tests/Base/TestPrint.C - tests/Base/TestProcessControl.C - tests/Base/TestPUPUtil.C - tests/Base/TestReader.C - tests/Base/TestStrConvUtil.C - tests/Base/TestTaggedTuple.C - tests/Base/TestTimer.C - tests/Base/TestVector.C - tests/Base/TestWriter.C - ${TestMKLUniformMethod} - ${TestMKLGaussianMethod} - ${TestMKLBetaMethod} - ${TestMKLGammaMethod} - tests/Control/Options/TestRNG.C - tests/Control/TestControl.C - tests/Control/TestFileParser.C - tests/Control/TestStringParser.C - tests/Control/TestSystemComponents.C - tests/Control/TestToggle.C - tests/Inciter/TestScheme.C - tests/Inciter/AMR/TestError.C - tests/IO/TestExodusIIMeshReader.C - tests/IO/TestMesh.C - tests/IO/TestMeshReader.C - tests/LoadBalance/TestLinearMap.C - tests/LoadBalance/TestLoadDistributor.C - tests/LoadBalance/TestUnsMeshMap.C - tests/Mesh/TestAround.C - tests/Mesh/TestDerivedData.C - tests/Mesh/TestGradients.C - tests/Mesh/TestReorder.C - ${TestMKLRNG} - ${TestRNGSSE} - tests/RNG/TestRNG.C - tests/RNG/TestRandom123.C ) addCharmModule( "tuttest" "UnitTest" ) From c5c8e40f1d2f0b0fa4a7943b26cef2c9b6b09f93 Mon Sep 17 00:00:00 2001 From: Jozsef Bakosi Date: Fri, 27 Jul 2018 22:12:27 -0600 Subject: [PATCH 15/19] Use max 2 cores on travis --- docker/Dockerfile.quinoa-build-travis | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docker/Dockerfile.quinoa-build-travis b/docker/Dockerfile.quinoa-build-travis index 7125decd921..0f22fd22d3e 100644 --- a/docker/Dockerfile.quinoa-build-travis +++ b/docker/Dockerfile.quinoa-build-travis @@ -39,10 +39,10 @@ RUN cmake \ -DLCOV=/bin/true \ -DGENHTML=/bin/true \ ../src -RUN ${SONARQUBE:+build-wrapper-linux-x86-64 --out-dir bw-output} ninja +RUN ${SONARQUBE:+build-wrapper-linux-x86-64 --out-dir bw-output} ninja -j2 RUN if [ -z "${SONARQUBE}" ]; then ./charmrun +p2 "${RUNNER_ARGS}" Main/unittest -v -q; fi RUN if [ -z "${SONARQUBE}" ]; then ctest --output-on-failure -j2 -LE stringent -E "(.*pe[48])"; fi -RUN if [ ${SONARQUBE} ]; then ninja doc; fi +RUN if [ ${SONARQUBE} ]; then ninja -j2 doc; fi RUN cd .. && if [ ${SONARQUBE} ]; then \ python -m coverxygen --xml-dir build/doc/xml/ --src-dir . --output doxygen.coverage.info; \ wget -O codecov.sh https://codecov.io/bash; \ @@ -81,7 +81,7 @@ RUN cd .. && if [ ${SONARQUBE} ] && [ -n "${SONARQUBE_GITHUB_TOKEN}" ] && [ -n " -Dsonar.login=${SONARQUBE_TOKEN}; \ fi USER root -RUN ninja install +RUN ninja -j2 install USER quinoa RUN export PATH=/usr/local/bin:$PATH && unittest -h && inciter && rngtest && meshconv && walker WORKDIR /home/quinoa From 8cfb59e26561ae412b42e057b30af926d11a0fcc Mon Sep 17 00:00:00 2001 From: Jozsef Bakosi Date: Sat, 28 Jul 2018 08:21:49 -0600 Subject: [PATCH 16/19] Do not remove intermediate containers during travis/docker build --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 5f2d3163f7e..59379d49b74 100644 --- a/.travis.yml +++ b/.travis.yml @@ -43,6 +43,7 @@ script: --build-arg TRAVIS_REPO_SLUG=${TRAVIS_REPO_SLUG} --build-arg TRAVIS_COMMIT=${TRAVIS_COMMIT} -t ${TRAVIS_REPO_SLUG}:${DISTRO} + -rm=false -f ${HOME}/docker/Dockerfile.quinoa-build-travis ${HOME}/docker/ && CON=$(docker run -d ${TRAVIS_REPO_SLUG}:${DISTRO} /bin/bash) && From 39d0bd9f2dd236ae96e7749cddda6376a332a316 Mon Sep 17 00:00:00 2001 From: Jozsef Bakosi Date: Sat, 28 Jul 2018 08:25:53 -0600 Subject: [PATCH 17/19] Fix docker build syntax --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 59379d49b74..06de7d06f3a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -43,7 +43,7 @@ script: --build-arg TRAVIS_REPO_SLUG=${TRAVIS_REPO_SLUG} --build-arg TRAVIS_COMMIT=${TRAVIS_COMMIT} -t ${TRAVIS_REPO_SLUG}:${DISTRO} - -rm=false + --rm=false -f ${HOME}/docker/Dockerfile.quinoa-build-travis ${HOME}/docker/ && CON=$(docker run -d ${TRAVIS_REPO_SLUG}:${DISTRO} /bin/bash) && From 637aee860de61b34dedacab0c32f1ecbd596c9f9 Mon Sep 17 00:00:00 2001 From: Jozsef Bakosi Date: Sat, 28 Jul 2018 14:00:20 -0600 Subject: [PATCH 18/19] Re-enable ccache in travis builds --- .travis.yml | 4 ++++ docker/Dockerfile.quinoa-build-travis | 6 +++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 06de7d06f3a..2cc2e5d1f5b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -29,6 +29,7 @@ script: - cp -vr docker ${HOME}/docker - cd ../../ - mv -v ${TRAVIS_REPO_SLUG} $HOME/docker/quinoa + - cp -r $HOME/.ccache ${HOME}/docker/ccache - cp -r $HOME/.sonar ${HOME}/docker/sonar - docker build --build-arg COMPILER=${COMPILER} --build-arg BUILD=${BUILD} @@ -46,7 +47,9 @@ script: --rm=false -f ${HOME}/docker/Dockerfile.quinoa-build-travis ${HOME}/docker/ && + rm -rf ${HOME}/.ccache && CON=$(docker run -d ${TRAVIS_REPO_SLUG}:${DISTRO} /bin/bash) && + docker cp ${CON}:/home/quinoa/.ccache ${HOME}/ && docker cp ${CON}:/home/quinoa/.sonar ${HOME}/ after_success: @@ -56,6 +59,7 @@ after_success: fi cache: + ccache: true directories: - $HOME/.sonar diff --git a/docker/Dockerfile.quinoa-build-travis b/docker/Dockerfile.quinoa-build-travis index 0f22fd22d3e..f62cd4e9b83 100644 --- a/docker/Dockerfile.quinoa-build-travis +++ b/docker/Dockerfile.quinoa-build-travis @@ -17,16 +17,19 @@ ENV RUNNER_ARGS="--bind-to none -oversubscribe" \ OMPI_MCA_plm=isolated \ PATH=/opt/openmpi/${COMPILER}/bin:$PATH +RUN rm -rf /home/quinoa/.ccache COPY quinoa /home/quinoa/quinoa +COPY ccache/ /home/quinoa/.ccache COPY sonar/ /home/quinoa/.sonar USER root -RUN chown -R quinoa:quinoa /home/quinoa/quinoa /home/quinoa/.sonar +RUN chown -R quinoa:quinoa /home/quinoa/quinoa /home/quinoa/.ccache /home/quinoa/.sonar USER quinoa WORKDIR /home/quinoa/quinoa RUN mkdir build WORKDIR build +RUN ccache -z RUN cmake \ -GNinja \ -DCMAKE_C_COMPILER=mpicc \ @@ -40,6 +43,7 @@ RUN cmake \ -DGENHTML=/bin/true \ ../src RUN ${SONARQUBE:+build-wrapper-linux-x86-64 --out-dir bw-output} ninja -j2 +RUN ccache -s RUN if [ -z "${SONARQUBE}" ]; then ./charmrun +p2 "${RUNNER_ARGS}" Main/unittest -v -q; fi RUN if [ -z "${SONARQUBE}" ]; then ctest --output-on-failure -j2 -LE stringent -E "(.*pe[48])"; fi RUN if [ ${SONARQUBE} ]; then ninja -j2 doc; fi From 9f1dcca64795e6a3ef67ed4ab891a17982b7caa4 Mon Sep 17 00:00:00 2001 From: Jozsef Bakosi Date: Sat, 28 Jul 2018 20:07:50 -0600 Subject: [PATCH 19/19] Add ccache path to travis builds --- docker/Dockerfile.quinoa-build-travis | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/Dockerfile.quinoa-build-travis b/docker/Dockerfile.quinoa-build-travis index f62cd4e9b83..3cb38aff41e 100644 --- a/docker/Dockerfile.quinoa-build-travis +++ b/docker/Dockerfile.quinoa-build-travis @@ -15,7 +15,7 @@ ARG TRAVIS_COMMIT ENV RUNNER_ARGS="--bind-to none -oversubscribe" \ OMPI_MCA_plm=isolated \ - PATH=/opt/openmpi/${COMPILER}/bin:$PATH + PATH=/usr/lib/ccache/bin:/opt/openmpi/${COMPILER}/bin:$PATH RUN rm -rf /home/quinoa/.ccache COPY quinoa /home/quinoa/quinoa