mapFolding 0.3.5__tar.gz → 0.3.6__tar.gz

{mapfolding-0.3.5 → mapfolding-0.3.6}/PKG-INFO

@@ -1,11 +1,12 @@
 Metadata-Version: 2.2
 Name: mapFolding
-Version: 0.3.5
+Version: 0.3.6
 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
-Project-URL: Homepage, https://github.com/hunterhogan/mapFolding
+Project-URL: homepage, https://github.com/hunterhogan/mapFolding
 Project-URL: Donate, https://www.patreon.com/integrated
+Project-URL: repository, https://github.com/hunterhogan/mapFolding.git
 Keywords: A001415,A001416,A001417,A001418,A195646,folding,map folding,OEIS,stamp folding
 Classifier: Development Status :: 5 - Production/Stable
 Classifier: Environment :: Console

mapfolding-0.3.6/mapFolding/citations/updateCitation.py

@@ -0,0 +1,116 @@
+from cffconvert.cli.create_citation import create_citation
+from cffconvert.cli.validate_or_write_output import validate_or_write_output
+from typing import Any, Dict
+import cffconvert
+import pathlib
+import packaging.metadata
+import tomli
+import inspect
+import json
+import ruamel.yaml
+import packaging
+from packaging.metadata import Metadata as PyPAMetadata
+import packaging.utils
+import packaging.version
+
+def addPypaMetadata(citation: cffconvert.Citation, metadata: PyPAMetadata) -> cffconvert.Citation:
+    # https://github.com/citation-file-format/cff-initializer-javascript
+    """
+keywords: pathFilenamePackageSSOT; packaging.metadata.Metadata.keywords
+license: pathFilenamePackageSSOT; packaging.metadata.Metadata.license_expression
+title: pathFilenamePackageSSOT; packaging.metadata.Metadata.name
+url: pathFilenamePackageSSOT; packaging.metadata.Metadata.project_urls: homepage
+repository: pathFilenamePackageSSOT; packaging.metadata.Metadata.project_urls: repository
+version: pathFilenamePackageSSOT; packaging.metadata.Metadata.version
+    """
+    return citation
+
+def getPypaMetadata(packageData: Dict[str, Any]) -> PyPAMetadata:
+    # https://packaging.python.org/en/latest/specifications/core-metadata/
+    dictionaryProjectURLs = {}
+    for urlKey, urlValue in packageData.get('urls', {}).items():
+        if urlKey.lower() in ('homepage', 'repository'):
+            dictionaryProjectURLs[urlKey] = urlValue
+
+    metadataRaw = packaging.metadata.RawMetadata(
+        keywords=packageData.get('keywords', []),
+        license_expression=packageData.get('license', {}).get('text', ''),
+        metadata_version='2.4',
+        name=packaging.utils.canonicalize_name(packageData.get('name', None), validate=True),
+        project_urls=dictionaryProjectURLs,
+        version=packageData.get('version', None),
+    )
+
+    metadata = PyPAMetadata().from_raw(metadataRaw)
+    return metadata
+
+"""
+Tentative plan:
+- Commit and push to GitHub
+- GitHub Action gathers information from the sources of truth
+- If the citation needs to be updated, write to both
+    - pathFilenameCitationSSOT
+    - pathFilenameCitationDOTcffRepo
+- Commit and push to GitHub
+    - this complicates things
+    - I want the updated citation to be in the `commit` field of itself
+"""
+"""cffconvert.Citation fields and the source of truth
+abstract: pathFilenameCitationSSOT
+authors: pathFilenamePackageSSOT
+cff-version: pathFilenameCitationSSOT
+commit: workflows['Make GitHub Release']
+contact: pathFilenamePackageSSOT
+date-released: workflows['Make GitHub Release']
+doi: pathFilenameCitationSSOT
+identifiers: workflows['Make GitHub Release']
+license-url: pathFilenamePackageSSOT
+message: pathFilenameCitationSSOT
+preferred-citation: pathFilenameCitationSSOT
+references: to be determined
+repository-artifact: (https://pypi.org/pypi/{package_name}/json').json()['releases']
+repository-code: workflows['Make GitHub Release']
+type: pathFilenameCitationSSOT
+
+keywords: pathFilenamePackageSSOT; packaging.metadata.Metadata.keywords
+license: pathFilenamePackageSSOT; packaging.metadata.Metadata.license_expression
+title: pathFilenamePackageSSOT; packaging.metadata.Metadata.name
+url: pathFilenamePackageSSOT; packaging.metadata.Metadata.project_urls: homepage
+repository: pathFilenamePackageSSOT; packaging.metadata.Metadata.project_urls: repository
+version: pathFilenamePackageSSOT; packaging.metadata.Metadata.version
+"""
+
+def logistics():
+    # Prefer reliable, dynamic values over hardcoded ones
+    packageName: str = 'mapFolding'
+    pathRepoRoot = pathlib.Path(__file__).parent.parent.parent
+    pathFilenamePackageSSOT = pathRepoRoot / 'pyproject.toml'
+    filenameGitHubAction = 'updateCitation.yml'
+    pathFilenameGitHubAction = pathRepoRoot / '.github' / 'workflows' / filenameGitHubAction
+
+    filenameCitationDOTcff = 'CITATION.cff'
+    pathCitations = pathRepoRoot / packageName / 'citations'
+    pathFilenameCitationSSOT = pathCitations / filenameCitationDOTcff
+    pathFilenameCitationDOTcffRepo = pathRepoRoot / filenameCitationDOTcff
+
+    citationObject: cffconvert.Citation = create_citation(infile=pathFilenameCitationSSOT, url=None)
+    print(citationObject._parse().as_cff())
+
+    tomlPackageData: Dict[str, Any] = tomli.loads(pathFilenamePackageSSOT.read_text())['project']
+    # https://packaging.python.org/en/latest/specifications/pyproject-toml/
+    pypaMetadata: PyPAMetadata = getPypaMetadata(tomlPackageData)
+
+    validate_or_write_output(outfile=pathFilenameCitationSSOT, outputformat='cff', validate_only=False, citation=citationObject)
+    validate_or_write_output(outfile=pathFilenameCitationDOTcffRepo, outputformat='cff', validate_only=False, citation=citationObject)
+
+if __name__ == '__main__':
+    logistics()
+
+    # print(f"{pypaMetadata.name=}, {pypaMetadata.version=}, {pypaMetadata.keywords=}, {pypaMetadata.license_expression=}, {pypaMetadata.project_urls=}")
+# path_cffconvert = pathlib.Path(inspect.getfile(cffconvert)).parent
+# pathFilenameSchema = path_cffconvert / "schemas/1.2.0/schema.json"
+# scheme: Dict[str, Any] = json.loads(pathFilenameSchema.read_text())
+# schemaSpecifications: Dict[str, Any] = scheme['properties']
+
+# for property, subProperties in schemaSpecifications.items():
+#     print(property, subProperties.get('items', None))

