Added standalone md5 hash code to avoid problems with Mac and Windows down the line

Author: Martin D. Weinberg

.gitmodules

@@ -8,3 +8,6 @@
 [submodule "extern/HighFive"]
 	path = extern/HighFive
 	url = https://github.com/BlueBrain/HighFive.git
+[submodule "extern/QuickDigest5"]
+	path = extern/QuickDigest5
+	url = https://github.com/nthnn/QuickDigest5.git

CMakeLists.txt

@@ -259,6 +259,7 @@ execute_process(
 
 include_directories(${PROJECT_SOURCE_DIR}/extern/yaml-cpp/include)
 include_directories(${PROJECT_SOURCE_DIR}/extern/pybind11/include)
+include_directories(${PROJECT_SOURCE_DIR}/extern/QuickDigest5/include)
 
 # Report to the user
 message("Configuring build for ${GIT_BRANCH}/${GIT_COMMIT} at ${COMPILE_TIME}")

expui/BiorthBasis.cc

@@ -1,5 +1,6 @@
 #include <algorithm>
 
+#include "quickdigest5.hpp"
 #include "YamlCheck.H"
 #include "EXPException.H"
 #include "BiorthBasis.H"
@@ -1654,7 +1655,7 @@ namespace BasisClasses
 
 	    // Get the md5sum for requested Python module
 	    try {
-	      current_md5 = get_md5sum(pyname);
+	      current_md5 = QuickDigest5::fileToHash(pyname);
 	    } catch (const std::runtime_error& e) {
 	      std::cerr << "Error: " << e.what() << std::endl;
 	    }
@@ -1720,7 +1721,7 @@ namespace BasisClasses
 
 	      // Get the md5sum for requested Python projection module
 	      try {
-		current_md5 = get_md5sum(pyproj);
+		current_md5 = QuickDigest5::fileToHash(pyproj);
 	      } catch (const std::runtime_error& e) {
 		std::cerr << "Error: " << e.what() << std::endl;
 	      }
@@ -1933,7 +1934,8 @@ namespace BasisClasses
 	// Write the md5sum for the Python module
 	if (DTYPE == DiskType::python) {
 	  try {
-	    std::vector<std::string> pyinfo = {pyname, get_md5sum(pyname)};
+	    std::string hash = QuickDigest5::fileToHash(pyname);
+	    std::vector<std::string> pyinfo = {pyname, hash};
 	    file.createAttribute<std::string>
 	    ("pythonDiskType", HighFive::DataSpace::From(pyinfo)).write(pyinfo);
 	  } catch (const std::runtime_error& e) {
@@ -1954,7 +1956,8 @@ namespace BasisClasses
 
 	  if (PTYPE == DeprojType::python) {
 	    try {
-	      std::vector<std::string> pyinfo = {pyproj, get_md5sum(pyproj)};
+	      std::string hash = QuickDigest5::fileToHash(pyproj);
+	      std::vector<std::string> pyinfo = {pyproj, hash};
 	      file.createAttribute<std::string>
 		("pythonProjType",
 		 HighFive::DataSpace::From(pyinfo)).write(pyinfo);

exputil/CMakeLists.txt

@@ -42,19 +42,21 @@ set(SLEDGE_SRC sledge.f)
 set(PARTICLE_SRC Particle.cc ParticleReader.cc header.cc)
 set(CUDA_SRC cudaParticle.cu cudaSLGridMP2.cu)
 set(PYWRAP_SRC DiskDensityFunc.cc)
+set(QD5_SRC ${PROJECT_SOURCE_DIR}/extern/QuickDigest5/src/quickdigest5.cpp)
 
-set(exputil_SOURCES ${ODE_SRC} ${ROOT_SRC} ${QUAD_SRC}
-  ${RANDOM_SRC} ${UTIL_SRC} ${SPECFUNC_SRC}
-  ${PHASE_SRC}  ${SYMP_SRC} ${INTERP_SRC} ${MASSMODEL_SRC}
-  ${ORBIT_SRC} ${BIORTH_SRC} ${POLY_SRC} ${GAUSS_SRC}
-  ${QPDISTF_SRC} ${BESSEL_SRC} ${OPTIMIZATION_SRC}
-  ${SLEDGE_SRC} ${PARTICLE_SRC} ${CUDA_SRC} ${PYWRAP_SRC})
+
+set(exputil_SOURCES ${ODE_SRC} ${ROOT_SRC} ${QUAD_SRC} ${RANDOM_SRC}
+  ${UTIL_SRC} ${SPECFUNC_SRC} ${PHASE_SRC} ${SYMP_SRC} ${INTERP_SRC}
+  ${MASSMODEL_SRC} ${ORBIT_SRC} ${BIORTH_SRC} ${POLY_SRC} ${GAUSS_SRC}
+  ${QPDISTF_SRC} ${BESSEL_SRC} ${OPTIMIZATION_SRC} ${SLEDGE_SRC}
+  ${PARTICLE_SRC} ${CUDA_SRC} ${PYWRAP_SRC} ${QD5_SRC})
 
 set(common_INCLUDE_DIRS $<INSTALL_INTERFACE:include>
   $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include/>
   $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/> ${CMAKE_BINARY_DIR}
   $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/extern/yaml-cpp/include>
   $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/extern/HighFive/include>
+  $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/extern/QuickDigest5/include>
   ${DEP_INC} ${EIGEN3_INCLUDE_DIR} ${HDF5_INCLUDE_DIRS}
   ${FFTW_INCLUDE_DIRS})
 

exputil/getmd5sum.cc

@@ -1,3 +1,6 @@
+// Initial reference implementation.  Better to use QuickDigest5 which
+// is currently a git submodule.
+
 #include <string>
 #include <cstdio>
 #include <array>

extern/QuickDigest5

@@ -1,6 +1,6 @@
 
 set(bin_PROGRAMS testBarrier expyaml orthoTest testDeproj
-		 testEmpDeproj testEmp)
+		 testEmpDeproj testEmp testmd5)
 
 set(common_LINKLIB OpenMP::OpenMP_CXX MPI::MPI_CXX expui exputil
   yaml-cpp ${VTK_LIBRARIES})
@@ -11,6 +11,7 @@ endif()
 
 set(common_INCLUDE
   $<INSTALL_INTERFACE:include>
+  $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/extern/QuickDigest5/include>
   $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include/>
   $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/>
   ${CMAKE_BINARY_DIR} ${DEP_INC}
@@ -37,6 +38,7 @@ add_executable(testDeproj     testDeproject.cc CubicSpline.cc Deprojector.cc)
 add_executable(testEmpDeproj  testEmpDeproj.cc CubicSpline.cc
 			      Deprojector.cc EmpDeproj.cc)
 add_executable(testEmp        testEmp.cc EmpDeproj.cc)
+add_executable(testmd5        testmd5.cc)
 
 foreach(program ${bin_PROGRAMS})
   target_link_libraries(${program} ${common_LINKLIB})