DEME 2.0.0__tar.gz → 2.0.2__tar.gz

{DEME-2.0.0 → deme-2.0.2}/CMakeLists.txt

@@ -35,6 +35,8 @@ set(CMAKE_USE_WIN32_THREADS_INIT 0)
 set(CMAKE_USE_PTHREADS_INIT 1)
 set(THREADS_PREFER_PTHREAD_FLAG ON)
 
+# Mark compile time (not runtime), affects how some kernel files include
+add_compile_definitions(DEME_BEING_CMAKE_COMPILED)
 
 # ---------------------------------------------------------------------------- #
 # Additional Packages

{DEME-2.0.0 → deme-2.0.2}/PKG-INFO

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

{DEME-2.0.0/DEME.egg-info → deme-2.0.2/deme.egg-info}/PKG-INFO

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

{DEME-2.0.0/DEME.egg-info → deme-2.0.2/deme.egg-info}/SOURCES.txt

@@ -5,12 +5,6 @@ README.md
 packaging_instructions.txt
 pyproject.toml
 setup.py
-DEME.egg-info/PKG-INFO
-DEME.egg-info/SOURCES.txt
-DEME.egg-info/dependency_links.txt
-DEME.egg-info/not-zip-safe
-DEME.egg-info/requires.txt
-DEME.egg-info/top_level.txt
 cmake/CudaSupportedArchitectures.cmake
 cmake/CxxStdAutodetect.cmake
 cmake/DEMEConfig.cmake.in
@@ -43,6 +37,12 @@ data/mesh/rover_wheels/curiosity_wheel.obj
 data/mesh/rover_wheels/curiosity_wheel_surface.obj
 data/mesh/rover_wheels/viper_wheel_right.obj
 data/sim_data/example_cnt_pairs.csv
+deme.egg-info/PKG-INFO
+deme.egg-info/SOURCES.txt
+deme.egg-info/dependency_links.txt
+deme.egg-info/not-zip-safe
+deme.egg-info/requires.txt
+deme.egg-info/top_level.txt
 src/.format_all
 src/DEM/API.h
 src/DEM/APIPrivate.cpp

{DEME-2.0.0 → deme-2.0.2}/packaging_instructions.txt

@@ -7,7 +7,7 @@ To perform a pip distribution, follow the steps listed below:
 3. Make sure you conda install cmake.
 4. Run the following command in the DEM-Engine directory: python -m build .
 5. Download Twine in order to upload packages to pyPi: python3 -m pip install --upgrade twine
-6. Upload the built package from the following command: python3 -m twine upload --repository pypi dist/DEME-<VERSION>.tar.gz
+6. Upload the built package from the following command: python3 -m twine upload --repository pypi dist/deme-<VERSION>.tar.gz
 
 NOTE: You will be prompted for a username after step 5. Enter '__token__' as the username, and enter your PyPi token obtained
 from the UW-SBEL pypi.org account.

{DEME-2.0.0 → deme-2.0.2}/setup.py

@@ -147,8 +147,8 @@ class CMakeBuild(build_ext):
 # The information here can also be placed in setup.cfg - better separation of
 # logic and declaration, and simpler if you include description/version in a file.
 setup(
-    name="DEME",
-    version="2.0.0",
+    name="deme",
+    version="2.0.2",
     author="Ruochun Zhang",
     author_email="ruochunz@gmail.com",
     description="PyBind Wrapper Library for DEM-Engine",

{DEME-2.0.0 → deme-2.0.2}/src/DEM/PyDEME.cpp

@@ -390,7 +390,7 @@ PYBIND11_MODULE(DEME, obj) {
                  &deme::DEMTracker::GetContactForcesAndLocalTorque),
              "Get all contact forces and local torques that concern this tracked object, as a list.",
              py::arg("offset") = 0)
-     .def("GetContactForcesAndLocalTorqueForAll",
+        .def("GetContactForcesAndLocalTorqueForAll",
              static_cast<std::vector<std::vector<std::vector<float>>> (deme::DEMTracker::*)()>(
                  &deme::DEMTracker::GetContactForcesAndLocalTorqueForAll),
              "Get all contact forces and local torques that concern all objects tracked by this tracker, as a list.")
@@ -400,7 +400,7 @@ PYBIND11_MODULE(DEME, obj) {
                  &deme::DEMTracker::GetContactForcesAndGlobalTorque),
              "Get all contact forces and global torques that concern this tracked object, as a list.",
              py::arg("offset") = 0)
-          .def("GetContactForcesAndGlobalTorqueForAll",
+        .def("GetContactForcesAndGlobalTorqueForAll",
              static_cast<std::vector<std::vector<std::vector<float>>> (deme::DEMTracker::*)()>(
                  &deme::DEMTracker::GetContactForcesAndGlobalTorqueForAll),
              "Get all contact forces and global torques that concern all objects tracked by this tracker, as a list.")
@@ -409,7 +409,7 @@ PYBIND11_MODULE(DEME, obj) {
              static_cast<std::vector<std::vector<std::vector<float>>> (deme::DEMTracker::*)(size_t)>(
                  &deme::DEMTracker::GetContactForces),
              "Get all contact forces that concern this tracked object, as a list.", py::arg("offset") = 0)
-          .def("GetContactForcesForAll",
+        .def("GetContactForcesForAll",
              static_cast<std::vector<std::vector<std::vector<float>>> (deme::DEMTracker::*)()>(
                  &deme::DEMTracker::GetContactForcesForAll),
              "Get all contact forces that concern all objects tracked by this tracker, as a list.");
@@ -1021,7 +1021,7 @@ PYBIND11_MODULE(DEME, obj) {
         .def("SetExpandSafetyMultiplier", &deme::DEMSolver::SetExpandSafetyMultiplier,
              "Assign a multiplier to our estimated maximum system velocity, when deriving the thinckness of the "
              "contact `safety' margin.")
-        .def("Initialize", &deme::DEMSolver::Initialize, "Initializes the system.")
+        .def("Initialize", &deme::DEMSolver::Initialize, "Initializes the system.", py::arg("dry_run") = false)
         .def("WriteSphereFile",
              static_cast<void (deme::DEMSolver::*)(const std::string&) const>(&deme::DEMSolver::WriteSphereFile),
              "Writes the current status of clumps (but decomposed as spheres) file.")

{DEME-2.0.0 → deme-2.0.2}/src/algorithms/CMakeLists.txt

@@ -7,8 +7,6 @@ message(STATUS "==== Configuring GPU Algorithm Components ====")
 
 set (algorithms_message "[algorithms]")
 
-
-
 add_library(algorithms OBJECT)
 
 target_include_directories(

{DEME-2.0.0 → deme-2.0.2}/src/kernel/DEMHelperKernels.cuh

@@ -4,7 +4,14 @@
 #define DEME_HELPER_KERNELS_CU
 
 #include <DEM/Defines.h>
-#include <kernel/CUDAMathHelpers.cuh>
+
+// 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>
+#else
+    #include <CUDAMathHelpers.cuh>
+#endif
 
 // inline __device__ voxelID_t position2VoxelID