mapFolding 0.2.6__py3-none-any.whl → 0.3.0__py3-none-any.whl
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- {mapFolding-0.2.6.dist-info → mapFolding-0.3.0.dist-info}/METADATA +23 -7
- mapFolding-0.3.0.dist-info/RECORD +20 -0
- mapFolding-0.3.0.dist-info/top_level.txt +3 -0
- someAssemblyRequired/__init__.py +3 -0
- someAssemblyRequired/countInitialize.py +45 -0
- someAssemblyRequired/countParallel.py +52 -0
- someAssemblyRequired/countSequential.py +59 -0
- mapFolding/someAssemblyRequired/inlineAfunction.py → someAssemblyRequired/synthesizeModules.py +76 -41
- mapFolding/__init__.py +0 -12
- mapFolding/babbage.py +0 -35
- mapFolding/beDRY.py +0 -319
- mapFolding/importSelector.py +0 -7
- mapFolding/lovelace.py +0 -213
- mapFolding/oeis.py +0 -323
- mapFolding/someAssemblyRequired/jobsAndTasks.py +0 -47
- mapFolding/someAssemblyRequired/makeNuitkaSource.py +0 -99
- mapFolding/someAssemblyRequired/makeNumbaJob.py +0 -144
- mapFolding/startHere.py +0 -50
- mapFolding/theSSOT.py +0 -76
- mapFolding-0.2.6.dist-info/RECORD +0 -33
- mapFolding-0.2.6.dist-info/top_level.txt +0 -2
- tests/__init__.py +0 -1
- tests/conftest.py +0 -343
- tests/pythons_idiotic_namespace.py +0 -1
- tests/test_oeis.py +0 -194
- tests/test_other.py +0 -282
- tests/test_tasks.py +0 -31
- {mapFolding/benchmarks → benchmarks}/benchmarking.py +0 -0
- {mapFolding-0.2.6.dist-info → mapFolding-0.3.0.dist-info}/WHEEL +0 -0
- {mapFolding-0.2.6.dist-info → mapFolding-0.3.0.dist-info}/entry_points.txt +0 -0
- {mapFolding/reference → reference}/flattened.py +0 -0
- {mapFolding/reference → reference}/hunterNumba.py +0 -0
- {mapFolding/reference → reference}/irvineJavaPort.py +0 -0
- {mapFolding/reference → reference}/jax.py +0 -0
- {mapFolding/reference → reference}/lunnan.py +0 -0
- {mapFolding/reference → reference}/lunnanNumpy.py +0 -0
- {mapFolding/reference → reference}/lunnanWhile.py +0 -0
- {mapFolding/reference → reference}/rotatedEntryPoint.py +0 -0
- {mapFolding/reference → reference}/total_countPlus1vsPlusN.py +0 -0
|
@@ -1,24 +1,40 @@
|
|
|
1
1
|
Metadata-Version: 2.2
|
|
2
2
|
Name: mapFolding
|
|
3
|
-
Version: 0.
|
|
3
|
+
Version: 0.3.0
|
|
4
4
|
Summary: Count distinct ways to fold a map (or a strip of stamps)
|
|
5
5
|
Author-email: Hunter Hogan <HunterHogan@pm.me>
|
|
6
|
-
|
|
7
|
-
|
|
6
|
+
License: CC-BY-NC-4.0
|
|
7
|
+
Project-URL: Homepage, https://github.com/hunterhogan/mapFolding
|
|
8
|
+
Project-URL: Donate, https://www.patreon.com/integrated
|
|
9
|
+
Keywords: A001415,A001416,A001417,A001418,A195646,folding,map folding,OEIS,stamp folding
|
|
10
|
+
Classifier: Development Status :: 5 - Production/Stable
|
|
11
|
+
Classifier: Environment :: Console
|
|
12
|
+
Classifier: Intended Audience :: Education
|
|
13
|
+
Classifier: Intended Audience :: End Users/Desktop
|
|
14
|
+
Classifier: Intended Audience :: Other Audience
|
|
15
|
+
Classifier: Intended Audience :: Science/Research
|
|
16
|
+
Classifier: Natural Language :: English
|
|
17
|
+
Classifier: Operating System :: OS Independent
|
|
18
|
+
Classifier: Programming Language :: Python
|
|
19
|
+
Classifier: Topic :: Scientific/Engineering :: Mathematics
|
|
20
|
+
Classifier: Typing :: Typed
|
|
21
|
+
Requires-Python: <3.14,>=3.10
|
|
8
22
|
Description-Content-Type: text/markdown
|
|
9
23
|
Requires-Dist: numba
|
|
10
24
|
Requires-Dist: numpy
|
|
11
|
-
Requires-Dist:
|
|
25
|
+
Requires-Dist: Z0Z_tools
|
|
12
26
|
Provides-Extra: benchmark
|
|
13
|
-
Requires-Dist: pandas; extra == "benchmark"
|
|
14
|
-
Requires-Dist: jupyter; extra == "benchmark"
|
|
15
27
|
Requires-Dist: ipywidgets; extra == "benchmark"
|
|
28
|
+
Requires-Dist: jupyter; extra == "benchmark"
|
|
29
|
+
Requires-Dist: pandas; extra == "benchmark"
|
|
16
30
|
Requires-Dist: tqdm; extra == "benchmark"
|
|
17
31
|
Provides-Extra: testing
|
|
32
|
+
Requires-Dist: more_itertools; extra == "testing"
|
|
18
33
|
Requires-Dist: pytest; extra == "testing"
|
|
19
34
|
Requires-Dist: pytest-cov; extra == "testing"
|
|
20
35
|
Requires-Dist: pytest-env; extra == "testing"
|
|
21
36
|
Requires-Dist: pytest-xdist; extra == "testing"
|
|
37
|
+
Requires-Dist: python_minifier; extra == "testing"
|
|
22
38
|
|
|
23
39
|
# Algorithm(s) for counting distinct ways to fold a map (or a strip of stamps)
|
|
24
40
|
|
|
@@ -40,7 +56,7 @@ The directory [mapFolding/reference](https://github.com/hunterhogan/mapFolding/b
|
|
|
40
56
|
|
|
41
57
|
## Simple, easy usage based on OEIS IDs
|
|
42
58
|
|
|
43
|
-
`mapFolding` directly implements some IDs from _The On-Line Encyclopedia of Integer Sequences_.
|
|
59
|
+
`mapFolding` directly implements some IDs from _The On-Line Encyclopedia of Integer Sequences_ ([BibTex](https://github.com/hunterhogan/mapFolding/blob/main/mapFolding/citations/oeis.bibtex) citation).
|
|
44
60
|
|
|
45
61
|
### Usage: command line
|
|
46
62
|
|
|
@@ -0,0 +1,20 @@
|
|
|
1
|
+
benchmarks/benchmarking.py,sha256=HD_0NSvuabblg94ftDre6LFnXShTe8MYj3hIodW-zV0,3076
|
|
2
|
+
reference/flattened.py,sha256=X9nvRzg7YDcpCtSDTL4YiidjshlX9rg2e6JVCY6i2u0,16547
|
|
3
|
+
reference/hunterNumba.py,sha256=0giUyqAFzP-XKcq3Kz8wIWCK0BVFhjABVJ1s-w4Jhu0,7109
|
|
4
|
+
reference/irvineJavaPort.py,sha256=Sj-63Z-OsGuDoEBXuxyjRrNmmyl0d7Yz_XuY7I47Oyg,4250
|
|
5
|
+
reference/jax.py,sha256=bB34dGdi3VSz4cRFbmCPn_erAmQ3FyrSED8uJ7CsES0,14961
|
|
6
|
+
reference/lunnan.py,sha256=XEcql_gxvCCghb6Or3qwmPbn4IZUbZTaSmw_fUjRxZE,5037
|
|
7
|
+
reference/lunnanNumpy.py,sha256=HqDgSwTOZA-G0oophOEfc4zs25Mv4yw2aoF1v8miOLk,4653
|
|
8
|
+
reference/lunnanWhile.py,sha256=7NY2IKO5XBgol0aWWF_Fi-7oTL9pvu_z6lB0TF1uVHk,4063
|
|
9
|
+
reference/rotatedEntryPoint.py,sha256=z0QyDQtnMvXNj5ntWzzJUQUMFm1-xHGLVhtYzwmczUI,11530
|
|
10
|
+
reference/total_countPlus1vsPlusN.py,sha256=usenM8Yn_G1dqlPl7NKKkcnbohBZVZBXTQRm2S3_EDA,8106
|
|
11
|
+
someAssemblyRequired/__init__.py,sha256=nDtS5UFMKN-F5pTp0qKA0J0I-XR3n3OFxV2bosieBu8,131
|
|
12
|
+
someAssemblyRequired/countInitialize.py,sha256=hwo9SW_IvB-bgKNfaGvjl40yayFEmZZmeywiEMDSQDw,1840
|
|
13
|
+
someAssemblyRequired/countParallel.py,sha256=4MfRYLBA2IBxRiXb04voNcxSDAtmZOe7lrji1c3kFls,2560
|
|
14
|
+
someAssemblyRequired/countSequential.py,sha256=8YILeL3rflOhW1ts78ZSgYkPYXMPfusYOPkPtf8Xa3M,3217
|
|
15
|
+
someAssemblyRequired/synthesizeModules.py,sha256=7i-64KmRjNm-qtY7jp-RHIYK3qj6pydmxzxg8rjqcDU,8632
|
|
16
|
+
mapFolding-0.3.0.dist-info/METADATA,sha256=zbjs82q33osuRYv7_piibsxIfKVSbgFpTPHpmNVIQe0,7526
|
|
17
|
+
mapFolding-0.3.0.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
|
|
18
|
+
mapFolding-0.3.0.dist-info/entry_points.txt,sha256=F3OUeZR1XDTpoH7k3wXuRb3KF_kXTTeYhu5AGK1SiOQ,146
|
|
19
|
+
mapFolding-0.3.0.dist-info/top_level.txt,sha256=yHhQq-bIJhB4pZcof5hXDTIjan0nxcFuOEWb7gy1DuU,42
|
|
20
|
+
mapFolding-0.3.0.dist-info/RECORD,,
|
|
@@ -0,0 +1,45 @@
|
|
|
1
|
+
from mapFolding import indexMy, indexTrack
|
|
2
|
+
import numba
|
|
3
|
+
|
|
4
|
+
@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)
|
|
5
|
+
def countInitialize(connectionGraph, gapsWhere, my, track):
|
|
6
|
+
while my[7] > 0:
|
|
7
|
+
if my[7] <= 1 or track[1, 0] == 1:
|
|
8
|
+
my[1] = my[0]
|
|
9
|
+
my[3] = track[3, my[7] - 1]
|
|
10
|
+
my[4] = 0
|
|
11
|
+
while my[4] < my[0]:
|
|
12
|
+
if connectionGraph[my[4], my[7], my[7]] == my[7]:
|
|
13
|
+
my[1] -= 1
|
|
14
|
+
else:
|
|
15
|
+
my[8] = connectionGraph[my[4], my[7], my[7]]
|
|
16
|
+
while my[8] != my[7]:
|
|
17
|
+
gapsWhere[my[3]] = my[8]
|
|
18
|
+
if track[2, my[8]] == 0:
|
|
19
|
+
my[3] += 1
|
|
20
|
+
track[2, my[8]] += 1
|
|
21
|
+
my[8] = connectionGraph[my[4], my[7], track[1, my[8]]]
|
|
22
|
+
my[4] += 1
|
|
23
|
+
if not my[1]:
|
|
24
|
+
my[5] = 0
|
|
25
|
+
while my[5] < my[7]:
|
|
26
|
+
gapsWhere[my[3]] = my[5]
|
|
27
|
+
my[3] += 1
|
|
28
|
+
my[5] += 1
|
|
29
|
+
my[6] = my[2]
|
|
30
|
+
while my[6] < my[3]:
|
|
31
|
+
gapsWhere[my[2]] = gapsWhere[my[6]]
|
|
32
|
+
if track[2, gapsWhere[my[6]]] == my[1]:
|
|
33
|
+
my[2] += 1
|
|
34
|
+
track[2, gapsWhere[my[6]]] = 0
|
|
35
|
+
my[6] += 1
|
|
36
|
+
if my[7] > 0:
|
|
37
|
+
my[2] -= 1
|
|
38
|
+
track[0, my[7]] = gapsWhere[my[2]]
|
|
39
|
+
track[1, my[7]] = track[1, track[0, my[7]]]
|
|
40
|
+
track[1, track[0, my[7]]] = my[7]
|
|
41
|
+
track[0, track[1, my[7]]] = my[7]
|
|
42
|
+
track[3, my[7]] = my[2]
|
|
43
|
+
my[7] += 1
|
|
44
|
+
if my[2] > 0:
|
|
45
|
+
return
|
|
@@ -0,0 +1,52 @@
|
|
|
1
|
+
from mapFolding import indexMy, indexTrack
|
|
2
|
+
import numba
|
|
3
|
+
|
|
4
|
+
@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)
|
|
5
|
+
def countParallel(connectionGraph, foldGroups, gapsWherePARALLEL, myPARALLEL, trackPARALLEL):
|
|
6
|
+
for indexSherpa in numba.prange(myPARALLEL[9]):
|
|
7
|
+
gapsWhere = gapsWherePARALLEL.copy()
|
|
8
|
+
my = myPARALLEL.copy()
|
|
9
|
+
my[10] = indexSherpa
|
|
10
|
+
track = trackPARALLEL.copy()
|
|
11
|
+
groupsOfFolds: int = 0
|
|
12
|
+
while my[7] > 0:
|
|
13
|
+
if my[7] <= 1 or track[1, 0] == 1:
|
|
14
|
+
if my[7] > foldGroups[-1]:
|
|
15
|
+
groupsOfFolds = groupsOfFolds + 1
|
|
16
|
+
else:
|
|
17
|
+
my[1] = my[0]
|
|
18
|
+
my[3] = track[3, my[7] - 1]
|
|
19
|
+
my[4] = 0
|
|
20
|
+
while my[4] < my[0]:
|
|
21
|
+
if connectionGraph[my[4], my[7], my[7]] == my[7]:
|
|
22
|
+
my[1] -= 1
|
|
23
|
+
else:
|
|
24
|
+
my[8] = connectionGraph[my[4], my[7], my[7]]
|
|
25
|
+
while my[8] != my[7]:
|
|
26
|
+
if my[7] != my[9] or my[8] % my[9] == my[10]:
|
|
27
|
+
gapsWhere[my[3]] = my[8]
|
|
28
|
+
if track[2, my[8]] == 0:
|
|
29
|
+
my[3] += 1
|
|
30
|
+
track[2, my[8]] += 1
|
|
31
|
+
my[8] = connectionGraph[my[4], my[7], track[1, my[8]]]
|
|
32
|
+
my[4] += 1
|
|
33
|
+
my[6] = my[2]
|
|
34
|
+
while my[6] < my[3]:
|
|
35
|
+
gapsWhere[my[2]] = gapsWhere[my[6]]
|
|
36
|
+
if track[2, gapsWhere[my[6]]] == my[1]:
|
|
37
|
+
my[2] += 1
|
|
38
|
+
track[2, gapsWhere[my[6]]] = 0
|
|
39
|
+
my[6] += 1
|
|
40
|
+
while my[7] > 0 and my[2] == track[3, my[7] - 1]:
|
|
41
|
+
my[7] -= 1
|
|
42
|
+
track[1, track[0, my[7]]] = track[1, my[7]]
|
|
43
|
+
track[0, track[1, my[7]]] = track[0, my[7]]
|
|
44
|
+
if my[7] > 0:
|
|
45
|
+
my[2] -= 1
|
|
46
|
+
track[0, my[7]] = gapsWhere[my[2]]
|
|
47
|
+
track[1, my[7]] = track[1, track[0, my[7]]]
|
|
48
|
+
track[1, track[0, my[7]]] = my[7]
|
|
49
|
+
track[0, track[1, my[7]]] = my[7]
|
|
50
|
+
track[3, my[7]] = my[2]
|
|
51
|
+
my[7] += 1
|
|
52
|
+
foldGroups[my[10]] = groupsOfFolds
|
|
@@ -0,0 +1,59 @@
|
|
|
1
|
+
from mapFolding import indexMy, indexTrack
|
|
2
|
+
import numba
|
|
3
|
+
|
|
4
|
+
@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)
|
|
5
|
+
def countSequential(connectionGraph, foldGroups, gapsWhere, my, track):
|
|
6
|
+
doFindGaps = True
|
|
7
|
+
dimensionsTotal = my[indexMy.dimensionsTotal.value]
|
|
8
|
+
dimensionsUnconstrained = my[indexMy.dimensionsUnconstrained.value]
|
|
9
|
+
gap1ndex = my[indexMy.gap1ndex.value]
|
|
10
|
+
gap1ndexCeiling = my[indexMy.gap1ndexCeiling.value]
|
|
11
|
+
indexDimension = my[indexMy.indexDimension.value]
|
|
12
|
+
indexMiniGap = my[indexMy.indexMiniGap.value]
|
|
13
|
+
leaf1ndex = my[indexMy.leaf1ndex.value]
|
|
14
|
+
leafConnectee = my[indexMy.leafConnectee.value]
|
|
15
|
+
taskIndex = my[indexMy.taskIndex.value]
|
|
16
|
+
leafAbove = track[indexTrack.leafAbove.value]
|
|
17
|
+
leafBelow = track[indexTrack.leafBelow.value]
|
|
18
|
+
countDimensionsGapped = track[indexTrack.countDimensionsGapped.value]
|
|
19
|
+
gapRangeStart = track[indexTrack.gapRangeStart.value]
|
|
20
|
+
groupsOfFolds: int = 0
|
|
21
|
+
while leaf1ndex > 0:
|
|
22
|
+
if (doFindGaps := (leaf1ndex <= 1 or leafBelow[0] == 1)) and leaf1ndex > foldGroups[-1]:
|
|
23
|
+
groupsOfFolds = groupsOfFolds + 1
|
|
24
|
+
elif doFindGaps:
|
|
25
|
+
dimensionsUnconstrained = dimensionsTotal
|
|
26
|
+
gap1ndexCeiling = gapRangeStart[leaf1ndex - 1]
|
|
27
|
+
indexDimension = 0
|
|
28
|
+
while indexDimension < dimensionsTotal:
|
|
29
|
+
if connectionGraph[indexDimension, leaf1ndex, leaf1ndex] == leaf1ndex:
|
|
30
|
+
dimensionsUnconstrained -= 1
|
|
31
|
+
else:
|
|
32
|
+
leafConnectee = connectionGraph[indexDimension, leaf1ndex, leaf1ndex]
|
|
33
|
+
while leafConnectee != leaf1ndex:
|
|
34
|
+
gapsWhere[gap1ndexCeiling] = leafConnectee
|
|
35
|
+
if countDimensionsGapped[leafConnectee] == 0:
|
|
36
|
+
gap1ndexCeiling += 1
|
|
37
|
+
countDimensionsGapped[leafConnectee] += 1
|
|
38
|
+
leafConnectee = connectionGraph[indexDimension, leaf1ndex, leafBelow[leafConnectee]]
|
|
39
|
+
indexDimension += 1
|
|
40
|
+
indexMiniGap = gap1ndex
|
|
41
|
+
while indexMiniGap < gap1ndexCeiling:
|
|
42
|
+
gapsWhere[gap1ndex] = gapsWhere[indexMiniGap]
|
|
43
|
+
if countDimensionsGapped[gapsWhere[indexMiniGap]] == dimensionsUnconstrained:
|
|
44
|
+
gap1ndex += 1
|
|
45
|
+
countDimensionsGapped[gapsWhere[indexMiniGap]] = 0
|
|
46
|
+
indexMiniGap += 1
|
|
47
|
+
while leaf1ndex > 0 and gap1ndex == gapRangeStart[leaf1ndex - 1]:
|
|
48
|
+
leaf1ndex -= 1
|
|
49
|
+
leafBelow[leafAbove[leaf1ndex]] = leafBelow[leaf1ndex]
|
|
50
|
+
leafAbove[leafBelow[leaf1ndex]] = leafAbove[leaf1ndex]
|
|
51
|
+
if leaf1ndex > 0:
|
|
52
|
+
gap1ndex -= 1
|
|
53
|
+
leafAbove[leaf1ndex] = gapsWhere[gap1ndex]
|
|
54
|
+
leafBelow[leaf1ndex] = leafBelow[leafAbove[leaf1ndex]]
|
|
55
|
+
leafBelow[leafAbove[leaf1ndex]] = leaf1ndex
|
|
56
|
+
leafAbove[leafBelow[leaf1ndex]] = leaf1ndex
|
|
57
|
+
gapRangeStart[leaf1ndex] = gap1ndex
|
|
58
|
+
leaf1ndex += 1
|
|
59
|
+
foldGroups[taskIndex] = groupsOfFolds
|
mapFolding/someAssemblyRequired/inlineAfunction.py → someAssemblyRequired/synthesizeModules.py
RENAMED
|
@@ -1,20 +1,34 @@
|
|
|
1
|
-
from mapFolding import indexMy,
|
|
1
|
+
from mapFolding import indexMy, indexTrack, theDao, datatypeDefault, datatypeLarge, datatypeSmall
|
|
2
2
|
import ast
|
|
3
|
-
import copy
|
|
4
3
|
import pathlib
|
|
4
|
+
import inspect
|
|
5
|
+
|
|
6
|
+
algorithmSource = theDao
|
|
7
|
+
|
|
8
|
+
dictionaryDecorators={
|
|
9
|
+
'countInitialize':
|
|
10
|
+
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',
|
|
11
|
+
'countParallel':
|
|
12
|
+
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',
|
|
13
|
+
'countSequential':
|
|
14
|
+
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',
|
|
15
|
+
}
|
|
5
16
|
|
|
6
17
|
def getDictionaryEnumValues():
|
|
7
18
|
dictionaryEnumValues = {}
|
|
8
|
-
for enumIndex in [indexMy,
|
|
19
|
+
for enumIndex in [indexMy, indexTrack]:
|
|
9
20
|
for memberName, memberValue in enumIndex._member_map_.items():
|
|
10
21
|
dictionaryEnumValues[f"{enumIndex.__name__}.{memberName}.value"] = memberValue.value
|
|
11
22
|
return dictionaryEnumValues
|
|
12
23
|
|
|
13
24
|
class RecursiveInlinerWithEnum(ast.NodeTransformer):
|
|
25
|
+
"""Process AST nodes to inline functions and substitute enum values.
|
|
26
|
+
Also handles function decorators during inlining."""
|
|
27
|
+
|
|
14
28
|
def __init__(self, dictionaryFunctions, dictionaryEnumValues):
|
|
15
29
|
self.dictionaryFunctions = dictionaryFunctions
|
|
16
30
|
self.dictionaryEnumValues = dictionaryEnumValues
|
|
17
|
-
self.processed = set()
|
|
31
|
+
self.processed = set()
|
|
18
32
|
|
|
19
33
|
def inlineFunctionBody(self, functionName):
|
|
20
34
|
if functionName in self.processed:
|
|
@@ -39,7 +53,7 @@ class RecursiveInlinerWithEnum(ast.NodeTransformer):
|
|
|
39
53
|
callNode = self.generic_visit(node)
|
|
40
54
|
if isinstance(callNode, ast.Call) and isinstance(callNode.func, ast.Name) and callNode.func.id in self.dictionaryFunctions:
|
|
41
55
|
inlineDefinition = self.inlineFunctionBody(callNode.func.id)
|
|
42
|
-
if inlineDefinition and inlineDefinition.body:
|
|
56
|
+
if (inlineDefinition and inlineDefinition.body):
|
|
43
57
|
lastStmt = inlineDefinition.body[-1]
|
|
44
58
|
if isinstance(lastStmt, ast.Return) and lastStmt.value is not None:
|
|
45
59
|
return self.visit(lastStmt.value)
|
|
@@ -78,20 +92,21 @@ def findRequiredImports(node):
|
|
|
78
92
|
|
|
79
93
|
def generateImports(requiredImports):
|
|
80
94
|
"""Generate import statements based on required modules."""
|
|
81
|
-
importStatements =
|
|
95
|
+
importStatements = {'import numba', 'from mapFolding import indexMy, indexTrack'}
|
|
82
96
|
|
|
83
|
-
# Map of module names to their import statements
|
|
84
97
|
importMapping = {
|
|
85
98
|
'numba': 'import numba',
|
|
86
99
|
}
|
|
87
100
|
|
|
88
101
|
for moduleName in sorted(requiredImports):
|
|
89
102
|
if moduleName in importMapping:
|
|
90
|
-
importStatements.
|
|
103
|
+
importStatements.add(importMapping[moduleName])
|
|
91
104
|
|
|
92
105
|
return '\n'.join(importStatements)
|
|
93
106
|
|
|
94
|
-
def inlineFunctions(sourceCode, targetFunctionName, dictionaryEnumValues):
|
|
107
|
+
def inlineFunctions(sourceCode, targetFunctionName, dictionaryEnumValues, skipEnum=False):
|
|
108
|
+
if skipEnum:
|
|
109
|
+
dictionaryEnumValues = {}
|
|
95
110
|
dictionaryParsed = ast.parse(sourceCode)
|
|
96
111
|
dictionaryFunctions = {
|
|
97
112
|
element.name: element
|
|
@@ -103,50 +118,70 @@ def inlineFunctions(sourceCode, targetFunctionName, dictionaryEnumValues):
|
|
|
103
118
|
nodeInlined = nodeInliner.visit(nodeTarget)
|
|
104
119
|
ast.fix_missing_locations(nodeInlined)
|
|
105
120
|
|
|
106
|
-
# Generate imports
|
|
107
121
|
requiredImports = findRequiredImports(nodeInlined)
|
|
108
122
|
importStatements = generateImports(requiredImports)
|
|
109
123
|
|
|
110
|
-
|
|
111
|
-
inlinedCode = importStatements + '\n\n' + ast.unparse(ast.Module(body=[nodeInlined], type_ignores=[]))
|
|
124
|
+
lineNumbaDecorator = dictionaryDecorators[targetFunctionName]
|
|
125
|
+
inlinedCode = importStatements + '\n\n' + lineNumbaDecorator + ast.unparse(ast.Module(body=[nodeInlined], type_ignores=[]))
|
|
112
126
|
return inlinedCode
|
|
113
127
|
|
|
128
|
+
def unpackArrays(codeInlined: str, callableTarget: str) -> str:
|
|
129
|
+
dictionaryReplaceScalars = {
|
|
130
|
+
'my[indexMy.dimensionsTotal.value]': 'dimensionsTotal',
|
|
131
|
+
'my[indexMy.dimensionsUnconstrained.value]': 'dimensionsUnconstrained',
|
|
132
|
+
'my[indexMy.gap1ndex.value]': 'gap1ndex',
|
|
133
|
+
'my[indexMy.gap1ndexCeiling.value]': 'gap1ndexCeiling',
|
|
134
|
+
'my[indexMy.indexDimension.value]': 'indexDimension',
|
|
135
|
+
# 'my[indexMy.indexLeaf.value]': 'indexLeaf',
|
|
136
|
+
'my[indexMy.indexMiniGap.value]': 'indexMiniGap',
|
|
137
|
+
'my[indexMy.leaf1ndex.value]': 'leaf1ndex',
|
|
138
|
+
'my[indexMy.leafConnectee.value]': 'leafConnectee',
|
|
139
|
+
# 'my[indexMy.taskDivisions.value]': 'taskDivisions',
|
|
140
|
+
'my[indexMy.taskIndex.value]': 'taskIndex',
|
|
141
|
+
# 'foldGroups[-1]': 'leavesTotal',
|
|
142
|
+
}
|
|
143
|
+
|
|
144
|
+
dictionaryReplaceArrays = {
|
|
145
|
+
"track[indexTrack.leafAbove.value, ": 'leafAbove[',
|
|
146
|
+
"track[indexTrack.leafBelow.value, ": 'leafBelow[',
|
|
147
|
+
'track[indexTrack.countDimensionsGapped.value, ': 'countDimensionsGapped[',
|
|
148
|
+
'track[indexTrack.gapRangeStart.value, ': 'gapRangeStart[',
|
|
149
|
+
}
|
|
150
|
+
|
|
151
|
+
ImaIndent = " "
|
|
152
|
+
linesInitialize = """"""
|
|
153
|
+
|
|
154
|
+
for find, replace in dictionaryReplaceScalars.items():
|
|
155
|
+
linesInitialize += f"{ImaIndent}{replace} = {find}\n"
|
|
156
|
+
codeInlined = codeInlined.replace(find, replace)
|
|
157
|
+
|
|
158
|
+
for find, replace in dictionaryReplaceArrays.items():
|
|
159
|
+
linesInitialize += f"{ImaIndent}{replace[0:-1]} = {find[0:-2]}]\n"
|
|
160
|
+
codeInlined = codeInlined.replace(find, replace)
|
|
161
|
+
|
|
162
|
+
ourGuyOnTheInside = " doFindGaps = True\n"
|
|
163
|
+
linesInitialize = ourGuyOnTheInside + linesInitialize
|
|
164
|
+
|
|
165
|
+
codeInlined = codeInlined.replace(ourGuyOnTheInside, linesInitialize)
|
|
166
|
+
|
|
167
|
+
return codeInlined
|
|
168
|
+
|
|
114
169
|
def Z0Z_inlineMapFolding():
|
|
115
170
|
dictionaryEnumValues = getDictionaryEnumValues()
|
|
171
|
+
codeSource = inspect.getsource(algorithmSource)
|
|
172
|
+
pathFilenameAlgorithm = pathlib.Path(inspect.getfile(algorithmSource))
|
|
116
173
|
|
|
117
|
-
|
|
118
|
-
codeSource = pathFilenameSource.read_text()
|
|
119
|
-
|
|
120
|
-
listCallables = [
|
|
121
|
-
'countInitialize',
|
|
122
|
-
'countParallel',
|
|
123
|
-
'countSequential',
|
|
124
|
-
]
|
|
174
|
+
listCallables = [ 'countInitialize', 'countParallel', 'countSequential', ]
|
|
125
175
|
|
|
126
176
|
listPathFilenamesDestination: list[pathlib.Path] = []
|
|
127
177
|
for callableTarget in listCallables:
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
pathFilenameDestination.
|
|
178
|
+
skipEnum = (callableTarget == 'countInitialize')
|
|
179
|
+
skipEnum = (callableTarget == 'countSequential')
|
|
180
|
+
pathFilenameDestination = pathFilenameAlgorithm.parent / "someAssemblyRequired" / pathFilenameAlgorithm.with_stem(callableTarget).name
|
|
181
|
+
codeInlined = inlineFunctions(codeSource, callableTarget, dictionaryEnumValues, skipEnum)
|
|
182
|
+
codeUnpacked = unpackArrays(codeInlined, callableTarget)
|
|
183
|
+
pathFilenameDestination.write_text(codeUnpacked)
|
|
131
184
|
listPathFilenamesDestination.append(pathFilenameDestination)
|
|
132
185
|
|
|
133
|
-
listNoNumba = [
|
|
134
|
-
'countInitialize',
|
|
135
|
-
'countSequential',
|
|
136
|
-
]
|
|
137
|
-
|
|
138
|
-
listPathFilenamesNoNumba = []
|
|
139
|
-
for pathFilename in listPathFilenamesDestination:
|
|
140
|
-
if pathFilename.stem in listNoNumba:
|
|
141
|
-
pathFilenameNoNumba = pathFilename.with_name(pathFilename.stem + 'NoNumba' + pathFilename.suffix)
|
|
142
|
-
else:
|
|
143
|
-
continue
|
|
144
|
-
codeNoNumba = pathFilename.read_text()
|
|
145
|
-
for codeLine in copy.copy(codeNoNumba.splitlines()):
|
|
146
|
-
if 'numba' in codeLine:
|
|
147
|
-
codeNoNumba = codeNoNumba.replace(codeLine, '')
|
|
148
|
-
pathFilenameNoNumba.write_text(codeNoNumba)
|
|
149
|
-
listPathFilenamesNoNumba.append(pathFilenameNoNumba)
|
|
150
|
-
|
|
151
186
|
if __name__ == '__main__':
|
|
152
187
|
Z0Z_inlineMapFolding()
|
mapFolding/__init__.py
DELETED
|
@@ -1,12 +0,0 @@
|
|
|
1
|
-
from .theSSOT import *
|
|
2
|
-
from Z0Z_tools import defineConcurrencyLimit, intInnit, oopsieKwargsie
|
|
3
|
-
from .beDRY import getFilenameFoldsTotal, getPathFilenameFoldsTotal, outfitCountFolds, saveFoldsTotal
|
|
4
|
-
from .startHere import countFolds
|
|
5
|
-
from .oeis import oeisIDfor_n, getOEISids, clearOEIScache
|
|
6
|
-
|
|
7
|
-
__all__ = [
|
|
8
|
-
'clearOEIScache',
|
|
9
|
-
'countFolds',
|
|
10
|
-
'getOEISids',
|
|
11
|
-
'oeisIDfor_n',
|
|
12
|
-
]
|
mapFolding/babbage.py
DELETED
|
@@ -1,35 +0,0 @@
|
|
|
1
|
-
from mapFolding.importSelector import countSequential, countParallel, countInitialize
|
|
2
|
-
from mapFolding import indexMy
|
|
3
|
-
from numpy import integer
|
|
4
|
-
from numpy.typing import NDArray
|
|
5
|
-
from typing import Any, Tuple
|
|
6
|
-
import numba
|
|
7
|
-
import numpy
|
|
8
|
-
|
|
9
|
-
@numba.jit(cache=True)
|
|
10
|
-
def _countFolds(connectionGraph: NDArray[integer[Any]], foldGroups: NDArray[integer[Any]], gapsWhere: NDArray[integer[Any]], mapShape: Tuple[int, ...], my: NDArray[integer[Any]], track: NDArray[integer[Any]]):
|
|
11
|
-
"""
|
|
12
|
-
What in tarnation is this stupid module and function?
|
|
13
|
-
|
|
14
|
-
- This function is not in the same module as `countFolds` so that we can delay Numba just-in-time (jit) compilation of this function and the finalization of its settings until we are ready.
|
|
15
|
-
- This function is not in the same module as `countFoldsCompiled`, which is the function that does the hard, so that we can delay `numba.jit` compilation of `countFoldsCompiled`.
|
|
16
|
-
- `countFoldsCompiled` is not merely "jitted", it is super jitted, which makes it too arrogant to talk to plebian Python functions. It will, however, reluctantly talk to basic jitted functions.
|
|
17
|
-
- The function in this module is jitted, so it can talk to `countFoldsCompiled`, and because it isn't so arrogant, it will talk to the low-class `countFolds` with only a few restrictions, such as:
|
|
18
|
-
- No `TypedDict`
|
|
19
|
-
- No Python v 3.13
|
|
20
|
-
- The plebs must clean up their own memory problems
|
|
21
|
-
- No oversized integers
|
|
22
|
-
- No global variables, only global constants
|
|
23
|
-
- They don't except pleb nonlocal variables either
|
|
24
|
-
- Python "class": they are all inferior to a jit
|
|
25
|
-
- No `**kwargs`
|
|
26
|
-
- and just a few dozen-jillion other things.
|
|
27
|
-
|
|
28
|
-
"""
|
|
29
|
-
# print("babbage")
|
|
30
|
-
countInitialize(connectionGraph=connectionGraph, gapsWhere=gapsWhere, my=my, track=track)
|
|
31
|
-
|
|
32
|
-
if my[indexMy.taskDivisions.value] > 0:
|
|
33
|
-
countParallel(connectionGraph=connectionGraph, foldGroups=foldGroups, gapsWherePARALLEL=gapsWhere, myPARALLEL=my, trackPARALLEL=track)
|
|
34
|
-
else:
|
|
35
|
-
countSequential(connectionGraph=connectionGraph, foldGroups=foldGroups, gapsWhere=gapsWhere, my=my, track=track)
|