mapfolding-0.3.6/mapFolding/citations/updateCitationgpt.py

@@ -0,0 +1,125 @@
+from cffconvert.cli.create_citation import create_citation
+from cffconvert.cli.validate_or_write_output import validate_or_write_output
+from typing import Any, Dict
+import cffconvert
+import pathlib
+import packaging.metadata
+import tomli
+import ruamel.yaml
+import packaging
+from packaging.metadata import Metadata as PyPAMetadata
+import packaging.utils
+import packaging.version
+
+def addPypaMetadata(citation: cffconvert.Citation, metadata: PyPAMetadata) -> cffconvert.Citation:
+    """
+    Map the PyPA metadata to the citation's internal representation.
+
+    Mapping:
+      - title: metadata.name
+      - version: metadata.version (converted to string)
+      - keywords: metadata.keywords
+      - license: metadata.license_expression
+      - url: from project URLs (homepage)
+      - repository: from project URLs (repository)
+    """
+    # Access the internal dictionary (used for conversion)
+    citationData: Dict[str, Any] = citation._cffobj
+
+    # Update title from PyPA metadata name
+    if metadata.name:
+        citationData["title"] = metadata.name
+
+    # Update version from PyPA metadata version
+    if metadata.version:
+        citationData["version"] = str(metadata.version)
+
+    # Update keywords from PyPA metadata keywords
+    if metadata.keywords:
+        citationData["keywords"] = metadata.keywords
+
+    # Update license from PyPA metadata license_expression
+    if metadata.license_expression:
+        citationData["license"] = metadata.license_expression
+
+    # Retrieve the project URLs that were attached in getPypaMetadata
+    projectURLs: Dict[str, str] = getattr(metadata, "_project_urls", {})
+
+    # Update the homepage URL
+    if "homepage" in projectURLs:
+        citationData["url"] = projectURLs["homepage"]
+
+    # Update the repository URL
+    if "repository" in projectURLs:
+        citationData["repository"] = projectURLs["repository"]
+
+    return citation
+
+def getPypaMetadata(packageData: Dict[str, Any]) -> PyPAMetadata:
+    """
+    Create a PyPA metadata object (version 2.4) from packageData.
+
+    Mapping for project URLs:
+      - 'homepage' and 'repository' are accepted from packageData['urls'].
+    """
+    dictionaryProjectURLs: Dict[str, str] = {}
+    for urlKey, urlValue in packageData.get("urls", {}).items():
+        lowerUrlKey = urlKey.lower()
+        if lowerUrlKey in ("homepage", "repository"):
+            dictionaryProjectURLs[lowerUrlKey] = urlValue
+
+    metadataRaw = packaging.metadata.RawMetadata(
+        keywords=packageData.get("keywords", []),
+        license_expression=packageData.get("license", {}).get("text", ""),
+        metadata_version="2.4",
+        name=packaging.utils.canonicalize_name(packageData.get("name", None), validate=True),
+        project_urls=dictionaryProjectURLs,
+        version=packageData.get("version", None),
+    )
+
+    metadata = PyPAMetadata().from_raw(metadataRaw)
+    # Attach the project URLs dictionary so it can be used later.
+    setattr(metadata, "_project_urls", dictionaryProjectURLs)
+    return metadata
+
+def logistics():
+    # Determine paths from your SSOT.
+    packageName: str = "mapFolding"
+    pathRepoRoot = pathlib.Path(__file__).parent.parent.parent
+    pathFilenamePackageSSOT = pathRepoRoot / "pyproject.toml"
+    filenameGitHubAction = "updateCitation.yml"
+    pathFilenameGitHubAction = pathRepoRoot / ".github" / "workflows" / filenameGitHubAction
+
+    filenameCitationDOTcff = "CITATION.cff"
+    pathCitations = pathRepoRoot / packageName / "citations"
+    pathFilenameCitationSSOT = pathCitations / filenameCitationDOTcff
+    pathFilenameCitationDOTcffRepo = pathRepoRoot / filenameCitationDOTcff
+
+    # Create a citation object from the SSOT citation file.
+    citationObject: cffconvert.Citation = create_citation(infile=pathFilenameCitationSSOT, url=None)
+    # Print the current citation in CFF format (for debugging) using the as_cff method.
+    print(citationObject.as_cff())
+
+    # Load package metadata from pyproject.toml.
+    tomlPackageData: Dict[str, Any] = tomli.loads(pathFilenamePackageSSOT.read_text())["project"]
+    pypaMetadata: PyPAMetadata = getPypaMetadata(tomlPackageData)
+
+    # Map the PyPA metadata into the citation's internal representation.
+    citationObject = addPypaMetadata(citation=citationObject, metadata=pypaMetadata)
+
+    # Validate and write out the updated citation file in both locations.
+    # validate_or_write_output(
+    #     outfile=pathFilenameCitationSSOT,
+    #     outputformat="cff",
+    #     validate_only=False,
+    #     citation=citationObject,
+    # )
+    validate_or_write_output(
+        outfile=pathFilenameCitationDOTcffRepo,
+        outputformat="cff",
+        validate_only=False,
+        citation=citationObject,
+    )
+
+if __name__ == "__main__":
+    logistics()

