mapFolding 0.9.0__py3-none-any.whl → 0.9.1__py3-none-any.whl

mapFolding/theSSOT.py

@@ -19,12 +19,13 @@ to avoid namespace collisions when transforming algorithms.
 from collections.abc import Callable
 from importlib import import_module as importlib_import_module
 from inspect import getfile as inspect_getfile
-from numpy import dtype, int64 as numpy_int64, int16 as numpy_int16, integer, ndarray
+from numpy import dtype, int64 as numpy_int64, int16 as numpy_int16, integer, ndarray, uint8 as numpy_uint8
 from pathlib import Path
 from tomli import load as tomli_load
 from types import ModuleType
 from typing import Any, TypeAlias, TypeVar
 import dataclasses
+from numba import int64, uint8
 
 # Evaluate When Packaging https://github.com/hunterhogan/mapFolding/issues/18
 try:
@@ -42,10 +43,10 @@ def getPathPackageINSTALLING() -> Path:
 # I believe these values should be dynamically determined, so I have conspicuously marked them "HARDCODED"
 # and created downstream logic that assumes the values were dynamically determined.
 # Figure out dynamic flow control to synthesized modules https://github.com/hunterhogan/mapFolding/issues/4
-logicalPathModuleDispatcherHARDCODED: str = 'mapFolding.syntheticModules.numbaCount_doTheNeedful'
+logicalPathModuleDispatcherHARDCODED: str = 'mapFolding.syntheticModules.numbaCount'
 callableDispatcherHARDCODED: str = 'doTheNeedful'
 concurrencyPackageHARDCODED = 'multiprocessing'
-# from mapFolding.someAssemblyRequired.synthesizeNumbaFlow.theNumbaFlow
+# from mapFolding.someAssemblyRequired.toolboxNumba.theNumbaFlow
 
 # PackageSettings in theSSOT.py and immutability https://github.com/hunterhogan/mapFolding/issues/11
 @dataclasses.dataclass
