Other fixes

milesgranger · Apr 16, 2024 · 2481f26 · 2481f26
1 parent 28d1c7a
commit 2481f26
Show file tree

Hide file tree

Showing 11 changed files with 135 additions and 125 deletions.
diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
@@ -1,6 +1,10 @@
 name: CI
 
 on:
+  push:
+    branches:
+      - master
+      - 'releases/**'
   pull_request:
   release:
     types:
@@ -12,7 +16,7 @@ jobs:
     runs-on: ${{ matrix.conf.os }}
     name: ${{ matrix.conf.os }}-${{ matrix.conf.target }}-${{ matrix.package.name }}-${{ matrix.python-version }}-${{ matrix.conf.python-architecture }}-${{ matrix.conf.manylinux }}
     strategy:
-      fail-fast: ${{ !(startsWith(github.ref, 'refs/heads/main') && !startsWith(github.ref, 'refs/tags/')) }}
+      fail-fast: ${{ !( startsWith(github.ref, 'refs/heads/master') || startsWith(github.ref, 'refs/tags/') ) }}
       matrix:
         python-version: 
           - '3.8' 
@@ -346,7 +350,7 @@ jobs:
             venv/bin/python -c 'import cramjam' || venv/bin/cramjam-cli --help
 
       - name: Upload wheels
-        if: startsWith(github.ref, 'refs/tags/')
+        if: startsWith(github.ref, 'refs/heads/master') || startsWith(github.ref, 'refs/tags/')
         uses: actions/upload-artifact@v3
         with:
           name: wheels

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/cramjam-python/Cargo.toml b/cramjam-python/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "cramjam-python"
-version = "2.8.4"
+version = "2.8.4-rc1"
 authors = ["Miles Granger <miles59923@gmail.com>"]
 edition = "2021"
 license = "MIT"