{mapfolding-0.3.5 → mapfolding-0.3.6}/mapFolding/mapFolding.egg-info/PKG-INFO

@@ -1,11 +1,12 @@
 Metadata-Version: 2.2
 Name: mapFolding
-Version: 0.3.5
+Version: 0.3.6
 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
-Project-URL: Homepage, https://github.com/hunterhogan/mapFolding
+Project-URL: homepage, https://github.com/hunterhogan/mapFolding
 Project-URL: Donate, https://www.patreon.com/integrated
+Project-URL: repository, https://github.com/hunterhogan/mapFolding.git
 Keywords: A001415,A001416,A001417,A001418,A195646,folding,map folding,OEIS,stamp folding
 Classifier: Development Status :: 5 - Production/Stable
 Classifier: Environment :: Console

{mapfolding-0.3.5 → mapfolding-0.3.6}/mapFolding/mapFolding.egg-info/SOURCES.txt

@@ -2,6 +2,7 @@ README.md
 pyproject.toml
 mapFolding/benchmarks/benchmarking.py
 mapFolding/citations/updateCitation.py
+mapFolding/citations/updateCitationgpt.py
 mapFolding/mapFolding.egg-info/PKG-INFO
 mapFolding/mapFolding.egg-info/SOURCES.txt
 mapFolding/mapFolding.egg-info/dependency_links.txt
@@ -23,10 +24,10 @@ mapFolding/someAssemblyRequired/getLLVMforNoReason.py
 mapFolding/someAssemblyRequired/makeJob.py
 mapFolding/someAssemblyRequired/synthesizeModuleJob.py
 mapFolding/someAssemblyRequired/synthesizeModules.py
+mapFolding/syntheticModules/Initialize.py
+mapFolding/syntheticModules/Parallel.py
+mapFolding/syntheticModules/Sequential.py
 mapFolding/syntheticModules/__init__.py
-mapFolding/syntheticModules/countInitialize.py
-mapFolding/syntheticModules/countParallel.py
-mapFolding/syntheticModules/countSequential.py
 tests/test_oeis.py
 tests/test_other.py
 tests/test_tasks.py

mapfolding-0.3.6/mapFolding/someAssemblyRequired/__init__.py

@@ -0,0 +1 @@
+from .makeJob import makeStateJob

mapfolding-0.3.6/mapFolding/someAssemblyRequired/makeJob.py

@@ -0,0 +1,34 @@
+from mapFolding import getPathFilenameFoldsTotal, computationState
+from mapFolding import outfitCountFolds
+from typing import Any, Literal, Optional, Sequence, Type, overload
+import pathlib
+import pickle
+
+@overload
+def makeStateJob(listDimensions: Sequence[int], writeJob: Literal[True] = True
+                 , **keywordArguments: Optional[Type[Any]]) -> pathlib.Path:
+    ...
+
+@overload
+def makeStateJob(listDimensions: Sequence[int], writeJob: Literal[False] = False
+                 , **keywordArguments: Optional[Type[Any]]) -> computationState:
+    ...
+
+def makeStateJob(listDimensions: Sequence[int], writeJob: bool = True, **keywordArguments: Optional[Type[Any]]) -> computationState | pathlib.Path:
+
+    stateUniversal: computationState = outfitCountFolds(listDimensions, computationDivisions=None, CPUlimit=None, **keywordArguments)
+
+    from mapFolding.syntheticModules import countInitialize
+    countInitialize(stateUniversal['connectionGraph'], stateUniversal['gapsWhere'], stateUniversal['my'], stateUniversal['track'])
+
+    if not writeJob:
+        return stateUniversal
+
+    pathFilenameChopChop = getPathFilenameFoldsTotal(stateUniversal['mapShape'])
+    suffix = pathFilenameChopChop.suffix
+    pathJob = pathlib.Path(str(pathFilenameChopChop)[0:-len(suffix)])
+    pathJob.mkdir(parents=True, exist_ok=True)
+    pathFilenameJob = pathJob / 'stateJob.pkl'
+
+    pathFilenameJob.write_bytes(pickle.dumps(stateUniversal))
+    return pathFilenameJob

{mapfolding-0.3.5 → mapfolding-0.3.6}/mapFolding/someAssemblyRequired/synthesizeModuleJob.py

@@ -1,15 +1,13 @@
-from mapFolding import getPathFilenameFoldsTotal
+from mapFolding import getPathFilenameFoldsTotal, indexMy, indexTrack
 from mapFolding import make_dtype, datatypeLargeDEFAULT, datatypeMediumDEFAULT, datatypeSmallDEFAULT, datatypeModuleDEFAULT
-from mapFolding import computationState
 from someAssemblyRequired import makeStateJob
 from typing import Optional
-import more_itertools
-import inspect
 import importlib
 import importlib.util
