piegy 2.1.0__cp311-cp311-macosx_11_0_arm64.whl → 2.1.8__cp311-cp311-macosx_11_0_arm64.whl

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/__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/__version__.py

@@ -1,4 +1,4 @@
-__version__ = '2.1.0'
+__version__ = '2.1.8'
 
 '''
 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.8: updating wheel.
 '''

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 machine",
+    "build date": "2025-06-28 01:25:49",
+    "python version": "3.11.10",
+    "platform": "darwin"
+}

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:] == '.dll':
+            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/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/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.dist-info → piegy-2.1.8.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: piegy
-Version: 2.1.0
+Version: 2.1.8
 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.dist-info → piegy-2.1.8.dist-info}/RECORD

@@ -1,27 +1,30 @@
-piegy/__init__.py,sha256=RastpPYH3VtnfKLVHfmccKCYH1TUtcZuLQeqhWY6pFI,2082
-piegy/__version__.py,sha256=rgltevVSlWt53OTpma9ZGXsUzLcskEhIpjG1QX4DTrs,1546
+piegy/__init__.py,sha256=VQcKA9Eg3hUJci2GV8fZjf9srZu9MPRc_LDVomaxowI,2117
+piegy/__version__.py,sha256=BpBy4N-qGYEU3VnA-wOBHaEl_T8Xd_djXPViwxORZZ0,1615
 piegy/analysis.py,sha256=2GBsBbi7LdstSEAM0-F2bfL2kHu3MElcrw8bxZ1x6LI,8719
+piegy/build_info.py,sha256=PhQEiMUFJTpnuj6ReYqJGAy2ujueT1VK9Ijcl3NWjyI,288
 piegy/data_tools.py,sha256=auliVb88qKQmCX7LEDgKQvhBcwFTCXBEWKtjJ4_-rTU,3446
 piegy/figures.py,sha256=GwixvD3Flaqg4feSvqr42lDR7CwZK0_2qmZg6N6_1uE,17936
-piegy/simulation.py,sha256=K11zY5i2WJlWwx-vDJ1f9sKwLe1ZqrF7d-rYOotJwPc,19905
-piegy/simulation_py.py,sha256=WtWhpHCosKQ457gZ-iJ-7v0N3NtyPqDfgXv4DL3aBKs,29523
+piegy/find_C.py,sha256=CoET9YkWqhvcHxdby6hVaZyPePBUm-fEWm2fo6ishYU,496
+piegy/simulation.py,sha256=5hKtwQGXeMWdZLTSco83CYR5phP6jrOkNcrcfbe7-Z0,20035
+piegy/simulation_py.py,sha256=vVQbb76ui8Dw1msdk_GaNDNYVkMEUG-Q3lMsCx-8KNs,29503
 piegy/test_var.py,sha256=EfItIK-FEApJTAW8rs15kdMs5xlv-8Bx6CtfpSoi8ys,23562
 piegy/videos.py,sha256=QfSpOdwfaDsrQYRoiHmZ6gowzRQHom3m8kx1P65_8sM,10218
-piegy/C_core/Makefile,sha256=oZOBh7LAIXaHRcTkTin4BZHqae3WEcgM24iqFR-3a18,2198
+piegy/C_core/Makefile,sha256=kVNaxlGxxvcODyaEKQkDoXnU68NueKxksxqXSrTnPcM,2069
 piegy/C_core/model.c,sha256=lAIQ2-r6GDBZNQUnxaj6EWiMLNI52-1vnYC6CPY8KyY,2854
 piegy/C_core/model.h,sha256=hmIqOwznkB8rhG-JeEUmn7JBDiWHkNrR9qfy1wN7X1E,1180
 piegy/C_core/patch.c,sha256=OVG4qyTpRs0hDa5eMRdPyNUmZk2G-FogBVq7Li381PQ,1032
 piegy/C_core/patch.h,sha256=c3MXJweW4cogRnacaoY-aoUsf98jhJ_Hs-hp9AH6gwY,963
 piegy/C_core/piegyc.cpython-311-darwin.so,sha256=X09xSi_scV7wr4wzE_BBjeN-a5R26cR2T3mnGCeo_4g,67656
 piegy/C_core/piegyc.h,sha256=INS97GRoOI01TQkzWHOa0KGKCBeg0L0pPFlb6Ei3faI,1078
+piegy/C_core/piegyc.so,sha256=X09xSi_scV7wr4wzE_BBjeN-a5R26cR2T3mnGCeo_4g,67656
 piegy/C_core/runner.c,sha256=WU2jfJUqwv0Xxp3g4cewVYsyDyvG4wkPFcu2VJ_sKNk,1576
 piegy/C_core/sim_funcs.c,sha256=TJp-u_bEMtjiJySY4LrjnFRK_wpUeC-tHk4BURkec_4,18830
 piegy/C_core/sim_funcs.h,sha256=w53jaLVf49h_OxEr3xbMT3p_v6KTmduf0ORsoSqFhTI,15144
 piegy/tools/__init__.py,sha256=eYOl_HJHDonYexfrmKh3koOlxvtSo46vH6jHvCEEB4k,300
 piegy/tools/figure_tools.py,sha256=54vJSJMReXidFnSPE_xFvedtgnJU3d55zQDPNBLGs98,6975
 piegy/tools/file_tools.py,sha256=ncxFWeHfIE-GYLQlOrahFlhBgqPyuY3R5_93fpQeCEs,630
-piegy-2.1.0.dist-info/licenses/LICENSE.txt,sha256=wfzEht_CxOcfGGmg3f3at4mWJb9rTBjA51mXLl_3O3g,1498
-piegy-2.1.0.dist-info/METADATA,sha256=SkhrNr5fXsPVv2y9txMuTfqyWAJyNljESI3co7uAlHs,5435
-piegy-2.1.0.dist-info/WHEEL,sha256=qxQkdhERtGxJzqnVOBnucx1aUmU2n3HmuzYdln_LyOw,109
-piegy-2.1.0.dist-info/top_level.txt,sha256=k4QLYL8PqdqDuy95-4NZD_FVLqJDsmq67tpKkBn4vMw,6
-piegy-2.1.0.dist-info/RECORD,,
+piegy-2.1.8.dist-info/licenses/LICENSE.txt,sha256=wfzEht_CxOcfGGmg3f3at4mWJb9rTBjA51mXLl_3O3g,1498
+piegy-2.1.8.dist-info/METADATA,sha256=0etGMI932tEbHgoft3Nq9ikZpKwIK4peEB8meiKABX8,5435
+piegy-2.1.8.dist-info/WHEEL,sha256=qxQkdhERtGxJzqnVOBnucx1aUmU2n3HmuzYdln_LyOw,109
+piegy-2.1.8.dist-info/top_level.txt,sha256=k4QLYL8PqdqDuy95-4NZD_FVLqJDsmq67tpKkBn4vMw,6
+piegy-2.1.8.dist-info/RECORD,,