mapFolding 0.2.4__tar.gz → 0.2.5__tar.gz

{mapfolding-0.2.4 → mapfolding-0.2.5}/PKG-INFO

@@ -1,7 +1,7 @@
 Metadata-Version: 2.2
 Name: mapFolding
-Version: 0.2.4
-Summary: Algorithm(s) for counting distinct ways to fold a map (or a strip of stamps)
+Version: 0.2.5
+Summary: Count distinct ways to fold a map (or a strip of stamps)
 Author-email: Hunter Hogan <HunterHogan@pm.me>
 Project-URL: homepage, https://github.com/hunterhogan/mapFolding
 Requires-Python: <3.13,>=3.10
@@ -14,16 +14,11 @@ Requires-Dist: pandas; extra == "benchmark"
 Requires-Dist: jupyter; extra == "benchmark"
 Requires-Dist: ipywidgets; extra == "benchmark"
 Requires-Dist: tqdm; extra == "benchmark"
-Provides-Extra: jax
-Requires-Dist: jax; extra == "jax"
-Requires-Dist: jaxtyping; extra == "jax"
 Provides-Extra: testing
 Requires-Dist: pytest; extra == "testing"
 Requires-Dist: pytest-cov; extra == "testing"
 Requires-Dist: pytest-env; extra == "testing"
 Requires-Dist: pytest-xdist; extra == "testing"
-Requires-Dist: pytest-order; extra == "testing"
-Requires-Dist: pytest-dependency; extra == "testing"
 
 # Algorithm(s) for counting distinct ways to fold a map (or a strip of stamps)
 