+import inspect
+import more_itertools
 import numpy
 import pathlib
-import pickle
 import python_minifier
 
 identifierCallableLaunch = "goGoGadgetAbsurdity"
@@ -52,33 +50,15 @@ def writeModuleWithNumba(listDimensions, **keywordArguments: Optional[str]) -> p
     dtypeMedium = make_dtype(datatypeMedium, datatypeModule) # type: ignore
     dtypeSmall = make_dtype(datatypeSmall, datatypeModule) # type: ignore
 
-    pathFilenameJob = makeStateJob(listDimensions, dtypeLarge = dtypeLarge, dtypeMedium = dtypeMedium, dtypeSmall = dtypeSmall)
-    stateJob: computationState = pickle.loads(pathFilenameJob.read_bytes())
-    pathFilenameFoldsTotal = getPathFilenameFoldsTotal(stateJob['mapShape'], pathFilenameJob.parent)
+    stateJob = makeStateJob(listDimensions, writeJob=False, dtypeLarge = dtypeLarge, dtypeMedium = dtypeMedium, dtypeSmall = dtypeSmall)
+    pathFilenameFoldsTotal = getPathFilenameFoldsTotal(stateJob['mapShape'])
 
     from syntheticModules import countSequential
     algorithmSource = countSequential
     codeSource = inspect.getsource(algorithmSource)
 
-    # 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, \
-
-    lineNumba = f"@numba.jit({parametersNumba})"
+    if datatypeLarge:
+        lineNumba = f"@numba.jit(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=True, no_cpython_wrapper=False)"
 
     linesImport = "\n".join([
                         "import numpy"
@@ -88,8 +68,8 @@ no_cpython_wrapper=False, \
     ImaIndent = '    '
     linesDataDynamic = """"""
     linesDataDynamic = "\n".join([linesDataDynamic
-            , ImaIndent + f"foldsTotal = numba.types.{datatypeLarge}(0)"
-            , ImaIndent + makeStrRLEcompacted(stateJob['foldGroups'], 'foldGroups')
+            # , ImaIndent + f"foldsTotal = numba.types.{datatypeLarge}(0)"
+            # , ImaIndent + makeStrRLEcompacted(stateJob['foldGroups'], 'foldGroups')
             , ImaIndent + makeStrRLEcompacted(stateJob['gapsWhere'], 'gapsWhere')
             ])
 
@@ -112,14 +92,22 @@ no_cpython_wrapper=False, \
                                 , linesDataDynamic
                                 , linesDataStatic
                                 ])
+        elif 'taskIndex' in lineSource:
+            continue
         elif 'my[indexMy.' in lineSource:
+            if 'dimensionsTotal' in lineSource:
+                continue
             # leaf1ndex = my[indexMy.leaf1ndex.value]
             identifier, statement = lineSource.split('=')
-            lineSource = ImaIndent + identifier.strip() + '=' + str(eval(statement.strip()))
+            lineSource = ImaIndent + identifier.strip() + f"=numba.types.{datatypeSmall}({str(eval(statement.strip()))})"
         elif 'track[indexTrack.' in lineSource:
             # leafAbove = track[indexTrack.leafAbove.value]
             identifier, statement = lineSource.split('=')
             lineSource = ImaIndent + makeStrRLEcompacted(eval(statement.strip()), identifier.strip())
