Rename headers to .hpp instead of .h.

Since these are C++ headers and .hpp is pretty standard.
sandialabs · Oct 16, 2017 · 545b4ef · 545b4ef
1 parent df6e9ee
commit 545b4ef
Show file tree

Hide file tree

Showing 57 changed files with 172 additions and 170 deletions.
diff --git 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
@@ -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 → driver/Genten_Driver_Utils.hpp b/driver/Genten_Driver_Utils.h → 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
@@ -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
@@ -47,10 +47,10 @@
 #include <iostream>
 #include <stdio.h>
 
-#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
@@ -47,16 +47,16 @@
 #include <iostream>
 #include <stdio.h>
 
-#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
@@ -47,16 +47,16 @@
 #include <iostream>
 #include <stdio.h>
 
-#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
@@ -47,12 +47,12 @@
 #include <cstring>
 #include <limits>
 
-#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 → src/Genten_Array.hpp b/src/Genten_Array.h → src/Genten_Array.hpp
@@ -47,8 +47,8 @@
 #include <vector>
 #include <assert.h>
 
-#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
@@ -49,16 +49,16 @@
 #include <stdio.h>
 #include <sstream>
 
-#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 → src/Genten_CpAls.hpp b/src/Genten_CpAls.h → 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
@@ -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 → src/Genten_FacMatArray.hpp b/src/Genten_FacMatArray.h → 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
@@ -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 <algorithm>     // for std::max with MSVC compiler
 #include <assert.h>

diff --git a/src/Genten_FacMatrix.h → src/Genten_FacMatrix.hpp b/src/Genten_FacMatrix.h → 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 <assert.h>
 
 namespace Genten

diff --git 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 → src/Genten_IOtext.hpp b/src/Genten_IOtext.h → src/Genten_IOtext.hpp
@@ -48,9 +48,9 @@
 #include <string>
 #include <vector>
 
-#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
@@ -38,7 +38,7 @@
 // ************************************************************************
 //@HEADER
 
-#include "Genten_IndxArray.h"
+#include "Genten_IndxArray.hpp"
 #include <cstring>
 #include <cstdlib>
 

diff --git a/src/Genten_IndxArray.h → src/Genten_IndxArray.hpp b/src/Genten_IndxArray.h → src/Genten_IndxArray.hpp
@@ -43,8 +43,8 @@
 #include <assert.h>
 #include <initializer_list>
 
-#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 → src/Genten_Kokkos.hpp b/src/Genten_Kokkos.h → src/Genten_Kokkos.hpp
diff --git a/src/Genten_Ktensor.cpp b/src/Genten_Ktensor.cpp
@@ -43,9 +43,9 @@
 #include <algorithm>
 #include <iostream>
 
-#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 → src/Genten_Ktensor.hpp b/src/Genten_Ktensor.h → src/Genten_Ktensor.hpp
@@ -42,10 +42,10 @@
 #pragma once
 #include <assert.h>
 
-#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 → src/Genten_MathLibs.hpp b/src/Genten_MathLibs.h → 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
@@ -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 → src/Genten_MathLibs_Wpr.hpp b/src/Genten_MathLibs_Wpr.h → 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
@@ -48,12 +48,12 @@
 
 #include <assert.h>
 
-#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 → src/Genten_MixedFormatOps.hpp b/src/Genten_MixedFormatOps.h → 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
@@ -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,