DEME 2.1.2__tar.gz → 2.1.4__tar.gz

deme-2.1.4/PKG-INFO

@@ -0,0 +1,19 @@
+Metadata-Version: 2.4
+Name: deme
+Version: 2.1.4
+Summary: PyBind Wrapper Library for DEM-Engine
+Author: Ruochun Zhang
+Author-email: ruochunz@gmail.com
+License-File: LICENSE.md
+Requires-Dist: numpy
+Requires-Dist: pybind11
+Provides-Extra: dev
+Requires-Dist: pybind11; extra == "dev"
+Provides-Extra: test
+Requires-Dist: pytest>=6.0; extra == "test"
+Dynamic: author
+Dynamic: author-email
+Dynamic: license-file
+Dynamic: provides-extra
+Dynamic: requires-dist
+Dynamic: summary

deme-2.1.4/deme.egg-info/PKG-INFO

@@ -0,0 +1,19 @@
+Metadata-Version: 2.4
+Name: deme
+Version: 2.1.4
+Summary: PyBind Wrapper Library for DEM-Engine
+Author: Ruochun Zhang
+Author-email: ruochunz@gmail.com
+License-File: LICENSE.md
+Requires-Dist: numpy
+Requires-Dist: pybind11
+Provides-Extra: dev
+Requires-Dist: pybind11; extra == "dev"
+Provides-Extra: test
+Requires-Dist: pytest>=6.0; extra == "test"
+Dynamic: author
+Dynamic: author-email
+Dynamic: license-file
+Dynamic: provides-extra
+Dynamic: requires-dist
+Dynamic: summary

deme-2.1.4/pyproject.toml

@@ -0,0 +1,2 @@
+[build-system]
+requires = ["setuptools >= 61.0", "pybind11", "cython ~= 0.29.0"]

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

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

@@ -11,19 +11,17 @@
 #include <cfloat>
 #include <functional>
 
