DEME 2.0.5__tar.gz → 2.0.7__tar.gz

{deme-2.0.5/deme.egg-info → deme-2.0.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: deme
-Version: 2.0.5
+Version: 2.0.7
 Summary: PyBind Wrapper Library for DEM-Engine
 Home-page: UNKNOWN
 Author: Ruochun Zhang

{deme-2.0.5 → deme-2.0.7/deme.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: deme
-Version: 2.0.5
+Version: 2.0.7
 Summary: PyBind Wrapper Library for DEM-Engine
 Home-page: UNKNOWN
 Author: Ruochun Zhang

{deme-2.0.5 → deme-2.0.7}/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.0.5",
+    version="2.0.7",
     author="Ruochun Zhang",
     author_email="ruochunz@gmail.com",
     description="PyBind Wrapper Library for DEM-Engine",

{deme-2.0.5 → deme-2.0.7}/src/DEM/API.h

@@ -1364,6 +1364,9 @@ class DEMSolver {
     /// @brief Remove all extra libraries that the kernels `include' in their headers.
     void RemoveKernelInclude() { kernel_includes = " "; }
 
+    /// @brief Print kT's scratch space usage. This is a debug method.
+    void PrintKinematicScratchSpaceUsage() const { kT->printScratchSpaceUsage(); }
+
     /// Let dT do this call and return the reduce value of the inspected quantity.
     float dTInspectReduce(const std::shared_ptr<jitify::Program>& inspection_kernel,
                           const std::string& kernel_name,

{deme-2.0.5 → deme-2.0.7}/src/DEM/Defines.h

@@ -26,7 +26,7 @@ namespace deme {
 // It is better to keep DEME_NUM_SPHERES_PER_CD_BATCH == DEME_KT_CD_NTHREADS_PER_BLOCK for better performance
 #define DEME_NUM_SPHERES_PER_CD_BATCH 512    ///< Can't be larger than DEME_KT_CD_NTHREADS_PER_BLOCK
 #define DEME_NUM_TRIANGLES_PER_CD_BATCH 256  ///< Can't be larger than DEME_KT_CD_NTHREADS_PER_BLOCK
-#define DEME_TINY_FLOAT 1e-15
+#define DEME_TINY_FLOAT 1e-12                ///< Appears to be very sensitive to even smaller values...
 #define DEME_HUGE_FLOAT 1e15
 #define DEME_BITS_PER_BYTE 8
 #define DEME_CUDA_WARP_SIZE 32

{deme-2.0.5 → deme-2.0.7}/src/DEM/PyDEME.cpp

@@ -1156,6 +1156,8 @@ PYBIND11_MODULE(DEME, obj) {
              "steps that dT should be allowed to be in advance of kT.")
         .def("ShowTimingStats", &deme::DEMSolver::ShowTimingStats,
              "Show the wall time and percentages of wall time spend on various solver tasks.")
+        .def("PrintKinematicScratchSpaceUsage", &deme::DEMSolver::PrintKinematicScratchSpaceUsage,
+             "Print kT's scratch space usage. This is a debug method.")
         .def("ShowAnomalies", &deme::DEMSolver::ShowAnomalies,
              "Show potential anomalies that may have been there in the simulation, then clear the anomaly log.")
         .def("ClearThreadCollaborationStats", &deme::DEMSolver::ClearThreadCollaborationStats,

{deme-2.0.5 → deme-2.0.7}/src/DEM/Structs.h

@@ -187,7 +187,7 @@ class DEMSolverScratchData {
     void finishUsingDualStruct(const std::string& name) { m_dualStructPool.unclaim(name); }
 
     // Debug util
-    void printVectorUsage() {
+    void printVectorUsage() const {
         m_deviceVecPool.printStatus();
         m_dualArrPool.printStatus();
         m_dualStructPool.printStatus();

{deme-2.0.5 → deme-2.0.7}/src/DEM/kT.h

@@ -386,6 +386,12 @@ class DEMKinematicThread {
     /// Update (overwrite) kT's previous contact array based on input
     void updatePrevContactArrays(DualStruct<DEMDataDT>& dT_data, size_t nContacts);
 
+    /// Print temporary arrays' memory usage. This is for debugging purposes only.
+    void printScratchSpaceUsage() const {
+        std::cout << Name << " scratch space usage: " << std::endl;
+        solverScratchSpace.printVectorUsage();
+    }
+
   private:
     const std::string Name = "kT";
 

{deme-2.0.5 → deme-2.0.7}/src/core/utils/DataMigrationHelper.hpp

@@ -192,6 +192,9 @@ class DualStruct : private NonCopyable {
 
     // Getter for the host pointer
     T* getHostPointer() { return host_data; }
+
+    // Get host or device size in bytes
+    size_t getNumBytes() const { return sizeof(T); }
 };
 
 #ifndef DEME_USE_MANAGED_ARRAYS
@@ -403,6 +406,9 @@ class DualArray : private NonCopyable {
     // Array's in-use data range is always stored on host by size()
     size_t size() const { return m_host_vec_ptr ? m_host_vec_ptr->size() : 0; }
 
+    // Get host or device size in bytes
+    size_t getNumBytes() const { return m_host_vec_ptr ? m_host_vec_ptr->size() * sizeof(T) : 0; }
+
     T* host() { return m_host_vec_ptr ? m_host_vec_ptr->data() : nullptr; }
 
     T* device() { return m_device_ptr; }
@@ -594,6 +600,9 @@ class DualArray : private NonCopyable {
     // Array's in-use data range is always stored on host by size()
     size_t size() const { return m_host_vec_ptr ? m_host_vec_ptr->size() : 0; }
 
+    // Get host or device size in bytes
+    size_t getNumBytes() const { return m_host_vec_ptr ? m_host_vec_ptr->size() * sizeof(T) : 0; }
+
     T* host() { return m_host_vec_ptr ? m_host_vec_ptr->data() : nullptr; }
 
     T* device() { return host(); }
@@ -694,6 +703,9 @@ class DeviceArray : private NonCopyable {
 
     size_t size() const { return m_capacity; }
 
+    // Get host or device size in bytes
+    size_t getNumBytes() const { return m_capacity * sizeof(T); }
+
     T* data() { return m_data; }
 
     const T* data() const { return m_data; }
@@ -760,10 +772,15 @@ class ResourcePool : private NonCopyable {
 
     void printStatus() const {
         for (size_t i = 0; i < in_use.size(); ++i) {
-            if (in_use[i])
-                std::cout << "Storage vector[" << i << "] in use as \"" << *in_use[i] << "\"\n";
-            else
+            if (in_use[i]) {
+                const std::string& name = *in_use[i];
+                const size_t index = name_to_index.at(name);
+                const auto& vec = vectors[index];
+                std::cout << "Storage vector[" << i << "] in use as \"" << name << "\", using " << vec->getNumBytes()
+                          << " bytes.\n";
+            } else {
                 std::cout << "Storage vector[" << i << "] is free\n";
+            }
         }
     }
 };

{deme-2.0.5 → deme-2.0.7}/src/demo/DEMdemo_SingleSphereCollide.cpp

@@ -214,6 +214,8 @@ int main() {
 
     DEMSim.ShowThreadCollaborationStats();
     DEMSim.ShowTimingStats();
+    // Testing this debug function...
+    DEMSim.PrintKinematicScratchSpaceUsage();
     std::cout << "DEMdemo_SingleSphereCollide exiting..." << std::endl;
     return 0;
 }