From 545b4efc3cc2d580391571b134812b32951862fb Mon Sep 17 00:00:00 2001 From: Eric Phipps Date: Mon, 16 Oct 2017 10:50:19 -0600 Subject: [PATCH] Rename headers to .hpp instead of .h. Since these are C++ headers and .hpp is pretty standard. --- CMakeLists.txt | 2 ++ driver/Genten_Driver_CpAls.cpp | 10 +++++----- ...Driver_Utils.h => Genten_Driver_Utils.hpp} | 4 ++-- maintenance/update_headers.sh | 2 +- performance/Genten_CpAlsAminoAcid.cpp | 8 ++++---- performance/Genten_CpAlsRandomKtensor.cpp | 18 ++++++++--------- .../Genten_CpAlsRandomKtensor_Sweep.cpp | 18 ++++++++--------- src/Genten_Array.cpp | 12 +++++------ src/{Genten_Array.h => Genten_Array.hpp} | 4 ++-- src/Genten_CpAls.cpp | 20 +++++++++---------- src/{Genten_CpAls.h => Genten_CpAls.hpp} | 4 ++-- src/Genten_FacMatArray.cpp | 2 +- ...n_FacMatArray.h => Genten_FacMatArray.hpp} | 6 +++--- src/Genten_FacMatrix.cpp | 12 +++++------ ...enten_FacMatrix.h => Genten_FacMatrix.hpp} | 8 ++++---- src/Genten_IOtext.cpp | 14 ++++++------- src/{Genten_IOtext.h => Genten_IOtext.hpp} | 6 +++--- src/Genten_IndxArray.cpp | 2 +- ...enten_IndxArray.h => Genten_IndxArray.hpp} | 4 ++-- src/{Genten_Kokkos.h => Genten_Kokkos.hpp} | 0 src/Genten_Ktensor.cpp | 6 +++--- src/{Genten_Ktensor.h => Genten_Ktensor.hpp} | 8 ++++---- ...{Genten_MathLibs.h => Genten_MathLibs.hpp} | 2 +- src/Genten_MathLibs_Wpr.cpp | 4 ++-- ...MathLibs_Wpr.h => Genten_MathLibs_Wpr.hpp} | 2 +- src/Genten_MixedFormatOps.cpp | 12 +++++------ ...dFormatOps.h => Genten_MixedFormatOps.hpp} | 12 +++++------ src/Genten_Sptensor.cpp | 2 +- ...{Genten_Sptensor.h => Genten_Sptensor.hpp} | 6 +++--- src/Genten_Sptensor_perm.cpp | 2 +- ...tensor_perm.h => Genten_Sptensor_perm.hpp} | 2 +- src/Genten_Sptensor_row.cpp | 2 +- ...Sptensor_row.h => Genten_Sptensor_row.hpp} | 2 +- src/{Genten_TinyVec.h => Genten_TinyVec.hpp} | 2 +- src/Genten_Util.cpp | 4 ++-- src/{Genten_Util.h => Genten_Util.hpp} | 2 +- src/Genten_portability.cpp | 2 +- ...n_portability.h => Genten_portability.hpp} | 2 +- src/mathlib/Genten_DiscreteCDF.cpp | 6 +++--- ...n_DiscreteCDF.h => Genten_DiscreteCDF.hpp} | 4 ++-- src/mathlib/Genten_FacTestSetGenerator.cpp | 12 +++++------ ...rator.h => Genten_FacTestSetGenerator.hpp} | 8 ++++---- src/mathlib/Genten_RandomMT.cpp | 2 +- ...{Genten_RandomMT.h => Genten_RandomMT.hpp} | 0 src/mathlib/Genten_SystemTimer.cpp | 2 +- ...n_SystemTimer.h => Genten_SystemTimer.hpp} | 0 test/Genten_Test_Array.cpp | 6 +++--- test/Genten_Test_CpAls.cpp | 14 ++++++------- test/Genten_Test_FacMatrix.cpp | 8 ++++---- test/Genten_Test_IOtext.cpp | 12 +++++------ test/Genten_Test_IndxArray.cpp | 4 ++-- test/Genten_Test_Ktensor.cpp | 8 ++++---- test/Genten_Test_MixedFormats.cpp | 16 +++++++-------- test/Genten_Test_Sptensor.cpp | 4 ++-- test/Genten_Test_UnitTests.cpp | 2 +- test/Genten_Test_Utils.cpp | 2 +- ...ten_Test_Utils.h => Genten_Test_Utils.hpp} | 2 +- 57 files changed, 172 insertions(+), 170 deletions(-) rename driver/{Genten_Driver_Utils.h => Genten_Driver_Utils.hpp} (99%) rename src/{Genten_Array.h => Genten_Array.hpp} (99%) rename src/{Genten_CpAls.h => Genten_CpAls.hpp} (99%) rename src/{Genten_FacMatArray.h => Genten_FacMatArray.hpp} (97%) rename src/{Genten_FacMatrix.h => Genten_FacMatrix.hpp} (99%) rename src/{Genten_IOtext.h => Genten_IOtext.hpp} (99%) rename src/{Genten_IndxArray.h => Genten_IndxArray.hpp} (99%) rename src/{Genten_Kokkos.h => Genten_Kokkos.hpp} (100%) rename src/{Genten_Ktensor.h => Genten_Ktensor.hpp} (98%) rename src/{Genten_MathLibs.h => Genten_MathLibs.hpp} (99%) rename src/{Genten_MathLibs_Wpr.h => Genten_MathLibs_Wpr.hpp} (99%) rename src/{Genten_MixedFormatOps.h => Genten_MixedFormatOps.hpp} (95%) rename src/{Genten_Sptensor.h => Genten_Sptensor.hpp} (98%) rename src/{Genten_Sptensor_perm.h => Genten_Sptensor_perm.hpp} (99%) rename src/{Genten_Sptensor_row.h => Genten_Sptensor_row.hpp} (99%) rename src/{Genten_TinyVec.h => Genten_TinyVec.hpp} (99%) rename src/{Genten_Util.h => Genten_Util.hpp} (99%) rename src/{Genten_portability.h => Genten_portability.hpp} (99%) rename src/mathlib/{Genten_DiscreteCDF.h => Genten_DiscreteCDF.hpp} (98%) rename src/mathlib/{Genten_FacTestSetGenerator.h => Genten_FacTestSetGenerator.hpp} (98%) rename src/mathlib/{Genten_RandomMT.h => Genten_RandomMT.hpp} (100%) rename src/mathlib/{Genten_SystemTimer.h => Genten_SystemTimer.hpp} (100%) rename test/{Genten_Test_Utils.h => Genten_Test_Utils.hpp} (99%) diff --git a/CMakeLists.txt b/CMakeLists.txt index dc000a6508..d723ea2c7e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -173,7 +173,9 @@ INCLUDE_DIRECTORIES ( ) FILE (GLOB genten_headers ${Genten_SOURCE_DIR}/src/*.h + ${Genten_SOURCE_DIR}/src/*.hpp ${Genten_SOURCE_DIR}/src/mathlib/*.h + ${Genten_SOURCE_DIR}/src/mathlib/*.hpp ) INSTALL ( FILES ${genten_headers} diff --git a/driver/Genten_Driver_CpAls.cpp b/driver/Genten_Driver_CpAls.cpp index 69f0a5c7d7..7de271cdcc 100644 --- a/driver/Genten_Driver_CpAls.cpp +++ b/driver/Genten_Driver_CpAls.cpp @@ -38,11 +38,11 @@ // ************************************************************************ //@HEADER -#include "Genten_IOtext.h" -#include "Genten_CpAls.h" -#include "Genten_Driver_Utils.h" -#include "Genten_SystemTimer.h" -#include "Genten_MixedFormatOps.h" +#include "Genten_IOtext.hpp" +#include "Genten_CpAls.hpp" +#include "Genten_Driver_Utils.hpp" +#include "Genten_SystemTimer.hpp" +#include "Genten_MixedFormatOps.hpp" enum SPTENSOR_TYPE { SPTENSOR, diff --git a/driver/Genten_Driver_Utils.h b/driver/Genten_Driver_Utils.hpp similarity index 99% rename from driver/Genten_Driver_Utils.h rename to driver/Genten_Driver_Utils.hpp index b40dabb12a..af13e73d15 100644 --- a/driver/Genten_Driver_Utils.h +++ b/driver/Genten_Driver_Utils.hpp @@ -45,8 +45,8 @@ using namespace std; -#include "Genten_Util.h" -#include "Genten_IndxArray.h" +#include "Genten_Util.hpp" +#include "Genten_IndxArray.hpp" string IntToStr( int i ) { std::ostringstream r; r << i; return r.str(); } diff --git a/maintenance/update_headers.sh b/maintenance/update_headers.sh index 3df74f573d..8c7f1e79c7 100755 --- a/maintenance/update_headers.sh +++ b/maintenance/update_headers.sh @@ -8,7 +8,7 @@ SCRIPT=${HOME}/Trilinos/Trilinos/commonTools/refactoring/update-copyright-header.py HEADER_DIR=$PWD/maintenance -find . -name \*.h -not -path ./kokkos/\* -exec $SCRIPT --copyright-header=${HEADER_DIR}/copyright_header_cpp.txt --file={} \; +find . -name \*.hpp -not -path ./kokkos/\* -exec $SCRIPT --copyright-header=${HEADER_DIR}/copyright_header_cpp.txt --file={} \; find . -name \*.cpp -not -path ./kokkos/\* -exec $SCRIPT --copyright-header=${HEADER_DIR}/copyright_header_cpp.txt --file={} \; find . -name \*.c -not -path ./kokkos/\* -exec $SCRIPT --copyright-header=${HEADER_DIR}/copyright_header_cpp.txt --file={} \; find . -name CMakeLists.txt -not -path ./kokkos/\* -exec $SCRIPT --copyright-header=${HEADER_DIR}/copyright_header_shell.txt --file={} \; diff --git a/performance/Genten_CpAlsAminoAcid.cpp b/performance/Genten_CpAlsAminoAcid.cpp index 7adaf1a850..8853055bfc 100644 --- a/performance/Genten_CpAlsAminoAcid.cpp +++ b/performance/Genten_CpAlsAminoAcid.cpp @@ -47,10 +47,10 @@ #include #include -#include "Genten_CpAls.h" -#include "Genten_IOtext.h" -#include "Genten_Ktensor.h" -#include "Genten_Sptensor.h" +#include "Genten_CpAls.hpp" +#include "Genten_IOtext.hpp" +#include "Genten_Ktensor.hpp" +#include "Genten_Sptensor.hpp" using namespace std; diff --git a/performance/Genten_CpAlsRandomKtensor.cpp b/performance/Genten_CpAlsRandomKtensor.cpp index 81ec7aa81b..74d9bb2024 100644 --- a/performance/Genten_CpAlsRandomKtensor.cpp +++ b/performance/Genten_CpAlsRandomKtensor.cpp @@ -47,16 +47,16 @@ #include #include -#include "Genten_CpAls.h" -#include "Genten_FacTestSetGenerator.h" -#include "Genten_IndxArray.h" -#include "Genten_IOtext.h" -#include "Genten_Ktensor.h" -#include "Genten_Sptensor.h" -#include "Genten_SystemTimer.h" -#include "Genten_Driver_Utils.h" +#include "Genten_CpAls.hpp" +#include "Genten_FacTestSetGenerator.hpp" +#include "Genten_IndxArray.hpp" +#include "Genten_IOtext.hpp" +#include "Genten_Ktensor.hpp" +#include "Genten_Sptensor.hpp" +#include "Genten_SystemTimer.hpp" +#include "Genten_Driver_Utils.hpp" -#include "Genten_MixedFormatOps.h" +#include "Genten_MixedFormatOps.hpp" using namespace std; diff --git a/performance/Genten_CpAlsRandomKtensor_Sweep.cpp b/performance/Genten_CpAlsRandomKtensor_Sweep.cpp index 6d0b515bc3..c23f827e9f 100644 --- a/performance/Genten_CpAlsRandomKtensor_Sweep.cpp +++ b/performance/Genten_CpAlsRandomKtensor_Sweep.cpp @@ -47,16 +47,16 @@ #include #include -#include "Genten_CpAls.h" -#include "Genten_FacTestSetGenerator.h" -#include "Genten_IndxArray.h" -#include "Genten_IOtext.h" -#include "Genten_Ktensor.h" -#include "Genten_Sptensor.h" -#include "Genten_SystemTimer.h" -#include "Genten_Driver_Utils.h" +#include "Genten_CpAls.hpp" +#include "Genten_FacTestSetGenerator.hpp" +#include "Genten_IndxArray.hpp" +#include "Genten_IOtext.hpp" +#include "Genten_Ktensor.hpp" +#include "Genten_Sptensor.hpp" +#include "Genten_SystemTimer.hpp" +#include "Genten_Driver_Utils.hpp" -#include "Genten_MixedFormatOps.h" +#include "Genten_MixedFormatOps.hpp" using namespace std; diff --git a/src/Genten_Array.cpp b/src/Genten_Array.cpp index c417b5a455..e3f188be9e 100644 --- a/src/Genten_Array.cpp +++ b/src/Genten_Array.cpp @@ -47,12 +47,12 @@ #include #include -#include "Genten_Array.h" -#include "Genten_MathLibs_Wpr.h" -#include "Genten_portability.h" -#include "Genten_RandomMT.h" -#include "Genten_Util.h" -#include "Genten_Kokkos.h" +#include "Genten_Array.hpp" +#include "Genten_MathLibs_Wpr.hpp" +#include "Genten_portability.hpp" +#include "Genten_RandomMT.hpp" +#include "Genten_Util.hpp" +#include "Genten_Kokkos.hpp" Genten::Array:: Array(ttb_indx n, bool parallel): diff --git a/src/Genten_Array.h b/src/Genten_Array.hpp similarity index 99% rename from src/Genten_Array.h rename to src/Genten_Array.hpp index 21b5626077..f71a3367d7 100644 --- a/src/Genten_Array.h +++ b/src/Genten_Array.hpp @@ -47,8 +47,8 @@ #include #include -#include "Genten_Util.h" -#include "Genten_RandomMT.h" +#include "Genten_Util.hpp" +#include "Genten_RandomMT.hpp" namespace Genten { diff --git a/src/Genten_CpAls.cpp b/src/Genten_CpAls.cpp index 22ab33e6fb..103846bce2 100644 --- a/src/Genten_CpAls.cpp +++ b/src/Genten_CpAls.cpp @@ -49,16 +49,16 @@ #include #include -#include "Genten_Array.h" -#include "Genten_CpAls.h" -#include "Genten_FacMatrix.h" -#include "Genten_Ktensor.h" -#include "Genten_MixedFormatOps.h" -#include "Genten_Sptensor.h" -#include "Genten_Sptensor_perm.h" -#include "Genten_Sptensor_row.h" -#include "Genten_SystemTimer.h" -#include "Genten_Util.h" +#include "Genten_Array.hpp" +#include "Genten_CpAls.hpp" +#include "Genten_FacMatrix.hpp" +#include "Genten_Ktensor.hpp" +#include "Genten_MixedFormatOps.hpp" +#include "Genten_Sptensor.hpp" +#include "Genten_Sptensor_perm.hpp" +#include "Genten_Sptensor_row.hpp" +#include "Genten_SystemTimer.hpp" +#include "Genten_Util.hpp" using namespace std; diff --git a/src/Genten_CpAls.h b/src/Genten_CpAls.hpp similarity index 99% rename from src/Genten_CpAls.h rename to src/Genten_CpAls.hpp index a33d363f43..474b4ac824 100644 --- a/src/Genten_CpAls.h +++ b/src/Genten_CpAls.hpp @@ -45,8 +45,8 @@ */ #pragma once -#include "Genten_Sptensor.h" -#include "Genten_Ktensor.h" +#include "Genten_Sptensor.hpp" +#include "Genten_Ktensor.hpp" namespace Genten { diff --git a/src/Genten_FacMatArray.cpp b/src/Genten_FacMatArray.cpp index df633feb7a..1f60debb6e 100644 --- a/src/Genten_FacMatArray.cpp +++ b/src/Genten_FacMatArray.cpp @@ -39,7 +39,7 @@ //@HEADER -#include "Genten_FacMatArray.h" +#include "Genten_FacMatArray.hpp" ttb_indx Genten::FacMatArray:: reals() const diff --git a/src/Genten_FacMatArray.h b/src/Genten_FacMatArray.hpp similarity index 97% rename from src/Genten_FacMatArray.h rename to src/Genten_FacMatArray.hpp index d95b5b0f89..dd3287ea49 100644 --- a/src/Genten_FacMatArray.h +++ b/src/Genten_FacMatArray.hpp @@ -44,9 +44,9 @@ */ #pragma once -#include "Genten_Util.h" -#include "Genten_IndxArray.h" -#include "Genten_FacMatrix.h" +#include "Genten_Util.hpp" +#include "Genten_IndxArray.hpp" +#include "Genten_FacMatrix.hpp" namespace Genten { diff --git a/src/Genten_FacMatrix.cpp b/src/Genten_FacMatrix.cpp index 61c415ae94..b46116dfe5 100644 --- a/src/Genten_FacMatrix.cpp +++ b/src/Genten_FacMatrix.cpp @@ -43,12 +43,12 @@ @brief Implementation of Genten::FacMatrix. */ -#include "Genten_IndxArray.h" -#include "Genten_FacMatrix.h" -#include "Genten_FacMatArray.h" -#include "Genten_MathLibs_Wpr.h" -#include "Genten_portability.h" -#include "Genten_TinyVec.h" +#include "Genten_IndxArray.hpp" +#include "Genten_FacMatrix.hpp" +#include "Genten_FacMatArray.hpp" +#include "Genten_MathLibs_Wpr.hpp" +#include "Genten_portability.hpp" +#include "Genten_TinyVec.hpp" #include "CMakeInclude.h" #include // for std::max with MSVC compiler #include diff --git a/src/Genten_FacMatrix.h b/src/Genten_FacMatrix.hpp similarity index 99% rename from src/Genten_FacMatrix.h rename to src/Genten_FacMatrix.hpp index 41dcb88dac..9f14b43950 100644 --- a/src/Genten_FacMatrix.h +++ b/src/Genten_FacMatrix.hpp @@ -45,10 +45,10 @@ #pragma once -#include "Genten_Array.h" -#include "Genten_IndxArray.h" -#include "Genten_RandomMT.h" -#include "Genten_Util.h" +#include "Genten_Array.hpp" +#include "Genten_IndxArray.hpp" +#include "Genten_RandomMT.hpp" +#include "Genten_Util.hpp" #include namespace Genten diff --git a/src/Genten_IOtext.cpp b/src/Genten_IOtext.cpp index d0d65b32ae..2f318324aa 100644 --- a/src/Genten_IOtext.cpp +++ b/src/Genten_IOtext.cpp @@ -50,13 +50,13 @@ using namespace std; -#include "Genten_FacMatrix.h" -#include "Genten_IOtext.h" -#include "Genten_Ktensor.h" -#include "Genten_Sptensor.h" -#include "Genten_Sptensor_perm.h" -#include "Genten_Sptensor_row.h" -#include "Genten_Util.h" +#include "Genten_FacMatrix.hpp" +#include "Genten_IOtext.hpp" +#include "Genten_Ktensor.hpp" +#include "Genten_Sptensor.hpp" +#include "Genten_Sptensor_perm.hpp" +#include "Genten_Sptensor_row.hpp" +#include "Genten_Util.hpp" #include "CMakeInclude.h" #ifdef HAVE_BOOST diff --git a/src/Genten_IOtext.h b/src/Genten_IOtext.hpp similarity index 99% rename from src/Genten_IOtext.h rename to src/Genten_IOtext.hpp index d721a5173b..46574f3024 100644 --- a/src/Genten_IOtext.h +++ b/src/Genten_IOtext.hpp @@ -48,9 +48,9 @@ #include #include -#include "Genten_FacMatrix.h" -#include "Genten_Ktensor.h" -#include "Genten_Sptensor.h" +#include "Genten_FacMatrix.hpp" +#include "Genten_Ktensor.hpp" +#include "Genten_Sptensor.hpp" //! Namespace for the Genten C++ project. diff --git a/src/Genten_IndxArray.cpp b/src/Genten_IndxArray.cpp index 2f57a2de6d..479bbae236 100644 --- a/src/Genten_IndxArray.cpp +++ b/src/Genten_IndxArray.cpp @@ -38,7 +38,7 @@ // ************************************************************************ //@HEADER -#include "Genten_IndxArray.h" +#include "Genten_IndxArray.hpp" #include #include diff --git a/src/Genten_IndxArray.h b/src/Genten_IndxArray.hpp similarity index 99% rename from src/Genten_IndxArray.h rename to src/Genten_IndxArray.hpp index 782c41b620..cb7b68e87c 100644 --- a/src/Genten_IndxArray.h +++ b/src/Genten_IndxArray.hpp @@ -43,8 +43,8 @@ #include #include -#include "Genten_Util.h" -#include "Genten_IndxArray.h" +#include "Genten_Util.hpp" +#include "Genten_IndxArray.hpp" namespace Genten { diff --git a/src/Genten_Kokkos.h b/src/Genten_Kokkos.hpp similarity index 100% rename from src/Genten_Kokkos.h rename to src/Genten_Kokkos.hpp diff --git a/src/Genten_Ktensor.cpp b/src/Genten_Ktensor.cpp index 8e0b1dabc1..7fd0726347 100644 --- a/src/Genten_Ktensor.cpp +++ b/src/Genten_Ktensor.cpp @@ -43,9 +43,9 @@ #include #include -#include "Genten_Ktensor.h" -#include "Genten_RandomMT.h" -#include "Genten_IndxArray.h" +#include "Genten_Ktensor.hpp" +#include "Genten_RandomMT.hpp" +#include "Genten_IndxArray.hpp" Genten::Ktensor:: Ktensor(ttb_indx nc, ttb_indx nd): diff --git a/src/Genten_Ktensor.h b/src/Genten_Ktensor.hpp similarity index 98% rename from src/Genten_Ktensor.h rename to src/Genten_Ktensor.hpp index 8c5dc5c0cc..54f20f9bdd 100644 --- a/src/Genten_Ktensor.h +++ b/src/Genten_Ktensor.hpp @@ -42,10 +42,10 @@ #pragma once #include -#include "Genten_FacMatArray.h" -#include "Genten_IndxArray.h" -#include "Genten_RandomMT.h" -#include "Genten_Util.h" +#include "Genten_FacMatArray.hpp" +#include "Genten_IndxArray.hpp" +#include "Genten_RandomMT.hpp" +#include "Genten_Util.hpp" namespace Genten { diff --git a/src/Genten_MathLibs.h b/src/Genten_MathLibs.hpp similarity index 99% rename from src/Genten_MathLibs.h rename to src/Genten_MathLibs.hpp index 88b5d6835d..e65cd35c34 100644 --- a/src/Genten_MathLibs.h +++ b/src/Genten_MathLibs.hpp @@ -42,7 +42,7 @@ #pragma once #include "CMakeInclude.h" -#include "Genten_Util.h" +#include "Genten_Util.hpp" typedef ptrdiff_t ttb_blas_int; typedef ptrdiff_t ttb_vml_int; diff --git a/src/Genten_MathLibs_Wpr.cpp b/src/Genten_MathLibs_Wpr.cpp index 20c36e0c10..92c75e430b 100644 --- a/src/Genten_MathLibs_Wpr.cpp +++ b/src/Genten_MathLibs_Wpr.cpp @@ -39,8 +39,8 @@ //@HEADER -#include "Genten_MathLibs.h" -#include "Genten_MathLibs_Wpr.h" +#include "Genten_MathLibs.hpp" +#include "Genten_MathLibs_Wpr.hpp" // // Double precision diff --git a/src/Genten_MathLibs_Wpr.h b/src/Genten_MathLibs_Wpr.hpp similarity index 99% rename from src/Genten_MathLibs_Wpr.h rename to src/Genten_MathLibs_Wpr.hpp index ed25ea6bd5..5771506d2d 100644 --- a/src/Genten_MathLibs_Wpr.h +++ b/src/Genten_MathLibs_Wpr.hpp @@ -51,7 +51,7 @@ #pragma once -#include "Genten_Util.h" +#include "Genten_Util.hpp" namespace Genten diff --git a/src/Genten_MixedFormatOps.cpp b/src/Genten_MixedFormatOps.cpp index 63e582e113..4379317f54 100644 --- a/src/Genten_MixedFormatOps.cpp +++ b/src/Genten_MixedFormatOps.cpp @@ -48,12 +48,12 @@ #include -#include "Genten_Util.h" -#include "Genten_FacMatrix.h" -#include "Genten_Ktensor.h" -#include "Genten_MixedFormatOps.h" -#include "Genten_Sptensor.h" -#include "Genten_TinyVec.h" +#include "Genten_Util.hpp" +#include "Genten_FacMatrix.hpp" +#include "Genten_Ktensor.hpp" +#include "Genten_MixedFormatOps.hpp" +#include "Genten_Sptensor.hpp" +#include "Genten_TinyVec.hpp" #define USE_NEW_MTTKRP 1 #define USE_NEW_MTTKRP_PERM 1 diff --git a/src/Genten_MixedFormatOps.h b/src/Genten_MixedFormatOps.hpp similarity index 95% rename from src/Genten_MixedFormatOps.h rename to src/Genten_MixedFormatOps.hpp index 8ff226b100..323f824477 100644 --- a/src/Genten_MixedFormatOps.h +++ b/src/Genten_MixedFormatOps.hpp @@ -45,12 +45,12 @@ #pragma once -#include "Genten_FacMatrix.h" -#include "Genten_Ktensor.h" -#include "Genten_Sptensor.h" -#include "Genten_Sptensor_perm.h" -#include "Genten_Sptensor_row.h" -#include "Genten_Util.h" +#include "Genten_FacMatrix.hpp" +#include "Genten_Ktensor.hpp" +#include "Genten_Sptensor.hpp" +#include "Genten_Sptensor_perm.hpp" +#include "Genten_Sptensor_row.hpp" +#include "Genten_Util.hpp" namespace Genten { diff --git a/src/Genten_Sptensor.cpp b/src/Genten_Sptensor.cpp index a7549e35d5..858d0d89ff 100644 --- a/src/Genten_Sptensor.cpp +++ b/src/Genten_Sptensor.cpp @@ -38,7 +38,7 @@ // ************************************************************************ //@HEADER -#include "Genten_Sptensor.h" +#include "Genten_Sptensor.hpp" Genten::Sptensor:: Sptensor(ttb_indx nd, ttb_real * sz, ttb_indx nz, ttb_real * vls, diff --git a/src/Genten_Sptensor.h b/src/Genten_Sptensor.hpp similarity index 98% rename from src/Genten_Sptensor.h rename to src/Genten_Sptensor.hpp index 80051c9957..2aef38c49a 100644 --- a/src/Genten_Sptensor.h +++ b/src/Genten_Sptensor.hpp @@ -42,9 +42,9 @@ #include -#include "Genten_Array.h" -#include "Genten_IndxArray.h" -#include "Genten_Ktensor.h" +#include "Genten_Array.hpp" +#include "Genten_IndxArray.hpp" +#include "Genten_Ktensor.hpp" namespace Genten { diff --git a/src/Genten_Sptensor_perm.cpp b/src/Genten_Sptensor_perm.cpp index f771b0a695..a2c65a0dda 100644 --- a/src/Genten_Sptensor_perm.cpp +++ b/src/Genten_Sptensor_perm.cpp @@ -38,7 +38,7 @@ // ************************************************************************ //@HEADER -#include "Genten_Sptensor_perm.h" +#include "Genten_Sptensor_perm.hpp" #include "Kokkos_Sort.hpp" #ifdef KOKKOS_HAVE_OPENMP diff --git a/src/Genten_Sptensor_perm.h b/src/Genten_Sptensor_perm.hpp similarity index 99% rename from src/Genten_Sptensor_perm.h rename to src/Genten_Sptensor_perm.hpp index b132ef7981..a60a7b0c87 100644 --- a/src/Genten_Sptensor_perm.h +++ b/src/Genten_Sptensor_perm.hpp @@ -42,7 +42,7 @@ #include -#include "Genten_Sptensor.h" +#include "Genten_Sptensor.hpp" namespace Genten { diff --git a/src/Genten_Sptensor_row.cpp b/src/Genten_Sptensor_row.cpp index 3733b660c7..16e5d816a2 100644 --- a/src/Genten_Sptensor_row.cpp +++ b/src/Genten_Sptensor_row.cpp @@ -38,7 +38,7 @@ // ************************************************************************ //@HEADER -#include "Genten_Sptensor_row.h" +#include "Genten_Sptensor_row.hpp" // Implementation of createRow(). Has to be done as a non-member function // because lambda capture of *this doesn't work on Cuda. diff --git a/src/Genten_Sptensor_row.h b/src/Genten_Sptensor_row.hpp similarity index 99% rename from src/Genten_Sptensor_row.h rename to src/Genten_Sptensor_row.hpp index 609df82850..9657c3b5df 100644 --- a/src/Genten_Sptensor_row.h +++ b/src/Genten_Sptensor_row.hpp @@ -42,7 +42,7 @@ #include -#include "Genten_Sptensor_perm.h" +#include "Genten_Sptensor_perm.hpp" namespace Genten { diff --git a/src/Genten_TinyVec.h b/src/Genten_TinyVec.hpp similarity index 99% rename from src/Genten_TinyVec.h rename to src/Genten_TinyVec.hpp index 93838f68a7..d051743c41 100644 --- a/src/Genten_TinyVec.h +++ b/src/Genten_TinyVec.hpp @@ -41,7 +41,7 @@ #pragma once -#include "Genten_Kokkos.h" +#include "Genten_Kokkos.hpp" #include // extern "C" { diff --git a/src/Genten_Util.cpp b/src/Genten_Util.cpp index e351a32741..64c6ce50ee 100644 --- a/src/Genten_Util.cpp +++ b/src/Genten_Util.cpp @@ -39,8 +39,8 @@ //@HEADER -#include "Genten_Util.h" -#include "Genten_IndxArray.h" +#include "Genten_Util.hpp" +#include "Genten_IndxArray.hpp" #include // For vtune diff --git a/src/Genten_Util.h b/src/Genten_Util.hpp similarity index 99% rename from src/Genten_Util.h rename to src/Genten_Util.hpp index 3bd0fdca91..6754ea88e9 100644 --- a/src/Genten_Util.h +++ b/src/Genten_Util.hpp @@ -49,7 +49,7 @@ #include #include -#include "Genten_Kokkos.h" +#include "Genten_Kokkos.hpp" // What we align memory to (in bytes) #define GENTEN_MEMORY_ALIGNMENT 64 diff --git a/src/Genten_portability.cpp b/src/Genten_portability.cpp index b005edc14c..974f6f0593 100644 --- a/src/Genten_portability.cpp +++ b/src/Genten_portability.cpp @@ -39,7 +39,7 @@ //@HEADER -#include "Genten_portability.h" +#include "Genten_portability.hpp" #if defined(_WIN32) #include "float.h" diff --git a/src/Genten_portability.h b/src/Genten_portability.hpp similarity index 99% rename from src/Genten_portability.h rename to src/Genten_portability.hpp index 390007dc3e..b9a29ceb61 100644 --- a/src/Genten_portability.h +++ b/src/Genten_portability.hpp @@ -42,7 +42,7 @@ #ifndef GENTEN_portability_h #define GENTEN_portability_h -#include "Genten_Util.h" +#include "Genten_Util.hpp" #ifdef __INTEL_COMPILER // for intel RESTRICT requires -restrict on CXXFLAGS, CFLAGS diff --git a/src/mathlib/Genten_DiscreteCDF.cpp b/src/mathlib/Genten_DiscreteCDF.cpp index b5c8eb8ae5..9ffe1cf0b9 100644 --- a/src/mathlib/Genten_DiscreteCDF.cpp +++ b/src/mathlib/Genten_DiscreteCDF.cpp @@ -41,9 +41,9 @@ #include -#include "Genten_Array.h" -#include "Genten_DiscreteCDF.h" -#include "Genten_FacMatrix.h" +#include "Genten_Array.hpp" +#include "Genten_DiscreteCDF.hpp" +#include "Genten_FacMatrix.hpp" using namespace std; diff --git a/src/mathlib/Genten_DiscreteCDF.h b/src/mathlib/Genten_DiscreteCDF.hpp similarity index 98% rename from src/mathlib/Genten_DiscreteCDF.h rename to src/mathlib/Genten_DiscreteCDF.hpp index 2cf3458b1e..5938f2cda7 100644 --- a/src/mathlib/Genten_DiscreteCDF.h +++ b/src/mathlib/Genten_DiscreteCDF.hpp @@ -47,8 +47,8 @@ #ifndef GENTEN_DISCRETECDF_H #define GENTEN_DISCRETECDF_H -#include "Genten_Array.h" -#include "Genten_FacMatrix.h" +#include "Genten_Array.hpp" +#include "Genten_FacMatrix.hpp" namespace Genten { diff --git a/src/mathlib/Genten_FacTestSetGenerator.cpp b/src/mathlib/Genten_FacTestSetGenerator.cpp index bde2f478fa..ec27bae66d 100644 --- a/src/mathlib/Genten_FacTestSetGenerator.cpp +++ b/src/mathlib/Genten_FacTestSetGenerator.cpp @@ -44,12 +44,12 @@ #include #include -#include "Genten_DiscreteCDF.h" -#include "Genten_FacTestSetGenerator.h" -#include "Genten_IndxArray.h" -#include "Genten_Ktensor.h" -#include "Genten_RandomMT.h" -#include "Genten_Sptensor.h" +#include "Genten_DiscreteCDF.hpp" +#include "Genten_FacTestSetGenerator.hpp" +#include "Genten_IndxArray.hpp" +#include "Genten_Ktensor.hpp" +#include "Genten_RandomMT.hpp" +#include "Genten_Sptensor.hpp" using namespace std; diff --git a/src/mathlib/Genten_FacTestSetGenerator.h b/src/mathlib/Genten_FacTestSetGenerator.hpp similarity index 98% rename from src/mathlib/Genten_FacTestSetGenerator.h rename to src/mathlib/Genten_FacTestSetGenerator.hpp index 737e8051bc..4eb568f4e4 100644 --- a/src/mathlib/Genten_FacTestSetGenerator.h +++ b/src/mathlib/Genten_FacTestSetGenerator.hpp @@ -48,10 +48,10 @@ #ifndef GENTEN_FACTESTSETGENERATOR_H #define GENTEN_FACTESTSETGENERATOR_H -#include "Genten_IndxArray.h" -#include "Genten_Ktensor.h" -#include "Genten_RandomMT.h" -#include "Genten_Sptensor.h" +#include "Genten_IndxArray.hpp" +#include "Genten_Ktensor.hpp" +#include "Genten_RandomMT.hpp" +#include "Genten_Sptensor.hpp" namespace Genten { diff --git a/src/mathlib/Genten_RandomMT.cpp b/src/mathlib/Genten_RandomMT.cpp index 2bcac211bf..977a9706c8 100644 --- a/src/mathlib/Genten_RandomMT.cpp +++ b/src/mathlib/Genten_RandomMT.cpp @@ -38,7 +38,7 @@ // ************************************************************************ //@HEADER -#include "Genten_RandomMT.h" +#include "Genten_RandomMT.hpp" //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ diff --git a/src/mathlib/Genten_RandomMT.h b/src/mathlib/Genten_RandomMT.hpp similarity index 100% rename from src/mathlib/Genten_RandomMT.h rename to src/mathlib/Genten_RandomMT.hpp diff --git a/src/mathlib/Genten_SystemTimer.cpp b/src/mathlib/Genten_SystemTimer.cpp index be2ba850af..5d324a95cf 100644 --- a/src/mathlib/Genten_SystemTimer.cpp +++ b/src/mathlib/Genten_SystemTimer.cpp @@ -55,7 +55,7 @@ #include #include #include -#include "Genten_SystemTimer.h" +#include "Genten_SystemTimer.hpp" //---- THIS IS WHERE HAVE_REALTIME_CLOCK WILL BE DEFINED (OR NOT). diff --git a/src/mathlib/Genten_SystemTimer.h b/src/mathlib/Genten_SystemTimer.hpp similarity index 100% rename from src/mathlib/Genten_SystemTimer.h rename to src/mathlib/Genten_SystemTimer.hpp diff --git a/test/Genten_Test_Array.cpp b/test/Genten_Test_Array.cpp index a32f60349e..6f1e7f9776 100644 --- a/test/Genten_Test_Array.cpp +++ b/test/Genten_Test_Array.cpp @@ -41,9 +41,9 @@ #include #include -#include "Genten_Array.h" -#include "Genten_Test_Utils.h" -#include "Genten_Util.h" +#include "Genten_Array.hpp" +#include "Genten_Test_Utils.hpp" +#include "Genten_Util.hpp" using namespace Genten::Test; diff --git a/test/Genten_Test_CpAls.cpp b/test/Genten_Test_CpAls.cpp index 183622659b..9159ca3bcc 100644 --- a/test/Genten_Test_CpAls.cpp +++ b/test/Genten_Test_CpAls.cpp @@ -41,13 +41,13 @@ #include -#include "Genten_CpAls.h" -#include "Genten_IndxArray.h" -#include "Genten_IOtext.h" -#include "Genten_Ktensor.h" -#include "Genten_MixedFormatOps.h" -#include "Genten_Sptensor.h" -#include "Genten_Test_Utils.h" +#include "Genten_CpAls.hpp" +#include "Genten_IndxArray.hpp" +#include "Genten_IOtext.hpp" +#include "Genten_Ktensor.hpp" +#include "Genten_MixedFormatOps.hpp" +#include "Genten_Sptensor.hpp" +#include "Genten_Test_Utils.hpp" using namespace Genten::Test; diff --git a/test/Genten_Test_FacMatrix.cpp b/test/Genten_Test_FacMatrix.cpp index 73453054b2..b70553fa90 100644 --- a/test/Genten_Test_FacMatrix.cpp +++ b/test/Genten_Test_FacMatrix.cpp @@ -39,10 +39,10 @@ //@HEADER -#include "Genten_FacMatrix.h" -#include "Genten_IOtext.h" -#include "Genten_Test_Utils.h" -#include "Genten_Util.h" +#include "Genten_FacMatrix.hpp" +#include "Genten_IOtext.hpp" +#include "Genten_Test_Utils.hpp" +#include "Genten_Util.hpp" using namespace Genten::Test; diff --git a/test/Genten_Test_IOtext.cpp b/test/Genten_Test_IOtext.cpp index 6a312131a5..8ec222c749 100644 --- a/test/Genten_Test_IOtext.cpp +++ b/test/Genten_Test_IOtext.cpp @@ -43,12 +43,12 @@ @brief Unit tests for methods in Genten_IOtext. */ -#include "Genten_IndxArray.h" -#include "Genten_IOtext.h" -#include "Genten_Ktensor.h" -#include "Genten_Sptensor.h" -#include "Genten_Test_Utils.h" -#include "Genten_Util.h" +#include "Genten_IndxArray.hpp" +#include "Genten_IOtext.hpp" +#include "Genten_Ktensor.hpp" +#include "Genten_Sptensor.hpp" +#include "Genten_Test_Utils.hpp" +#include "Genten_Util.hpp" using namespace std; using namespace Genten::Test; diff --git a/test/Genten_Test_IndxArray.cpp b/test/Genten_Test_IndxArray.cpp index 1a0ab8d53f..474afa0dee 100644 --- a/test/Genten_Test_IndxArray.cpp +++ b/test/Genten_Test_IndxArray.cpp @@ -39,8 +39,8 @@ //@HEADER -#include "Genten_IndxArray.h" -#include "Genten_Test_Utils.h" +#include "Genten_IndxArray.hpp" +#include "Genten_Test_Utils.hpp" using namespace Genten::Test; diff --git a/test/Genten_Test_Ktensor.cpp b/test/Genten_Test_Ktensor.cpp index 6d5d8fea61..520737ed8b 100644 --- a/test/Genten_Test_Ktensor.cpp +++ b/test/Genten_Test_Ktensor.cpp @@ -39,10 +39,10 @@ //@HEADER -#include "Genten_IndxArray.h" -#include "Genten_IOtext.h" -#include "Genten_Ktensor.h" -#include "Genten_Test_Utils.h" +#include "Genten_IndxArray.hpp" +#include "Genten_IOtext.hpp" +#include "Genten_Ktensor.hpp" +#include "Genten_Test_Utils.hpp" using namespace Genten::Test; diff --git a/test/Genten_Test_MixedFormats.cpp b/test/Genten_Test_MixedFormats.cpp index 81662764d3..07ed849857 100644 --- a/test/Genten_Test_MixedFormats.cpp +++ b/test/Genten_Test_MixedFormats.cpp @@ -39,14 +39,14 @@ //@HEADER -#include "Genten_Array.h" -#include "Genten_FacMatrix.h" -#include "Genten_IOtext.h" // In case debug lines are uncommented -#include "Genten_Ktensor.h" -#include "Genten_MixedFormatOps.h" -#include "Genten_Sptensor.h" -#include "Genten_Test_Utils.h" -#include "Genten_Util.h" +#include "Genten_Array.hpp" +#include "Genten_FacMatrix.hpp" +#include "Genten_IOtext.hpp" // In case debug lines are uncommented +#include "Genten_Ktensor.hpp" +#include "Genten_MixedFormatOps.hpp" +#include "Genten_Sptensor.hpp" +#include "Genten_Test_Utils.hpp" +#include "Genten_Util.hpp" using namespace Genten::Test; diff --git a/test/Genten_Test_Sptensor.cpp b/test/Genten_Test_Sptensor.cpp index 08d6a89eb1..6f9d8d3dda 100644 --- a/test/Genten_Test_Sptensor.cpp +++ b/test/Genten_Test_Sptensor.cpp @@ -42,8 +42,8 @@ #include #include #include -#include "Genten_Sptensor.h" -#include "Genten_Test_Utils.h" +#include "Genten_Sptensor.hpp" +#include "Genten_Test_Utils.hpp" using namespace Genten::Test; diff --git a/test/Genten_Test_UnitTests.cpp b/test/Genten_Test_UnitTests.cpp index 37139d8439..b2a59fbd65 100644 --- a/test/Genten_Test_UnitTests.cpp +++ b/test/Genten_Test_UnitTests.cpp @@ -41,7 +41,7 @@ #include -#include "Genten_Util.h" +#include "Genten_Util.hpp" using namespace std; diff --git a/test/Genten_Test_Utils.cpp b/test/Genten_Test_Utils.cpp index 3ae2462d08..7358b716b0 100644 --- a/test/Genten_Test_Utils.cpp +++ b/test/Genten_Test_Utils.cpp @@ -41,7 +41,7 @@ #include #include -#include "Genten_Test_Utils.h" +#include "Genten_Test_Utils.hpp" using namespace std; diff --git a/test/Genten_Test_Utils.h b/test/Genten_Test_Utils.hpp similarity index 99% rename from test/Genten_Test_Utils.h rename to test/Genten_Test_Utils.hpp index 39c8f3d260..d8fae3040f 100644 --- a/test/Genten_Test_Utils.h +++ b/test/Genten_Test_Utils.hpp @@ -41,7 +41,7 @@ #include #include -#include "Genten_Util.h" +#include "Genten_Util.hpp" namespace Genten