DEME 0.2.4__tar.gz → 0.2.6__tar.gz

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

@@ -46,7 +46,7 @@ add_subdirectory(thirdparty/pybind11)
 set(CMAKE_SKIP_BUILD_RPATH FALSE)
 set(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE)
 
-set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib")
+set(CMAKE_INSTALL_RPATH "$ENV{CONDA_PREFIX}/lib/python3.10/site-packages/lib")
 set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
 
 # Find CUB library (this might need to be done in source-level config)
@@ -93,6 +93,11 @@ set_property(
 	STRINGS STD_AUTODETECT STD_CXX11 STD_CXX14 STD_CXX17 STD_CXX20
 )
 
+# Defining option to build PyDEME wrapper
+
+option(PYTHON_BUILD "Sets the build process for Python wrapper around DEME" OFF)
+mark_as_advanced(PYTHON_BUILD)
+
 # Convert the standard into something CMake will understand
 if(TargetCXXStandard STREQUAL STD_CXX11)
 	set(CXXSTD_MAX 11)
@@ -149,7 +154,7 @@ target_link_libraries(simulator_multi_gpu
 	PUBLIC CUDA::nvrtc
 	PUBLIC CUDA::cuda_driver
 	PUBLIC ${ChPF_IMPORTED_NAME}
-	PUBLIC DEMERuntimeDataHelper
+	PUBLIC DEMERuntimeDataHelper_install
 	PUBLIC ${PYTHON_LIBRARIES}
 )
 

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

@@ -1,9 +1,16 @@
 Metadata-Version: 2.1
 Name: DEME
-Version: 0.2.4
+Version: 0.2.6
 Summary: PyBind Wrapper Library for DEM-Engine
+Home-page: UNKNOWN
 Author: Rouchun Zhang
 Author-email: noreply@wisc.edu
+License: UNKNOWN
+Platform: UNKNOWN
 Requires-Python: >=3.8
+Provides-Extra: dev
 Provides-Extra: test
 License-File: LICENSE.md
+
+UNKNOWN
+

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

@@ -2,6 +2,7 @@ CMakeLists.txt
 LICENSE.md
 MANIFEST.in
 README.md
+pyproject.toml
 setup.py
 DEME.egg-info/PKG-INFO
 DEME.egg-info/SOURCES.txt
@@ -64,10 +65,6 @@ src/DEME.egg-info/dependency_links.txt
 src/DEME.egg-info/not-zip-safe
 src/DEME.egg-info/requires.txt
 src/DEME.egg-info/top_level.txt
-src/UNKNOWN.egg-info/PKG-INFO
-src/UNKNOWN.egg-info/SOURCES.txt
-src/UNKNOWN.egg-info/dependency_links.txt
-src/UNKNOWN.egg-info/top_level.txt
 src/algorithms/CMakeLists.txt
 src/algorithms/DEMCubBasedSubroutines.h
 src/algorithms/DEMCubContactDetection.cu

{DEME-0.2.4/src → DEME-0.2.6}/DEME.egg-info/requires.txt

@@ -1,4 +1,8 @@
 numpy
+pybind11
+
+[dev]
+pybind11
 
 [test]
 pytest>=6.0

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

@@ -1,9 +1,16 @@
 Metadata-Version: 2.1
 Name: DEME
-Version: 0.2.4
+Version: 0.2.6
 Summary: PyBind Wrapper Library for DEM-Engine
+Home-page: UNKNOWN
 Author: Rouchun Zhang
 Author-email: noreply@wisc.edu
+License: UNKNOWN
+Platform: UNKNOWN
 Requires-Python: >=3.8
+Provides-Extra: dev
 Provides-Extra: test
 License-File: LICENSE.md
+
+UNKNOWN
+

DEME-0.2.6/pyproject.toml

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

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

@@ -5,7 +5,8 @@ import sys
 from pathlib import Path
 
 from setuptools import Extension, setup
