diff --git a/.github/workflows/Build_wheels_for_cpython27_x86.yml b/.github/workflows/Build_wheels_for_cpython27_x86.yml index cad594e8e..4eea46a5e 100644 --- a/.github/workflows/Build_wheels_for_cpython27_x86.yml +++ b/.github/workflows/Build_wheels_for_cpython27_x86.yml @@ -90,8 +90,7 @@ jobs: - name: Pepare for ${{matrix.os.pypkg}} ${{matrix.os.arch}} if: matrix.os.matrix == 'linux' run: | - sudo chroot ./ubuntu-${{matrix.os.release}}-${{matrix.os.arch}} /usr/bin/apt-cache madison clang-18 - sudo chroot ./ubuntu-${{matrix.os.release}}-${{matrix.os.arch}} /usr/bin/apt install -y ${{matrix.os.pypkg}}-dev gcc pkg-config ${{matrix.os.pypkgadd}} + sudo chroot ./ubuntu-${{matrix.os.release}}-${{matrix.os.arch}} /usr/bin/apt install --no-install-recommends -y ${{matrix.os.pypkg}}-dev gcc pkg-config ${{matrix.os.pypkgadd}} sudo chroot ./ubuntu-${{matrix.os.release}}-${{matrix.os.arch}} /bin/bash -c "wget ${{matrix.os.getpipurl}} -O get-pip.py && ${{matrix.os.pypkg}} get-pip.py" sudo chroot ./ubuntu-${{matrix.os.release}}-${{matrix.os.arch}} /bin/bash -c "${{matrix.os.pypkg}} -m pip install -U 'setuptools'" @@ -107,8 +106,6 @@ jobs: sudo chroot ./ubuntu-${{matrix.os.release}}-${{matrix.os.arch}} pkg-config libzstd --modversion sudo chroot ./ubuntu-${{matrix.os.release}}-${{matrix.os.arch}} echo GCC sudo chroot ./ubuntu-${{matrix.os.release}}-${{matrix.os.arch}} gcc -v - false && sudo chroot ./ubuntu-${{matrix.os.release}}-${{matrix.os.arch}} echo CLANG - false && sudo chroot ./ubuntu-${{matrix.os.release}}-${{matrix.os.arch}} clang-20 -v sudo chroot ./ubuntu-${{matrix.os.release}}-${{matrix.os.arch}} /bin/bash -c "cd /build_wheel/zstd-$version && _CC=clang-20 ZSTD_ASM=1 ZSTD_WARNINGS=1 _ZSTD_WERRORS=1 _ZSTD_SMALL=1 _ZSTD_ASM_BMI2=1 ZSTD_THREADS=1 _ZSTD_EXTERNAL=1 ${{matrix.os.pypkg}} setup.py bdist_wheel " - name: Test wheel for ${{matrix.os.pypkg}} ${{matrix.os.arch}} diff --git a/.github/workflows/Build_wheels_for_cpython313_x86_u16.yml b/.github/workflows/Build_wheels_for_cpython313_x86_u16.yml index 538b59c50..f121beff7 100644 --- a/.github/workflows/Build_wheels_for_cpython313_x86_u16.yml +++ b/.github/workflows/Build_wheels_for_cpython313_x86_u16.yml @@ -1,4 +1,4 @@ -name: Build wheels for CPython3.13 x86 on Ubuntu22 with GCC-10 All warnings +name: Build wheels for CPython3.13 x86 on Ubuntu16 with GCC-5 All warnings on: [push, pull_request] @@ -14,12 +14,12 @@ jobs: fail-fast: false matrix: os: - - name: Ubuntu 24+22 x86 CPython 3.13 + - name: Ubuntu 24+16 x86 CPython 3.13 runs-on: ubuntu-latest matrix: linux arch: i386 tag_arch: i686 - release: jammy + release: xenial mirror: http://azure.archive.ubuntu.com/ubuntu getpipurl: https://bootstrap.pypa.io/pip/get-pip.py pypkg: python3.13 @@ -60,10 +60,10 @@ jobs: sudo mount none ./ubuntu-${{matrix.os.release}}-${{matrix.os.arch}}/proc -t proc sudo mount none ./ubuntu-${{matrix.os.release}}-${{matrix.os.arch}}/dev/pts -t devpts sudo mount none ./ubuntu-${{matrix.os.release}}-${{matrix.os.arch}}/sys -t sysfs - echo "# deb [trusted=yes] http://packages.rusoft.ru/ppa/rusoft/python ubuntu-${{matrix.os.release}} main" > rusoft-python.list - echo "# deb [trusted=yes] http://packages.rusoft.ru/ppa/rusoft/backports ubuntu-${{matrix.os.release}} main" > rusoft-backports.list - echo "# deb [trusted=yes] http://packages.rusoft.ru/ppa/rusoft/packages ubuntu-${{matrix.os.release}} main" > rusoft-packages.list - echo " deb [trusted=yes] http://ppa.launchpadcontent.net/deadsnakes/ppa/ubuntu ${{matrix.os.release}} main" > deadsnakes.list + echo " deb [trusted=yes] http://packages.rusoft.ru/ppa/rusoft/python ubuntu-${{matrix.os.release}} main" > rusoft-python.list + echo " deb [trusted=yes] http://packages.rusoft.ru/ppa/rusoft/backports ubuntu-${{matrix.os.release}} main" > rusoft-backports.list + echo " deb [trusted=yes] http://packages.rusoft.ru/ppa/rusoft/packages ubuntu-${{matrix.os.release}} main" > rusoft-packages.list + echo "# deb [trusted=yes] http://ppa.launchpadcontent.net/deadsnakes/ppa/ubuntu ${{matrix.os.release}} main" > deadsnakes.list sudo chroot ./ubuntu-${{matrix.os.release}}-${{matrix.os.arch}} /usr/bin/apt update sudo cp -v ./*.list ./ubuntu-${{matrix.os.release}}-${{matrix.os.arch}}/etc/apt/sources.list.d false && sudo rm -fv ./ubuntu-${{matrix.os.release}}-${{matrix.os.arch}}/etc/apt/trusted.gpg.d/* && sudo rm -fv ./ubuntu-xenial-x86/etc/apt/trusted.gpg @@ -96,7 +96,7 @@ jobs: sudo tar -xvf dist/zstd-$version.tar.gz -C ./ubuntu-${{matrix.os.release}}-${{matrix.os.arch}}/build_wheel/ false && sudo chroot ./ubuntu-${{matrix.os.release}}-${{matrix.os.arch}} env sudo chroot ./ubuntu-${{matrix.os.release}}-${{matrix.os.arch}} pkg-config libzstd --modversion - sudo chroot ./ubuntu-${{matrix.os.release}}-${{matrix.os.arch}} echo GCC + sudo chroot ./ubuntu-${{matrix.os.release}}-${{matrix.os.arch}} echo GCC-5 sudo chroot ./ubuntu-${{matrix.os.release}}-${{matrix.os.arch}} gcc -v sudo chroot ./ubuntu-${{matrix.os.release}}-${{matrix.os.arch}} /bin/bash -c "cd /build_wheel/zstd-$version/ && ZSTD_ASM=1 ZSTD_WARNINGS=1 _ZSTD_SMALL=1 LDFLAGS='-Wl,--as-needed -Wl,-s' ZSTD_BUILD_STRIP=1 _ZSTD_SPEED=0 _ZSTD_SPEEDMAX=0 _ZSTD_ASM_BMI2=1 ZSTD_THREADS=1 _ZSTD_EXTERNAL=0 ${{matrix.os.pypkg}} setup.py bdist_wheel" diff --git a/PKG-INFO b/PKG-INFO index e27581280..03c6bb72d 100644 --- a/PKG-INFO +++ b/PKG-INFO @@ -1,12 +1,12 @@ Metadata-Version: 1.1 Name: zstd -Version: 1.5.7.2 +Version: 1.5.7.3 Summary: Simple python bindings to Yann Collet ZSTD compression library Home-page: https://github.com/sergey-dryabzhinsky/python-zstd Author: Sergey Dryabzhinsky Author-email: sergey.dryabzhinsky@gmail.com License: BSD -Download-URL: https://github.com/sergey-dryabzhinsky/python-zstd/archive/v1.5.7.2.tar.gz +Download-URL: https://github.com/sergey-dryabzhinsky/python-zstd/archive/v1.5.7.3.tar.gz Description: Simple ZSTandarD bindings for Python Keywords: zstd,zstandard,compression Platform: POSIX diff --git a/README.rst b/README.rst index 1dd489fff..dd6eff7c1 100644 --- a/README.rst +++ b/README.rst @@ -497,14 +497,12 @@ version (): string|bytes Since: 1.3.4.3 ZSTD_version (): string|bytes - Returns ZSTD library doted version string. + Returns ZSTD library doted version string, with which are compiled. Since: 1.3.4.3 -ZSTD_version_compiled (): string|bytes - Returns ZSTD library doted version string, wi which are compiled. - - Since: 1.5.7.3 +Aliases: + - ZSTD_version_compiled (): string|bytes Since: 1.5.7.3 ZSTD_version_loaded (): string|bytes Returns ZSTD library doted version string, with which currently loaded. @@ -512,13 +510,14 @@ ZSTD_version_loaded (): string|bytes Since: 1.5.7.3 ZSTD_version_number (): int - Returns ZSTD library version in format: MAJOR*100*100 + MINOR*100 + RELEASE. + Returns ZSTD library version, compiled with, in format: MAJOR*100*100 + MINOR*100 + RELEASE. Since: 1.3.4.3 ZSTD_threads_count (): int Returns ZSTD determined CPU cores count. - Better to get this nuber as early as possible befor compression starts. + Better to get this nuber as early as possible befor compression starts. + Since: 1.5.4.1 ZSTD_max_threads_count (): int diff --git a/setup.py b/setup.py index 192d27ed0..a1df2f9f5 100644 --- a/setup.py +++ b/setup.py @@ -21,7 +21,7 @@ # Package version, even external PKG_VERSION = VERSION # Minor revision -PKG_VERSION += (2,) +PKG_VERSION += (3,) PKG_VERSION_STR = ".".join([str(x) for x in PKG_VERSION]) vpath="./version" if not os.path.exists(vpath): diff --git a/src/python-zstd.c b/src/python-zstd.c index 6a920feaf..c2f4406d7 100644 --- a/src/python-zstd.c +++ b/src/python-zstd.c @@ -735,6 +735,7 @@ static int init_py_zstd(PyObject *module) { Py_INCREF(ZstdError); PyModule_AddObject(module, "Error", ZstdError); + int32_t threads = UTIL_countAvailableCores(); init_cContext(1, 3); return 0; } diff --git a/tests/base.py b/tests/base.py index 85870c04d..681de50a1 100644 --- a/tests/base.py +++ b/tests/base.py @@ -59,7 +59,7 @@ class BaseTestZSTD(unittest.TestCase): VERSION_INT = 10507 # minimal external version, must be >=1.4.0 VERSION_INT_MIN = 1 * 100*100 + 4* 1*100 + 0 - PKG_VERSION = "1.5.7.2" + PKG_VERSION = "1.5.7.3" def helper_version(self): #if zstd.ZSTD_external(): diff --git a/tests/test_speed.py b/tests/test_speed.py index cfc27aa48..56d6a48cb 100644 --- a/tests/test_speed.py +++ b/tests/test_speed.py @@ -11,7 +11,7 @@ def test_00_system_info(self): log.info("Bundled libzstd uses assembler? : %r" % zstd.ZSTD_with_asm()) log.info("Bundled libzstd uses threads? :%r" % zstd.ZSTD_with_threads()) - def test_compression_speed(self): + def test_compression_speed3(self): wait = 10 if "ZSTD_FULLTIME_TESTS" in os.environ: wait = 30 @@ -27,10 +27,48 @@ def test_compression_speed(self): endMemoryUsage=get_real_memory_usage() log.info("end Compression memory usage = %6.2f kb" % (1.0*endMemoryUsage/1024,)) - log.info("Compression speed average = %6.2f Mb/sec" % (1.0*sum/1024/1024/wait,)) + log.info("Compression speed 3 average = %6.2f Mb/sec" % (1.0*sum/1024/1024/wait,)) + log.info("diff Compression memory usage = %6.2f kb" % (1.0*(endMemoryUsage-beginMemoryUsage)/1024,)) + + def test_compression_speed19(self): + wait = 10 + if "ZSTD_FULLTIME_TESTS" in os.environ: + wait = 30 + log.info("\nWait %d seconds..." % wait) + sum = 0 + l=len(tDATA) + tbegin = time() + beginMemoryUsage=get_real_memory_usage() + log.info("begin Compression memory usage = %6.2f kb" % (1.0*beginMemoryUsage/1024,)) + while time()-tbegin