-#include <core/ApiVersion.h>
-#include <DEM/kT.h>
-#include <DEM/dT.h>
-#include <core/utils/CudaAllocator.hpp>
-#include <core/utils/ThreadManager.h>
-#include <core/utils/GpuManager.h>
-#include <core/utils/DEMEPaths.h>
-#include <kernel/DEMHelperKernels.cuh>
-#include <DEM/Defines.h>
-#include <DEM/Structs.h>
-#include <DEM/BdrsAndObjs.h>
-#include <DEM/Models.h>
-#include <DEM/AuxClasses.h>
+#include "kT.h"
+#include "dT.h"
+#include "../core/utils/CudaAllocator.hpp"
+#include "../core/utils/ThreadManager.h"
+#include "../core/utils/GpuManager.h"
+#include "../core/utils/DEMEPaths.h"
+#include "Defines.h"
+#include "Structs.h"
+#include "BdrsAndObjs.h"
+#include "Models.h"
+#include "AuxClasses.h"
 
 /// Main namespace for the DEM-Engine package.
 namespace deme {
@@ -1417,8 +1415,9 @@ class DEMSolver {
     // The output file format for contact pairs
     OUTPUT_FORMAT m_cnt_out_format = OUTPUT_FORMAT::CSV;
     // The output file content for contact pairs
-    unsigned int m_cnt_out_content = CNT_OUTPUT_CONTENT::OWNER | CNT_OUTPUT_CONTENT::FORCE |
-                                     CNT_OUTPUT_CONTENT::CNT_POINT | CNT_OUTPUT_CONTENT::CNT_WILDCARD;
+    unsigned int m_cnt_out_content = CNT_OUTPUT_CONTENT::OWNER | CNT_OUTPUT_CONTENT::GEO_ID |
+                                     CNT_OUTPUT_CONTENT::FORCE | CNT_OUTPUT_CONTENT::CNT_POINT |
+                                     CNT_OUTPUT_CONTENT::CNT_WILDCARD;
     // The output file format for meshes
     MESH_FORMAT m_mesh_out_format = MESH_FORMAT::VTK;
     // If the solver should output wildcards to file
@@ -1650,7 +1649,7 @@ class DEMSolver {
     // A big fat tab for all string replacement that the JIT compiler needs to consider
     std::unordered_map<std::string, std::string> m_subs;
     // jitify's compilation options
-    std::vector<std::string> m_jitify_options = DEME_JITIFY_DEFAULT_OPTIONS;
+    std::vector<std::string> m_jitify_options;
 
     // A map that records the numbering for user-defined owner wildcards
     std::unordered_map<std::string, unsigned int> m_owner_wc_num;
@@ -1943,6 +1942,9 @@ class DEMSolver {
     inline void equipForceModel(std::unordered_map<std::string, std::string>& strMap);
     inline void equipIntegrationScheme(std::unordered_map<std::string, std::string>& strMap);
     inline void equipKernelIncludes(std::unordered_map<std::string, std::string>& strMap);
+
+    // Default solver params at construction time
+    void setDefaultSolverParams();
 };
 
 }  // namespace deme

{deme-2.1.2 → deme-2.1.4}/src/DEM/APIPrivate.cpp

@@ -4,9 +4,9 @@
 //	SPDX-License-Identifier: BSD-3-Clause
 
 #include <core/ApiVersion.h>
-#include <DEM/API.h>
-#include <DEM/Defines.h>
-#include <DEM/HostSideHelpers.hpp>
+#include "API.h"
+#include "Defines.h"
+#include "HostSideHelpers.hpp"
 
 #include <iostream>
 #include <fstream>
@@ -2134,4 +2134,12 @@ inline void DEMSolver::equipKernelIncludes(std::unordered_map<std::string, std::
     strMap["_kernelIncludes_;"] = kernel_includes;
 }
 
+// Jitify options include suppressing variable-not-used warnings. We could use CUDA lib functions too.
+// It's put here as ApiVersion.h.in (which sets DEME_CUDA_TOOLKIT_HEADERS) is a CMake-in configuration file, we don't
+// want to include it anywhere in the h headers in case DEM-Engine is included by some parent project.
+void DEMSolver::setDefaultSolverParams() {
+    m_jitify_options = {"-I" + (JitHelper::KERNEL_INCLUDE_DIR).string(), "-I" + (JitHelper::KERNEL_DIR).string(),
+                        "-I" + std::string(DEME_CUDA_TOOLKIT_HEADERS), "-diag-suppress=550", "-diag-suppress=177"};
+}
+
 }  // namespace deme

{deme-2.1.2 → deme-2.1.4}/src/DEM/APIPublic.cpp

@@ -4,10 +4,11 @@
 //	SPDX-License-Identifier: BSD-3-Clause
 
 #include <core/ApiVersion.h>
-#include <DEM/API.h>
-#include <DEM/Defines.h>
-#include <DEM/HostSideHelpers.hpp>
-#include <DEM/AuxClasses.h>
+#include "API.h"
+#include "Defines.h"
+#include "HostSideHelpers.hpp"
+#include "AuxClasses.h"
+#include "../kernel/DEMHelperKernels.cuh"
 
 #include <iostream>
 #include <fstream>
@@ -27,6 +28,9 @@ DEMSolver::DEMSolver(unsigned int nGPUs) {
     // 2 means 2 threads (nGPUs is currently not used)
     dTkT_GpuManager = new GpuManager(2);
 
+    // Set default solver params
+    setDefaultSolverParams();
+
     // Thread-based worker creation may be needed as the workers allocate DualStructs on construction
     std::thread dT_construct([&]() {
         // Get a device/stream ID to use from the GPU Manager

{deme-2.1.2 → deme-2.1.4}/src/DEM/AuxClasses.cpp

@@ -5,10 +5,10 @@
 
 #include <numeric>
 
-#include <DEM/API.h>
-#include <DEM/AuxClasses.h>
-#include <DEM/HostSideHelpers.hpp>
-#include <DEM/Models.h>
+#include "API.h"
+#include "AuxClasses.h"
+#include "HostSideHelpers.hpp"
+#include "Models.h"
 
 namespace deme {
 

{deme-2.1.2 → deme-2.1.4}/src/DEM/AuxClasses.h

@@ -7,10 +7,9 @@
 #define DEME_INSPECTOR_HPP
 
 #include <unordered_map>
-#include <core/utils/JitHelper.h>
-#include <DEM/Defines.h>
-// #include <cuda.h>
-// #include <cuda_runtime_api.h>
+
+#include "../core/utils/JitHelper.h"
+#include "Defines.h"
 
 // Forward declare jitify::Program to avoid downstream dependency
 namespace jitify {

{deme-2.1.2 → deme-2.1.4}/src/DEM/BdrsAndObjs.h

@@ -14,11 +14,11 @@
 #include <array>
 #include <cmath>
 
-#include <kernel/DEMHelperKernels.cuh>
-#include <DEM/Defines.h>
-#include <DEM/Structs.h>
-#include <core/utils/CudaAllocator.hpp>
-#include <DEM/HostSideHelpers.hpp>
+#include "../kernel/DEMHelperKernels.cuh"
+#include "Defines.h"
+#include "Structs.h"
+#include "../core/utils/CudaAllocator.hpp"
+#include "HostSideHelpers.hpp"
 
 namespace deme {
 

{deme-2.1.2 → deme-2.1.4}/src/DEM/Defines.h

@@ -11,7 +11,7 @@
 #include <algorithm>
 #include <cmath>
 
-#include <DEM/VariableTypes.h>
+#include "VariableTypes.h"
 #include "cuda_runtime.h"
 
 #define DEME_MIN(a, b) ((a < b) ? a : b)

{deme-2.1.2 → deme-2.1.4}/src/DEM/HostSideHelpers.hpp

@@ -25,8 +25,8 @@
 #include <tuple>
 #include <type_traits>
 
-#include <kernel/DEMHelperKernels.cuh>
-#include <DEM/VariableTypes.h>
+#include "../kernel/DEMHelperKernels.cuh"
+#include "VariableTypes.h"
 
 namespace deme {
 

{deme-2.1.2 → deme-2.1.4}/src/DEM/MeshUtils.cpp

@@ -33,9 +33,9 @@
 #include <map>
 #include <unordered_map>
 
-#include <kernel/DEMHelperKernels.cuh>
-#include <DEM/BdrsAndObjs.h>
-#include <core/utils/WavefrontMeshLoader.hpp>
+#include "../kernel/DEMHelperKernels.cuh"
+#include "BdrsAndObjs.h"
+#include "../core/utils/WavefrontMeshLoader.hpp"
 
 namespace deme {
 

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

@@ -11,11 +11,11 @@
 #include <vector>
 #include <filesystem>
 
-#include <DEM/Defines.h>
-#include <DEM/Structs.h>
-#include <DEM/HostSideHelpers.hpp>
-#include <core/utils/RuntimeData.h>
-#include <core/utils/DEMEPaths.h>
+#include "Defines.h"
+#include "Structs.h"
+#include "HostSideHelpers.hpp"
+#include "../core/utils/RuntimeData.h"
+#include "../core/utils/DEMEPaths.h"
 
 namespace deme {
 

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

@@ -6,16 +6,16 @@
 #ifndef DEME_HOST_STRUCTS
 #define DEME_HOST_STRUCTS
 
-#include <DEM/Defines.h>
-#include <core/utils/CudaAllocator.hpp>
-#include <core/utils/ManagedMemory.hpp>
-#include <core/utils/csv.hpp>
-#include <core/utils/GpuError.h>
-#include <core/utils/DataMigrationHelper.hpp>
-#include <core/utils/Timer.hpp>
-#include <core/utils/RuntimeData.h>
-#include <kernel/DEMHelperKernels.cuh>
-#include <DEM/HostSideHelpers.hpp>
+#include "Defines.h"
+#include "../core/utils/CudaAllocator.hpp"
+#include "../core/utils/ManagedMemory.hpp"
+#include "../core/utils/csv.hpp"
+#include "../core/utils/GpuError.h"
+#include "../core/utils/DataMigrationHelper.hpp"
+#include "../core/utils/Timer.hpp"
+#include "../core/utils/RuntimeData.h"
+#include "../kernel/DEMHelperKernels.cuh"
+#include "HostSideHelpers.hpp"
 
 #include <sstream>
 #include <exception>
@@ -365,13 +365,6 @@ enum class ADAPT_TS_TYPE { NONE, MAX_VEL, INT_DIFF };
         }                                         \
     }
 
-// Jitify options include suppressing variable-not-used warnings. We could use CUDA lib functions too.
-#define DEME_JITIFY_DEFAULT_OPTIONS                                                                   \
-    {                                                                                                 \
-        "-I" + (JitHelper::KERNEL_INCLUDE_DIR).string(), "-I" + (JitHelper::KERNEL_DIR).string(),     \
-            "-I" + std::string(DEME_CUDA_TOOLKIT_HEADERS), "-diag-suppress=550", "-diag-suppress=177" \
-    }
-
 // =============================================================================
 // NOW SOME HOST-SIDE SIMPLE STRUCTS USED BY THE DEM MODULE
 // =============================================================================

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

@@ -20,6 +20,7 @@
 #include <DEM/Defines.h>
 
 #include <algorithms/DEMStaticDeviceSubroutines.h>
+#include <kernel/DEMHelperKernels.cuh>
 
 namespace deme {
 

{deme-2.1.2 → deme-2.1.4}/src/DEM/dT.h

@@ -13,17 +13,15 @@
 #include <set>
 #include <functional>
 
-#include <core/ApiVersion.h>
-#include <core/utils/CudaAllocator.hpp>
-#include <core/utils/ThreadManager.h>
-#include <core/utils/GpuManager.h>
-#include <core/utils/DataMigrationHelper.hpp>
-#include <kernel/DEMHelperKernels.cuh>
-#include <core/utils/GpuError.h>
-#include <DEM/BdrsAndObjs.h>
-#include <DEM/Defines.h>
-#include <DEM/Structs.h>
-#include <DEM/AuxClasses.h>
+#include "../core/utils/CudaAllocator.hpp"
+#include "../core/utils/ThreadManager.h"
+#include "../core/utils/GpuManager.h"
+#include "../core/utils/DataMigrationHelper.hpp"
+#include "../core/utils/GpuError.h"
+#include "BdrsAndObjs.h"
+#include "Defines.h"
+#include "Structs.h"
+#include "AuxClasses.h"
 
 // Forward declare jitify::Program to avoid downstream dependency
 namespace jitify {

{deme-2.1.2 → deme-2.1.4}/src/DEM/kT.cpp

@@ -10,11 +10,11 @@
 #include <core/ApiVersion.h>
 #include <core/utils/JitHelper.h>
 #include <DEM/kT.h>
-#include <DEM/dT.h>
-#include <DEM/HostSideHelpers.hpp>
-#include <DEM/Defines.h>
-
-#include <algorithms/DEMStaticDeviceSubroutines.h>
+#include "dT.h"
+#include "HostSideHelpers.hpp"
+#include "Defines.h"
+#include "algorithms/DEMStaticDeviceSubroutines.h"
+#include "kernel/DEMHelperKernels.cuh"
 
 namespace deme {
 

{deme-2.1.2 → deme-2.1.4}/src/DEM/kT.h

@@ -12,18 +12,16 @@
 #include <unordered_map>
 // #include <set>
 
-#include <core/ApiVersion.h>
-#include <core/utils/CudaAllocator.hpp>
-#include <core/utils/ThreadManager.h>
-#include <core/utils/GpuManager.h>
-#include <core/utils/DataMigrationHelper.hpp>
-#include <kernel/DEMHelperKernels.cuh>
-#include <core/utils/GpuError.h>
-#include <core/utils/Timer.hpp>
-
-#include <DEM/BdrsAndObjs.h>
-#include <DEM/Defines.h>
-#include <DEM/Structs.h>
+#include "../core/utils/CudaAllocator.hpp"
+#include "../core/utils/ThreadManager.h"
+#include "../core/utils/GpuManager.h"
+#include "../core/utils/DataMigrationHelper.hpp"
+#include "../core/utils/GpuError.h"
+#include "../core/utils/Timer.hpp"
+
+#include "BdrsAndObjs.h"
+#include "Defines.h"
+#include "Structs.h"
 
 // Forward declare jitify::Program to avoid downstream dependency
 namespace jitify {

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

@@ -5,6 +5,7 @@
 
 #include <filesystem>
 #include <cstring>
+
 #include "DEMEPaths.h"
 #include <iostream>
 #include <core/utils/JitHelper.h>

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

@@ -9,8 +9,7 @@
 #include <filesystem>
 #include <cstring>
 
-#include <core/ApiVersion.h>
-#include <core/utils/RuntimeData.h>
+#include "RuntimeData.h"
 
 namespace deme {
 

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

@@ -9,8 +9,8 @@
 #include <cassert>
 #include <optional>
 #include <unordered_map>
-#include <core/utils/GpuError.h>
-#include <DEM/VariableTypes.h>
+#include "GpuError.h"
+#include "../../DEM/VariableTypes.h"
 
 namespace deme {
 

{deme-2.1.2 → deme-2.1.4}/src/core/utils/GpuManager.cpp

@@ -2,6 +2,7 @@
 #include <stdexcept>
 #include <iostream>
 
+#include <core/ApiVersion.h>
 #include "GpuManager.h"
 #include "GpuError.h"
 

{deme-2.1.2 → deme-2.1.4}/src/core/utils/GpuManager.h

@@ -4,7 +4,6 @@
 #include <cuda_runtime_api.h>
 #include <vector>
 #include <mutex>
-#include <core/ApiVersion.h>
 
 // A device number manager that evenly distributes the streams needed to all the available devices
 class GpuManager {

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

@@ -9,9 +9,8 @@
 #include <regex>
 
 #include <core/ApiVersion.h>
-#include <core/utils/RuntimeData.h>
-#include <core/utils/JitHelper.h>
-#include <core/utils/DEMEPaths.h>
+#include "RuntimeData.h"
+#include "JitHelper.h"
 
 jitify::JitCache JitHelper::kcache;
 

{deme-2.1.2 → deme-2.1.4}/src/demo/DEMdemo_GRCPrep_Part1.cpp

@@ -31,8 +31,9 @@ int main() {
     DEMSolver DEMSim;
     DEMSim.SetVerbosity(INFO);
     DEMSim.SetOutputFormat(OUTPUT_FORMAT::CSV);
-    // DEMSim.SetOutputContent(OUTPUT_CONTENT::FAMILY);
     DEMSim.SetOutputContent(OUTPUT_CONTENT::XYZ);
+    // Let the contact output file include "GEO_ID" geoA and geoB (not just owner IDs A and B, but their components)
+    DEMSim.SetContactOutputContent({"OWNER", "GEO_ID", "FORCE", "POINT", "CNT_WILDCARD"});
 
     srand(759);
 

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

@@ -3,14 +3,13 @@
 #ifndef DEME_HELPER_KERNELS_CU
 #define DEME_HELPER_KERNELS_CU
 
-#include <DEM/Defines.h>
-
-// CUDAMathHelpers.cuh is used in static compilation, and that needs to be found through src then kernel. But at
-// runtime, we ask jitify to find include files only at same level of all other fellow kernel files.
-#ifdef DEME_BEING_CMAKE_COMPILED
-    #include <kernel/CUDAMathHelpers.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
-    #include <CUDAMathHelpers.cuh>
+    #include "../DEM/Defines.h"
 #endif
 
 // inline __device__ voxelID_t position2VoxelID

deme-2.1.2/PKG-INFO

@@ -1,15 +0,0 @@
-Metadata-Version: 2.1
-Name: deme
-Version: 2.1.2
-Summary: PyBind Wrapper Library for DEM-Engine
-Home-page: UNKNOWN
-Author: Ruochun Zhang
-Author-email: ruochunz@gmail.com
-License: UNKNOWN
-Platform: UNKNOWN
-Provides-Extra: dev
-Provides-Extra: test
-License-File: LICENSE.md
-
-UNKNOWN
-

deme-2.1.2/deme.egg-info/PKG-INFO

@@ -1,15 +0,0 @@
-Metadata-Version: 2.1
-Name: deme
-Version: 2.1.2
-Summary: PyBind Wrapper Library for DEM-Engine
-Home-page: UNKNOWN
-Author: Ruochun Zhang
-Author-email: ruochunz@gmail.com
-License: UNKNOWN
-Platform: UNKNOWN
-Provides-Extra: dev
-Provides-Extra: test
-License-File: LICENSE.md
-
-UNKNOWN
-

deme-2.1.2/pyproject.toml

@@ -1,2 +0,0 @@
-[build-system]
-requires = ["setuptools ~= 58.0", "pybind11", "cython ~= 0.29.0"]