@@ -41,7 +36,7 @@ The directory [mapFolding/reference](https://github.com/hunterhogan/mapFolding/b
 - [hunterNumba.py](https://github.com/hunterhogan/mapFolding/blob/main/mapFolding/reference), a one-size-fits-all, self-contained, reasonably fast, contemporary algorithm that is nevertheless infected by _noobaceae ignorancium_, and
 - miscellaneous notes.
 
-[![Python Tests](https://github.com/hunterhogan/mapFolding/actions/workflows/unittests.yml/badge.svg)](https://github.com/hunterhogan/mapFolding/actions/workflows/unittests.yml) [![pip install mapFolding](https://img.shields.io/badge/pip%20install-mapFolding-gray.svg?colorB=3b434b)](https://pypi.org/project/mapFolding/) ![Static Badge](https://img.shields.io/badge/stinkin'%20badges-don't%20need-b98e5e) ![PyPI - Downloads](https://img.shields.io/pypi/dd/mapFolding) ![Static Badge](https://img.shields.io/badge/issues-I%20have%20them-brightgreen) ![GitHub repo size](https://img.shields.io/github/repo-size/hunterhogan/mapFolding)
+[![pip install mapFolding](https://img.shields.io/badge/pip%20install-mapFolding-gray.svg?colorB=3b434b)](https://pypi.org/project/mapFolding/) [![Python Tests](https://github.com/hunterhogan/mapFolding/actions/workflows/unittests.yml/badge.svg)](https://github.com/hunterhogan/mapFolding/actions/workflows/unittests.yml) [![Static Badge](https://img.shields.io/badge/stinkin'%20badges-don't%20need-b98e5e)](https://youtu.be/g6f_miE91mk&t=4) ![PyPI - Downloads](https://img.shields.io/pypi/dd/mapFolding) ![Static Badge](https://img.shields.io/badge/issues-I%20have%20them-brightgreen) ![GitHub repo size](https://img.shields.io/github/repo-size/hunterhogan/mapFolding)
 
 ## Simple, easy usage based on OEIS IDs
 
@@ -133,3 +128,8 @@ In [`foldings.txt`](https://github.com/hunterhogan/mapFolding/blob/main/mapFoldi
 ```sh
 pip install mapFolding
 ```
+
+## My recovery
+
+[![Static Badge](https://img.shields.io/badge/2011_August-Homeless_since-blue?style=flat)](https://HunterThinks.com/support)
+[![YouTube Channel Subscribers](https://img.shields.io/youtube/channel/subscribers/UC3Gx7kz61009NbhpRtPP7tw)](https://www.youtube.com/@HunterHogan)

{mapfolding-0.2.4 → mapfolding-0.2.5}/README.md

@@ -14,7 +14,7 @@ The directory [mapFolding/reference](https://github.com/hunterhogan/mapFolding/b
 - [hunterNumba.py](https://github.com/hunterhogan/mapFolding/blob/main/mapFolding/reference), a one-size-fits-all, self-contained, reasonably fast, contemporary algorithm that is nevertheless infected by _noobaceae ignorancium_, and
 - miscellaneous notes.
 
-[![Python Tests](https://github.com/hunterhogan/mapFolding/actions/workflows/unittests.yml/badge.svg)](https://github.com/hunterhogan/mapFolding/actions/workflows/unittests.yml) [![pip install mapFolding](https://img.shields.io/badge/pip%20install-mapFolding-gray.svg?colorB=3b434b)](https://pypi.org/project/mapFolding/) ![Static Badge](https://img.shields.io/badge/stinkin'%20badges-don't%20need-b98e5e) ![PyPI - Downloads](https://img.shields.io/pypi/dd/mapFolding) ![Static Badge](https://img.shields.io/badge/issues-I%20have%20them-brightgreen) ![GitHub repo size](https://img.shields.io/github/repo-size/hunterhogan/mapFolding)
+[![pip install mapFolding](https://img.shields.io/badge/pip%20install-mapFolding-gray.svg?colorB=3b434b)](https://pypi.org/project/mapFolding/) [![Python Tests](https://github.com/hunterhogan/mapFolding/actions/workflows/unittests.yml/badge.svg)](https://github.com/hunterhogan/mapFolding/actions/workflows/unittests.yml) [![Static Badge](https://img.shields.io/badge/stinkin'%20badges-don't%20need-b98e5e)](https://youtu.be/g6f_miE91mk&t=4) ![PyPI - Downloads](https://img.shields.io/pypi/dd/mapFolding) ![Static Badge](https://img.shields.io/badge/issues-I%20have%20them-brightgreen) ![GitHub repo size](https://img.shields.io/github/repo-size/hunterhogan/mapFolding)
 
 ## Simple, easy usage based on OEIS IDs
 
@@ -106,3 +106,8 @@ In [`foldings.txt`](https://github.com/hunterhogan/mapFolding/blob/main/mapFoldi
 ```sh
 pip install mapFolding
 ```
+
+## My recovery
+
+[![Static Badge](https://img.shields.io/badge/2011_August-Homeless_since-blue?style=flat)](https://HunterThinks.com/support)
+[![YouTube Channel Subscribers](https://img.shields.io/youtube/channel/subscribers/UC3Gx7kz61009NbhpRtPP7tw)](https://www.youtube.com/@HunterHogan)

{mapfolding-0.2.4 → mapfolding-0.2.5}/mapFolding/__init__.py

@@ -1,6 +1,6 @@
 from .theSSOT import *
 from Z0Z_tools import defineConcurrencyLimit, intInnit, oopsieKwargsie
-from .beDRY import getFilenameFoldsTotal, outfitCountFolds
+from .beDRY import getFilenameFoldsTotal, getPathFilenameFoldsTotal, outfitCountFolds, saveFoldsTotal
 from .startHere import countFolds
 from .oeis import oeisIDfor_n, getOEISids, clearOEIScache
 

{mapfolding-0.2.4 → mapfolding-0.2.5}/mapFolding/beDRY.py

@@ -1,5 +1,5 @@
 """A relatively stable API for oft-needed functionality."""
-from mapFolding import dtypeDefault, dtypeLarge
+from mapFolding import dtypeDefault, dtypeLarge, pathJobDEFAULT
 from mapFolding import indexMy, indexThe, indexTrack, computationState
 from mapFolding import intInnit, defineConcurrencyLimit, oopsieKwargsie
 from numpy import integer
@@ -7,10 +7,12 @@ from numpy.typing import NDArray
 from typing import Any, List, Optional, Sequence, Type, Union
 import numba
 import numpy
+import os
+import pathlib
 import sys
 
 def getFilenameFoldsTotal(listDimensions: Sequence[int]) -> str:
-    return str(sorted(listDimensions)).replace(' ', '') + '.foldsTotal'
+    return str(sorted(listDimensions)).replace(', ', 'x') + '.foldsTotal'
 
 def getLeavesTotal(listDimensions: Sequence[int]) -> int:
     """
@@ -36,6 +38,14 @@ def getLeavesTotal(listDimensions: Sequence[int]) -> int:
 
         return productDimensions
 
+def getPathFilenameFoldsTotal(listDimensions: Sequence[int], pathishWriteFoldsTotal: Optional[Union[str, os.PathLike[str]]] = None) -> pathlib.Path:
+    pathFilenameFoldsTotal = pathlib.Path(pathishWriteFoldsTotal) if pathishWriteFoldsTotal is not None else pathJobDEFAULT
+    if pathFilenameFoldsTotal.is_dir():
+        filenameFoldsTotalDEFAULT = getFilenameFoldsTotal(listDimensions)
+        pathFilenameFoldsTotal = pathFilenameFoldsTotal / filenameFoldsTotalDEFAULT
+    pathFilenameFoldsTotal.parent.mkdir(parents=True, exist_ok=True)
+    return pathFilenameFoldsTotal
+
 def getTaskDivisions(computationDivisions: Optional[Union[int, str]], concurrencyLimit: int, CPUlimit: Optional[Union[bool, float, int]], listDimensions: Sequence[int]):
     """
     Determines whether or how to divide the computation into tasks.
@@ -148,7 +158,7 @@ def makeDataContainer(shape, datatype: Optional[Type] = None):
         datatype = dtypeDefault
     return numpy.zeros(shape, dtype=datatype)
 
-def outfitCountFolds(listDimensions: Sequence[int], computationDivisions: Optional[Union[int, str]] = None, CPUlimit: Optional[Union[bool, float, int]] = None, **keywordArguments: Optional[Type]) -> computationState:
+def outfitCountFolds(listDimensions: Sequence[int], computationDivisions: Optional[Union[int, str]] = None, CPUlimit: Optional[Union[bool, float, int]] = None, **keywordArguments: Optional[Type[Any]]) -> computationState:
     """
     Initializes and configures the computation state for map folding computations.
 
@@ -232,6 +242,40 @@ def parseDimensions(dimensions: Sequence[int], parameterName: str = 'unnamed par
 
     return listNonNegative
 
+import tempfile
+import shutil
+import logging
+import os
+def saveFoldsTotal(pathFilename: Union[str, os.PathLike[str]], foldsTotal: int) -> None:
+    """
+    Save foldsTotal with multiple fallback mechanisms.
+
+    Parameters:
+        pathFilename: Target save location
+        foldsTotal: Critical computed value to save
+    """
+    """Thoughts
+    Everything in a try block
+    Save it multiple times with multiple packages
+    no need for context managers, especially because they can cause errors"""
+    try:
+        pathFilenameFoldsTotal = pathlib.Path(pathFilename)
+        pathFilenameFoldsTotal.parent.mkdir(parents=True, exist_ok=True)
+        pathFilenameFoldsTotal.write_text(str(foldsTotal))
+    except Exception as ERRORmessage:
+        try:
+            print(f"\nfoldsTotal foldsTotal foldsTotal foldsTotal foldsTotal\n\n{foldsTotal=}\n\nfoldsTotal foldsTotal foldsTotal foldsTotal foldsTotal\n")
+            print(ERRORmessage)
+            print(f"\nfoldsTotal foldsTotal foldsTotal foldsTotal foldsTotal\n\n{foldsTotal=}\n\nfoldsTotal foldsTotal foldsTotal foldsTotal foldsTotal\n")
+            randomnessPlanB = (int(str(foldsTotal).strip()[-1]) + 1) * ['YO_']
+            filenameInfixUnique = ''.join(randomnessPlanB)
+            import os
+            pathFilenamePlanB = os.path.join(os.getcwd(), 'foldsTotal' + filenameInfixUnique + '.txt')
+            open(pathFilenamePlanB, 'w').write(str(foldsTotal))
+            print(str(pathFilenamePlanB))
+        except:
+            print(foldsTotal)
+
 def setCPUlimit(CPUlimit: Union[bool, float, int, None]) -> int:
     """Sets CPU limit for Numba concurrent operations. Note that it can only affect Numba-jitted functions that have not yet been imported.
 

mapfolding-0.2.5/mapFolding/importSelector.py

@@ -0,0 +1,7 @@
+from mapFolding.lovelace import countSequential
+from mapFolding.lovelace import countParallel
+from mapFolding.lovelace import countInitialize
+
+# from mapFolding.countSequential import countSequential
+# from mapFolding.countParallel import countParallel
+# from mapFolding.countInitialize import countInitialize

mapfolding-0.2.4/mapFolding/JAX/lunnanJAX.py → mapfolding-0.2.5/mapFolding/reference/jax.py

@@ -1,3 +1,5 @@
+"""I was able to implement the algorithm with JAX, but I didn't see an advantage and it's a pain in the ass.
+I don't maintain this module."""
 from mapFolding import validateListDimensions, getLeavesTotal, makeConnectionGraph
 from typing import List, Tuple
 import jax

{mapfolding-0.2.4/mapFolding → mapfolding-0.2.5/mapFolding/someAssemblyRequired}/inlineAfunction.py

@@ -1,19 +1,22 @@
 from mapFolding import indexMy, indexThe, indexTrack
 import ast
+import copy
 import pathlib
 
-dictionaryEnumValues = {}
-for enumIndex in [indexMy, indexThe, indexTrack]:
-    for memberName, memberValue in enumIndex._member_map_.items():
-        dictionaryEnumValues[f"{enumIndex.__name__}.{memberName}.value"] = memberValue.value
+def getDictionaryEnumValues():
+    dictionaryEnumValues = {}
+    for enumIndex in [indexMy, indexThe, indexTrack]:
+        for memberName, memberValue in enumIndex._member_map_.items():
+            dictionaryEnumValues[f"{enumIndex.__name__}.{memberName}.value"] = memberValue.value
+    return dictionaryEnumValues
 
-class RecursiveInliner(ast.NodeTransformer):
+class RecursiveInlinerWithEnum(ast.NodeTransformer):
     def __init__(self, dictionaryFunctions, dictionaryEnumValues):
         self.dictionaryFunctions = dictionaryFunctions
         self.dictionaryEnumValues = dictionaryEnumValues
         self.processed = set()  # Track processed functions to avoid infinite recursion
 
-    def inline_function_body(self, functionName):
+    def inlineFunctionBody(self, functionName):
         if functionName in self.processed:
             return None
 
@@ -35,7 +38,7 @@ class RecursiveInliner(ast.NodeTransformer):
     def visit_Call(self, node):
         callNode = self.generic_visit(node)
         if isinstance(callNode, ast.Call) and isinstance(callNode.func, ast.Name) and callNode.func.id in self.dictionaryFunctions:
-            inlineDefinition = self.inline_function_body(callNode.func.id)
+            inlineDefinition = self.inlineFunctionBody(callNode.func.id)
             if inlineDefinition and inlineDefinition.body:
                 lastStmt = inlineDefinition.body[-1]
                 if isinstance(lastStmt, ast.Return) and lastStmt.value is not None:
@@ -48,23 +51,23 @@ class RecursiveInliner(ast.NodeTransformer):
     def visit_Expr(self, node):
         if isinstance(node.value, ast.Call):
             if isinstance(node.value.func, ast.Name) and node.value.func.id in self.dictionaryFunctions:
-                inlineDefinition = self.inline_function_body(node.value.func.id)
+                inlineDefinition = self.inlineFunctionBody(node.value.func.id)
                 if inlineDefinition:
                     return [self.visit(stmt) for stmt in inlineDefinition.body]
         return self.generic_visit(node)
 
-def find_required_imports(node):
-    """Find all modules that need to be imported based on AST analysis."""
+def findRequiredImports(node):
+    """Find all modules that need to be imported based on AST analysis.
+    NOTE: due to hardcoding, this is a glorified regex. No, wait, this is less versatile than regex."""
     requiredImports = set()
 
     class ImportFinder(ast.NodeVisitor):
         def visit_Name(self, node):
-            # Common modules we might need
             if node.id in {'numba'}:
                 requiredImports.add(node.id)
             self.generic_visit(node)
 
-        def visit_Decorator(self, node):
+        def visitDecorator(self, node):
             if isinstance(node, ast.Call) and isinstance(node.func, ast.Name):
                 if node.func.id == 'jit':
                     requiredImports.add('numba')
@@ -73,7 +76,7 @@ def find_required_imports(node):
     ImportFinder().visit(node)
     return requiredImports
 
-def generate_imports(requiredImports):
+def generateImports(requiredImports):
     """Generate import statements based on required modules."""
     importStatements = []
 
@@ -88,7 +91,7 @@ def generate_imports(requiredImports):
 
     return '\n'.join(importStatements)
 
-def inline_functions(sourceCode, targetFunctionName, dictionaryEnumValues):
+def inlineFunctions(sourceCode, targetFunctionName, dictionaryEnumValues):
     dictionaryParsed = ast.parse(sourceCode)
     dictionaryFunctions = {
         element.name: element
@@ -96,29 +99,54 @@ def inline_functions(sourceCode, targetFunctionName, dictionaryEnumValues):
         if isinstance(element, ast.FunctionDef)
     }
     nodeTarget = dictionaryFunctions[targetFunctionName]
-    nodeInliner = RecursiveInliner(dictionaryFunctions, dictionaryEnumValues)
+    nodeInliner = RecursiveInlinerWithEnum(dictionaryFunctions, dictionaryEnumValues)
     nodeInlined = nodeInliner.visit(nodeTarget)
     ast.fix_missing_locations(nodeInlined)
 
     # Generate imports
-    requiredImports = find_required_imports(nodeInlined)
-    importStatements = generate_imports(requiredImports)
+    requiredImports = findRequiredImports(nodeInlined)
+    importStatements = generateImports(requiredImports)
 
     # Combine imports with inlined code
     inlinedCode = importStatements + '\n\n' + ast.unparse(ast.Module(body=[nodeInlined], type_ignores=[]))
     return inlinedCode
 
-pathFilenameSource = pathlib.Path("/apps/mapFolding/mapFolding/lovelace.py")
-codeSource = pathFilenameSource.read_text()
-
-listCallables = [
-    'countSequential',
-    'countParallel',
-    'countInitialize',
-]
-listPathFilenamesDestination = []
-for callableTarget in listCallables:
-    pathFilenameDestination = pathFilenameSource.with_stem(callableTarget)
-    codeInlined = inline_functions(codeSource, callableTarget, dictionaryEnumValues)
-    pathFilenameDestination.write_text(codeInlined)
-    listPathFilenamesDestination.append(pathFilenameDestination)
+def Z0Z_inlineMapFolding():
+    dictionaryEnumValues = getDictionaryEnumValues()
+
+    pathFilenameSource = pathlib.Path("/apps/mapFolding/mapFolding/lovelace.py")
+    codeSource = pathFilenameSource.read_text()
+
+    listCallables = [
+        'countInitialize',
+        'countParallel',
+        'countSequential',
+    ]
+
+    listPathFilenamesDestination: list[pathlib.Path] = []
+    for callableTarget in listCallables:
+        pathFilenameDestination = pathFilenameSource.with_stem(callableTarget)
+        codeInlined = inlineFunctions(codeSource, callableTarget, dictionaryEnumValues)
+        pathFilenameDestination.write_text(codeInlined)
+        listPathFilenamesDestination.append(pathFilenameDestination)
+
+    listNoNumba = [
+        'countInitialize',
+        'countSequential',
+    ]
+
+    listPathFilenamesNoNumba = []
+    for pathFilename in listPathFilenamesDestination:
+        if pathFilename.stem in listNoNumba:
+            pathFilenameNoNumba = pathFilename.with_name(pathFilename.stem + 'NoNumba' + pathFilename.suffix)
+        else:
+            continue
+        codeNoNumba = pathFilename.read_text()
+        for codeLine in copy.copy(codeNoNumba.splitlines()):
+            if 'numba' in codeLine:
+                codeNoNumba = codeNoNumba.replace(codeLine, '')
+        pathFilenameNoNumba.write_text(codeNoNumba)
+        listPathFilenamesNoNumba.append(pathFilenameNoNumba)
+
+if __name__ == '__main__':
+    Z0Z_inlineMapFolding()

mapfolding-0.2.5/mapFolding/someAssemblyRequired/jobsAndTasks.py

@@ -0,0 +1,47 @@
+from typing import Any, Optional, Sequence, Type, Union
+
+def Z0Z_makeJob(listDimensions: Sequence[int], **keywordArguments: Optional[Type[Any]]):
+    from mapFolding import outfitCountFolds
+    stateUniversal = outfitCountFolds(listDimensions, computationDivisions=None, CPUlimit=None, **keywordArguments)
+    from mapFolding.countInitialize import countInitialize
+    countInitialize(stateUniversal['connectionGraph'], stateUniversal['gapsWhere'], stateUniversal['my'], stateUniversal['the'], stateUniversal['track'])
+    from mapFolding import getPathFilenameFoldsTotal
+    pathFilenameChopChop = getPathFilenameFoldsTotal(stateUniversal['mapShape'])
+    import pathlib
+    suffix = pathFilenameChopChop.suffix
+    pathJob = pathlib.Path(str(pathFilenameChopChop)[0:-len(suffix)])
+    pathJob.mkdir(parents=True, exist_ok=True)
+    pathFilenameJob = pathJob / 'stateJob.pkl'
+
+    pathFilenameFoldsTotal = getPathFilenameFoldsTotal(stateUniversal['mapShape'], pathFilenameJob.parent)
+    stateJob = {**stateUniversal, 'pathFilenameFoldsTotal': pathFilenameFoldsTotal}
+
+    del stateJob['mapShape']
+
+    import pickle
+    pathFilenameJob.write_bytes(pickle.dumps(stateJob))
+    return pathFilenameJob
+
+def runJob(pathFilename):
+    from typing import Final
+    import numpy
+    from pathlib import Path
+    pathFilenameJob = Path(pathFilename)
+    from pickle import loads
+    stateJob = loads(pathFilenameJob.read_bytes())
+
+    connectionGraph: numpy.ndarray = stateJob['connectionGraph']
+    foldsSubTotals: numpy.ndarray = stateJob['foldsSubTotals']
+    gapsWhere: numpy.ndarray = stateJob['gapsWhere']
+    my: numpy.ndarray = stateJob['my']
+    pathFilenameFoldsTotal: Final[Path] = stateJob['pathFilenameFoldsTotal']
+    the: Final[numpy.ndarray] = stateJob['the']
+    track: numpy.ndarray = stateJob['track']
+
+    from mapFolding.countSequentialNoNumba import countSequential
+    countSequential(connectionGraph, foldsSubTotals, gapsWhere, my, the, track)
+
+    print(foldsSubTotals.sum().item())
+    Path(pathFilenameFoldsTotal).parent.mkdir(parents=True, exist_ok=True)
+    Path(pathFilenameFoldsTotal).write_text(str(foldsSubTotals.sum().item()))
+    print(pathFilenameFoldsTotal)

mapfolding-0.2.5/mapFolding/someAssemblyRequired/makeNuitkaSource.py

@@ -0,0 +1,99 @@
+"""NOTE make a special venv for nuitka, then run nuitka from that venv"""
+from pathlib import Path
+from pickle import loads
+from typing import Final
+import numpy
+from mapFolding.someAssemblyRequired.jobsAndTasks import Z0Z_makeJob
+
+"""
+Section: configure every time"""
+
+# TODO configure this
+mapShape = [3]*3
+# NOTE ^^^^^^ pay attention
+
+"""
+Section: settings"""
+
+pathFilenameData = Z0Z_makeJob(mapShape)
+
+pathJob = pathFilenameData.parent
+
+pathFilenameAlgorithm = Path('/apps/mapFolding/mapFolding/countSequentialNoNumba.py')
+pathFilenameDestination = Path(f"/apps/mapFolding/nn/{pathJob.name}.py")
+
+"""
+Section: did you handle and include this stuff?"""
+
+lineImportNumPy = "import numpy"
+linePrintFoldsTotal = "print(foldsSubTotals.sum().item())"
+linesAlgorithm = """"""
+linesData = """"""
+settingsNuitkaProject=f"""
+# nuitka-project: --mode=onefile
+# nuitka-project: --onefile-no-compression
+# nuitka-project: --lto=yes
+# nuitka-project: --clang
+# nuitka-project: --output-dir={pathJob}
+# nuitka-project: --output-filename={pathJob.name}.exe
+"""
+# nuitka-project:
+"""
+Section: do the work"""
+
+WTFamIdoing = pathFilenameAlgorithm.read_text()
+for lineSource in WTFamIdoing.splitlines():
+    ImaIndent = '    '
+    if lineSource.startswith(ImaIndent):
+        lineSource = lineSource[len(ImaIndent):None]
+    elif lineSource.startswith('#'):
+        continue
+    elif not lineSource:
+        continue
+    elif lineSource.startswith('def '):
+        continue
+    else:
+        raise NotImplementedError("You didn't anticipate this.")
+    linesAlgorithm = "\n".join([linesAlgorithm
+                            , lineSource
+                            ])
+
+stateJob = loads(pathFilenameData.read_bytes())
+connectionGraph: Final[numpy.ndarray] = stateJob['connectionGraph']
+foldsSubTotals: numpy.ndarray = stateJob['foldsSubTotals']
+gapsWhere: numpy.ndarray = stateJob['gapsWhere']
+my: numpy.ndarray = stateJob['my']
+the: numpy.ndarray = stateJob['the']
+track: numpy.ndarray = stateJob['track']
+
+pathFilenameFoldsTotal = stateJob['pathFilenameFoldsTotal']
+lineDataPathFilenameFoldsTotal = "pathFilenameFoldsTotal = r'" + str(pathFilenameFoldsTotal) + "'\n"
+
+def archivistFormatsArrayToCode(arrayTarget: numpy.ndarray, identifierName: str) -> str:
+    """Format numpy array into a code string that recreates the array."""
+    arrayAsTypeStr = numpy.array2string(
+        arrayTarget,
+        threshold=10000,
+        max_line_width=100,
+        separator=','
+        )
+    return f"{identifierName} = numpy.array({arrayAsTypeStr}, dtype=numpy.{arrayTarget.dtype})\n"
+
+linesData = "\n".join([linesData
+            , lineDataPathFilenameFoldsTotal
+            , archivistFormatsArrayToCode(the, 'the')
+            , archivistFormatsArrayToCode(my, 'my')
+            , archivistFormatsArrayToCode(foldsSubTotals, 'foldsSubTotals')
+            , archivistFormatsArrayToCode(gapsWhere, 'gapsWhere')
+            , archivistFormatsArrayToCode(connectionGraph, 'connectionGraph')
+            , archivistFormatsArrayToCode(track, 'track')
+            ])
+
+linesAll = "\n".join([settingsNuitkaProject
+            , lineImportNumPy
+            , linesData
+            , linesAlgorithm
+            , linePrintFoldsTotal
+            ])
+
+pathFilenameDestination.write_text(linesAll)

mapfolding-0.2.5/mapFolding/someAssemblyRequired/makeNumbaJob.py

@@ -0,0 +1,121 @@
+"""Create a python module hardcoded to compute a map's foldsTotal.
+NumPy ndarray.
+Numba optimized.
+Absolutely no other imports.
+"""
+from mapFolding import datatypeLarge, dtypeLarge, dtypeDefault
+from mapFolding.someAssemblyRequired.inlineAfunction import Z0Z_inlineMapFolding
+from mapFolding.someAssemblyRequired.jobsAndTasks import Z0Z_makeJob
+import importlib
+import llvmlite.binding
+import numpy
+import pathlib
+import pickle
+
+listDimensions = [3,7]
+
+# NOTE this overwrites files
+Z0Z_inlineMapFolding()
+
+identifierCallableLaunch = "goGoGadgetAbsurdity"
+
+def archivistFormatsArrayToCode(arrayTarget: numpy.ndarray, identifierName: str) -> str:
+    """Format numpy array into a code string that recreates the array."""
+    arrayAsTypeStr = numpy.array2string(arrayTarget, threshold=10000, max_line_width=200, separator=',')
+    return f"{identifierName} = numpy.array({arrayAsTypeStr}, dtype=numpy.{arrayTarget.dtype})"
+
+def writeModuleWithNumba(listDimensions):
+    numpy_dtypeLarge = dtypeLarge
+    numpy_dtypeDefault = dtypeDefault
+
+    parametersNumba = f"numba.types.{datatypeLarge}(), cache=True, parallel=False, boundscheck=False, \
+        error_model='numpy', fastmath=True, nogil=True, nopython=True, _nrt=True, forceinline=True, \
+            inline=True, looplift=True, no_cfunc_wrapper=False, no_cpython_wrapper=False"
+
+    pathFilenameData = Z0Z_makeJob(listDimensions, datatypeDefault=numpy_dtypeDefault, datatypeLarge=numpy_dtypeLarge)
+
+    pathFilenameAlgorithm = pathlib.Path('/apps/mapFolding/mapFolding/countSequentialNoNumba.py')
+    pathFilenameDestination = pathFilenameData.with_stem(pathFilenameData.parent.name).with_suffix(".py")
+
+    lineNumba = f"@numba.jit({parametersNumba})"
+
+    linesImport = "\n".join([
+                        "import numpy"
+                        , "import numba"
+                        ])
+
+    stateJob = pickle.loads(pathFilenameData.read_bytes())
+
+    ImaIndent = '    '
+    linesDataDynamic = """"""
+    linesDataDynamic = "\n".join([linesDataDynamic
+            , ImaIndent + archivistFormatsArrayToCode(stateJob['my'], 'my')
+            , ImaIndent + archivistFormatsArrayToCode(stateJob['foldsSubTotals'], 'foldsSubTotals')
+            , ImaIndent + archivistFormatsArrayToCode(stateJob['gapsWhere'], 'gapsWhere')
+            , ImaIndent + archivistFormatsArrayToCode(stateJob['track'], 'track')
+            ])
+
+    linesDataStatic = """"""
+    linesDataStatic = "\n".join([linesDataStatic
+            , ImaIndent + archivistFormatsArrayToCode(stateJob['the'], 'the')
+            , ImaIndent + archivistFormatsArrayToCode(stateJob['connectionGraph'], 'connectionGraph')
+            ])
+
+    pathFilenameFoldsTotal: pathlib.Path = stateJob['pathFilenameFoldsTotal']
+
+    linesAlgorithm = """"""
+    for lineSource in pathFilenameAlgorithm.read_text().splitlines():
+        if lineSource.startswith('#'):
+            continue
+        elif not lineSource:
+            continue
+        elif lineSource.startswith('def '):
+            lineSource = "\n".join([lineNumba
+                                , f"def {identifierCallableLaunch}():"
+                                , linesDataDynamic
+                                , linesDataStatic
+                                ])
+        linesAlgorithm = "\n".join([linesAlgorithm
+                            , lineSource
+                            ])
+
+    lineReturn = f"{ImaIndent}return foldsSubTotals.sum().item()"
+
+    linesLaunch = """"""
+    linesLaunch = linesLaunch + f"""
+if __name__ == '__main__':
+    foldsTotal = {identifierCallableLaunch}()"""
+
+    linesWriteFoldsTotal = """"""
+    linesWriteFoldsTotal = "\n".join([linesWriteFoldsTotal
+                                    , "    print(foldsTotal)"
+                                    , f"    open('{pathFilenameFoldsTotal.as_posix()}', 'w').write(str(foldsTotal))"
+                                    ])
+
+    linesAll = "\n".join([
+                        linesImport
+                        , linesAlgorithm
+                        , f"{ImaIndent}print(foldsSubTotals.sum().item())"
+                        , lineReturn
+                        , linesLaunch
+                        , linesWriteFoldsTotal
+                        ])
+
+    pathFilenameDestination.write_text(linesAll)
+
+    return pathFilenameDestination
+
+def writeModuleLLVM(pathFilenamePythonFile: pathlib.Path) -> pathlib.Path:
+    pathRootPackage = pathlib.Path('c:/apps/mapFolding')
+    relativePathModule = pathFilenamePythonFile.relative_to(pathRootPackage)
+    moduleTarget = '.'.join(relativePathModule.parts)[0:-len(relativePathModule.suffix)]
+    moduleTargetImported = importlib.import_module(moduleTarget)
+    linesLLVM = moduleTargetImported.__dict__[identifierCallableLaunch].inspect_llvm()[()]
+    moduleLLVM = llvmlite.binding.module.parse_assembly(linesLLVM)
+    pathFilenameLLVM = pathFilenamePythonFile.with_suffix(".ll")
+    pathFilenameLLVM.write_text(str(moduleLLVM))
+    return pathFilenameLLVM
+
+if __name__ == '__main__':
+    pathFilenamePythonFile = writeModuleWithNumba(listDimensions)
+    pathFilenameLLVM = writeModuleLLVM(pathFilenamePythonFile)

{mapfolding-0.2.4 → mapfolding-0.2.5}/mapFolding/startHere.py

@@ -1,15 +1,14 @@
-from mapFolding import outfitCountFolds, getFilenameFoldsTotal
-from typing import Optional, Sequence, Type, Union
+from mapFolding import outfitCountFolds, getPathFilenameFoldsTotal, saveFoldsTotal
+from typing import Any, Optional, Sequence, Type, Union
 import os
-import pathlib
 
-def countFolds(listDimensions: Sequence[int], writeFoldsTotal: Optional[Union[str, os.PathLike[str]]] = None, computationDivisions: Optional[Union[int, str]] = None, CPUlimit: Optional[Union[int, float, bool]] = None, **keywordArguments: Optional[Type]) -> int:
+def countFolds(listDimensions: Sequence[int], pathishWriteFoldsTotal: Optional[Union[str, os.PathLike[str]]] = None, computationDivisions: Optional[Union[int, str]] = None, CPUlimit: Optional[Union[int, float, bool]] = None, **keywordArguments: Optional[Type[Any]]) -> int:
     """Count the total number of possible foldings for a given map dimensions.
 
     Parameters:
         listDimensions: List of integers representing the dimensions of the map to be folded.
-        writeFoldsTotal (None): Path or filename to write the total fold count.
-            If a directory is provided, creates a file with default name based on map dimensions.
+        pathishWriteFoldsTotal (None): Path, filename, or pathFilename to write the total fold count to.
+            If a directory is provided, creates a file with a default name based on map dimensions.
         computationDivisions (None):
             Whether and how to divide the computational work. See notes for details.
         CPUlimit (None): This is only relevant if there are `computationDivisions`: whether and how to limit the CPU usage. See notes for details.
@@ -37,12 +36,8 @@ def countFolds(listDimensions: Sequence[int], writeFoldsTotal: Optional[Union[st
     stateUniversal = outfitCountFolds(listDimensions, computationDivisions=computationDivisions, CPUlimit=CPUlimit, **keywordArguments)
 
     pathFilenameFoldsTotal = None
-    if writeFoldsTotal is not None:
-        pathFilenameFoldsTotal = pathlib.Path(writeFoldsTotal)
-        if pathFilenameFoldsTotal.is_dir():
-            filenameFoldsTotalDEFAULT = getFilenameFoldsTotal(stateUniversal['mapShape'])
-            pathFilenameFoldsTotal = pathFilenameFoldsTotal / filenameFoldsTotalDEFAULT
-        pathFilenameFoldsTotal.parent.mkdir(parents=True, exist_ok=True)
+    if pathishWriteFoldsTotal is not None:
+        pathFilenameFoldsTotal = getPathFilenameFoldsTotal(stateUniversal['mapShape'], pathishWriteFoldsTotal)
 
     from mapFolding.babbage import _countFolds
     _countFolds(**stateUniversal)
@@ -50,10 +45,6 @@ def countFolds(listDimensions: Sequence[int], writeFoldsTotal: Optional[Union[st
     foldsTotal = stateUniversal['foldsSubTotals'].sum().item()
 
     if pathFilenameFoldsTotal is not None:
-        try:
-            pathFilenameFoldsTotal.write_text(str(foldsTotal))
-        except Exception as ERRORmessage:
-            print(ERRORmessage)
-            print(f"\nfoldsTotal foldsTotal foldsTotal foldsTotal foldsTotal\n\n{foldsTotal=}\n\nfoldsTotal foldsTotal foldsTotal foldsTotal foldsTotal")
+        saveFoldsTotal(pathFilenameFoldsTotal, foldsTotal)
 
     return foldsTotal