@@ -150,15 +151,21 @@ The = PackageSettings(logicalPathModuleDispatcher=logicalPathModuleDispatcherHAR
 
 NumPyIntegerType = TypeVar('NumPyIntegerType', bound=integer[Any], covariant=True)
 
-DatatypeLeavesTotal: TypeAlias = int
-NumPyLeavesTotal: TypeAlias = numpy_int16 # this would be uint8, but mapShape (2,2,2,2, 2,2,2,2) has 256 leaves, so generic containers must accommodate at least 256 leaves
+# DatatypeLeavesTotal: TypeAlias = int
+NumPyLeavesTotal: TypeAlias = numpy_uint8
+# NumPyLeavesTotal: TypeAlias = numpy_int16 # this would be uint8, but mapShape (2,2,2,2, 2,2,2,2) has 256 leaves, so generic containers must accommodate at least 256 leaves
 
-DatatypeElephino: TypeAlias = int
-NumPyElephino: TypeAlias = numpy_int16
+# DatatypeElephino: TypeAlias = int
+NumPyElephino: TypeAlias = numpy_uint8
+# NumPyElephino: TypeAlias = numpy_int16
 
-DatatypeFoldsTotal: TypeAlias = int
+# DatatypeFoldsTotal: TypeAlias = int
 NumPyFoldsTotal: TypeAlias = numpy_int64
 
+DatatypeLeavesTotal = uint8
+DatatypeElephino = uint8
+DatatypeFoldsTotal = int64
+
 Array3D: TypeAlias = ndarray[tuple[int, int, int], dtype[NumPyLeavesTotal]]
 Array1DLeavesTotal: TypeAlias = ndarray[tuple[int], dtype[NumPyLeavesTotal]]
 Array1DElephino: TypeAlias = ndarray[tuple[int], dtype[NumPyElephino]]
@@ -244,16 +251,19 @@ class ComputationState:
 	indexMiniGap: DatatypeElephino = DatatypeElephino(0)
 	"""Index used when filtering common gaps."""
 
-	leaf1ndex: DatatypeElephino = DatatypeElephino(1)
+	leaf1ndex: DatatypeLeavesTotal = DatatypeLeavesTotal(1)
 	"""Active leaf being processed in the folding algorithm. Starts at 1, not 0."""
 
 	leafConnectee: DatatypeElephino = DatatypeElephino(0)
 	"""Leaf that is being connected to the active leaf."""
 
+	# leafSequence: list[DatatypeLeavesTotal] = dataclasses.field(default_factory=list, metadata={'elementConstructor': 'DatatypeLeavesTotal'})
+
 	taskIndex: DatatypeLeavesTotal = DatatypeLeavesTotal(0)
 	"""Index of the current parallel task when using task divisions."""
 
 	def __post_init__(self) -> None:
+		# self.leafSequence = [self.leaf1ndex]
 		from mapFolding.beDRY import getConnectionGraph, makeDataContainer
 		self.dimensionsTotal = DatatypeLeavesTotal(len(self.mapShape))
 		leavesTotalAsInt = int(self.leavesTotal)

{mapfolding-0.9.0.dist-info → mapfolding-0.9.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mapFolding
-Version: 0.9.0
+Version: 0.9.1
 Summary: Map folding algorithm with code transformation framework for optimizing numerical computations
 Author-email: Hunter Hogan <HunterHogan@pm.me>
 License: CC-BY-NC-4.0

{mapfolding-0.9.0.dist-info → mapfolding-0.9.1.dist-info}/RECORD

@@ -1,10 +1,10 @@
 mapFolding/__init__.py,sha256=TXCWanI9snueVZMTtjLNpvG4um7vyPXmJeIvvrBuJCA,3887
 mapFolding/basecamp.py,sha256=L0eduDE8-5SnEYpnI-GHs-am4ico9kEn75SuOUgibZ8,4770
-mapFolding/beDRY.py,sha256=cWMHETsTofpGMKmbEB3E8NiiujmyYOVq0HW-VqI3-Pk,15272
-mapFolding/oeis.py,sha256=qgmlMbqDZ1O3DKrhKttm2J0Lwm9iGGKqLhwJQNULLGM,16995
+mapFolding/beDRY.py,sha256=6E7fLwBK5E7vnI4mHJK6EmxU2Vmxk5d8yBip45uuuyw,15213
+mapFolding/oeis.py,sha256=kVBIYUx4AvGGCqKBvtvSZvq1B6oLPw24wCHNZIOtiTc,17170
 mapFolding/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-mapFolding/theDao.py,sha256=MVopt1LzhdIQYA97SEoq9bdzct6hbK0lEyPxBAAlVTc,9934
-mapFolding/theSSOT.py,sha256=20Z0Cs2Sj5EZPFXE6dT_rb6iH6DTBVq-gaysemQTVPc,16829
+mapFolding/theDao.py,sha256=oj-NKxFVsfMUTQomQDK6Xh6GmKbE9gLqMWEyPStzIj0,10022
+mapFolding/theSSOT.py,sha256=fG0WuZrCx77qgJmjZSFLmY03_oQzhh1Xr70-0pNLRe4,17223
 mapFolding/toolboxFilesystem.py,sha256=5RZ9CshZwgjejH_sMG4_Kk4JX3QJLkK30OqFeL5jFWg,9974
 mapFolding/reference/__init__.py,sha256=UIEU8BJR_YDzjFQcLel3XtHzOCJiOUGlGiWzOzbvhik,2206
 mapFolding/reference/flattened.py,sha256=QK1xG9SllqCoi68e86Hyl9d9ATUAAFNpTQI-3zmcp5I,16072
@@ -18,29 +18,30 @@ mapFolding/reference/total_countPlus1vsPlusN.py,sha256=yJZAVLVdoXqHag2_N6_6CT-Q6
 mapFolding/reference/jobsCompleted/__init__.py,sha256=TU93ZGUW1xEkT6d9mQFn_rp5DvRy0ZslEB2Q6MF5ZDc,2596
 mapFolding/reference/jobsCompleted/[2x19]/p2x19.py,sha256=_tvYtfzMWVo2VtUbIAieoscb4N8FFflgTdW4-ljBUuA,19626
 mapFolding/reference/jobsCompleted/p2x19/p2x19.py,sha256=eZEw4Me4ocTt6VXoK2-Sbd5SowZtxRIbN9dZmc7OCVg,6395
-mapFolding/someAssemblyRequired/__init__.py,sha256=ZtYMGjxMnl1mnwSLSBm73meaXP1P_MBd4RlAwlOyRXY,3318
+mapFolding/someAssemblyRequired/RecipeJob.py,sha256=JL5Xkmp8ritVMhL1pGhX7eEw5fde3FVD8-9-vZOZwWI,5399
+mapFolding/someAssemblyRequired/__init__.py,sha256=JLccUsx6FnBn1W2XbaBfVD3KNGmfw0HoO0NwxbzF3uA,4036
 mapFolding/someAssemblyRequired/_theTypes.py,sha256=YFiQI6zsrFNruvqGDXHJVH0OWXsOj9EwDrt4G59OVHA,3995
-mapFolding/someAssemblyRequired/_tool_Make.py,sha256=-ISVrr09mYuo5dhJfjYs38jhSd_IjYPrheGC6RWUmBI,7373
+mapFolding/someAssemblyRequired/_tool_Make.py,sha256=GQDt6LXGJ1QLVQTGdEu-GJH7y4I2rO60sIBVS5p2Rjk,7384
 mapFolding/someAssemblyRequired/_tool_Then.py,sha256=uc1of9ZPCp5Vrh5Qg80giatGHwT9wRzW3dWaKxGYQsg,4125
-mapFolding/someAssemblyRequired/_toolboxAntecedents.py,sha256=bK5IDfHZ_p1p4rhQ1Q21FM4J8i9Yl6gD7mAOw6NJahU,10591
-mapFolding/someAssemblyRequired/_toolboxContainers.py,sha256=yIad3WTL60qGdLd87Wr-FJccNyhGLD3tsFJGA0sdknU,24183
-mapFolding/someAssemblyRequired/_toolboxPython.py,sha256=dkEWp4-SAc8xe-pkeCXh6iVUSolSlXSFCBun1Asn1gE,7639
+mapFolding/someAssemblyRequired/_toolboxAntecedents.py,sha256=9RWpbKkf90ApmUPckLqJLhjK6Iasq8Txsa9IOYwTbgw,10909
+mapFolding/someAssemblyRequired/_toolboxContainers.py,sha256=-ImBTd0IlgmHwL9VrUarykOeSmmdLOrRiISoel5vizA,23794
+mapFolding/someAssemblyRequired/_toolboxPython.py,sha256=TuRC5CD_6tTjjLuvGgPbnqCSvIP3Vp2k2r592Dcpff4,7642
 mapFolding/someAssemblyRequired/getLLVMforNoReason.py,sha256=9RPU6vK_eUg64GtVFI_nZnvUryXw8gfHJs9NyDYHIvg,2745
-mapFolding/someAssemblyRequired/synthesizeNumbaJob.py,sha256=7jwUcHpZk3T_PoFgLtZhYayx5VbJP1f15a2JPlZegFI,14453
-mapFolding/someAssemblyRequired/toolboxNumba.py,sha256=GkBmcztmGSwm2bolK76FPPdc2c9AWrtMGztgZb3rS7Y,24381
-mapFolding/someAssemblyRequired/transformationTools.py,sha256=bI8ApAb-Z-VIdRa-ORQilnT6LjejTPeTyC5nOrpDz94,23323
+mapFolding/someAssemblyRequired/synthesizeNumbaJob.py,sha256=N5rl_YbiK0YTRv3V27tRrrwVxpEbSe6sxZJBMtLNlco,15587
+mapFolding/someAssemblyRequired/toolboxNumba.py,sha256=3Saast4QvugNwluc4CLMfelZG2sKdZO74z_8p2LkG_k,10972
+mapFolding/someAssemblyRequired/transformationTools.py,sha256=M5cDR1_jPOs92XoPd8Mbcxc5fTWW2YwaG4HGcSJQUeY,34238
 mapFolding/syntheticModules/__init__.py,sha256=evVFqhCGa-WZKDiLcnQWjs-Bj34eRnfSLqz_d7dFYZY,83
-mapFolding/syntheticModules/numbaCount_doTheNeedful.py,sha256=vSqV1WbyZ0mXg2TNgMR9EndiitVKM8GQa72ijOUCEZ8,15659
-mapfolding-0.9.0.dist-info/licenses/LICENSE,sha256=NxH5Y8BdC-gNU-WSMwim3uMbID2iNDXJz7fHtuTdXhk,19346
+mapFolding/syntheticModules/numbaCount.py,sha256=hQPPLKZi99Sayny1Gp3Y9Jv_XLSwozIiUmOrHVaaQ2Q,15768
+mapfolding-0.9.1.dist-info/licenses/LICENSE,sha256=NxH5Y8BdC-gNU-WSMwim3uMbID2iNDXJz7fHtuTdXhk,19346
 tests/__init__.py,sha256=UIvSWWz_anRXBELKPOdhfRoZ4hArHQTvghHrRquDHHw,1940
 tests/conftest.py,sha256=G8vhDSTdTbYZUFBUKLFOUOzDL1Ja6NVZmICCh4biZas,14298
-tests/test_computations.py,sha256=oT2f_7Hzis3dLgOmfzlA_I-5fG3D0NURWab0rZkARfc,6152
+tests/test_computations.py,sha256=MbnK9kRRwH3UI7aVMreNuEbzNVC2hP0Gq2mR-xjuxrI,6205
 tests/test_filesystem.py,sha256=T2DkjBoI3lW6tCxd5BilPmUFrVukNKLjOOZVZxLM560,3004
 tests/test_oeis.py,sha256=uxvwmgbnylSDdsVJfuAT0LuYLbIVFwSgdLxHm-xUGBM,5043
 tests/test_other.py,sha256=zZmSZpcNsk4oeD4EHNLMNtmiz9hnwwoV62DFSQrLKwo,4258
 tests/test_tasks.py,sha256=yrExYvFP23TEA3ta0IotMNmi59rwQ3Y9hA3fwvIhxTE,2851
-mapfolding-0.9.0.dist-info/METADATA,sha256=yjarli2blxeiwu9i1nFOrPT6gevc6YRzIbDy8KMbbr4,7445
-mapfolding-0.9.0.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
-mapfolding-0.9.0.dist-info/entry_points.txt,sha256=F3OUeZR1XDTpoH7k3wXuRb3KF_kXTTeYhu5AGK1SiOQ,146
-mapfolding-0.9.0.dist-info/top_level.txt,sha256=1gP2vFaqPwHujGwb3UjtMlLEGN-943VSYFR7V4gDqW8,17
-mapfolding-0.9.0.dist-info/RECORD,,
+mapfolding-0.9.1.dist-info/METADATA,sha256=UQmPj1bF5CjCNrNSwfemNPHz80PPRqKr63EbE5rdMzI,7445
+mapfolding-0.9.1.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
+mapfolding-0.9.1.dist-info/entry_points.txt,sha256=F3OUeZR1XDTpoH7k3wXuRb3KF_kXTTeYhu5AGK1SiOQ,146
+mapfolding-0.9.1.dist-info/top_level.txt,sha256=1gP2vFaqPwHujGwb3UjtMlLEGN-943VSYFR7V4gDqW8,17
+mapfolding-0.9.1.dist-info/RECORD,,

tests/test_computations.py

@@ -87,6 +87,7 @@ that provide consistent, informative error messages and simplify test validation
 
 from mapFolding import countFolds, getFoldsTotalKnown, oeisIDfor_n, validateListDimensions
 from mapFolding.oeis import settingsOEIS
+from mapFolding.someAssemblyRequired.RecipeJob import RecipeJob
 from mapFolding.someAssemblyRequired.transformationTools import makeInitializedComputationState
 from pathlib import Path, PurePosixPath
 from tests.conftest import standardizedEqualToCallableReturn, registrarRecordsTmpObject
@@ -115,7 +116,7 @@ def test_syntheticSequential(syntheticDispatcherFixture: None, listDimensionsTes
 
 @pytest.mark.parametrize('pathFilenameTmpTesting', ['.py'], indirect=True)
 def test_writeJobNumba(oneTestCuzTestsOverwritingTests: list[int], pathFilenameTmpTesting: Path) -> None:
-	from mapFolding.someAssemblyRequired.toolboxNumba import RecipeJob, SpicesJobNumba
+	from mapFolding.someAssemblyRequired.toolboxNumba import SpicesJobNumba
 	from mapFolding.someAssemblyRequired.synthesizeNumbaJob import makeJobNumba
 	mapShape = validateListDimensions(oneTestCuzTestsOverwritingTests)
 	state = makeInitializedComputationState(mapShape)