diff --git a/cramjam-python/benchmarks/README.md b/cramjam-python/benchmarks/README.md
@@ -442,3 +442,66 @@ test_lzma[urls.10K-lzma]                            114.8733 (48.71)       118.0
 -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 ```
 
+#### Blosc2 
+
+`make bench-blosc2`
+
+```
+------------------------------------------------------------------------------------------------------------ benchmark: 52 tests -------------------------------------------------------------------------------------------------------------
+Name (time in us)                                          Min                    Max                   Mean                StdDev                 Median                   IQR            Outliers          OPS            Rounds  Iterations
+----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+test_blosc2[Mark.Twain-Tom.Sawyer.txt-blosc2]          78.4160 (4.27)        129.4690 (1.52)         85.8983 (4.24)         5.5085 (4.02)         84.2935 (4.20)         4.6535 (5.80)      837;445  11,641.6774 (0.24)       5204           1
+test_blosc2[Mark.Twain-Tom.Sawyer.txt-cramjam]         77.8270 (4.24)        175.6630 (2.06)         87.1714 (4.30)         5.6912 (4.15)         85.5560 (4.26)         6.1857 (7.71)     1272;301  11,471.6588 (0.23)       6015           1
+test_blosc2[alice29.txt-blosc2]                       846.6740 (46.14)     1,023.7690 (12.03)       900.4706 (44.40)       16.7216 (12.19)       899.9500 (44.85)       18.6420 (23.24)      249;36   1,110.5304 (0.02)       1025           1
+test_blosc2[alice29.txt-cramjam]                      835.3000 (45.52)       960.3880 (11.28)       894.6317 (44.11)       16.7924 (12.24)       894.2650 (44.57)       21.4440 (26.74)      319;15   1,117.7784 (0.02)       1013           1
+test_blosc2[asyoulik.txt-blosc2]                      706.9720 (38.52)     1,002.9360 (11.78)       790.8599 (38.99)       23.7597 (17.32)       793.8370 (39.56)       23.0105 (28.69)      199;74   1,264.4465 (0.03)       1204           1
+test_blosc2[asyoulik.txt-cramjam]                     726.8280 (39.60)       906.0000 (10.64)       792.6543 (39.08)       17.4962 (12.76)       792.8810 (39.51)       21.4530 (26.75)      345;19   1,261.5841 (0.03)       1157           1
+test_blosc2[dickens-blosc2]                         9,750.5190 (531.31)   18,455.6990 (216.82)   10,920.7085 (538.44)   1,055.1419 (769.30)   10,683.5490 (532.42)     466.6533 (581.86)      10;12      91.5692 (0.00)         95           1
+test_blosc2[dickens-cramjam]                        5,533.2100 (301.50)    8,417.1410 (98.89)     6,698.9113 (330.28)     532.2939 (388.09)    6,651.2055 (331.47)     771.5420 (962.02)       41;1     149.2780 (0.00)        138           1
+test_blosc2[fifty-four-mb-random-blosc2]           12,247.7870 (667.38)   18,902.5920 (222.07)   15,304.6653 (754.58)   1,911.4859 (>1000.0)  15,350.3830 (764.99)   3,671.3150 (>1000.0)      34;0      65.3396 (0.00)         81           1
+test_blosc2[fifty-four-mb-random-cramjam]           9,612.6680 (523.79)   14,456.1190 (169.83)   11,062.8211 (545.44)     815.1332 (594.31)   11,102.1700 (553.28)   1,116.5420 (>1000.0)      23;1      90.3929 (0.00)         79           1
+test_blosc2[fifty-four-mb-repeating-blosc2]         5,957.3030 (324.61)   11,853.1440 (139.25)    9,533.5083 (470.04)   1,046.1766 (762.77)    9,676.4565 (482.23)   1,076.2740 (>1000.0)     48;11     104.8932 (0.00)        184           1
+test_blosc2[fifty-four-mb-repeating-cramjam]        4,108.6190 (223.88)    7,928.0990 (93.14)     5,539.3702 (273.11)     663.2870 (483.60)    5,446.3765 (271.42)     737.0130 (918.97)       50;7     180.5259 (0.00)        178           1
+test_blosc2[fireworks.jpeg-blosc2]                     20.4510 (1.11)         85.1200 (1.0)          22.4037 (1.10)         1.5648 (1.14)         22.2410 (1.11)         1.1383 (1.42)     1058;665  44,635.4304 (0.91)      19497           1
+test_blosc2[fireworks.jpeg-cramjam]                    18.3520 (1.0)         102.4280 (1.20)         20.2822 (1.0)          1.3716 (1.0)          20.0660 (1.0)          0.8020 (1.0)     1588;1325  49,304.2454 (1.0)       22696           1
+test_blosc2[geo.protodata-blosc2]                     139.7410 (7.61)        343.8850 (4.04)        157.1060 (7.75)        14.2895 (10.42)       154.5325 (7.70)         8.0380 (10.02)     338;265   6,365.1277 (0.13)       4592           1
+test_blosc2[geo.protodata-cramjam]                    135.5260 (7.38)        239.2470 (2.81)        146.0398 (7.20)         7.2431 (5.28)        143.9320 (7.17)         6.7322 (8.39)      799;318   6,847.4487 (0.14)       4557           1
+test_blosc2[html-blosc2]                              186.3640 (10.15)       241.5230 (2.84)        194.4792 (9.59)         5.7714 (4.21)        193.0920 (9.62)         5.6557 (7.05)      747;206   5,141.9375 (0.10)       3873           1
+test_blosc2[html-cramjam]                             174.3570 (9.50)        242.1000 (2.84)        190.3023 (9.38)         5.4898 (4.00)        188.8805 (9.41)         5.2260 (6.52)      659;283   5,254.7964 (0.11)       4310           1
+test_blosc2[html_x_4-blosc2]                          745.5020 (40.62)       894.5650 (10.51)       799.1659 (39.40)       21.5082 (15.68)       797.4520 (39.74)       27.1190 (33.81)      340;10   1,251.3046 (0.03)       1109           1
+test_blosc2[html_x_4-cramjam]                         730.4610 (39.80)     1,184.2940 (13.91)       822.9737 (40.58)       38.9620 (28.41)       827.5550 (41.24)       37.4873 (46.74)      202;37   1,215.1057 (0.02)       1171           1
+test_blosc2[kppkn.gtb-blosc2]                         641.9660 (34.98)       792.4040 (9.31)        709.0996 (34.96)       15.1127 (11.02)       709.6455 (35.37)       16.4385 (20.50)      322;57   1,410.2392 (0.03)       1316           1
+test_blosc2[kppkn.gtb-cramjam]                        617.9660 (33.67)     1,030.8910 (12.11)       686.1275 (33.83)       45.9881 (33.53)       677.3435 (33.76)       52.2225 (65.12)      147;29   1,457.4551 (0.03)       1440           1
+test_blosc2[lcet10.txt-blosc2]                      2,227.6290 (121.38)    2,759.7260 (32.42)     2,466.5525 (121.61)      68.9448 (50.27)     2,477.6140 (123.47)      74.3865 (92.75)       91;28     405.4242 (0.01)        432           1
+test_blosc2[lcet10.txt-cramjam]                     2,199.6860 (119.86)    3,398.2780 (39.92)     2,378.2839 (117.26)     137.0596 (99.93)     2,321.0360 (115.67)     201.1310 (250.79)       78;4     420.4712 (0.01)        433           1
+test_blosc2[mozilla-blosc2]                        29,972.5840 (>1000.0)  33,999.7360 (399.43)   31,781.1051 (>1000.0)    874.3491 (637.49)   31,748.5970 (>1000.0)  1,328.3660 (>1000.0)       6;0      31.4652 (0.00)         29           1
+test_blosc2[mozilla-cramjam]                       18,864.0400 (>1000.0)  23,362.9420 (274.47)   20,805.9920 (>1000.0)    972.6175 (709.13)   20,813.7170 (>1000.0)  1,321.4537 (>1000.0)      19;0      48.0631 (0.00)         59           1
+test_blosc2[mr-blosc2]                              5,133.9550 (279.75)   10,572.7500 (124.21)    5,975.9287 (294.64)     633.8772 (462.16)    5,887.3470 (293.40)     367.8630 (458.68)       11;8     167.3380 (0.00)        164           1
+test_blosc2[mr-cramjam]                             3,064.9790 (167.01)    4,241.9170 (49.83)     3,654.4829 (180.18)     243.8860 (177.82)    3,619.4400 (180.38)     343.7660 (428.64)       74;0     273.6365 (0.01)        241           1
+test_blosc2[nci-blosc2]                            11,511.2100 (627.25)   17,723.0360 (208.21)   12,959.7086 (638.97)   1,130.1584 (824.00)   12,552.5205 (625.56)   1,419.7045 (>1000.0)      20;2      77.1622 (0.00)         96           1
+test_blosc2[nci-cramjam]                            6,744.5140 (367.51)   10,125.9160 (118.96)    8,062.8074 (397.53)     619.3829 (451.59)    7,987.0295 (398.04)     746.3090 (930.56)       44;2     124.0263 (0.00)        140           1
+test_blosc2[ooffice-blosc2]                         4,140.7960 (225.63)    5,847.4770 (68.70)     5,012.5712 (247.14)     282.4189 (205.91)    4,997.3480 (249.05)     358.4380 (446.93)       58;4     199.4984 (0.00)        210           1
+test_blosc2[ooffice-cramjam]                        3,096.4640 (168.73)    4,784.3570 (56.21)     3,628.9101 (178.92)     305.4110 (222.67)    3,589.6805 (178.89)     450.9780 (562.32)       76;1     275.5648 (0.01)        244           1
+test_blosc2[osdb-blosc2]                            4,973.0210 (270.98)    7,235.2250 (85.00)     5,588.2538 (275.52)     282.0545 (205.65)    5,531.1010 (275.65)     333.5620 (415.91)       39;3     178.9468 (0.00)        174           1
+test_blosc2[osdb-cramjam]                           3,126.7870 (170.38)    5,045.0940 (59.27)     3,686.6050 (181.77)     222.9210 (162.53)    3,657.7220 (182.28)     286.5050 (357.24)       86;2     271.2523 (0.01)        284           1
+test_blosc2[paper-100k.pdf-blosc2]                    102.3790 (5.58)        196.6890 (2.31)        108.2362 (5.34)         4.0137 (2.93)        107.4230 (5.35)         3.3890 (4.23)      882;289   9,239.0492 (0.19)       5854           1
+test_blosc2[paper-100k.pdf-cramjam]                    97.2950 (5.30)        279.4410 (3.28)        125.3957 (6.18)         7.6812 (5.60)        125.3395 (6.25)         7.0210 (8.75)     1152;215   7,974.7539 (0.16)       6564           1
+test_blosc2[plrabn12.txt-blosc2]                    2,909.2140 (158.52)    3,339.0350 (39.23)     3,040.1373 (149.89)      36.8841 (26.89)     3,043.9220 (151.70)      36.0882 (45.00)       86;14     328.9325 (0.01)        341           1
+test_blosc2[plrabn12.txt-cramjam]                   2,865.6490 (156.15)    3,501.1750 (41.13)     3,101.8339 (152.93)     114.9680 (83.82)     3,056.2750 (152.31)     188.9033 (235.54)      121;1     322.3899 (0.01)        329           1
+test_blosc2[reymont-blosc2]                         5,005.3520 (272.74)    6,943.3790 (81.57)     5,499.4432 (271.15)     302.3018 (220.41)    5,438.4400 (271.03)     274.2850 (342.00)      32;10     181.8366 (0.00)        181           1
+test_blosc2[reymont-cramjam]                        3,689.1970 (201.02)    5,537.3160 (65.05)     4,476.1293 (220.69)     269.3684 (196.40)    4,479.7650 (223.25)     324.2543 (404.31)       67;4     223.4073 (0.00)        221           1
+test_blosc2[samba-blosc2]                          11,039.7830 (601.56)   14,726.7910 (173.01)   11,984.3788 (590.88)     544.8694 (397.26)   11,844.9790 (590.30)     472.5840 (589.26)       14;4      83.4420 (0.00)         71           1
+test_blosc2[samba-cramjam]                          6,067.1410 (330.60)    8,234.0660 (96.73)     7,194.4381 (354.72)     363.9852 (265.38)    7,169.5530 (357.30)     350.9830 (437.63)      34;11     138.9963 (0.00)        143           1
+test_blosc2[sao-blosc2]                             4,411.5210 (240.38)    8,601.3210 (101.05)    5,234.8062 (258.10)     475.1468 (346.43)    5,164.9145 (257.40)     348.2365 (434.21)      25;11     191.0290 (0.00)        200           1
+test_blosc2[sao-cramjam]                            3,158.0390 (172.08)    4,254.6260 (49.98)     3,613.6887 (178.17)     191.3573 (139.52)    3,604.5925 (179.64)     263.5200 (328.58)       84;4     276.7255 (0.01)        270           1
+test_blosc2[urls.10K-blosc2]                        1,032.4210 (56.26)     2,410.9010 (28.32)     1,342.7858 (66.21)      156.5562 (114.14)    1,309.2620 (65.25)      204.0065 (254.37)      182;5     744.7204 (0.02)        633           1
+test_blosc2[urls.10K-cramjam]                       1,042.2570 (56.79)     1,713.8730 (20.13)     1,216.5490 (59.98)      118.7578 (86.59)     1,180.1200 (58.81)       82.3950 (102.74)    157;117     821.9973 (0.02)        710           1
+test_blosc2[webster-blosc2]                        35,538.4260 (>1000.0)  38,440.4660 (451.60)   37,466.4085 (>1000.0)    648.7814 (473.03)   37,657.2540 (>1000.0)    703.3940 (877.05)        5;2      26.6906 (0.00)         28           1
+test_blosc2[webster-cramjam]                       22,190.2990 (>1000.0)  27,667.8060 (325.04)   25,140.1717 (>1000.0)  1,484.4451 (>1000.0)  25,449.2840 (>1000.0)  2,499.7048 (>1000.0)      16;0      39.7770 (0.00)         41           1
+test_blosc2[x-ray-blosc2]                           4,282.5140 (233.35)    6,791.2850 (79.78)     5,164.9098 (254.65)     344.9927 (251.53)    5,137.0000 (256.01)     343.8285 (428.71)       43;9     193.6142 (0.00)        187           1
+test_blosc2[x-ray-cramjam]                          2,442.3520 (133.08)    3,918.4730 (46.03)     3,123.1563 (153.98)     288.4846 (210.33)    3,119.8745 (155.48)     434.7830 (542.12)       97;0     320.1889 (0.01)        278           1
+test_blosc2[xml-blosc2]                             2,770.0400 (150.94)    4,419.4420 (51.92)     3,405.5445 (167.91)     267.6235 (195.12)    3,365.7325 (167.73)     362.9820 (452.60)       81;3     293.6388 (0.01)        280           1
+test_blosc2[xml-cramjam]                            2,431.7630 (132.51)    4,648.2960 (54.61)     3,225.8202 (159.05)     408.8631 (298.10)    3,179.8315 (158.47)     504.8680 (629.51)      100;9     309.9987 (0.01)        362           1
+----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+
+```
diff --git a/cramjam-python/benchmarks/test_bench.py b/cramjam-python/benchmarks/test_bench.py
@@ -5,6 +5,10 @@
 import numpy as np
 
 
+if hasattr(cramjam, 'experimental') and not hasattr(cramjam, 'blosc2'):
+    cramjam.blosc2 = cramjam.experimental.blosc2
+
+
 class Bzip2CompressedFile:
     """
     Too bad can't just inherit pathlib.Path