-from setuptools.command.build_ext import build_ext
+from pybind11.setup_helpers import Pybind11Extension, build_ext
+# from setuptools.command.build_ext import build_ext
 
 # Convert distutils Windows platform specifiers to CMake -A arguments
 PLAT_TO_CMAKE = {
@@ -18,13 +19,16 @@ PLAT_TO_CMAKE = {
 # A CMakeExtension needs a sourcedir instead of a file list.
 # The name must be the _single_ output extension from the CMake build.
 # If you need multiple extensions, see scikit-build.
-class CMakeExtension(Extension):
+
+
+class CMakeExtension(Pybind11Extension):
     def __init__(self, name: str, sourcedir: str = "") -> None:
-        
+
         # Obtaining conda_prefix environment variable
         conda_prefix = os.environ.get("CONDA_PREFIX")
 
-        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"])
+        super().__init__(name, sources=[], extra_link_args=['--no-as-needed', '-Wl,-rpath,' + conda_prefix + '/lib/python3.10/site-packages/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())
 
 
@@ -32,13 +36,15 @@ class CMakeBuild(build_ext):
     def build_extension(self, ext: CMakeExtension) -> None:
         # Must be in this form due to bug in .resolve() only fixed in Python 3.10+
         ext_fullpath = Path.cwd() / self.get_ext_fullpath(ext.name)
-        
-        extdir = os.path.abspath(os.path.dirname(self.get_ext_fullpath(ext.name)))
+
+        extdir = os.path.abspath(os.path.dirname(
+            self.get_ext_fullpath(ext.name)))
 
         # Using this requires trailing slash for auto-detection & inclusion of
         # auxiliary "native" libs
 
-        debug = int(os.environ.get("DEBUG", 0)) if self.debug is None else self.debug
+        debug = int(os.environ.get("DEBUG", 0)
+                    ) if self.debug is None else self.debug
         cfg = "Debug" if debug else "Release"
 
         # CMake lets you override the generator - we need to check this.
@@ -49,6 +55,7 @@ class CMakeBuild(build_ext):
         # EXAMPLE_VERSION_INFO shows you how to pass a value into the C++ code
         # from Python.
         cmake_args = [
+            f"-DPYTHON_BUILD=ON",
             f"-DCMAKE_LIBRARY_OUTPUT_DIRECTORY={extdir}{os.sep}",
             f"-DPYTHON_EXECUTABLE={sys.executable}",
             f"-DCMAKE_INSTALL_PREFIX={extdir}{os.sep}",
@@ -60,10 +67,12 @@ class CMakeBuild(build_ext):
         # Adding CMake arguments set as environment variable
         # (needed e.g. to build for ARM OSx on conda-forge)
         if "CMAKE_ARGS" in os.environ:
-            cmake_args += [item for item in os.environ["CMAKE_ARGS"].split(" ") if item]
+            cmake_args += [
+                item for item in os.environ["CMAKE_ARGS"].split(" ") if item]
 
         # In this example, we pass in the version to C++. You might not need to.
-        cmake_args += [f"-DEXAMPLE_VERSION_INFO={self.distribution.get_version()}"]
+        cmake_args += [
+            f"-DEXAMPLE_VERSION_INFO={self.distribution.get_version()}"]
 
         if self.compiler.compiler_type != "msvc":
             # Using Ninja-build since it a) is available as a wheel and b)
@@ -85,7 +94,8 @@ class CMakeBuild(build_ext):
 
         else:
             # Single config generators are handled "normally"
-            single_config = any(x in cmake_generator for x in {"NMake", "Ninja"})
+            single_config = any(
+                x in cmake_generator for x in {"NMake", "Ninja"})
 
             # CMake allows an arch-in-generator style for backward compatibility
             contains_arch = any(x in cmake_generator for x in {"ARM", "Win64"})
@@ -107,7 +117,8 @@ class CMakeBuild(build_ext):
             # Cross-compile support for macOS - respect ARCHFLAGS if set
             archs = re.findall(r"-arch (\S+)", os.environ.get("ARCHFLAGS", ""))
             if archs:
-                cmake_args += ["-DCMAKE_OSX_ARCHITECTURES={}".format(";".join(archs))]
+                cmake_args += [
+                    "-DCMAKE_OSX_ARCHITECTURES={}".format(";".join(archs))]
 
         # Set CMAKE_BUILD_PARALLEL_LEVEL to control the parallel build level
         # across all generators.
@@ -129,14 +140,15 @@ class CMakeBuild(build_ext):
         subprocess.run(
             ["cmake", "--build", ".", "-j 8", *build_args], cwd=build_temp, check=True
         )
-        
+
         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.4",
+    version="0.2.6",
     author="Rouchun Zhang",
     author_email="noreply@wisc.edu",
     description="PyBind Wrapper Library for DEM-Engine",
@@ -146,7 +158,7 @@ setup(
     zip_safe=False,
     include_package_data=True,
     sources=["./src/"],
-    install_requires=['numpy'],
-    extras_require={"test": ["pytest>=6.0"]},
+    install_requires=['numpy', 'pybind11'],
+    extras_require={"dev": ['pybind11'], "test": ["pytest>=6.0"]},
     python_requires=">=3.8",
 )

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

@@ -25,6 +25,7 @@ target_link_libraries(
 	PUBLIC ${PYTHON_LIBRARIES}
 	PUBLIC ${CMAKE_INSTALL_INCLUDEDIR}/DEM
 	PUBLIC core
+	PUBLIC DEMERuntimeDataHelper_install
 	PUBLIC algorithms
 	pybind11::headers
 	-static-libgcc -static-libstdc++
@@ -87,6 +88,7 @@ target_link_libraries(
 	PUBLIC ${PYTHON_LIBRARIES}
 	PUBLIC ${CMAKE_INSTALL_INCLUDEDIR}/DEM
 	PUBLIC pybind11::headers
+	PUBLIC DEMERuntimeDataHelper_install
 	PUBLIC core
 	PUBLIC algorithms
 	-static-libgcc -static-libstdc++
@@ -110,45 +112,48 @@ install(
 		PATTERN "utils/*.hpp"
 )
 
-message(STATUS "==== Building PyDEME Components ====")
-
-pybind11_add_module(DEME ${DEM_headers} ${DEM_sources} ${PyDEME_sources})
-
-set_target_properties(DEME PROPERTIES LINKER_LANGUAGE CXX)
-
-target_include_directories(
-	DEME
-	PUBLIC ${CMAKE_CUDA_TOOLKIT_INCLUDE_DIRECTORIES}
-	PUBLIC ${ProjectIncludeSource}
-	PUBLIC ${ProjectIncludeGenerated}
-	PUBLIC ${NVIDIAMathDir}
-	PUBLIC ${CMAKE_INSTALL_INCLUDEDIR}/DEM
-	PUBLIC ${CMAKE_INSTALL_INCLUDEDIR}/core
-	PUBLIC ${CMAKE_INSTALL_INCLUDEDIR}/algorithms
-)
-
-target_link_libraries(
-	DEME
-	PUBLIC CUDA::cudart
-        PUBLIC CUDA::nvrtc
-	PUBLIC CUDA::cuda_driver	
-	PUBLIC ${ChPF_IMPORTED_NAME}
-	PUBLIC ${PYTHON_LIBRARIES}
-	PUBLIC core
-	PUBLIC DEMERuntimeDataHelper
-	PUBLIC algorithms
-	PUBLIC pybind11::headers
-	-static-libgcc -static-libstdc++
-)
-
-set_target_properties(
-	DEME PROPERTIES
-	POSITION_INDEPENDENT_CODE True
-	CXX_STANDARD ${CXXSTD_SUPPORTED}
-	PUBLIC_HEADER "${DEM_headers}"
-	INSTALL_RPATH "$ENV{CONDA_PREFIX}/lib/python3.10/site-packages/lib"
-)
-
-add_compile_options(-fno-lto)
-
-message(STATUS "==== Completed Building PyDEME Components ====")
+if(PYTHON_BUILD)
+	message(STATUS "==== Building PyDEME Components ====")
+
+	pybind11_add_module(DEME ${DEM_headers} ${DEM_sources} ${PyDEME_sources})
+
+	set_target_properties(DEME PROPERTIES LINKER_LANGUAGE CXX)
+
+	target_include_directories(
+		DEME
+		PUBLIC ${CMAKE_CUDA_TOOLKIT_INCLUDE_DIRECTORIES}
+		PUBLIC ${ProjectIncludeSource}
+		PUBLIC ${ProjectIncludeGenerated}
+		PUBLIC ${NVIDIAMathDir}
+		PUBLIC ${CMAKE_INSTALL_INCLUDEDIR}/DEM
+		PUBLIC ${CMAKE_INSTALL_INCLUDEDIR}/core
+		PUBLIC ${CMAKE_INSTALL_INCLUDEDIR}/algorithms
+	)
+
+	target_link_libraries(
+		DEME
+		PUBLIC CUDA::cudart
+		PUBLIC CUDA::nvrtc
+		PUBLIC CUDA::cuda_driver	
+		PUBLIC ${ChPF_IMPORTED_NAME}
+		PUBLIC ${PYTHON_LIBRARIES}
+		PUBLIC core
+		PUBLIC DEMERuntimeDataHelper_install
+		PUBLIC algorithms
+		PUBLIC pybind11::headers
+		PRIVATE pybind11::embed
+		-static-libgcc -static-libstdc++
+	)
+
+	set_target_properties(
+		DEME PROPERTIES
+		POSITION_INDEPENDENT_CODE True
+		CXX_STANDARD ${CXXSTD_SUPPORTED}
+		PUBLIC_HEADER "${DEM_headers}"
+		INSTALL_RPATH "$ENV{CONDA_PREFIX}/lib/python3.10/site-packages/lib"
+	)
+
+	add_compile_options(-fno-lto)
+
+	message(STATUS "==== Completed Building PyDEME Components ====")
+endif()

{DEME-0.2.4 → DEME-0.2.6}/src/DEM/PyDEME.cpp

@@ -13,7 +13,9 @@
 #include <sstream>
 #include <array>
 #include <cmath>
+#include <string>
 
+#include <core/utils/RuntimeData.h>
 #include <nvmath/helper_math.cuh>
 #include <DEM/Defines.h>
 #include <DEM/Structs.h>
@@ -23,21 +25,35 @@
 
 namespace py = pybind11;
 
-// Defining PyBind11 inclusion code
-
 PYBIND11_MODULE(DEME, obj) {
+    // Obtaining the location of python's site-packages dynamically and setting it
+    // as path prefix
+
+    py::module _site = py::module_::import("site");
+    std::string loc = _site.attr("getsitepackages")().cast<py::list>()[0].cast<py::str>();
+
+    std::filesystem::path path = loc;
+
+    RuntimeDataHelper::SetPathPrefix(path);
+
     obj.def("GetDEMEDataFile", &deme::GetDEMEDataFile);
     obj.def("DEMBoxGridSampler",
             static_cast<std::vector<std::vector<float>> (*)(const std::vector<float>&, const std::vector<float>&, float,
                                                             float, float)>(&deme::DEMBoxGridSampler),
             py::arg("BoxCenter"), py::arg("HalfDims"), py::arg("GridSizeX"), py::arg("GridSizeY") = -1.0,
             py::arg("GridSizeZ") = -1.0);
+
     obj.def(
         "DEMBoxHCPSampler",
         static_cast<std::vector<std::vector<float>> (*)(const std::vector<float>&, const std::vector<float>&, float)>(
             &deme::DEMBoxHCPSampler));
+
     obj.attr("PI") = py::float_(3.14);
 
+    py::class_<RuntimeDataHelper>(obj, "RuntimeDataHelper")
+        .def(py::init<>())
+        .def_static("SetPathPrefix", &RuntimeDataHelper::SetPathPrefix);
+
     py::class_<deme::GridSampler>(obj, "GridSampler")
         .def(py::init<float>())
         .def("SetSeparation", &deme::GridSampler::SetSeparation)
@@ -45,15 +61,20 @@ PYBIND11_MODULE(DEME, obj) {
              static_cast<std::vector<std::vector<float>> (deme::GridSampler::*)(
                  const std::vector<float>& center, const std::vector<float>& halfDim)>(&deme::GridSampler::SampleBox),
              "Generates a sample box")
+
         .def("SampleSphere",
              static_cast<std::vector<std::vector<float>> (deme::GridSampler::*)(const std::vector<float>&, float)>(
                  &deme::GridSampler::SampleSphere))
+
         .def("SampleCylinderX", static_cast<std::vector<std::vector<float>> (deme::GridSampler::*)(
                                     const std::vector<float>&, float, float)>(&deme::GridSampler::SampleCylinderX))
+
         .def("SampleCylinderY", static_cast<std::vector<std::vector<float>> (deme::GridSampler::*)(
                                     const std::vector<float>&, float, float)>(&deme::GridSampler::SampleCylinderY))
+
         .def("SampleCylinderZ", static_cast<std::vector<std::vector<float>> (deme::GridSampler::*)(
                                     const std::vector<float>&, float, float)>(&deme::GridSampler::SampleCylinderZ))
+
         .def("GetSeparation", &deme::Sampler::GetSeparation);
 
     py::class_<deme::HCPSampler>(obj, "HCPSampler")
@@ -62,22 +83,27 @@ PYBIND11_MODULE(DEME, obj) {
              static_cast<std::vector<std::vector<float>> (deme::HCPSampler::*)(
                  const std::vector<float>& center, const std::vector<float>& halfDim)>(&deme::HCPSampler::SampleBox),
              "Generates a sample box")
+
         .def("SetSeparation", &deme::HCPSampler::SetSeparation)
         .def("SampleSphere",
              static_cast<std::vector<std::vector<float>> (deme::HCPSampler::*)(const std::vector<float>&, float)>(
                  &deme::HCPSampler::SampleSphere))
+
         .def(
             "SampleCylinderX",
             static_cast<std::vector<std::vector<float>> (deme::HCPSampler::*)(const std::vector<float>&, float, float)>(
                 &deme::HCPSampler::SampleCylinderX))
+
         .def(
             "SampleCylinderY",
             static_cast<std::vector<std::vector<float>> (deme::HCPSampler::*)(const std::vector<float>&, float, float)>(
                 &deme::HCPSampler::SampleCylinderY))
+
         .def(
             "SampleCylinderZ",
             static_cast<std::vector<std::vector<float>> (deme::HCPSampler::*)(const std::vector<float>&, float, float)>(
                 &deme::HCPSampler::SampleCylinderZ))
+
         .def("GetSeparation", &deme::HCPSampler::GetSeparation);
 
     py::class_<deme::DEMInspector, std::shared_ptr<deme::DEMInspector>>(obj, "DEMInspector")

{DEME-0.2.4 → DEME-0.2.6}/src/algorithms/CMakeLists.txt

@@ -20,6 +20,7 @@ target_include_directories(
 
 target_link_libraries(
 	algorithms
+	PUBLIC DEMERuntimeDataHelper_install
 	PUBLIC CUB::CUB
 )
 

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

@@ -5,6 +5,85 @@
 
 message(STATUS "==== Configuring Core Components ====")
 
+# --------------------------------------------------------- #
+# Runtime data path helper library
+# --------------------------------------------------------- #
+
+
+message(STATUS "${core_message} Generating Runtime Data helper (build)...")
+
+set(RUNTIME_DATA_DIRECTORY "${CMAKE_BINARY_DIR}")
+set(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)... ${CONDA_PREFIX}")
+
+set(RUNTIME_DATA_DIRECTORY "$ENV{CONDA_PREFIX}/lib/python3.10/site-packages/share/DEME")
+set(RUNTIME_INCLUDE_DIRECTORY "$ENV{CONDA_PREFIX}/lib/python3.10/site-packages/include")
+
+configure_file(
+	utils/RuntimeData.cpp.in utils/RuntimeDataInstall.cpp
+	@ONLY
+)
+
+## if not a python build, use these
+
+# Build tree version
+
+add_library(DEMERuntimeDataHelper SHARED)
+
+target_sources(DEMERuntimeDataHelper
+	PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/utils/RuntimeData.h> $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/core/utils/RuntimeData.h>
+	PRIVATE "${CMAKE_BINARY_DIR}/src/core/utils/RuntimeDataBuild.cpp"
+)
+
+target_include_directories(
+	DEMERuntimeDataHelper
+	PUBLIC $<BUILD_INTERFACE:${ProjectIncludeSource}> $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>
+)
+
+set_target_properties(
+	DEMERuntimeDataHelper PROPERTIES
+	POSITION_INDEPENDENT_CODE True
+	CXX_STANDARD "${CXXSTD_SUPPORTED}"
+)
+
+# Install tree version
+
+##
+## This MUST be installed after the Build tree version as it overwrites the .so file
+##
+
+add_library(DEMERuntimeDataHelper_install SHARED)
+
+target_sources(DEMERuntimeDataHelper_install
+	PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/utils/RuntimeData.h> $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/core/utils/RuntimeData.h>
+	PRIVATE "${CMAKE_BINARY_DIR}/src/core/utils/RuntimeDataInstall.cpp"
+)
+
+target_include_directories(
+	DEMERuntimeDataHelper_install
+	PUBLIC $<BUILD_INTERFACE:${ProjectIncludeSource}> $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>
+)
+
+set_target_properties(
+	DEMERuntimeDataHelper_install PROPERTIES
+	POSITION_INDEPENDENT_CODE True
+	CXX_STANDARD "${CXXSTD_SUPPORTED}"
+	LIBRARY_OUTPUT_NAME "DEMERuntimeDataHelper")
+
+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)
+
 set (core_message "[core]")
 message(STATUS "${core_message} Generating API version header...")
 configure_file(
@@ -13,7 +92,8 @@ configure_file(
 	@ONLY
 )
 
-
+## If a python package, build the library as STATIC, expecting the value
+## to be overwritten by __init__.py
 
 message(STATUS "${core_message} Extracting NVIDIA Jitify header...")
 configure_file(
@@ -24,7 +104,6 @@ configure_file(
 
 add_library(core OBJECT)
 
-
 target_include_directories(
 	core
 	PUBLIC $<BUILD_INTERFACE:${ProjectIncludeSource}> $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>
@@ -34,6 +113,7 @@ target_include_directories(
 
 target_link_libraries(
 	core
+	PUBLIC DEMERuntimeDataHelper_install
 	PUBLIC CUB::CUB
 	INTERFACE ${ChPF_IMPORTED_NAME}
 )
@@ -102,82 +182,3 @@ install(
 		${CMAKE_INSTALL_INCLUDEDIR}/jitify
 )
 
-
-# --------------------------------------------------------- #
-# Runtime data path helper library
-# --------------------------------------------------------- #
-
-
-message(STATUS "${core_message} Generating Runtime Data helper (build)...")
-
-set(RUNTIME_DATA_DIRECTORY "${CMAKE_BINARY_DIR}")
-set(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)... ${CONDA_PREFIX}")
-
-set(RUNTIME_DATA_DIRECTORY "$ENV{CONDA_PREFIX}/lib/python3.10/site-packages/share/DEME")
-set(RUNTIME_INCLUDE_DIRECTORY "$ENV{CONDA_PREFIX}/lib/python3.10/site-packages/include")
-
-configure_file(
-	utils/RuntimeData.cpp.in utils/RuntimeDataInstall.cpp
-	@ONLY
-)
-
-# Build tree version
-
-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>
-	PRIVATE "${CMAKE_BINARY_DIR}/src/core/utils/RuntimeDataBuild.cpp"
-)
-
-target_include_directories(
-	DEMERuntimeDataHelper
-	PUBLIC $<BUILD_INTERFACE:${ProjectIncludeSource}> $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>
-)
-
-set_target_properties(
-	DEMERuntimeDataHelper PROPERTIES
-	POSITION_INDEPENDENT_CODE True
-	CXX_STANDARD "${CXXSTD_SUPPORTED}"
-)
-
-# Install tree version
-
-##
-## This MUST be installed after the Build tree version as it overwrites the .so file
-##
-
-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>
-	PRIVATE "${CMAKE_BINARY_DIR}/src/core/utils/RuntimeDataInstall.cpp"
-)
-
-target_include_directories(
-	DEMERuntimeDataHelper_install
-	PUBLIC $<BUILD_INTERFACE:${ProjectIncludeSource}> $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>
-)
-
-set_target_properties(
-	DEMERuntimeDataHelper_install PROPERTIES
-	POSITION_INDEPENDENT_CODE True
-	CXX_STANDARD "${CXXSTD_SUPPORTED}"
-#	LIBRARY_OUTPUT_NAME "DEMERuntimeDataHelper"
-)
-
-#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)
-

{DEME-0.2.4 → DEME-0.2.6}/src/core/utils/RuntimeData.cpp.in

@@ -14,3 +14,10 @@ std::filesystem::path RuntimeDataHelper::data_path = std::filesystem::path(RUNTI
 // 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);
 
+// 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(std::filesystem::path& p) {
+    data_path = p / "share/DEME";
+    include_path = p / "include";
+}

{DEME-0.2.4 → DEME-0.2.6}/src/core/utils/RuntimeData.h

@@ -12,6 +12,9 @@ class RuntimeDataHelper {
   public:
     static std::filesystem::path data_path;
     static std::filesystem::path include_path;
+
+    // or std::string
+    static void SetPathPrefix(std::filesystem::path& p);
 };
 
 #endif

{DEME-0.2.4 → DEME-0.2.6}/src/demo/CMakeLists.txt

@@ -52,6 +52,7 @@ FOREACH(PROGRAM ${DEMOS})
 		
 		target_link_libraries(${PROGRAM} 
 			PUBLIC ${LIBRARIES}
+			PUBLIC DEMERuntimeDataHelper_install
 			PUBLIC ${EXTERNAL_LIBRARIES}
 		)
 		

DEME-0.2.4/src/UNKNOWN.egg-info/PKG-INFO

@@ -1,4 +0,0 @@
-Metadata-Version: 2.1
-Name: UNKNOWN
-Version: 0.0.0
-License-File: LICENSE.md