DEME 2.1.4__tar.gz → 2.1.6__tar.gz

{deme-2.1.4/deme.egg-info → deme-2.1.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: deme
-Version: 2.1.4
+Version: 2.1.6
 Summary: PyBind Wrapper Library for DEM-Engine
 Author: Ruochun Zhang
 Author-email: ruochunz@gmail.com

{deme-2.1.4 → deme-2.1.6/deme.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: deme
-Version: 2.1.4
+Version: 2.1.6
 Summary: PyBind Wrapper Library for DEM-Engine
 Author: Ruochun Zhang
 Author-email: ruochunz@gmail.com

{deme-2.1.4 → deme-2.1.6}/setup.py

@@ -152,7 +152,7 @@ class CMakeBuild(build_ext):
 # logic and declaration, and simpler if you include description/version in a file.
 setup(
     name="deme",
-    version="2.1.4",
+    version="2.1.6",
     author="Ruochun Zhang",
     author_email="ruochunz@gmail.com",
     description="PyBind Wrapper Library for DEM-Engine",

{deme-2.1.4 → deme-2.1.6}/src/DEM/API.h

@@ -17,6 +17,7 @@
 #include "../core/utils/ThreadManager.h"
 #include "../core/utils/GpuManager.h"
 #include "../core/utils/DEMEPaths.h"
+#include "../core/utils/JitHelper.h"
 #include "Defines.h"
 #include "Structs.h"
 #include "BdrsAndObjs.h"

{deme-2.1.4 → deme-2.1.6}/src/DEM/Models.h

@@ -25,7 +25,7 @@ namespace deme {
 
 inline std::string HERTZIAN_FORCE_MODEL() {
     std::filesystem::path sourcefile =
-        RuntimeDataHelper::data_path / "kernel" / "DEMCustomizablePolicies" / "FullHertzianForceModel.cu";
+        DEMERuntimeDataHelper::data_path / "kernel" / "DEMCustomizablePolicies" / "FullHertzianForceModel.cu";
     if (!std::filesystem::exists(sourcefile)) {
         DEME_ERROR("The force model file %s is not found.", sourcefile.string().c_str());
     }
@@ -34,7 +34,7 @@ inline std::string HERTZIAN_FORCE_MODEL() {
 
 inline std::string HERTZIAN_FORCE_MODEL_FRICTIONLESS() {
     std::filesystem::path sourcefile =
-        RuntimeDataHelper::data_path / "kernel" / "DEMCustomizablePolicies" / "FrictionlessHertzianForceModel.cu";
+        DEMERuntimeDataHelper::data_path / "kernel" / "DEMCustomizablePolicies" / "FrictionlessHertzianForceModel.cu";
     if (!std::filesystem::exists(sourcefile)) {
         DEME_ERROR("The force model file %s is not found.", sourcefile.string().c_str());
     }
@@ -43,7 +43,7 @@ inline std::string HERTZIAN_FORCE_MODEL_FRICTIONLESS() {
 
 inline std::string FORCE_REDUCTION_RIGHT_AFTER_CALC_STRAT() {
     std::filesystem::path sourcefile =
-        RuntimeDataHelper::data_path / "kernel" / "DEMCustomizablePolicies" / "ForceInKernelReductionStrat.cu";
+        DEMERuntimeDataHelper::data_path / "kernel" / "DEMCustomizablePolicies" / "ForceInKernelReductionStrat.cu";
     if (!std::filesystem::exists(sourcefile)) {
         DEME_ERROR("A strategy file %s is not found.", sourcefile.string().c_str());
     }
@@ -52,7 +52,7 @@ inline std::string FORCE_REDUCTION_RIGHT_AFTER_CALC_STRAT() {
 
 inline std::string FORCE_INFO_WRITE_BACK_STRAT() {
     std::filesystem::path sourcefile =
-        RuntimeDataHelper::data_path / "kernel" / "DEMCustomizablePolicies" / "ContactInfoWriteBack.cu";
+        DEMERuntimeDataHelper::data_path / "kernel" / "DEMCustomizablePolicies" / "ContactInfoWriteBack.cu";
     if (!std::filesystem::exists(sourcefile)) {
         DEME_ERROR("A strategy file %s is not found.", sourcefile.string().c_str());
     }
@@ -65,7 +65,7 @@ inline std::string FORCE_INFO_WRITE_BACK_STRAT() {
 
 inline std::string CLUMP_COMPONENT_ACQUISITION_ALL_JITIFIED() {
     std::filesystem::path sourcefile =
-        RuntimeDataHelper::data_path / "kernel" / "DEMCustomizablePolicies" / "ClumpCompAcqStratAllJitify.cu";
+        DEMERuntimeDataHelper::data_path / "kernel" / "DEMCustomizablePolicies" / "ClumpCompAcqStratAllJitify.cu";
     if (!std::filesystem::exists(sourcefile)) {
         DEME_ERROR("The clump component jitification strategy file %s is not found.", sourcefile.string().c_str());
     }
@@ -74,7 +74,7 @@ inline std::string CLUMP_COMPONENT_ACQUISITION_ALL_JITIFIED() {
 
 inline std::string CLUMP_COMPONENT_ACQUISITION_PARTIALLY_JITIFIED() {
     std::filesystem::path sourcefile =
-        RuntimeDataHelper::data_path / "kernel" / "DEMCustomizablePolicies" / "ClumpCompAcqStratPartialJitify.cu";
+        DEMERuntimeDataHelper::data_path / "kernel" / "DEMCustomizablePolicies" / "ClumpCompAcqStratPartialJitify.cu";
     if (!std::filesystem::exists(sourcefile)) {
         DEME_ERROR("The clump component jitification strategy file %s is not found.", sourcefile.string().c_str());
     }
@@ -83,7 +83,7 @@ inline std::string CLUMP_COMPONENT_ACQUISITION_PARTIALLY_JITIFIED() {
 
 inline std::string CLUMP_COMPONENT_DEFINITIONS_JITIFIED() {
     std::filesystem::path sourcefile =
-        RuntimeDataHelper::data_path / "kernel" / "DEMCustomizablePolicies" / "ClumpCompDefJitify.cu";
+        DEMERuntimeDataHelper::data_path / "kernel" / "DEMCustomizablePolicies" / "ClumpCompDefJitify.cu";
     if (!std::filesystem::exists(sourcefile)) {
         DEME_ERROR("The jitified clump component array file %s is not found.", sourcefile.string().c_str());
     }
@@ -92,7 +92,7 @@ inline std::string CLUMP_COMPONENT_DEFINITIONS_JITIFIED() {
 
 inline std::string CLUMP_COMPONENT_ACQUISITION_FLATTENED() {
     std::filesystem::path sourcefile =
-        RuntimeDataHelper::data_path / "kernel" / "DEMCustomizablePolicies" / "ClumpCompAcqStratAllFlatten.cu";
+        DEMERuntimeDataHelper::data_path / "kernel" / "DEMCustomizablePolicies" / "ClumpCompAcqStratAllFlatten.cu";
     if (!std::filesystem::exists(sourcefile)) {
         DEME_ERROR("The clump component loading strategy file %s is not found.", sourcefile.string().c_str());
     }
@@ -105,7 +105,7 @@ inline std::string CLUMP_COMPONENT_ACQUISITION_FLATTENED() {
 
 inline std::string ANALYTICAL_COMPONENT_DEFINITIONS_JITIFIED() {
     std::filesystem::path sourcefile =
-        RuntimeDataHelper::data_path / "kernel" / "DEMCustomizablePolicies" / "AnalyticalCompDefJitify.cu";
+        DEMERuntimeDataHelper::data_path / "kernel" / "DEMCustomizablePolicies" / "AnalyticalCompDefJitify.cu";
     if (!std::filesystem::exists(sourcefile)) {
         DEME_ERROR("The jitified analytical object component array file %s is not found.", sourcefile.string().c_str());
     }
@@ -118,7 +118,7 @@ inline std::string ANALYTICAL_COMPONENT_DEFINITIONS_JITIFIED() {
 
 inline std::string MASS_DEFINITIONS_JITIFIED() {
     std::filesystem::path sourcefile =
-        RuntimeDataHelper::data_path / "kernel" / "DEMCustomizablePolicies" / "MassDefJitify.cu";
+        DEMERuntimeDataHelper::data_path / "kernel" / "DEMCustomizablePolicies" / "MassDefJitify.cu";
     if (!std::filesystem::exists(sourcefile)) {
         DEME_ERROR("The mass property array file %s is not found.", sourcefile.string().c_str());
     }
@@ -127,7 +127,7 @@ inline std::string MASS_DEFINITIONS_JITIFIED() {
 
 inline std::string MOI_DEFINITIONS_JITIFIED() {
     std::filesystem::path sourcefile =
-        RuntimeDataHelper::data_path / "kernel" / "DEMCustomizablePolicies" / "MOIDefJitify.cu";
+        DEMERuntimeDataHelper::data_path / "kernel" / "DEMCustomizablePolicies" / "MOIDefJitify.cu";
     if (!std::filesystem::exists(sourcefile)) {
         DEME_ERROR("The MOI property array file %s is not found.", sourcefile.string().c_str());
     }
@@ -136,7 +136,7 @@ inline std::string MOI_DEFINITIONS_JITIFIED() {
 
 inline std::string MASS_ACQUISITION_JITIFIED() {
     std::filesystem::path sourcefile =
-        RuntimeDataHelper::data_path / "kernel" / "DEMCustomizablePolicies" / "MassAcqStratJitify.cu";
+        DEMERuntimeDataHelper::data_path / "kernel" / "DEMCustomizablePolicies" / "MassAcqStratJitify.cu";
     if (!std::filesystem::exists(sourcefile)) {
         DEME_ERROR("The mass loading strategy array file %s is not found.", sourcefile.string().c_str());
     }
@@ -145,7 +145,7 @@ inline std::string MASS_ACQUISITION_JITIFIED() {
 
 inline std::string MASS_ACQUISITION_FLATTENED() {
     std::filesystem::path sourcefile =
-        RuntimeDataHelper::data_path / "kernel" / "DEMCustomizablePolicies" / "MassAcqStratFlatten.cu";
+        DEMERuntimeDataHelper::data_path / "kernel" / "DEMCustomizablePolicies" / "MassAcqStratFlatten.cu";
     if (!std::filesystem::exists(sourcefile)) {
         DEME_ERROR("The mass loading strategy array file %s is not found.", sourcefile.string().c_str());
     }
@@ -154,7 +154,7 @@ inline std::string MASS_ACQUISITION_FLATTENED() {
 
 inline std::string MOI_ACQUISITION_JITIFIED() {
     std::filesystem::path sourcefile =
-        RuntimeDataHelper::data_path / "kernel" / "DEMCustomizablePolicies" / "MOIAcqStratJitify.cu";
+        DEMERuntimeDataHelper::data_path / "kernel" / "DEMCustomizablePolicies" / "MOIAcqStratJitify.cu";
     if (!std::filesystem::exists(sourcefile)) {
         DEME_ERROR("The MOI loading strategy array file %s is not found.", sourcefile.string().c_str());
     }
@@ -163,7 +163,7 @@ inline std::string MOI_ACQUISITION_JITIFIED() {
 
 inline std::string MOI_ACQUISITION_FLATTENED() {
     std::filesystem::path sourcefile =
-        RuntimeDataHelper::data_path / "kernel" / "DEMCustomizablePolicies" / "MOIAcqStratFlatten.cu";
+        DEMERuntimeDataHelper::data_path / "kernel" / "DEMCustomizablePolicies" / "MOIAcqStratFlatten.cu";
     if (!std::filesystem::exists(sourcefile)) {
         DEME_ERROR("The MOI loading strategy array file %s is not found.", sourcefile.string().c_str());
     }
@@ -184,7 +184,7 @@ inline std::filesystem::path GET_DATA_PATH() {
 
 inline std::string VEL_TO_PASS_ON_FORWARD_EULER() {
     std::filesystem::path sourcefile =
-        RuntimeDataHelper::data_path / "kernel" / "DEMCustomizablePolicies" / "IntegrationVelPassOnForwardEuler.cu";
+        DEMERuntimeDataHelper::data_path / "kernel" / "DEMCustomizablePolicies" / "IntegrationVelPassOnForwardEuler.cu";
     if (!std::filesystem::exists(sourcefile)) {
         DEME_ERROR("The integration strategy file %s is not found.", sourcefile.string().c_str());
     }
@@ -192,8 +192,8 @@ inline std::string VEL_TO_PASS_ON_FORWARD_EULER() {
 }
 
 inline std::string VEL_TO_PASS_ON_EXTENDED_TAYLOR() {
-    std::filesystem::path sourcefile =
-        RuntimeDataHelper::data_path / "kernel" / "DEMCustomizablePolicies" / "IntegrationVelPassOnExtendedTaylor.cu";
+    std::filesystem::path sourcefile = DEMERuntimeDataHelper::data_path / "kernel" / "DEMCustomizablePolicies" /
+                                       "IntegrationVelPassOnExtendedTaylor.cu";
     if (!std::filesystem::exists(sourcefile)) {
         DEME_ERROR("The integration strategy file %s is not found.", sourcefile.string().c_str());
     }
@@ -202,7 +202,7 @@ inline std::string VEL_TO_PASS_ON_EXTENDED_TAYLOR() {
 
 inline std::string VEL_TO_PASS_ON_CENTERED_DIFF() {
     std::filesystem::path sourcefile =
-        RuntimeDataHelper::data_path / "kernel" / "DEMCustomizablePolicies" / "IntegrationVelPassOnCenteredDiff.cu";
+        DEMERuntimeDataHelper::data_path / "kernel" / "DEMCustomizablePolicies" / "IntegrationVelPassOnCenteredDiff.cu";
     if (!std::filesystem::exists(sourcefile)) {
         DEME_ERROR("The integration strategy file %s is not found.", sourcefile.string().c_str());
     }

{deme-2.1.4 → deme-2.1.6}/src/DEM/PyDEME.cpp

@@ -91,12 +91,12 @@ PYBIND11_MODULE(DEME, obj) {
 
     // Setting path prefix
     std::filesystem::path path = loc;
-    RuntimeDataHelper::SetPathPrefix(path);
-    deme::SetDEMEDataPath(path / "share/data");
+    DEMERuntimeDataHelper::SetPathPrefix(path);
+    deme::SetDEMEDataPath();
 
     // Setting JitHelper variables
-    deme::SetDEMEKernelPath(path / "share/kernel");
-    deme::SetDEMEIncludePath(path / "include");
+    deme::SetDEMEKernelPath();
+    deme::SetDEMEIncludePath();
 
     // To define methods independent of a class, use obj.def() syntax to wrap them!
     obj.def("FrameTransformGlobalToLocal", &deme::FrameTransformGlobalToLocal,
@@ -122,9 +122,9 @@ PYBIND11_MODULE(DEME, obj) {
 
     obj.attr("PI") = py::float_(3.141592653589793238462643383279502884197);
 
-    py::class_<RuntimeDataHelper>(obj, "RuntimeDataHelper")
+    py::class_<DEMERuntimeDataHelper>(obj, "DEMERuntimeDataHelper")
         .def(py::init<>())
-        .def_static("SetPathPrefix", &RuntimeDataHelper::SetPathPrefix);
+        .def_static("SetPathPrefix", &DEMERuntimeDataHelper::SetPathPrefix);
 
     py::class_<deme::PDSampler>(obj, "PDSampler")
         .def(py::init<float>())

{deme-2.1.4 → deme-2.1.6}/src/DEM/Structs.h

@@ -53,7 +53,7 @@ const std::string OUTPUT_FILE_ANGVEL_X_COL_NAME = std::string("w_x");
 const std::string OUTPUT_FILE_ANGVEL_Y_COL_NAME = std::string("w_y");
 const std::string OUTPUT_FILE_ANGVEL_Z_COL_NAME = std::string("w_z");
 const std::string OUTPUT_FILE_CLUMP_TYPE_NAME = std::string("clump_type");
-const std::filesystem::path USER_SCRIPT_PATH = RuntimeDataHelper::data_path / "kernel" / "DEMUserScripts";
+const std::filesystem::path USER_SCRIPT_PATH = DEMERuntimeDataHelper::data_path / "kernel" / "DEMUserScripts";
 const std::string DEFAULT_FORCE_MODEL_NAME = std::string("DEM_Contact");
 // Column names for contact pair output file
 const std::string OUTPUT_FILE_OWNER_1_NAME = std::string("A");

{deme-2.1.4 → deme-2.1.6}/src/DEM/dT.cpp

@@ -1822,6 +1822,11 @@ void DEMDynamicThread::writeContactsAsCsv(std::ofstream& ptFile, float force_thr
                          << contactInfo->Get<float3>("Point")[i].y << "," << contactInfo->Get<float3>("Point")[i].z;
         }
 
+        if (solverFlags.cntOutFlags & CNT_OUTPUT_CONTENT::NORMAL) {
+            outstrstream << "," << contactInfo->Get<float3>("Normal")[i].x << ","
+                         << contactInfo->Get<float3>("Normal")[i].y << "," << contactInfo->Get<float3>("Normal")[i].z;
+        }
+
         // Torque is in global already...
         if (solverFlags.cntOutFlags & CNT_OUTPUT_CONTENT::TORQUE) {
             outstrstream << "," << contactInfo->Get<float3>("Torque")[i].x << ","

{deme-2.1.4 → deme-2.1.6}/src/DEM/utils/Samplers.hpp

@@ -38,8 +38,8 @@
 #include <random>
 #include <utility>
 #include <vector>
-#include <DEM/HostSideHelpers.hpp>
-#include <DEM/Defines.h>
+
+#include "../HostSideHelpers.hpp"
 
 namespace deme {
 

{deme-2.1.4 → deme-2.1.6}/src/core/CMakeLists.txt

@@ -147,16 +147,16 @@ if(NOT PYTHON_BUILD)
 
 
 message(STATUS "${core_message} Generating Runtime Data helper (build)...")
-set(RUNTIME_DATA_DIRECTORY "${CMAKE_BINARY_DIR}")
-set(RUNTIME_INCLUDE_DIRECTORY "${CMAKE_BINARY_DIR}")
+set(DEME_RUNTIME_DATA_DIRECTORY "${CMAKE_BINARY_DIR}")
+set(DEME_RUNTIME_INCLUDE_DIRECTORY "${CMAKE_BINARY_DIR}")
 configure_file(
 	utils/RuntimeData.cpp.in utils/RuntimeDataBuild.cpp
 	@ONLY
 )
 
 message(STATUS "${core_message} Generating Runtime Data helper (install)...")
-set(RUNTIME_DATA_DIRECTORY "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_DATADIR}/DEME")
-set(RUNTIME_INCLUDE_DIRECTORY "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_INCLUDEDIR}")
+set(DEME_RUNTIME_DATA_DIRECTORY "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_DATADIR}/DEME")
+set(DEME_RUNTIME_INCLUDE_DIRECTORY "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_INCLUDEDIR}")
 configure_file(
 	utils/RuntimeData.cpp.in utils/RuntimeDataInstall.cpp
 	@ONLY

{deme-2.1.4 → deme-2.1.6}/src/core/utils/CudaAllocator.hpp

@@ -3,8 +3,8 @@
 //
 //	SPDX-License-Identifier: BSD-3-Clause
 
-#ifndef CUDALLOC_HPP
-#define CUDALLOC_HPP
+#ifndef DEME_CUDALLOC_HPP
+#define DEME_CUDALLOC_HPP
 
 #include <core/ApiVersion.h>
 

{deme-2.1.4 → deme-2.1.6}/src/core/utils/DEMEPaths.cpp

@@ -5,9 +5,9 @@
 
 #include <filesystem>
 #include <cstring>
+#include <iostream>
 
 #include "DEMEPaths.h"
-#include <iostream>
 #include <core/utils/JitHelper.h>
 
 namespace deme {
@@ -17,8 +17,8 @@ namespace deme {
 // -----------------------------------------------------------------------------
 
 // Set the path to the DEME data directory (ATTENTION: not thread safe)
-void SetDEMEDataPath(const std::string& path) {
-    DEME_data_path = path;
+void SetDEMEDataPath() {
+    DEME_data_path = DEMERuntimeDataHelper::data_path / "data";
 }
 
 // Obtain the current path to the DEME data directory (thread safe)
@@ -29,17 +29,17 @@ std::filesystem::path& GetDEMEDataPath() {
 // Obtain the complete path to the specified filename, given relative to the
 // DEME data directory (thread safe)
 std::string GetDEMEDataFile(const std::string& filename) {
-    return (RuntimeDataHelper::data_path / "data" / filename).string();
+    return (DEME_data_path / filename).string();
 }
 
 // Set the path to the DEME data kernel directory
-void SetDEMEKernelPath(const std::filesystem::path& kernel_path) {
-    JitHelper::KERNEL_DIR = RuntimeDataHelper::data_path / "kernel";
+void SetDEMEKernelPath() {
+    JitHelper::KERNEL_DIR = DEMERuntimeDataHelper::data_path / "kernel";
 }
 
 // Set the path to the DEME include directory
-void SetDEMEIncludePath(const std::filesystem::path& include_path) {
-    JitHelper::KERNEL_INCLUDE_DIR = RuntimeDataHelper::include_path;
+void SetDEMEIncludePath() {
+    JitHelper::KERNEL_INCLUDE_DIR = DEMERuntimeDataHelper::include_path;
 }
 
 }  // namespace deme

{deme-2.1.4 → deme-2.1.6}/src/core/utils/DEMEPaths.h

@@ -18,19 +18,19 @@ namespace deme {
 // -----------------------------------------------------------------------------
 
 // Build or installation data path
-static std::filesystem::path DEME_data_path(RuntimeDataHelper::data_path / "data");
+const std::filesystem::path BUILD_DATA_PATH = DEMERuntimeDataHelper::data_path / "data";
+static std::filesystem::path DEME_data_path(BUILD_DATA_PATH);
 
 // Set the path to the DEME data directory (ATTENTION: not thread safe)
-void SetDEMEDataPath(const std::string& path);
+void SetDEMEDataPath();
+// Obtain the current path to the DEME data directory (thread safe)
+std::filesystem::path& GetDEMEDataPath();
 
 // Set the path to the DEME data kernel directory
-void SetDEMEKernelPath(const std::filesystem::path& kernel_path);
+void SetDEMEKernelPath();
 
 // Set the path to the DEME include directory
-void SetDEMEIncludePath(const std::filesystem::path& include_path);
-
-// Obtain the current path to the DEME data directory (thread safe)
-std::filesystem::path& GetDEMEDataPath();
+void SetDEMEIncludePath();
 
 // Obtain the complete path to the specified filename, given relative to the
 // DEME data directory (thread safe)

{deme-2.1.4 → deme-2.1.6}/src/core/utils/DataMigrationHelper.hpp

@@ -9,6 +9,7 @@
 #include <cassert>
 #include <optional>
 #include <unordered_map>
+
 #include "GpuError.h"
 #include "../../DEM/VariableTypes.h"
 

{deme-2.1.4 → deme-2.1.6}/src/core/utils/JitHelper.cpp

@@ -14,8 +14,10 @@
 
 jitify::JitCache JitHelper::kcache;
 
-std::filesystem::path JitHelper::KERNEL_DIR = RuntimeDataHelper::data_path / "kernel";
-std::filesystem::path JitHelper::KERNEL_INCLUDE_DIR = RuntimeDataHelper::include_path;
+// const std::filesystem::path JitHelper::KERNEL_DIR = DEMERuntimeDataHelper::data_path / "kernel";
+// const std::filesystem::path JitHelper::KERNEL_INCLUDE_DIR = DEMERuntimeDataHelper::include_path;
+std::filesystem::path JitHelper::KERNEL_DIR = DEMERuntimeDataHelper::data_path / "kernel";
+std::filesystem::path JitHelper::KERNEL_INCLUDE_DIR = DEMERuntimeDataHelper::include_path;
 
 JitHelper::Header::Header(const std::filesystem::path& sourcefile) {
     this->_source = JitHelper::loadSourceFile(sourcefile);

{deme-2.1.4 → deme-2.1.6}/src/core/utils/RuntimeData.cpp.in

@@ -5,19 +5,19 @@
 
 #include <core/utils/RuntimeData.h>
 
-#define RUNTIME_DATA_DIRECTORY "@RUNTIME_DATA_DIRECTORY@"
-#define RUNTIME_INCLUDE_DIRECTORY "@RUNTIME_INCLUDE_DIRECTORY@"
+#define DEME_RUNTIME_DATA_DIRECTORY "@DEME_RUNTIME_DATA_DIRECTORY@"
+#define DEME_RUNTIME_INCLUDE_DIRECTORY "@DEME_RUNTIME_INCLUDE_DIRECTORY@"
 
 // It's called data_path, but it includes both data files and kernel files
-std::filesystem::path RuntimeDataHelper::data_path = std::filesystem::path(RUNTIME_DATA_DIRECTORY);
+std::filesystem::path DEMERuntimeDataHelper::data_path = std::filesystem::path(DEME_RUNTIME_DATA_DIRECTORY);
 
 // This include path is for the included headers in the kernels that need jitification
-std::filesystem::path RuntimeDataHelper::include_path = std::filesystem::path(RUNTIME_INCLUDE_DIRECTORY);
+std::filesystem::path DEMERuntimeDataHelper::include_path = std::filesystem::path(DEME_RUNTIME_INCLUDE_DIRECTORY);
 
 // p should be something like /path/to/pip/prefix/bin/../lib/python${PY_VER}/site-packages
 // can get path from python's sys.executable, then run os.path.dirname on it to strip away the binary name
 
-void RuntimeDataHelper::SetPathPrefix(const std::filesystem::path& p) {
+void DEMERuntimeDataHelper::SetPathPrefix(const std::filesystem::path& p) {
     data_path = p / "share/DEME";
     include_path = p / "include";
 }

{deme-2.1.4 → deme-2.1.6}/src/core/utils/RuntimeData.h

@@ -18,7 +18,7 @@
     #define DEMERuntimeDataHelper_API
 #endif
 
-class DEMERuntimeDataHelper_API RuntimeDataHelper {
+class DEMERuntimeDataHelper_API DEMERuntimeDataHelper {
   public:
     static std::filesystem::path data_path;
     static std::filesystem::path include_path;

{deme-2.1.4 → deme-2.1.6}/src/kernel/CUDAMathHelpers.cuh

@@ -36,8 +36,8 @@
  *    Thanks to Linh Hah for additions and fixes.
  */
 
-#ifndef HELPER_MATH_H
-#define HELPER_MATH_H
+#ifndef DEME_HELPER_MATH_CUH
+#define DEME_HELPER_MATH_CUH
 
 #if defined(_WIN32) || defined(_WIN64)
     #undef max

{deme-2.1.4 → deme-2.1.6}/src/kernel/DEMHelperKernels.cuh

@@ -1,15 +1,15 @@
 // DEM device-side helper kernel collection
 
-#ifndef DEME_HELPER_KERNELS_CU
-#define DEME_HELPER_KERNELS_CU
+#ifndef DEME_HELPER_KERNELS_CUH
+#define DEME_HELPER_KERNELS_CUH
 
 #include "CUDAMathHelpers.cuh"
 // If being statically compiled using CMake, then include DEM/Defines.h using relative path.
 // Otherwise, use the angle bracket form for jitify to pick it up from the build dir.
-#if __has_include(<DEM/Defines.h>)
-    #include <DEM/Defines.h>
-#else
+#if __has_include("../DEM/Defines.h")
     #include "../DEM/Defines.h"
+#else
+    #include <DEM/Defines.h>
 #endif
 
 // inline __device__ voxelID_t position2VoxelID