piegy 2.1.0__tar.gz → 2.1.9__tar.gz

{piegy-2.1.0/src/piegy.egg-info → piegy-2.1.9}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: piegy
-Version: 2.1.0
+Version: 2.1.9
 Summary: Payoff-Driven Stochastic Spatial Model for Evolutionary Game Theory
 Author-email: Chenning Xu <cxu7@caltech.edu>
 License: BSD 3-Clause License
@@ -44,7 +44,7 @@ Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Operating System :: OS Independent
-Requires-Python: >=3.8
+Requires-Python: >=3.7
 Description-Content-Type: text/markdown
 License-File: LICENSE.txt
 Requires-Dist: numpy

{piegy-2.1.0 → piegy-2.1.9}/pyproject.toml

@@ -4,10 +4,10 @@ build-backend = 'setuptools.build_meta'
 
 [project]
 name = 'piegy'
-version = '2.1.0'
+version = '2.1.9'
 description = 'Payoff-Driven Stochastic Spatial Model for Evolutionary Game Theory'
 readme = 'README.md'
-requires-python = '>=3.8'
+requires-python = '>=3.7'
 license = {file = "LICENSE.txt"}
 authors = [
     {name = 'Chenning Xu', email = 'cxu7@caltech.edu'}

piegy-2.1.9/setup.py

@@ -0,0 +1,85 @@
+import subprocess
+import sys
+import os
+import re
+from setuptools import setup, Extension
+from setuptools.command.build_ext import build_ext
+from setuptools.command.build_py import build_py
+import platform
+import datetime
+import textwrap
+
+
+class BuildSharedLib(build_ext):
+    def run(self):
+        # Build your shared lib first
+        subprocess.check_call(['make', '-C', 'src/piegy/C_core', 'clean', 'so'])
+        # Then continue with normal build_ext run
+        super().run()
+
+    def build_extension(self, ext):
+        if sys.platform == 'win32':
+            lib_name = 'piegyc.dll'
+        else:
+            lib_name = 'piegyc.so'
+        so_path = os.path.abspath(f'src/piegy/C_core/{lib_name}')
+        target_path = self.get_ext_fullpath(ext.name)
+
+        os.makedirs(os.path.dirname(target_path), exist_ok=True)
+        self.copy_file(so_path, target_path)
+
+
+
+class AddCompileInfo(build_py):
+
+    def get_version(self):
+        version_file = os.path.join('src', 'piegy', '__version__.py')
+        with open(version_file, 'r', encoding='utf-8') as f:
+            content = f.read()
+        # Regex to extract __version__ = '...'
+        version_match = re.search(r'^__version__\s*=\s*[\'"]([^\'"]*)[\'"]', content, re.MULTILINE)
+        if version_match:
+            return version_match.group(1)
+        raise RuntimeError("Unable to find version string.")
+
+    def generate_build_info(self):
+        version = self.get_version()
+        build_from = os.environ.get("BUILD_TYPE", "local machine")
+        build_info_content = f'''
+        """
+        Contains build info, whether it's local built, or a pre-compiled wheel.
+        Auto-generated at compile time.
+        """
+
+        build_info = {{
+            "version": "{version}",
+            "built from": "{build_from}",
+            "build date": "{datetime.datetime.now().strftime("%Y-%m-%d %H:%M:%S")}",
+            "python version": "{platform.python_version()}",
+            "platform": "{sys.platform}"
+        }}
+        '''
+        return textwrap.dedent(build_info_content[1:])
+    
+    
+    def run(self):
+        # Write build_info.py directly before building python files
+        build_info_path = os.path.abspath(os.path.join('src/piegy/build_info.py'))
+        with open(build_info_path, 'w') as f:
+            f.write(self.generate_build_info())
+        super().run()
+
+
+# Declare the extension module (empty sources)
+ext_modules = [
+    Extension('piegy.C_core.piegyc', sources=[])
+]
+
+setup(
+    ext_modules=ext_modules,
+    cmdclass={'build_ext': BuildSharedLib, 
+              'build_py': AddCompileInfo,},
+    package_data={"piegy": ["build_info.py"]},
+    include_package_data=True,
+)
+

{piegy-2.1.0 → piegy-2.1.9}/src/piegy/C_core/Makefile

@@ -5,40 +5,36 @@ CC = gcc
 
 ## Flags for Max Speed ##
 # standard
-CFLAGS_COMMON = -O3 -flto -std=c99 -DNDEBUG -ffp-contract=fast
+CFLAGS_COMMON = -O3 -flto -std=c99 -DNDEBUG -ffp-contract=fast -MMD -MP
 LDFLAGS_COMMON = -flto
 
 ## Flags for Debugging ##
 # slower, debuggable with lldb, with Address Sanitizer. Don't use in python
-#CFLAGS = -g -std=c99 -Wall -Wextra -fsanitize=address,undefined -fno-omit-frame-pointer
+#CFLAGS = -g -std=c99 -Wall -Wextra -MMD -MP -fsanitize=address,undefined -fno-omit-frame-pointer
 #LDFLAGS = -fsanitize=address,undefined
 # slower, regular build, allow lldb
-#CFLAGS = -g -std=c99 -Wall -Wextra
+#CFLAGS = -g -std=c99 -Wall -Wextra -MMD -MP
 #LDFLAGS = 
 
-# Enable auto header dependency tracking
-DEPFLAGS = -MMD -MP
-CFLAGS += $(DEPFLAGS)
-
 
 #### OS specific ####
-UNAME_S := $(shell uname -s)
+OS := $(shell uname)
 
-ifeq ($(UNAME_S),Darwin)
-    # macOS-specific flags
-    CFLAGS = $(CFLAGS_COMMON) -fPIC -mmacosx-version-min=11.0 -arch arm64 $(DEPFLAGS)
+ifeq ($(OS),Darwin)
+    # macOS flags
+    CFLAGS = $(CFLAGS_COMMON) -fPIC -mmacosx-version-min=11.0 -arch arm64
     LDFLAGS = $(LDFLAGS_COMMON)
-else ifeq ($(UNAME_S),Linux)
-    # Linux-specific flags
-    CFLAGS = $(CFLAGS_COMMON) -fPIC $(DEPFLAGS)
+else ifeq ($(OS),Linux)
+    # Linux flags
+    CFLAGS = $(CFLAGS_COMMON) -fPIC 
     LDFLAGS = $(LDFLAGS_COMMON)
-else ifeq ($(UNAME_S),Windows_NT)
-    # Windows-specific flags
-    CFLAGS = $(CFLAGS_COMMON) -D_WIN32_WINNT=0x0A00 -DWINVER=0x0A00 $(DEPFLAGS)
+else ifeq '$(findstring ;,$(PATH))' ';'
+    # windows flags
+    CFLAGS = $(CFLAGS_COMMON) -D_WIN32_WINNT=0x0A00 -DWINVER=0x0A00
     LDFLAGS = $(LDFLAGS_COMMON)
 else
     # Default fallback
-    CFLAGS = $(CFLAGS_COMMON) -fPIC $(DEPFLAGS)
+    CFLAGS = $(CFLAGS_COMMON) -fPIC
     LDFLAGS = $(LDFLAGS_COMMON)
 endif
 
@@ -56,7 +52,8 @@ DEPS = $(OBJ:.o=.d) $(RUNNER_DEPS)
 
 # Executable name
 TEST = runner
-ifeq ($(OS),Windows_NT)
+ifeq '$(findstring ;,$(PATH))' ';'
+    # windows
     SHARED_LIB = piegyc.dll
 else
     SHARED_LIB = piegyc.so
@@ -82,7 +79,7 @@ $(SHARED_LIB): $(OBJ)
 
 # Compile source files to object files
 %.o: %.c
-	$(CC) $(CFLAGS) $(LDFLAGS) -c $< -o $@
+	$(CC) $(CFLAGS) -c $< -o $@
 
 # Clean build files
 clean:

{piegy-2.1.0 → piegy-2.1.9}/src/piegy/__init__.py

@@ -19,6 +19,7 @@ Last update: May 12, 2025
 '''
 
 from .__version__ import __version__
+from .build_info import build_info
 
 from .simulation import model, run, demo_model, UV_expected_val, check_overflow_func
 from .videos import make_video, SUPPORTED_FIGURES

{piegy-2.1.0 → piegy-2.1.9}/src/piegy/__version__.py

@@ -1,4 +1,4 @@
-__version__ = '2.1.0'
+__version__ = '2.1.9'
 
 '''
 version history:
@@ -28,4 +28,6 @@ version history:
 2.0.4: minor debuggings.
 2.0.5: fix error in random number generator.
 2.1.0: redo random number generator. Update package upload so that more compatible across platforms.
+2.1.1: fix import bug for the C core.
+2.1.2 ~ 2.1.9: updating & fixing wheel.
 '''

piegy-2.1.9/src/piegy/build_info.py

@@ -0,0 +1,12 @@
+"""
+Contains build info, whether it's local built, or a pre-compiled wheel.
+Auto-generated at compile time.
+"""
+
+build_info = {
+    "version": "2.1.8",
+    "built from": "local",
+    "build date": "2025-06-28 01:23:08",
+    "python version": "3.11.10",
+    "platform": "darwin"
+}

piegy-2.1.9/src/piegy/find_C.py

@@ -0,0 +1,17 @@
+'''
+This module is used to find the C core
+'''
+
+import os
+
+
+def find_C():
+    C_core_path = os.path.join(os.path.dirname(__file__), 'C_core')
+    C_list = os.listdir(C_core_path)
+    for file in C_list:
+        if file[-3:] == '.so':
+            return C_core_path + '/' + file
+        if file[-4:] == '.pyd':
+            return C_core_path + '/' + file
+
+    raise FileNotFoundError('C computation core not found. You can either compile manully or use the Python core instead. Please see docs.')

{piegy-2.1.0 → piegy-2.1.9}/src/piegy/simulation.py

@@ -12,6 +12,7 @@ Class & Functions:
 - check_overflow_func:  check whether an overflow might happen in simulation. This is usually done automatically when init-ing a model.
 '''
 
+from . import find_C
 
 import numpy as np
 import os
@@ -21,14 +22,15 @@ import numpy as np
 from numpy.ctypeslib import ndpointer
 
 
-# path to the C shared libary
-C_LIB_PATH = os.path.join(os.path.dirname(__file__), 'C_core', 'piegyc.so')
-
 # check whether overflow / too large values might be encountered
 # these values are considered as exponents in exp()
 EXP_OVERFLOW_BOUND = 709  # where exp(x) reaches overflow bound
 EXP_TOO_LARGE_BOUND = 88  # where exp(x) reaches 1e20
 
+# read the C core into LIB
+# initialized upon first run
+LIB = None
+
 
 '''
 The C core
@@ -69,23 +71,28 @@ class model_c(ctypes.Structure):
         ptr = getattr(self, name)
         return np.ctypeslib.as_array(ptr, shape=(self.arr_size,))
 
-lib = ctypes.CDLL(C_LIB_PATH, winmode = 0)
-lib.mod_init.argtypes = [
-    ctypes.POINTER(model_c), c_size_t, c_size_t,
-    c_double, c_double, c_size_t, c_bool,
-    ndpointer(dtype=np.uint32, flags="C_CONTIGUOUS"),
-    ndpointer(dtype=np.float64, flags="C_CONTIGUOUS"),
-    ndpointer(dtype=np.float64, flags="C_CONTIGUOUS"),
-    c_int32, c_int32
-]
-lib.mod_init.restype = c_bool
 
-lib.mod_free_py.argtypes = [ctypes.POINTER(model_c)]
-lib.mod_free_py.restype = None
+def read_lib():
+    global LIB
+    if LIB != None:
+        return
+    
+    LIB = ctypes.CDLL(find_C.find_C(), winmode = 0)
+    LIB.mod_init.argtypes = [
+        ctypes.POINTER(model_c), c_size_t, c_size_t,
+        c_double, c_double, c_size_t, c_bool,
+        ndpointer(dtype=np.uint32, flags="C_CONTIGUOUS"),
+        ndpointer(dtype=np.float64, flags="C_CONTIGUOUS"),
+        ndpointer(dtype=np.float64, flags="C_CONTIGUOUS"),
+        c_int32, c_int32
+    ]
+    LIB.mod_init.restype = c_bool
 
-lib.run.argtypes = [ctypes.POINTER(model_c), ctypes.POINTER(c_char), c_size_t]
-lib.run.restype = None
+    LIB.mod_free_py.argtypes = [ctypes.POINTER(model_c)]
+    LIB.mod_free_py.restype = None
 
+    LIB.run.argtypes = [ctypes.POINTER(model_c), ctypes.POINTER(c_char), c_size_t]
+    LIB.run.restype = None
 
 
 
@@ -396,6 +403,8 @@ def run(mod, message = ""):
     C-cored simulation
     '''
 
+    read_lib()
+
     if not mod.data_empty:
         raise ValueError('mod has non-empty data.')
 
@@ -408,20 +417,20 @@ def run(mod, message = ""):
     P = np.ascontiguousarray(mod.P.flatten(), dtype = np.float64)
 
     mod_c = model_c()
-    success = lib.mod_init(ctypes.byref(mod_c), 
+    success = LIB.mod_init(ctypes.byref(mod_c), 
                            mod.N, mod.M, mod.maxtime, mod.record_itv, mod.sim_time, mod.boundary,
                            I, X, P, mod.print_pct, mod.seed)
     if not success:
         raise RuntimeError('mod_init failed')
     
-    lib.run(ctypes.byref(mod_c), msg_buffer, msg_len)
+    LIB.run(ctypes.byref(mod_c), msg_buffer, msg_len)
 
     mod.set_data(False, mod.max_record, 1, mod_c.get_array('U1d').reshape(mod.N, mod.M, mod.max_record), 
                  mod_c.get_array('V1d').reshape(mod.N, mod.M, mod.max_record), 
                  mod_c.get_array('Upi_1d').reshape(mod.N, mod.M, mod.max_record), 
                  mod_c.get_array('Vpi_1d').reshape(mod.N, mod.M, mod.max_record))
 
-    lib.mod_free_py(ctypes.byref(mod_c))
+    LIB.mod_free_py(ctypes.byref(mod_c))
     del mod_c
 
 

{piegy-2.1.0 → piegy-2.1.9}/src/piegy/simulation_py.py

@@ -5,8 +5,7 @@ But you can still run them by calling:
 >>> run_py(mod)
 '''
 
-from . import simulation
-model = simulation.model
+from .simulation import model
 
 import math
 import numpy as np

{piegy-2.1.0 → piegy-2.1.9/src/piegy.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: piegy
-Version: 2.1.0
+Version: 2.1.9
 Summary: Payoff-Driven Stochastic Spatial Model for Evolutionary Game Theory
 Author-email: Chenning Xu <cxu7@caltech.edu>
 License: BSD 3-Clause License
@@ -44,7 +44,7 @@ Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Operating System :: OS Independent
-Requires-Python: >=3.8
+Requires-Python: >=3.7
 Description-Content-Type: text/markdown
 License-File: LICENSE.txt
 Requires-Dist: numpy

{piegy-2.1.0 → piegy-2.1.9}/src/piegy.egg-info/SOURCES.txt

@@ -6,8 +6,10 @@ setup.py
 src/piegy/__init__.py
 src/piegy/__version__.py
 src/piegy/analysis.py
+src/piegy/build_info.py
 src/piegy/data_tools.py
 src/piegy/figures.py
+src/piegy/find_C.py
 src/piegy/simulation.py
 src/piegy/simulation_py.py
 src/piegy/test_var.py
@@ -23,6 +25,7 @@ src/piegy/C_core/model.h
 src/piegy/C_core/patch.c
 src/piegy/C_core/patch.h
 src/piegy/C_core/piegyc.h
+src/piegy/C_core/piegyc.so
 src/piegy/C_core/runner.c
 src/piegy/C_core/sim_funcs.c
 src/piegy/C_core/sim_funcs.h

piegy-2.1.0/setup.py

@@ -1,35 +0,0 @@
-import subprocess
-import sys
-import os
-from setuptools import setup, Extension
-from setuptools.command.build_ext import build_ext
-
-class BuildSharedLib(build_ext):
-    def run(self):
-        # Build your shared lib first
-        subprocess.check_call(['make', '-C', 'src/piegy/C_core', 'clean', 'so'])
-        # Then continue with normal build_ext run
-        super().run()
-
-    def build_extension(self, ext):
-        if sys.platform == 'win32':
-            lib_name = 'piegyc.dll'
-        else:
-            lib_name = 'piegyc.so'
-        so_path = os.path.abspath(f'src/piegy/C_core/{lib_name}')
-        target_path = self.get_ext_fullpath(ext.name)
-
-        os.makedirs(os.path.dirname(target_path), exist_ok=True)
-        self.copy_file(so_path, target_path)
-
-# Declare the extension module (empty sources)
-ext_modules = [
-    Extension('piegy.C_core.piegyc', sources=[])
-]
-
-setup(
-    ext_modules=ext_modules,
-    cmdclass={'build_ext': BuildSharedLib},
-    package_data={"piegy": ["C_core/piegyc.so"]},
-    include_package_data=True,
-)