DEME 0.2.1__tar.gz → 0.2.4__tar.gz

{DEME-0.2.1 → DEME-0.2.4}/CMakeLists.txt

@@ -39,7 +39,7 @@ include(FetchContent)
 
 
 find_package(CUDAToolkit REQUIRED)
-find_package(PythonLibs REQUIRED)
+find_package(Python COMPONENTS Interpreter Development)
 
 add_subdirectory(thirdparty/pybind11)
 

{DEME-0.2.1 → DEME-0.2.4/DEME.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: DEME
-Version: 0.2.1
+Version: 0.2.4
 Summary: PyBind Wrapper Library for DEM-Engine
 Author: Rouchun Zhang
 Author-email: noreply@wisc.edu

{DEME-0.2.1 → DEME-0.2.4}/DEME.egg-info/SOURCES.txt

@@ -123,6 +123,10 @@ src/demo/pyDEME_FlexibleMesh.py
 src/demo/pyDEME_GRCPrep_Part1.py
 src/demo/pyDEME_GameOfLife.py
 src/demo/pyDEME_WheelDPSimplified.py
+src/demo/DemoOutput_BallDrop/DEMdemo_mesh_0000.vtk
+src/demo/DemoOutput_BallDrop/DEMdemo_mesh_0001.vtk
+src/demo/DemoOutput_BallDrop/DEMdemo_output_0000.csv
+src/demo/DemoOutput_BallDrop/DEMdemo_output_0001.csv
 src/kernel/CUDAMathHelpers.cu
 src/kernel/DEMBinSphereKernels.cu
 src/kernel/DEMBinTriangleKernels.cu

{DEME-0.2.1/DEME.egg-info → DEME-0.2.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: DEME
-Version: 0.2.1
+Version: 0.2.4
 Summary: PyBind Wrapper Library for DEM-Engine
 Author: Rouchun Zhang
 Author-email: noreply@wisc.edu

{DEME-0.2.1 → DEME-0.2.4}/setup.py

@@ -24,7 +24,7 @@ class CMakeExtension(Extension):
         # Obtaining conda_prefix environment variable
         conda_prefix = os.environ.get("CONDA_PREFIX")
 
-        super().__init__(name, sources=[], runtime_library_dirs=[conda_prefix + "/lib/python3.10/site-packages/lib/"], libraries=["libDEMERuntimeDataHelper"], include_dirs=["./src/DEM/", "./src/DEM/VariableTypes"], extra_objects=["./build"])
+        super().__init__(name, sources=[], extra_link_args=['-Wl,-rpath,' + conda_prefix + '/lib/python3.10/site-packages/lib', '-Wl,-rpath,$ORIGIN/lib'], runtime_library_dirs=[conda_prefix + "/lib/python3.10/site-packages/lib/"], libraries=["libDEMERuntimeDataHelper"], include_dirs=["./src/DEM/", "./src/DEM/VariableTypes"], extra_objects=["./build"])
         self.sourcedir = os.fspath(Path(sourcedir).resolve())
 
 
@@ -131,13 +131,12 @@ class CMakeBuild(build_ext):
         )
         
         subprocess.run(["make", "install"], cwd=build_temp, check=True)
-
-
+        
 # 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="0.2.1",
+    version="0.2.4",
     author="Rouchun Zhang",
     author_email="noreply@wisc.edu",
     description="PyBind Wrapper Library for DEM-Engine",

{DEME-0.2.1 → DEME-0.2.4}/src/DEM/CMakeLists.txt

@@ -146,7 +146,7 @@ set_target_properties(
 	POSITION_INDEPENDENT_CODE True
 	CXX_STANDARD ${CXXSTD_SUPPORTED}
 	PUBLIC_HEADER "${DEM_headers}"
-	INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}"
+	INSTALL_RPATH "$ENV{CONDA_PREFIX}/lib/python3.10/site-packages/lib"
 )
 
 add_compile_options(-fno-lto)

{DEME-0.2.1 → DEME-0.2.4}/src/core/CMakeLists.txt

@@ -130,7 +130,7 @@ configure_file(
 
 # Build tree version
 
-add_library(DEMERuntimeDataHelper SHARED)
+add_library(DEMERuntimeDataHelper)
 
 target_sources(DEMERuntimeDataHelper
 	PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/utils/RuntimeData.h> $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/core/utils/RuntimeData.h>
@@ -154,7 +154,7 @@ set_target_properties(
 ## This MUST be installed after the Build tree version as it overwrites the .so file
 ##
 
-add_library(DEMERuntimeDataHelper_install SHARED)
+add_library(DEMERuntimeDataHelper_install)
 
 target_sources(DEMERuntimeDataHelper_install
 	PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/utils/RuntimeData.h> $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/core/utils/RuntimeData.h>
@@ -170,13 +170,13 @@ set_target_properties(
 	DEMERuntimeDataHelper_install PROPERTIES
 	POSITION_INDEPENDENT_CODE True
 	CXX_STANDARD "${CXXSTD_SUPPORTED}"
-	LIBRARY_OUTPUT_NAME "DEMERuntimeDataHelper"
+#	LIBRARY_OUTPUT_NAME "DEMERuntimeDataHelper"
 )
 
-install(TARGETS
-	DEMERuntimeDataHelper_install 
-	LIBRARY DESTINATION "${CMAKE_INSTALL_PREFIX}/lib"
-	RUNTIME DESTINATION "${CMAKE_INSTALL_PREFIX}/bin")
+#install(TARGETS
+#	DEMERuntimeDataHelper_install 
+#	LIBRARY DESTINATION "${CMAKE_INSTALL_PREFIX}/lib"
+#	RUNTIME DESTINATION "${CMAKE_INSTALL_PREFIX}/bin")
 
 # Make sure this target is generated **AFTER** the build-tree version
 add_dependencies(DEMERuntimeDataHelper_install DEMERuntimeDataHelper)