mapFolding 0.2.7__tar.gz → 0.3.0__tar.gz

{mapfolding-0.2.7 → mapfolding-0.3.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: mapFolding
-Version: 0.2.7
+Version: 0.3.0
 Summary: Count distinct ways to fold a map (or a strip of stamps)
 Author-email: Hunter Hogan <HunterHogan@pm.me>
 License: CC-BY-NC-4.0
@@ -29,10 +29,12 @@ Requires-Dist: jupyter; extra == "benchmark"
 Requires-Dist: pandas; extra == "benchmark"
 Requires-Dist: tqdm; extra == "benchmark"
 Provides-Extra: testing
+Requires-Dist: more_itertools; 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: python_minifier; extra == "testing"
 
 # Algorithm(s) for counting distinct ways to fold a map (or a strip of stamps)
 

{mapfolding-0.2.7 → mapfolding-0.3.0}/mapFolding/mapFolding.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: mapFolding
-Version: 0.2.7
+Version: 0.3.0
 Summary: Count distinct ways to fold a map (or a strip of stamps)
 Author-email: Hunter Hogan <HunterHogan@pm.me>
 License: CC-BY-NC-4.0
@@ -29,10 +29,12 @@ Requires-Dist: jupyter; extra == "benchmark"
 Requires-Dist: pandas; extra == "benchmark"
 Requires-Dist: tqdm; extra == "benchmark"
 Provides-Extra: testing
+Requires-Dist: more_itertools; 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: python_minifier; extra == "testing"
 
 # Algorithm(s) for counting distinct ways to fold a map (or a strip of stamps)
 

{mapfolding-0.2.7 → mapfolding-0.3.0}/mapFolding/mapFolding.egg-info/SOURCES.txt

@@ -16,10 +16,11 @@ mapFolding/reference/lunnanNumpy.py
 mapFolding/reference/lunnanWhile.py
 mapFolding/reference/rotatedEntryPoint.py
 mapFolding/reference/total_countPlus1vsPlusN.py
-mapFolding/someAssemblyRequired/inlineAfunction.py
-mapFolding/someAssemblyRequired/jobsAndTasks.py
-mapFolding/someAssemblyRequired/makeNuitkaSource.py
-mapFolding/someAssemblyRequired/makeNumbaJob.py
+mapFolding/someAssemblyRequired/__init__.py
+mapFolding/someAssemblyRequired/countInitialize.py
+mapFolding/someAssemblyRequired/countParallel.py
+mapFolding/someAssemblyRequired/countSequential.py
+mapFolding/someAssemblyRequired/synthesizeModules.py
 tests/test_oeis.py
 tests/test_other.py
 tests/test_tasks.py

{mapfolding-0.2.7 → mapfolding-0.3.0}/mapFolding/mapFolding.egg-info/requires.txt

@@ -9,7 +9,9 @@ pandas
 tqdm
 
 [testing]
+more_itertools
 pytest
 pytest-cov
 pytest-env
 pytest-xdist
+python_minifier

mapfolding-0.3.0/mapFolding/someAssemblyRequired/__init__.py

@@ -0,0 +1,3 @@
+from .countSequential import countSequential
+from .countParallel import countParallel
+from .countInitialize import countInitialize

mapfolding-0.3.0/mapFolding/someAssemblyRequired/countInitialize.py

@@ -0,0 +1,45 @@
+from mapFolding import indexMy, indexTrack
+import numba
+
+@numba.jit((numba.uint8[:,:,::1], numba.uint8[::1], numba.uint8[::1], numba.uint8[:,::1]), parallel=False, boundscheck=False, cache=True, error_model="numpy", fastmath=True, looplift=False, nogil=True, nopython=True)
+def countInitialize(connectionGraph, gapsWhere, my, track):
+    while my[7] > 0:
+        if my[7] <= 1 or track[1, 0] == 1:
+            my[1] = my[0]
+            my[3] = track[3, my[7] - 1]
+            my[4] = 0
+            while my[4] < my[0]:
+                if connectionGraph[my[4], my[7], my[7]] == my[7]:
+                    my[1] -= 1
+                else:
+                    my[8] = connectionGraph[my[4], my[7], my[7]]
+                    while my[8] != my[7]:
+                        gapsWhere[my[3]] = my[8]
+                        if track[2, my[8]] == 0:
+                            my[3] += 1
+                        track[2, my[8]] += 1
+                        my[8] = connectionGraph[my[4], my[7], track[1, my[8]]]
+                my[4] += 1
+            if not my[1]:
+                my[5] = 0
+                while my[5] < my[7]:
+                    gapsWhere[my[3]] = my[5]
+                    my[3] += 1
+                    my[5] += 1
+            my[6] = my[2]
+            while my[6] < my[3]:
+                gapsWhere[my[2]] = gapsWhere[my[6]]
+                if track[2, gapsWhere[my[6]]] == my[1]:
+                    my[2] += 1
+                track[2, gapsWhere[my[6]]] = 0
+                my[6] += 1
+        if my[7] > 0:
+            my[2] -= 1
+            track[0, my[7]] = gapsWhere[my[2]]
+            track[1, my[7]] = track[1, track[0, my[7]]]
+            track[1, track[0, my[7]]] = my[7]
+            track[0, track[1, my[7]]] = my[7]
+            track[3, my[7]] = my[2]
+            my[7] += 1
+        if my[2] > 0:
+            return

mapfolding-0.3.0/mapFolding/someAssemblyRequired/countParallel.py

@@ -0,0 +1,52 @@
+from mapFolding import indexMy, indexTrack
+import numba
+
+@numba.jit((numba.uint8[:,:,::1], numba.int64[::1], numba.uint8[::1], numba.uint8[::1], numba.uint8[:,::1]), parallel=True, boundscheck=False, cache=True, error_model="numpy", fastmath=True, looplift=False, nogil=True, nopython=True)
+def countParallel(connectionGraph, foldGroups, gapsWherePARALLEL, myPARALLEL, trackPARALLEL):
+    for indexSherpa in numba.prange(myPARALLEL[9]):
+        gapsWhere = gapsWherePARALLEL.copy()
+        my = myPARALLEL.copy()
+        my[10] = indexSherpa
+        track = trackPARALLEL.copy()
+        groupsOfFolds: int = 0
+        while my[7] > 0:
+            if my[7] <= 1 or track[1, 0] == 1:
+                if my[7] > foldGroups[-1]:
+                    groupsOfFolds = groupsOfFolds + 1
+                else:
+                    my[1] = my[0]
+                    my[3] = track[3, my[7] - 1]
+                    my[4] = 0
+                    while my[4] < my[0]:
+                        if connectionGraph[my[4], my[7], my[7]] == my[7]:
+                            my[1] -= 1
+                        else:
+                            my[8] = connectionGraph[my[4], my[7], my[7]]
+                            while my[8] != my[7]:
+                                if my[7] != my[9] or my[8] % my[9] == my[10]:
+                                    gapsWhere[my[3]] = my[8]
+                                    if track[2, my[8]] == 0:
+                                        my[3] += 1
+                                    track[2, my[8]] += 1
+                                my[8] = connectionGraph[my[4], my[7], track[1, my[8]]]
+                        my[4] += 1
+                    my[6] = my[2]
+                    while my[6] < my[3]:
+                        gapsWhere[my[2]] = gapsWhere[my[6]]
+                        if track[2, gapsWhere[my[6]]] == my[1]:
+                            my[2] += 1
+                        track[2, gapsWhere[my[6]]] = 0
+                        my[6] += 1
+            while my[7] > 0 and my[2] == track[3, my[7] - 1]:
+                my[7] -= 1
+                track[1, track[0, my[7]]] = track[1, my[7]]
+                track[0, track[1, my[7]]] = track[0, my[7]]
+            if my[7] > 0:
+                my[2] -= 1
+                track[0, my[7]] = gapsWhere[my[2]]
+                track[1, my[7]] = track[1, track[0, my[7]]]
+                track[1, track[0, my[7]]] = my[7]
+                track[0, track[1, my[7]]] = my[7]
+                track[3, my[7]] = my[2]
+                my[7] += 1
+        foldGroups[my[10]] = groupsOfFolds

mapfolding-0.3.0/mapFolding/someAssemblyRequired/countSequential.py

@@ -0,0 +1,59 @@
+from mapFolding import indexMy, indexTrack
+import numba
+
+@numba.jit((numba.uint8[:,:,::1], numba.int64[::1], numba.uint8[::1], numba.uint8[::1], numba.uint8[:,::1]), parallel=False, boundscheck=False, cache=True, error_model="numpy", fastmath=True, looplift=False, nogil=True, nopython=True)
+def countSequential(connectionGraph, foldGroups, gapsWhere, my, track):
+    doFindGaps = True
+    dimensionsTotal = my[indexMy.dimensionsTotal.value]
+    dimensionsUnconstrained = my[indexMy.dimensionsUnconstrained.value]
+    gap1ndex = my[indexMy.gap1ndex.value]
+    gap1ndexCeiling = my[indexMy.gap1ndexCeiling.value]
+    indexDimension = my[indexMy.indexDimension.value]
+    indexMiniGap = my[indexMy.indexMiniGap.value]
+    leaf1ndex = my[indexMy.leaf1ndex.value]
+    leafConnectee = my[indexMy.leafConnectee.value]
+    taskIndex = my[indexMy.taskIndex.value]
+    leafAbove = track[indexTrack.leafAbove.value]
+    leafBelow = track[indexTrack.leafBelow.value]
+    countDimensionsGapped = track[indexTrack.countDimensionsGapped.value]
+    gapRangeStart = track[indexTrack.gapRangeStart.value]
+    groupsOfFolds: int = 0
+    while leaf1ndex > 0:
+        if (doFindGaps := (leaf1ndex <= 1 or leafBelow[0] == 1)) and leaf1ndex > foldGroups[-1]:
+            groupsOfFolds = groupsOfFolds + 1
+        elif doFindGaps:
+            dimensionsUnconstrained = dimensionsTotal
+            gap1ndexCeiling = gapRangeStart[leaf1ndex - 1]
+            indexDimension = 0
+            while indexDimension < dimensionsTotal:
+                if connectionGraph[indexDimension, leaf1ndex, leaf1ndex] == leaf1ndex:
+                    dimensionsUnconstrained -= 1
+                else:
+                    leafConnectee = connectionGraph[indexDimension, leaf1ndex, leaf1ndex]
+                    while leafConnectee != leaf1ndex:
+                        gapsWhere[gap1ndexCeiling] = leafConnectee
+                        if countDimensionsGapped[leafConnectee] == 0:
+                            gap1ndexCeiling += 1
+                        countDimensionsGapped[leafConnectee] += 1
+                        leafConnectee = connectionGraph[indexDimension, leaf1ndex, leafBelow[leafConnectee]]
+                indexDimension += 1
+            indexMiniGap = gap1ndex
+            while indexMiniGap < gap1ndexCeiling:
+                gapsWhere[gap1ndex] = gapsWhere[indexMiniGap]
+                if countDimensionsGapped[gapsWhere[indexMiniGap]] == dimensionsUnconstrained:
+                    gap1ndex += 1
+                countDimensionsGapped[gapsWhere[indexMiniGap]] = 0
+                indexMiniGap += 1
+        while leaf1ndex > 0 and gap1ndex == gapRangeStart[leaf1ndex - 1]:
+            leaf1ndex -= 1
+            leafBelow[leafAbove[leaf1ndex]] = leafBelow[leaf1ndex]
+            leafAbove[leafBelow[leaf1ndex]] = leafAbove[leaf1ndex]
+        if leaf1ndex > 0:
+            gap1ndex -= 1
+            leafAbove[leaf1ndex] = gapsWhere[gap1ndex]
+            leafBelow[leaf1ndex] = leafBelow[leafAbove[leaf1ndex]]
+            leafBelow[leafAbove[leaf1ndex]] = leaf1ndex
+            leafAbove[leafBelow[leaf1ndex]] = leaf1ndex
+            gapRangeStart[leaf1ndex] = gap1ndex
+            leaf1ndex += 1
+    foldGroups[taskIndex] = groupsOfFolds

mapfolding-0.2.7/mapFolding/someAssemblyRequired/inlineAfunction.py → mapfolding-0.3.0/mapFolding/someAssemblyRequired/synthesizeModules.py

@@ -1,7 +1,18 @@
-from mapFolding import indexMy, indexTrack
+from mapFolding import indexMy, indexTrack, theDao, datatypeDefault, datatypeLarge, datatypeSmall
 import ast
-import copy
 import pathlib
+import inspect
+
+algorithmSource = theDao
+
+dictionaryDecorators={
+    'countInitialize':
+    f'@numba.jit((numba.{datatypeSmall}[:,:,::1], numba.{datatypeDefault}[::1], numba.{datatypeSmall}[::1], numba.{datatypeDefault}[:,::1]), parallel=False, boundscheck=False, cache=True, error_model="numpy", fastmath=True, looplift=False, nogil=True, nopython=True)\n',
+    'countParallel':
+    f'@numba.jit((numba.{datatypeSmall}[:,:,::1], numba.{datatypeLarge}[::1], numba.{datatypeDefault}[::1], numba.{datatypeSmall}[::1], numba.{datatypeDefault}[:,::1]), parallel=True, boundscheck=False, cache=True, error_model="numpy", fastmath=True, looplift=False, nogil=True, nopython=True)\n',
+    'countSequential':
+    f'@numba.jit((numba.{datatypeSmall}[:,:,::1], numba.{datatypeLarge}[::1], numba.{datatypeDefault}[::1], numba.{datatypeSmall}[::1], numba.{datatypeDefault}[:,::1]), parallel=False, boundscheck=False, cache=True, error_model="numpy", fastmath=True, looplift=False, nogil=True, nopython=True)\n',
+    }
 
 def getDictionaryEnumValues():
     dictionaryEnumValues = {}
@@ -11,10 +22,13 @@ def getDictionaryEnumValues():
     return dictionaryEnumValues
 
 class RecursiveInlinerWithEnum(ast.NodeTransformer):
+    """Process AST nodes to inline functions and substitute enum values.
+    Also handles function decorators during inlining."""
+
     def __init__(self, dictionaryFunctions, dictionaryEnumValues):
         self.dictionaryFunctions = dictionaryFunctions
         self.dictionaryEnumValues = dictionaryEnumValues
-        self.processed = set()  # Track processed functions to avoid infinite recursion
+        self.processed = set()
 
     def inlineFunctionBody(self, functionName):
         if functionName in self.processed:
@@ -39,7 +53,7 @@ class RecursiveInlinerWithEnum(ast.NodeTransformer):
         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.inlineFunctionBody(callNode.func.id)
-            if inlineDefinition and inlineDefinition.body:
+            if (inlineDefinition and inlineDefinition.body):
                 lastStmt = inlineDefinition.body[-1]
                 if isinstance(lastStmt, ast.Return) and lastStmt.value is not None:
                     return self.visit(lastStmt.value)
@@ -78,20 +92,21 @@ def findRequiredImports(node):
 
 def generateImports(requiredImports):
     """Generate import statements based on required modules."""
-    importStatements = []
+    importStatements = {'import numba', 'from mapFolding import indexMy, indexTrack'}
 
-    # Map of module names to their import statements
     importMapping = {
         'numba': 'import numba',
     }
 
     for moduleName in sorted(requiredImports):
         if moduleName in importMapping:
-            importStatements.append(importMapping[moduleName])
+            importStatements.add(importMapping[moduleName])
 
     return '\n'.join(importStatements)
 
-def inlineFunctions(sourceCode, targetFunctionName, dictionaryEnumValues):
+def inlineFunctions(sourceCode, targetFunctionName, dictionaryEnumValues, skipEnum=False):
+    if skipEnum:
+        dictionaryEnumValues = {}
     dictionaryParsed = ast.parse(sourceCode)
     dictionaryFunctions = {
         element.name: element
@@ -103,50 +118,70 @@ def inlineFunctions(sourceCode, targetFunctionName, dictionaryEnumValues):
     nodeInlined = nodeInliner.visit(nodeTarget)
     ast.fix_missing_locations(nodeInlined)
 
-    # Generate imports
     requiredImports = findRequiredImports(nodeInlined)
     importStatements = generateImports(requiredImports)
 
-    # Combine imports with inlined code
-    inlinedCode = importStatements + '\n\n' + ast.unparse(ast.Module(body=[nodeInlined], type_ignores=[]))
+    lineNumbaDecorator = dictionaryDecorators[targetFunctionName]
+    inlinedCode = importStatements + '\n\n' + lineNumbaDecorator + ast.unparse(ast.Module(body=[nodeInlined], type_ignores=[]))
     return inlinedCode
 
+def unpackArrays(codeInlined: str, callableTarget: str) -> str:
+    dictionaryReplaceScalars = {
+        'my[indexMy.dimensionsTotal.value]': 'dimensionsTotal',
+        'my[indexMy.dimensionsUnconstrained.value]': 'dimensionsUnconstrained',
+        'my[indexMy.gap1ndex.value]': 'gap1ndex',
+        'my[indexMy.gap1ndexCeiling.value]': 'gap1ndexCeiling',
+        'my[indexMy.indexDimension.value]': 'indexDimension',
+        # 'my[indexMy.indexLeaf.value]': 'indexLeaf',
+        'my[indexMy.indexMiniGap.value]': 'indexMiniGap',
+        'my[indexMy.leaf1ndex.value]': 'leaf1ndex',
+        'my[indexMy.leafConnectee.value]': 'leafConnectee',
+        # 'my[indexMy.taskDivisions.value]': 'taskDivisions',
+        'my[indexMy.taskIndex.value]': 'taskIndex',
+        # 'foldGroups[-1]': 'leavesTotal',
+    }
+
+    dictionaryReplaceArrays = {
+        "track[indexTrack.leafAbove.value, ": 'leafAbove[',
+        "track[indexTrack.leafBelow.value, ": 'leafBelow[',
+        'track[indexTrack.countDimensionsGapped.value, ': 'countDimensionsGapped[',
+        'track[indexTrack.gapRangeStart.value, ': 'gapRangeStart[',
+    }
+
+    ImaIndent = "    "
+    linesInitialize = """"""
+
+    for find, replace in dictionaryReplaceScalars.items():
+        linesInitialize += f"{ImaIndent}{replace} = {find}\n"
+        codeInlined = codeInlined.replace(find, replace)
+
+    for find, replace in dictionaryReplaceArrays.items():
+        linesInitialize += f"{ImaIndent}{replace[0:-1]} = {find[0:-2]}]\n"
+        codeInlined = codeInlined.replace(find, replace)
+
+    ourGuyOnTheInside = "    doFindGaps = True\n"
+    linesInitialize = ourGuyOnTheInside + linesInitialize
+
+    codeInlined = codeInlined.replace(ourGuyOnTheInside, linesInitialize)
+
+    return codeInlined
+
 def Z0Z_inlineMapFolding():
     dictionaryEnumValues = getDictionaryEnumValues()
+    codeSource = inspect.getsource(algorithmSource)
+    pathFilenameAlgorithm = pathlib.Path(inspect.getfile(algorithmSource))
 
-    pathFilenameSource = pathlib.Path("/apps/mapFolding/mapFolding/lovelace.py")
-    codeSource = pathFilenameSource.read_text()
-
-    listCallables = [
-        'countInitialize',
-        'countParallel',
-        'countSequential',
-    ]
+    listCallables = [ 'countInitialize', 'countParallel', 'countSequential', ]
 
     listPathFilenamesDestination: list[pathlib.Path] = []
     for callableTarget in listCallables:
-        pathFilenameDestination = pathFilenameSource.parent / "someAssemblyRequired" / pathFilenameSource.with_stem(callableTarget).name
-        codeInlined = inlineFunctions(codeSource, callableTarget, dictionaryEnumValues)
-        pathFilenameDestination.write_text(codeInlined)
+        skipEnum = (callableTarget == 'countInitialize')
+        skipEnum = (callableTarget == 'countSequential')
+        pathFilenameDestination = pathFilenameAlgorithm.parent / "someAssemblyRequired" / pathFilenameAlgorithm.with_stem(callableTarget).name
+        codeInlined = inlineFunctions(codeSource, callableTarget, dictionaryEnumValues, skipEnum)
+        codeUnpacked = unpackArrays(codeInlined, callableTarget)
+        pathFilenameDestination.write_text(codeUnpacked)
         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.7 → mapfolding-0.3.0}/pyproject.toml

@@ -38,16 +38,18 @@ optional-dependencies = { benchmark = [
     "pandas",
     "tqdm",
 ], testing = [
+    "more_itertools",
     "pytest",
     "pytest-cov",
     "pytest-env",
     "pytest-xdist",
+    "python_minifier",
 ] }
 readme = { file = "README.md", content-type = "text/markdown" }
 requires-python = ">=3.10,<3.14"
 scripts = { getOEISids = "mapFolding.oeis:getOEISids", clearOEIScache = "mapFolding.oeis:clearOEIScache", OEIS_for_n = "mapFolding.oeis:OEIS_for_n" }
 urls = { Homepage = "https://github.com/hunterhogan/mapFolding", Donate = "https://www.patreon.com/integrated" }
-version = "0.2.7"
+version = "0.3.0"
 
 [tool.coverage]
 report = { exclude_lines = [
@@ -68,7 +70,8 @@ xml = { output = "tests/coverage/coverage.xml" }
 
 [tool.pytest.ini_options]
 addopts = ["--color=yes", "-n 4"]
-env = ["NUMBA_JIT_COVERAGE=1"]
+# env = ["NUMBA_JIT_COVERAGE=1"]
+env = ["NUMBA_DISABLE_JIT=1"]
 testpaths = ["tests"]
 
 [tool.setuptools.packages.find]

mapfolding-0.2.7/mapFolding/someAssemblyRequired/jobsAndTasks.py

@@ -1,46 +0,0 @@
-from typing import Any, Optional, Sequence, Type
-
-def Z0Z_makeJob(listDimensions: Sequence[int], **keywordArguments: Optional[Type[Any]]):
-    from mapFolding import outfitCountFolds
-    stateUniversal = outfitCountFolds(listDimensions, computationDivisions=None, CPUlimit=None, **keywordArguments)
-    from mapFolding.someAssemblyRequired.countInitializeNoNumba import countInitialize
-    countInitialize(stateUniversal['connectionGraph'], stateUniversal['gapsWhere'], stateUniversal['my'], 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']
-    track: numpy.ndarray = stateJob['track']
-
-    from mapFolding.someAssemblyRequired.countSequentialNoNumba import countSequential
-    countSequential(connectionGraph, foldsSubTotals, gapsWhere, my, 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.7/mapFolding/someAssemblyRequired/makeNuitkaSource.py

@@ -1,99 +0,0 @@
-"""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.7/mapFolding/someAssemblyRequired/makeNumbaJob.py

@@ -1,147 +0,0 @@
-"""Create a python module hardcoded to compute a map's foldsTotal.
-- NumPy ndarray.
-- Numba optimized.
-- Absolutely no other imports.
-
-Can create LLVM IR from the module: of unknown utility.
-"""
-# from mapFolding import dtypeDefault, dtypeSmall
-from mapFolding import make_dtype, datatypeLarge, dtypeLarge
-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
-import python_minifier
-
-listDimensions = [5,5]
-
-# NOTE this overwrites files
-Z0Z_inlineMapFolding()
-
-identifierCallableLaunch = "goGoGadgetAbsurdity"
-
-def convertNDArrayToStr(arrayTarget: numpy.ndarray, identifierName: str) -> str:
-    arrayAsTypeStr = numpy.array2string(arrayTarget, threshold=100000, max_line_width=200, separator=',')
-    stringMinimized = python_minifier.minify(arrayAsTypeStr)
-    commaZeroMaximum = arrayTarget.shape[-1] - 1
-    stringMinimized = stringMinimized.replace('[0' + ',0'*commaZeroMaximum + ']', '[0]*'+str(commaZeroMaximum+1))
-    for countZeros in range(commaZeroMaximum, 2, -1):
-        stringMinimized = stringMinimized.replace(',0'*countZeros + ']', ']+[0]*'+str(countZeros))
-    return f"{identifierName} = numpy.array({stringMinimized}, dtype=numpy.{arrayTarget.dtype})"
-
-def writeModuleWithNumba(listDimensions):
-    numpy_dtypeLarge = dtypeLarge
-    # numpy_dtypeDefault = dtypeDefault
-    datatypeDefault = 'uint8'
-    numpy_dtypeDefault = make_dtype(datatypeDefault)
-    numpy_dtypeSmall = numpy_dtypeDefault
-    # forceinline=True might actually be useful
-    parametersNumba = f"numba.types.{datatypeLarge}(), \
-cache=True, \
-nopython=True, \
-fastmath=True, \
-forceinline=True, \
-inline='always', \
-looplift=False, \
-_nrt=True, \
-error_model='numpy', \
-parallel=False, \
-boundscheck=False, \
-no_cfunc_wrapper=False, \
-no_cpython_wrapper=False, \
-"
-# no_cfunc_wrapper=True, \
-# no_cpython_wrapper=True, \
-
-    pathFilenameData = Z0Z_makeJob(listDimensions, datatypeDefault=numpy_dtypeDefault, datatypeLarge=numpy_dtypeLarge, datatypeSmall=numpy_dtypeSmall)
-
-    pathFilenameAlgorithm = pathlib.Path('/apps/mapFolding/mapFolding/someAssemblyRequired/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 + f"foldsTotal = numba.types.{datatypeLarge}(0)"
-            , ImaIndent + convertNDArrayToStr(stateJob['my'], 'my')
-            , ImaIndent + convertNDArrayToStr(stateJob['foldGroups'], 'foldGroups')
-            , ImaIndent + convertNDArrayToStr(stateJob['gapsWhere'], 'gapsWhere')
-            , ImaIndent + convertNDArrayToStr(stateJob['track'], 'track')
-            ])
-
-    linesDataStatic = """"""
-    linesDataStatic = "\n".join([linesDataStatic
-            , ImaIndent + convertNDArrayToStr(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
-                            ])
-
-    linesLaunch = """"""
-    linesLaunch = linesLaunch + f"""
-if __name__ == '__main__':
-    import time
-    timeStart = time.perf_counter()
-    {identifierCallableLaunch}()
-    print(time.perf_counter() - timeStart)"""
-
-    linesWriteFoldsTotal = """"""
-    linesWriteFoldsTotal = "\n".join([linesWriteFoldsTotal
-                                    , "    foldsTotal = foldGroups[0:-1].sum() * foldGroups[-1]"
-                                    , "    print(foldsTotal)"
-                                    , "    with numba.objmode():"
-                                    , f"        open('{pathFilenameFoldsTotal.as_posix()}', 'w').write(str(foldsTotal))"
-                                    , "    return foldsTotal"
-                                    ])
-
-    linesAll = "\n".join([
-                        linesImport
-                        , linesAlgorithm
-                        , linesWriteFoldsTotal
-                        , linesLaunch
-                        ])
-
-    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)