+        elif 'foldGroups[-1]' in lineSource:
+            lineSource = lineSource.replace('foldGroups[-1]', str(stateJob['foldGroups'][-1]))
+        elif 'dimensionsTotal' in lineSource:
+            lineSource = lineSource.replace('dimensionsTotal', str(stateJob['my'][indexMy.dimensionsTotal]))
 
         linesAlgorithm = "\n".join([linesAlgorithm
                             , lineSource
@@ -135,11 +123,11 @@ if __name__ == '__main__':
 
     linesWriteFoldsTotal = """"""
     linesWriteFoldsTotal = "\n".join([linesWriteFoldsTotal
-                                    , "    foldsTotal = foldGroups[0:-1].sum() * foldGroups[-1]"
-                                    , "    print(foldsTotal)"
+                                    , f"    groupsOfFolds *= {str(stateJob['foldGroups'][-1])}"
+                                    , "    print(groupsOfFolds)"
                                     , "    with numba.objmode():"
-                                    , f"        open('{pathFilenameFoldsTotal.as_posix()}', 'w').write(str(foldsTotal))"
-                                    , "    return foldsTotal"
+                                    , f"        open('{pathFilenameFoldsTotal.as_posix()}', 'w').write(str(groupsOfFolds))"
+                                    , "    return groupsOfFolds"
                                     ])
 
     linesAll = "\n".join([
@@ -149,7 +137,7 @@ if __name__ == '__main__':
                         , linesLaunch
                         ])
 
-    pathFilenameDestination = pathFilenameJob.with_stem(pathFilenameJob.parent.name).with_suffix(".py")
+    pathFilenameDestination = pathFilenameFoldsTotal.with_suffix(".py")
     pathFilenameDestination.write_text(linesAll)
 
     return pathFilenameDestination
@@ -160,11 +148,10 @@ if __name__ == '__main__':
     datatypeMedium = 'uint8'
     datatypeSmall = datatypeMedium
     pathFilenameModule = writeModuleWithNumba(listDimensions, datatypeLarge=datatypeLarge, datatypeMedium=datatypeMedium, datatypeSmall=datatypeSmall)
+
     # Induce numba.jit compilation
     moduleSpec = importlib.util.spec_from_file_location(pathFilenameModule.stem, pathFilenameModule)
-    if moduleSpec is None:
-        raise ImportError(f"Could not load module specification from {pathFilenameModule}")
+    if moduleSpec is None: raise ImportError(f"Could not load module specification from {pathFilenameModule}")
     module = importlib.util.module_from_spec(moduleSpec)
-    if moduleSpec.loader is None:
-        raise ImportError(f"Could not load module from {moduleSpec}")
+    if moduleSpec.loader is None: raise ImportError(f"Could not load module from {moduleSpec}")
     moduleSpec.loader.exec_module(module)

{mapfolding-0.3.5 → mapfolding-0.3.6}/mapFolding/someAssemblyRequired/synthesizeModules.py

@@ -82,7 +82,10 @@ def decorateCallableWithNumba(astCallable: ast.FunctionDef, parallel: bool=False
 
     astArgsNumbaSignature = ast.Tuple(elts=listNumbaParameterSignature, ctx=ast.Load())
 
-    parametersNumba = parametersNumbaDEFAULT if not parallel else ParametersNumba({**parametersNumbaDEFAULT, 'parallel': True})
+    if astCallable.name == 'countInitialize':
+        parametersNumba = {}
+    else:
+        parametersNumba = parametersNumbaDEFAULT if not parallel else ParametersNumba({**parametersNumbaDEFAULT, 'parallel': True})
     listKeywordsNumbaSignature = [ast.keyword(arg=parameterName, value=ast.Constant(value=parameterValue)) for parameterName, parameterValue in parametersNumba.items()]
 
     astDecoratorNumba = ast.Call(func=ast.Attribute(value=ast.Name(id='numba', ctx=ast.Load()), attr='jit', ctx=ast.Load()), args=[astArgsNumbaSignature], keywords=listKeywordsNumbaSignature)
@@ -117,10 +120,7 @@ class UnpackArrayAccesses(ast.NodeTransformer):
                     return ast.Name(id=member_name, ctx=node.ctx)
             elif isinstance(node, ast.Tuple):
                 # Handle tuple slices by transforming each element
-                return ast.Tuple(
-                    elts=cast(List[ast.expr], [self.transform_slice_element(elt) for elt in node.elts]),
-                    ctx=node.ctx
-                )
+                return ast.Tuple(elts=cast(List[ast.expr], [self.transform_slice_element(elt) for elt in node.elts]), ctx=node.ctx)
         elif isinstance(node, ast.Attribute):
             member_name = self.extract_member_name(node)
             if member_name:
@@ -131,7 +131,6 @@ class UnpackArrayAccesses(ast.NodeTransformer):
         # Recursively visit any nested subscripts in value or slice
         node.value = self.visit(node.value)
         node.slice = self.visit(node.slice)
-
         # If node.value is not our arrayName, just return node
         if not (isinstance(node.value, ast.Name) and node.value.id == self.arrayName):
             return node
@@ -152,11 +151,7 @@ class UnpackArrayAccesses(ast.NodeTransformer):
                 self.substitutions[memberName] = ('array', node)
                 if len(sliceRemainder) == 0:
                     return ast.Name(id=memberName, ctx=ast.Load())
-                return ast.Subscript(
-                    value=ast.Name(id=memberName, ctx=ast.Load()),
-                    slice=ast.Tuple(elts=sliceRemainder, ctx=ast.Load()) if len(sliceRemainder) > 1 else sliceRemainder[0],
-                    ctx=ast.Load()
-                )
+                return ast.Subscript(value=ast.Name(id=memberName, ctx=ast.Load()), slice=ast.Tuple(elts=sliceRemainder, ctx=ast.Load()) if len(sliceRemainder) > 1 else sliceRemainder[0], ctx=ast.Load())
 
         # If single-element tuple, unwrap
         if isinstance(node.slice, ast.Tuple) and len(node.slice.elts) == 1:
@@ -170,44 +165,20 @@ class UnpackArrayAccesses(ast.NodeTransformer):
         initializations = []
         for name, (kind, original_node) in self.substitutions.items():
             if kind == 'scalar':
-                initializations.append(
-                    ast.Assign(
-                        targets=[ast.Name(id=name, ctx=ast.Store())],
-                        value=original_node
-                    )
-                )
+                initializations.append(ast.Assign(targets=[ast.Name(id=name, ctx=ast.Store())], value=original_node))
             else:  # array
                 initializations.append(
                     ast.Assign(
                         targets=[ast.Name(id=name, ctx=ast.Store())],
-                        value=ast.Subscript(
-                            value=ast.Name(id=self.arrayName, ctx=ast.Load()),
-                            slice=ast.Attribute(
-                                value=ast.Attribute(
+                        value=ast.Subscript(value=ast.Name(id=self.arrayName, ctx=ast.Load()),
+                            slice=ast.Attribute(value=ast.Attribute(
                                     value=ast.Name(id=self.enumIndexClass.__name__, ctx=ast.Load()),
-                                    attr=name,
-                                    ctx=ast.Load()
-                                ),
-                                attr='value',
-                                ctx=ast.Load()
-                            ),
-                            ctx=ast.Load()
-                        )
-                    )
-                )
+                                    attr=name, ctx=ast.Load()), attr='value', ctx=ast.Load()), ctx=ast.Load())))
 
         node.body = initializations + node.body
         return node
 
-def getDictionaryEnumValues() -> Dict[str, int]:
-    dictionaryEnumValues = {}
-    for enumIndex in [indexMy, indexTrack]:
-        for memberName, memberValue in enumIndex._member_map_.items():
-            dictionaryEnumValues[f"{enumIndex.__name__}.{memberName}.value"] = memberValue.value
-    return dictionaryEnumValues
-
 def inlineMapFoldingNumba(**keywordArguments: Optional[str]):
-    dictionaryEnumValues = getDictionaryEnumValues()
     codeSource = inspect.getsource(algorithmSource)
     pathFilenameAlgorithm = pathlib.Path(inspect.getfile(algorithmSource))
 
@@ -233,11 +204,12 @@ def inlineMapFoldingNumba(**keywordArguments: Optional[str]):
                 callableDecorated = cast(ast.FunctionDef, trackUnpacker.visit(callableDecorated))
                 ast.fix_missing_locations(callableDecorated)
 
-            callableInlined = ast.unparse(callableDecorated)
-            importsRequired = "\n".join([ast.unparse(importStatement) for importStatement in codeSourceImportStatements])
+            moduleAST = ast.Module(body=cast(List[ast.stmt], list(codeSourceImportStatements) + [callableDecorated]), type_ignores=[])
+            ast.fix_missing_locations(moduleAST)
+            moduleSource = ast.unparse(moduleAST)
 
-            pathFilenameDestination = pathFilenameAlgorithm.parent / "syntheticModules" / pathFilenameAlgorithm.with_stem(callableTarget).name
-            pathFilenameDestination.write_text(importsRequired + "\n" + callableInlined)
+            pathFilenameDestination = pathFilenameAlgorithm.parent / "syntheticModules" / pathFilenameAlgorithm.with_stem(callableTarget).name[5:None]
+            pathFilenameDestination.write_text(moduleSource)
             listPathFilenamesDestination.append(pathFilenameDestination)
 
 if __name__ == '__main__':

mapfolding-0.3.5/mapFolding/syntheticModules/countInitialize.py → mapfolding-0.3.6/mapFolding/syntheticModules/Initialize.py

@@ -1,11 +1,12 @@
-import numpy
-from typing import Any, Tuple
-from mapFolding import indexMy, indexTrack
 import numba
 from numpy import integer
-@numba.jit((numba.uint8[:, :, ::1], numba.uint8[::1], numba.uint8[::1], numba.uint8[:, ::1]), _nrt=True, boundscheck=False, cache=True, error_model='numpy', fastmath=True, forceinline=False, inline='never', looplift=False, no_cfunc_wrapper=True, no_cpython_wrapper=True, nopython=True, parallel=False)
+from mapFolding import indexMy, indexTrack
+import numpy
+from typing import Any, Tuple
+
+@numba.jit((numba.uint8[:, :, ::1], numba.uint8[::1], numba.uint8[::1], numba.uint8[:, ::1]))
 def countInitialize(connectionGraph: numpy.ndarray[Tuple[int, int, int], numpy.dtype[integer[Any]]], gapsWhere: numpy.ndarray[Tuple[int], numpy.dtype[integer[Any]]], my: numpy.ndarray[Tuple[int], numpy.dtype[integer[Any]]], track: numpy.ndarray[Tuple[int, int], numpy.dtype[integer[Any]]]):
-    while my[indexMy.leaf1ndex.value] > 0:
+    while my[indexMy.leaf1ndex.value]:
         if my[indexMy.leaf1ndex.value] <= 1 or track[indexTrack.leafBelow.value, 0] == 1:
             my[indexMy.dimensionsUnconstrained.value] = my[indexMy.dimensionsTotal.value]
             my[indexMy.gap1ndexCeiling.value] = track[indexTrack.gapRangeStart.value, my[indexMy.leaf1ndex.value] - 1]
@@ -35,7 +36,7 @@ def countInitialize(connectionGraph: numpy.ndarray[Tuple[int, int, int], numpy.d
                     my[indexMy.gap1ndex.value] += 1
                 track[indexTrack.countDimensionsGapped.value, gapsWhere[my[indexMy.indexMiniGap.value]]] = 0
                 my[indexMy.indexMiniGap.value] += 1
-        if my[indexMy.leaf1ndex.value] > 0:
+        if my[indexMy.leaf1ndex.value]:
             my[indexMy.gap1ndex.value] -= 1
             track[indexTrack.leafAbove.value, my[indexMy.leaf1ndex.value]] = gapsWhere[my[indexMy.gap1ndex.value]]
             track[indexTrack.leafBelow.value, my[indexMy.leaf1ndex.value]] = track[indexTrack.leafBelow.value, track[indexTrack.leafAbove.value, my[indexMy.leaf1ndex.value]]]

mapfolding-0.3.5/mapFolding/syntheticModules/countParallel.py → mapfolding-0.3.6/mapFolding/syntheticModules/Parallel.py

@@ -3,15 +3,16 @@ from typing import Any, Tuple
 import numba
 from mapFolding import indexMy, indexTrack
 import numpy
+
 @numba.jit((numba.uint8[:, :, ::1], numba.int64[::1], numba.uint8[::1], numba.uint8[::1], numba.uint8[:, ::1]), _nrt=True, boundscheck=False, cache=True, error_model='numpy', fastmath=True, forceinline=False, inline='never', looplift=False, no_cfunc_wrapper=True, no_cpython_wrapper=True, nopython=True, parallel=True)
 def countParallel(connectionGraph: numpy.ndarray[Tuple[int, int, int], numpy.dtype[integer[Any]]], foldGroups: numpy.ndarray[Tuple[int], numpy.dtype[integer[Any]]], gapsWherePARALLEL: numpy.ndarray[Tuple[int], numpy.dtype[integer[Any]]], myPARALLEL: numpy.ndarray[Tuple[int], numpy.dtype[integer[Any]]], trackPARALLEL: numpy.ndarray[Tuple[int, int], numpy.dtype[integer[Any]]]):
     for indexSherpa in numba.prange(myPARALLEL[indexMy.taskDivisions.value]):
-        groupsOfFolds: int = 0
+        groupsOfFolds = numba.types.int64(0)
         gapsWhere = gapsWherePARALLEL.copy()
         my = myPARALLEL.copy()
         my[indexMy.taskIndex.value] = indexSherpa
         track = trackPARALLEL.copy()
-        while my[indexMy.leaf1ndex.value] > 0:
+        while my[indexMy.leaf1ndex.value]:
             if my[indexMy.leaf1ndex.value] <= 1 or track[indexTrack.leafBelow.value, 0] == 1:
                 if my[indexMy.leaf1ndex.value] > foldGroups[-1]:
                     groupsOfFolds += 1
@@ -39,11 +40,11 @@ def countParallel(connectionGraph: numpy.ndarray[Tuple[int, int, int], numpy.dty
                             my[indexMy.gap1ndex.value] += 1
                         track[indexTrack.countDimensionsGapped.value, gapsWhere[my[indexMy.indexMiniGap.value]]] = 0
                         my[indexMy.indexMiniGap.value] += 1
-            while my[indexMy.leaf1ndex.value] > 0 and my[indexMy.gap1ndex.value] == track[indexTrack.gapRangeStart.value, my[indexMy.leaf1ndex.value] - 1]:
+            while my[indexMy.leaf1ndex.value] and my[indexMy.gap1ndex.value] == track[indexTrack.gapRangeStart.value, my[indexMy.leaf1ndex.value] - 1]:
                 my[indexMy.leaf1ndex.value] -= 1
                 track[indexTrack.leafBelow.value, track[indexTrack.leafAbove.value, my[indexMy.leaf1ndex.value]]] = track[indexTrack.leafBelow.value, my[indexMy.leaf1ndex.value]]
                 track[indexTrack.leafAbove.value, track[indexTrack.leafBelow.value, my[indexMy.leaf1ndex.value]]] = track[indexTrack.leafAbove.value, my[indexMy.leaf1ndex.value]]
-            if my[indexMy.leaf1ndex.value] > 0:
+            if my[indexMy.leaf1ndex.value]:
                 my[indexMy.gap1ndex.value] -= 1
                 track[indexTrack.leafAbove.value, my[indexMy.leaf1ndex.value]] = gapsWhere[my[indexMy.gap1ndex.value]]
                 track[indexTrack.leafBelow.value, my[indexMy.leaf1ndex.value]] = track[indexTrack.leafBelow.value, track[indexTrack.leafAbove.value, my[indexMy.leaf1ndex.value]]]

mapfolding-0.3.5/mapFolding/syntheticModules/countSequential.py → mapfolding-0.3.6/mapFolding/syntheticModules/Sequential.py

@@ -1,8 +1,9 @@
 from numpy import integer
-from typing import Any, Tuple
 import numba
+from typing import Any, Tuple
 from mapFolding import indexMy, indexTrack
 import numpy
+
 @numba.jit((numba.uint8[:, :, ::1], numba.int64[::1], numba.uint8[::1], numba.uint8[::1], numba.uint8[:, ::1]), _nrt=True, boundscheck=False, cache=True, error_model='numpy', fastmath=True, forceinline=False, inline='never', looplift=False, no_cfunc_wrapper=True, no_cpython_wrapper=True, nopython=True, parallel=False)
 def countSequential(connectionGraph: numpy.ndarray[Tuple[int, int, int], numpy.dtype[integer[Any]]], foldGroups: numpy.ndarray[Tuple[int], numpy.dtype[integer[Any]]], gapsWhere: numpy.ndarray[Tuple[int], numpy.dtype[integer[Any]]], my: numpy.ndarray[Tuple[int], numpy.dtype[integer[Any]]], track: numpy.ndarray[Tuple[int, int], numpy.dtype[integer[Any]]]):
     leafBelow = track[indexTrack.leafBelow.value]
@@ -18,9 +19,9 @@ def countSequential(connectionGraph: numpy.ndarray[Tuple[int, int, int], numpy.d
     indexMiniGap = my[indexMy.indexMiniGap.value]
     gap1ndex = my[indexMy.gap1ndex.value]
     taskIndex = my[indexMy.taskIndex.value]
-    groupsOfFolds: int = 0
+    groupsOfFolds = numba.types.int64(0)
     doFindGaps = True
-    while leaf1ndex > 0:
+    while leaf1ndex:
         if (doFindGaps := (leaf1ndex <= 1 or leafBelow[0] == 1)) and leaf1ndex > foldGroups[-1]:
             groupsOfFolds += 1
         elif doFindGaps:
@@ -46,11 +47,11 @@ def countSequential(connectionGraph: numpy.ndarray[Tuple[int, int, int], numpy.d
                     gap1ndex += 1
                 countDimensionsGapped[gapsWhere[indexMiniGap]] = 0
                 indexMiniGap += 1
-        while leaf1ndex > 0 and gap1ndex == gapRangeStart[leaf1ndex - 1]:
+        while leaf1ndex and gap1ndex == gapRangeStart[leaf1ndex - 1]:
             leaf1ndex -= 1
             leafBelow[leafAbove[leaf1ndex]] = leafBelow[leaf1ndex]
             leafAbove[leafBelow[leaf1ndex]] = leafAbove[leaf1ndex]
-        if leaf1ndex > 0:
+        if leaf1ndex:
             gap1ndex -= 1
             leafAbove[leaf1ndex] = gapsWhere[gap1ndex]
             leafBelow[leaf1ndex] = leafBelow[leafAbove[leaf1ndex]]

mapfolding-0.3.6/mapFolding/syntheticModules/__init__.py

@@ -0,0 +1,4 @@
+from .Initialize import countInitialize
+from .Parallel import countParallel
+from .Sequential import countSequential
+

{mapfolding-0.3.5 → mapfolding-0.3.6}/pyproject.toml

@@ -28,7 +28,8 @@ keywords = [
     "map folding",
     "OEIS",
     "stamp folding",]
-license = { text = "CC-BY-NC-4.0" }
+license = { 'text' = "CC-BY-NC-4.0" }
+maintainers = []
 name = "mapFolding"
 optional-dependencies = { benchmark = [
     "ipywidgets",
@@ -47,8 +48,8 @@ optional-dependencies = { benchmark = [
 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.3.5"
+urls = { homepage = "https://github.com/hunterhogan/mapFolding", Donate = "https://www.patreon.com/integrated", repository = "https://github.com/hunterhogan/mapFolding.git" }
+version = "0.3.6"
 
 [tool.coverage]
 report = { exclude_lines = [

mapfolding-0.3.5/mapFolding/citations/updateCitation.py

@@ -1,67 +0,0 @@
-from cffconvert.cli.create_citation import create_citation
-from typing import Any, Dict
-import cffconvert
-import pathlib
-import tomli
-import inspect
-import json
-
-"""
-Tentative plan:
-- Commit and push to GitHub
-- GitHub Action gathers information from the sources of truth
-- If the citation needs to be updated, write to both
-    - pathFilenameCitationSSOT
-    - pathFilenameCitationDOTcffRepo
-- Commit and push to GitHub
-    - this complicates things
-    - I want the updated citation to be in the `commit` field of itself
-"""
-
-"""cffconvert.Citation fields and the source of truth
-abstract: pathFilenameCitationSSOT
-authors: pathFilenamePackageSSOT
-cff-version: pathFilenameCitationSSOT
-commit: workflows['Make GitHub Release']
-contact: pathFilenamePackageSSOT
-date-released: workflows['Make GitHub Release']
-doi: pathFilenameCitationSSOT
-identifiers: workflows['Make GitHub Release']
-keywords: pathFilenamePackageSSOT
-license: pathFilenamePackageSSOT
-license-url: pathFilenamePackageSSOT
-message: pathFilenameCitationSSOT
-preferred-citation: pathFilenameCitationSSOT
-references: to be determined
-repository: pathFilenamePackageSSOT
-repository-artifact: (https://pypi.org/pypi/{package_name}/json').json()['releases']
-repository-code: workflows['Make GitHub Release']
-title: pathFilenamePackageSSOT
-type: pathFilenameCitationSSOT
-url: pathFilenamePackageSSOT
-version: pathFilenamePackageSSOT
-"""
-# Prefer reliable, dynamic values over hardcoded ones
-packageName: str = 'mapFolding'
-pathRepoRoot = pathlib.Path(__file__).parent.parent.parent
-pathFilenamePackageSSOT = pathRepoRoot / 'pyproject.toml'
-
-filenameGitHubAction = 'updateCitation.yml'
-pathFilenameGitHubAction = pathRepoRoot / '.github' / 'workflows' / filenameGitHubAction
-
-filenameCitationDOTcff = 'CITATION.cff'
-pathCitations = pathRepoRoot / packageName / 'citations'
-pathFilenameCitationSSOT = pathCitations / filenameCitationDOTcff
-pathFilenameCitationDOTcffRepo = pathRepoRoot / filenameCitationDOTcff
-
-tomlPackageData: Dict[str, Any] = tomli.loads(pathFilenamePackageSSOT.read_text())['project']
-
-citationObject: cffconvert.Citation = create_citation(infile=pathFilenameCitationSSOT, url=None)
-
-path_cffconvert = pathlib.Path(inspect.getfile(cffconvert)).parent
-pathFilenameSchema = path_cffconvert / "schemas/1.2.0/schema.json"
-scheme: Dict[str, Any] = json.loads(pathFilenameSchema.read_text())
-schemaSpecifications: Dict[str, Any] = scheme['properties']
-
-for property, subProperties in schemaSpecifications.items():
-    print(property, subProperties.get('items', None))

mapfolding-0.3.5/mapFolding/someAssemblyRequired/__init__.py

@@ -1,2 +0,0 @@
-from .makeJob import makeStateJob
-# from .generalizeSourceCode import makeInlineFunction

mapfolding-0.3.5/mapFolding/someAssemblyRequired/makeJob.py

@@ -1,21 +0,0 @@
-from mapFolding import getPathFilenameFoldsTotal
-from mapFolding import outfitCountFolds
-from typing import Any, Optional, Sequence, Type
-import pathlib
-import pickle
-
-def makeStateJob(listDimensions: Sequence[int], **keywordArguments: Optional[Type[Any]]) -> pathlib.Path:
-
-    stateUniversal = outfitCountFolds(listDimensions, computationDivisions=None, CPUlimit=None, **keywordArguments)
-
-    from syntheticModules import countInitialize
-    countInitialize(stateUniversal['connectionGraph'], stateUniversal['gapsWhere'], stateUniversal['my'], stateUniversal['track'])
-
-    pathFilenameChopChop = getPathFilenameFoldsTotal(stateUniversal['mapShape'])
-    suffix = pathFilenameChopChop.suffix
-    pathJob = pathlib.Path(str(pathFilenameChopChop)[0:-len(suffix)])
-    pathJob.mkdir(parents=True, exist_ok=True)
-    pathFilenameJob = pathJob / 'stateJob.pkl'
-
-    pathFilenameJob.write_bytes(pickle.dumps(stateUniversal))
-    return pathFilenameJob

mapfolding-0.3.5/mapFolding/syntheticModules/__init__.py

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