polybench 0.3.0__tar.gz → 0.3.2__tar.gz

{polybench-0.3.0 → polybench-0.3.2}/LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2020-2024 Takahiro Ueda
+Copyright (c) 2020-2025 Takahiro Ueda
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

{polybench-0.3.0 → polybench-0.3.2}/PKG-INFO

@@ -1,8 +1,7 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.3
 Name: polybench
-Version: 0.3.0
+Version: 0.3.2
 Summary: Multivariate polynomial arithmetic benchmark tests.
-Home-page: https://github.com/tueda/polybench
 License: MIT
 Keywords: benchmark,mathematics,multivariate-polynomials
 Author: Takahiro Ueda
@@ -19,28 +18,29 @@ Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
 Classifier: Topic :: Scientific/Engineering :: Mathematics
 Classifier: Topic :: System :: Benchmark
 Requires-Dist: colorama (>=0.4.5,<0.5.0)
-Requires-Dist: colorlog (>=6.8.2,<7.0.0)
+Requires-Dist: colorlog (>=6.9.0,<7.0.0)
 Requires-Dist: importlib-metadata (>=4.8.3,<5.0.0)
 Requires-Dist: importlib-resources (>=5.4.0,<6.0.0)
 Requires-Dist: kiwisolver (>=1.3.1,<1.4.0) ; python_full_version >= "3.6.1" and python_full_version < "3.7.0"
-Requires-Dist: kiwisolver (>=1.4.5,<2.0.0) ; python_version >= "3.7" and python_version < "3.13"
+Requires-Dist: kiwisolver (>=1.4.5,<2.0.0) ; python_version >= "3.7" and python_version < "3.14"
 Requires-Dist: matplotlib (>=3.3.4,<3.4.0) ; python_full_version >= "3.6.1" and python_full_version < "3.7.0"
 Requires-Dist: matplotlib (>=3.5.3,<3.6.0) ; python_version >= "3.7" and python_version < "3.11"
-Requires-Dist: matplotlib (>=3.9.0,<4.0.0) ; python_version >= "3.11" and python_version < "3.13"
+Requires-Dist: matplotlib (>=3.9.0,<4.0.0) ; python_version >= "3.11" and python_version < "3.14"
 Requires-Dist: numpy (>=1.19.5,<1.20.0) ; python_full_version >= "3.6.1" and python_full_version < "3.7.0"
 Requires-Dist: numpy (>=1.21.6,<1.22.0) ; python_version >= "3.7" and python_version < "3.11"
-Requires-Dist: numpy (>=2.0.0,<3.0.0) ; python_version >= "3.11" and python_version < "3.13"
+Requires-Dist: numpy (>=2.0.0,<3.0.0) ; python_version >= "3.11" and python_version < "3.14"
 Requires-Dist: pandas (>=1.1.5,<1.2.0) ; python_full_version >= "3.6.1" and python_full_version < "3.7.1"
 Requires-Dist: pandas (>=1.3.5,<1.4.0) ; python_full_version >= "3.7.1" and python_version < "3.11"
-Requires-Dist: pandas (>=2.2.2,<3.0.0) ; python_version >= "3.11" and python_version < "3.13"
+Requires-Dist: pandas (>=2.2.2,<3.0.0) ; python_version >= "3.11" and python_version < "3.14"
 Requires-Dist: pretty-errors (>=1.2.25,<2.0.0)
-Requires-Dist: psutil (>=6.0.0,<7.0.0)
+Requires-Dist: psutil (>=7.0.0,<8.0.0)
 Requires-Dist: py-cpuinfo (>=9.0.0,<10.0.0)
-Requires-Dist: symengine (>=0.10.0,<0.11.0) ; python_version >= "3.7" and python_version < "3.8"
-Requires-Dist: symengine (>=0.11.0,<0.12.0) ; python_version >= "3.8" and python_version < "3.13"
+Requires-Dist: symengine (>=0.10.0,<0.11.0) ; python_version == "3.7"
+Requires-Dist: symengine (>=0.13.0,<0.14.0) ; python_version >= "3.8" and python_version < "3.14"
 Requires-Dist: symengine (>=0.8.1,<0.9.0) ; python_full_version >= "3.6.1" and python_full_version < "3.7.0"
 Requires-Dist: toml (>=0.10.2,<0.11.0)
 Requires-Dist: typing-extensions (>=4.1.1,<5.0.0)
@@ -50,7 +50,7 @@ Description-Content-Type: text/markdown
 polybench
 =========
 
-[![Test](https://github.com/tueda/polybench/actions/workflows/test.yml/badge.svg?branch=master)](https://github.com/tueda/polybench/actions?query=branch:master)
+[![Test](https://github.com/tueda/polybench/actions/workflows/test.yml/badge.svg?branch=main)](https://github.com/tueda/polybench/actions?query=branch:main)
 [![PyPI version](https://badge.fury.io/py/polybench.svg)](https://pypi.org/project/polybench/)
 
 Multivariate polynomial arithmetic benchmark tests.
@@ -74,7 +74,8 @@ They are (in alphabetical order):
 
 - [Fermat](https://home.bway.net/lewis/)
 - [FLINT](https://flintlib.org/): automatically downloaded via [vcpkg](https://vcpkg.io/)
-  (requires [CMake](https://cmake.org/) >= 3.15, a C compiler and the Make utility).
+  (requires [CMake](https://cmake.org/) >= 3.15, a C compiler and the Make utility;
+  see also [vcpkg dependencies](https://learn.microsoft.com/en-us/vcpkg/concepts/supported-hosts#dependencies)).
 - [FORM](https://www.nikhef.nl/~form/):
   if not available in the system, then
   a [release binary](https://github.com/vermaseren/form/releases)
@@ -160,14 +161,14 @@ Example
 | FLINT          | flint 2.9.0, cc (GNU) 10.5.0                                                 |
 | FORM           | FORM 4.3.1 (Apr 11 2023, v4.3.1) 64-bits                                     |
 | Mathematica    | 14.1.0 for Linux x86 (64-bit) (July 22, 2024)                                |
-| reFORM         | 0.1.0-fix-serialize, rustc 1.81.0 (eeb90cda1 2024-09-04)                     |
+| reFORM         | 0.1.0-fix-serialize, rustc 1.84.1 (e71f9a9a9 2025-01-27)                     |
 | Rings          | 2.5.8, JVM: 11.0.20.1 (Ubuntu 11.0.20.1+1-post-Ubuntu-0ubuntu120.04)         |
-| Singular       | Singular for x86_64-Linux version 4.4.0 (44002, 64 bit) May 29 2024 14:14:10 |
-| Symbolica      | 0.11.0, rustc 1.81.0 (eeb90cda1 2024-09-04)                                  |
+| Singular       | Singular for x86_64-Linux version 4.4.1 (44100, 64 bit) Jan 2025             |
+| Symbolica      | 0.15.0, rustc 1.84.1 (e71f9a9a9 2025-01-27)                                  |
 
-![nontrivial-gcd](https://raw.githubusercontent.com/tueda/polybench-result/refs/heads/main/0.3.0/05/0002.figures/summary.png)
+![nontrivial-gcd](https://raw.githubusercontent.com/tueda/polybench-result/refs/heads/main/0.3.1/05/0002.figures/summary.png)
 
-![nontrivial-factor](https://raw.githubusercontent.com/tueda/polybench-result/refs/heads/main/0.3.0/05/0004.figures/summary.png)
+![nontrivial-factor](https://raw.githubusercontent.com/tueda/polybench-result/refs/heads/main/0.3.1/05/0004.figures/summary.png)
 
 Additional benchmark results are available [here](https://github.com/tueda/polybench-result/tree/main).
 
@@ -206,5 +207,5 @@ cd path/to/project
 License
 -------
 
-[MIT](https://github.com/tueda/polybench/blob/master/LICENSE)
+[MIT](https://github.com/tueda/polybench/blob/main/LICENSE)
 

{polybench-0.3.0 → polybench-0.3.2}/README.md

@@ -1,7 +1,7 @@
 polybench
 =========
 
-[![Test](https://github.com/tueda/polybench/actions/workflows/test.yml/badge.svg?branch=master)](https://github.com/tueda/polybench/actions?query=branch:master)
+[![Test](https://github.com/tueda/polybench/actions/workflows/test.yml/badge.svg?branch=main)](https://github.com/tueda/polybench/actions?query=branch:main)
 [![PyPI version](https://badge.fury.io/py/polybench.svg)](https://pypi.org/project/polybench/)
 
 Multivariate polynomial arithmetic benchmark tests.
@@ -25,7 +25,8 @@ They are (in alphabetical order):
 
 - [Fermat](https://home.bway.net/lewis/)
 - [FLINT](https://flintlib.org/): automatically downloaded via [vcpkg](https://vcpkg.io/)
-  (requires [CMake](https://cmake.org/) >= 3.15, a C compiler and the Make utility).
+  (requires [CMake](https://cmake.org/) >= 3.15, a C compiler and the Make utility;
+  see also [vcpkg dependencies](https://learn.microsoft.com/en-us/vcpkg/concepts/supported-hosts#dependencies)).
 - [FORM](https://www.nikhef.nl/~form/):
   if not available in the system, then
   a [release binary](https://github.com/vermaseren/form/releases)
@@ -111,14 +112,14 @@ Example
 | FLINT          | flint 2.9.0, cc (GNU) 10.5.0                                                 |
 | FORM           | FORM 4.3.1 (Apr 11 2023, v4.3.1) 64-bits                                     |
 | Mathematica    | 14.1.0 for Linux x86 (64-bit) (July 22, 2024)                                |
-| reFORM         | 0.1.0-fix-serialize, rustc 1.81.0 (eeb90cda1 2024-09-04)                     |
+| reFORM         | 0.1.0-fix-serialize, rustc 1.84.1 (e71f9a9a9 2025-01-27)                     |
 | Rings          | 2.5.8, JVM: 11.0.20.1 (Ubuntu 11.0.20.1+1-post-Ubuntu-0ubuntu120.04)         |
-| Singular       | Singular for x86_64-Linux version 4.4.0 (44002, 64 bit) May 29 2024 14:14:10 |
-| Symbolica      | 0.11.0, rustc 1.81.0 (eeb90cda1 2024-09-04)                                  |
+| Singular       | Singular for x86_64-Linux version 4.4.1 (44100, 64 bit) Jan 2025             |
+| Symbolica      | 0.15.0, rustc 1.84.1 (e71f9a9a9 2025-01-27)                                  |
 
-![nontrivial-gcd](https://raw.githubusercontent.com/tueda/polybench-result/refs/heads/main/0.3.0/05/0002.figures/summary.png)
+![nontrivial-gcd](https://raw.githubusercontent.com/tueda/polybench-result/refs/heads/main/0.3.1/05/0002.figures/summary.png)
 
-![nontrivial-factor](https://raw.githubusercontent.com/tueda/polybench-result/refs/heads/main/0.3.0/05/0004.figures/summary.png)
+![nontrivial-factor](https://raw.githubusercontent.com/tueda/polybench-result/refs/heads/main/0.3.1/05/0004.figures/summary.png)
 
 Additional benchmark results are available [here](https://github.com/tueda/polybench-result/tree/main).
 
@@ -157,4 +158,4 @@ cd path/to/project
 License
 -------
 
-[MIT](https://github.com/tueda/polybench/blob/master/LICENSE)
+[MIT](https://github.com/tueda/polybench/blob/main/LICENSE)

{polybench-0.3.0 → polybench-0.3.2}/polybench/solvers/flint/vcpkg.json

@@ -2,7 +2,7 @@
   "$schema": "https://raw.githubusercontent.com/microsoft/vcpkg-tool/main/docs/vcpkg.schema.json",
   "name": "polybench-flint",
   "version-string": "0.1.0",
-  "builtin-baseline": "f7423ee180c4b7f40d43402c2feb3859161ef625",
+  "builtin-baseline": "ce613c41372b23b1f51333815feb3edd87ef8a8b",
   "dependencies": [
     {
       "name": "flint",

{polybench-0.3.0 → polybench-0.3.2}/polybench/solvers/rings/build.gradle

@@ -1,12 +1,12 @@
 plugins {
   id 'application'
-  id 'com.diffplug.spotless' version '5.8.2'
-  id 'com.github.ben-manes.versions' version '0.36.0'
-  id 'ru.vyarus.quality' version '4.4.0'
+  id 'com.diffplug.spotless' version '7.0.4'
+  id 'com.github.ben-manes.versions' version '0.52.0'
+  id 'ru.vyarus.quality' version '5.0.0'
 }
 
 def versions = [
-  checkstyle: '8.38',
+  checkstyle: '10.25.0',
   rings: '2.5.8',
 ]
 

{polybench-0.3.0 → polybench-0.3.2}/polybench/solvers/rings/src/main/java/com/github/tueda/polybench/rings/App.java

@@ -21,31 +21,24 @@ public class App {
     final Path inputFile = Paths.get(args[1]);
     final Path outputFile = Paths.get(args[2]);
 
-    final BufferedReader in = Files.newBufferedReader(inputFile);
-    try {
-      final PrintWriter out = new PrintWriter(Files.newBufferedWriter(outputFile));
-      try {
-        while (true) {
-          final String line = in.readLine();
-          if (line == null) {
-            break;
-          }
-          String answer;
-          if (line.startsWith("gcd")) {
-            answer = doGcd(line, variables);
-          } else if (line.startsWith("factor")) {
-            answer = doFactor(line, variables);
-          } else {
-            String problemType = line.length() > 8 ? line.substring(0, 8) + "..." : line;
-            throw new IllegalArgumentException("unknown problem type: " + problemType);
-          }
-          out.println(answer);
+    try (BufferedReader in = Files.newBufferedReader(inputFile);
+        PrintWriter out = new PrintWriter(Files.newBufferedWriter(outputFile))) {
+      while (true) {
+        final String line = in.readLine();
+        if (line == null) {
+          break;
         }
-      } finally {
-        out.close();
+        String answer;
+        if (line.startsWith("gcd")) {
+          answer = doGcd(line, variables);
+        } else if (line.startsWith("factor")) {
+          answer = doFactor(line, variables);
+        } else {
+          String problemType = line.length() > 8 ? line.substring(0, 8) + "..." : line;
+          throw new IllegalArgumentException("unknown problem type: " + problemType);
+        }
+        out.println(answer);
       }
-    } finally {
-      in.close();
     }
   }
 

{polybench-0.3.0 → polybench-0.3.2}/polybench/solvers/symbolica/Cargo.lock

@@ -1,6 +1,6 @@
 # This file is automatically @generated by Cargo.
 # It is not intended for manual editing.
-version = 3
+version = 4
 
 [[package]]
 name = "ahash"
@@ -321,26 +321,6 @@ version = "1.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d369a96f978623eb3dc28807c4852d6cc617fed53da5d3c400feff1ef34a714a"
 
-[[package]]
-name = "serde"
-version = "1.0.208"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cff085d2cb684faa248efb494c39b68e522822ac0de72ccf08109abde717cfb2"
-dependencies = [
- "serde_derive",
-]
-
-[[package]]
-name = "serde_derive"
-version = "1.0.208"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "24008e81ff7613ed8e5ba0cfaf24e2c2f1e5b8a0495711e44fcd4882fca62bcf"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
 [[package]]
 name = "smallvec"
 version = "1.13.2"
@@ -366,9 +346,9 @@ checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f"
 
 [[package]]
 name = "symbolica"
-version = "0.11.0"
+version = "0.16.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e9d742dabb0b6b3f5e4a324ec9f836e8bb5ef9e5675e80e78583a51fe4c1d8b8"
+checksum = "cd604b65465f118ac20bc2edef1b45f15f28e978b72e89050101dc524432e501"
 dependencies = [
  "ahash",
  "append-only-vec",
@@ -384,7 +364,6 @@ dependencies = [
  "rayon",
  "rug",
  "self_cell",
- "serde",
  "smallvec",
  "smartstring",
  "tinyjson",

{polybench-0.3.0 → polybench-0.3.2}/polybench/solvers/symbolica/Cargo.toml

@@ -5,4 +5,4 @@ authors = ["Takahiro Ueda <t.ueda.od@juntendo.ac.jp>"]
 edition = "2021"
 
 [dependencies]
-symbolica = "0.11.0"
+symbolica = "0.16.0"

{polybench-0.3.0 → polybench-0.3.2}/polybench/solvers/symbolica/src/main.rs

@@ -3,12 +3,11 @@ use std::fs::File;
 use std::io::{BufRead, BufReader, LineWriter, Write};
 use std::sync::Arc;
 use std::time::Instant;
-use symbolica::atom::Atom;
 use symbolica::domains::integer::Z;
 use symbolica::poly::factor::Factorize;
 use symbolica::poly::polynomial::MultivariatePolynomial;
 use symbolica::poly::Variable;
-use symbolica::state::State;
+use symbolica::{atom::AtomCore, parse, symbol};
 
 fn main() {
     let args: Vec<_> = env::args().collect();
@@ -22,12 +21,8 @@ fn main() {
 
     let mut output = LineWriter::new(output_file);
 
-    let var_map: Arc<Vec<Variable>> = Arc::new(
-        variables
-            .iter()
-            .map(|x| State::get_symbol(x).into())
-            .collect(),
-    );
+    let var_map: Arc<Vec<Variable>> =
+        Arc::new(variables.iter().map(|x| symbol!(x).into()).collect());
 
     for line in BufReader::new(input_file).lines() {
         let line = line.unwrap();
@@ -97,8 +92,8 @@ fn main() {
     }
 }
 
-fn get_poly(expr: &str, var_map: &Arc<Vec<Variable>>) -> MultivariatePolynomial<Z> {
-    Atom::parse(expr)
+fn get_poly(expr: &str, var_map: &Arc<Vec<Variable>>) -> MultivariatePolynomial<Z, u8> {
+    parse!(expr)
         .unwrap()
         .to_polynomial(&Z, Some(var_map.clone()))
 }

{polybench-0.3.0 → polybench-0.3.2}/polybench/solvers/symbolica.py

@@ -38,11 +38,7 @@ class SymbolicaSolver(Solver):
         args = [variables, str(self.problem_file), str(log_file)]
         if not self.run(
             [
-                *self.cargo_command,
-                "run",
-                f"--manifest-path={self._build_dir}/Cargo.toml",
-                "--release",
-                "--",
+                f"{self._build_dir}/target/release/polybench-symbolica",
                 *args,
             ]
         ):

{polybench-0.3.0 → polybench-0.3.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "polybench"
-version = "0.3.0"
+version = "0.3.2"
 description = "Multivariate polynomial arithmetic benchmark tests."
 license = "MIT"
 authors = ["Takahiro Ueda <t.ueda.od@juntendo.ac.jp>"]
@@ -19,38 +19,38 @@ classifiers = [
 python = "^3.6.1"
 
 colorama = "^0.4.5"  # 0.4.6 requires python >= 3.7
-colorlog = "^6.8.2"
+colorlog = "^6.9.0"
 importlib-metadata = "^4.8.3"  # 4.9.0 requires python >= 3.7
 importlib-resources = "^5.4.0"  # 5.6.0 requires python >= 3.7
 pretty-errors = "^1.2.25"
-psutil = "^6.0.0"
+psutil = "^7.0.0"
 py-cpuinfo = "^9.0.0"
 toml = "^0.10.2"
 typing-extensions = "^4.1.1"  # 4.2.0 requires python >= 3.7
 
 kiwisolver = [
     { version = "~1.3.1", python = "~3.6.1" },
-    { version = "^1.4.5", python = ">=3.7,<3.13" },
+    { version = "^1.4.5", python = ">=3.7,<3.14" },
 ]
 symengine = [
     { version = "~0.8.1", python = "~3.6.1" },
     { version = "~0.10.0", python = ">=3.7,<3.8" },
-    { version = "^0.11.0", python = ">=3.8,<3.13" },
+    { version = "^0.13.0", python = ">=3.8,<3.14" },
 ]
 matplotlib = [
     { version = "~3.3.4", python = "~3.6.1" },
     { version = "~3.5.3", python = ">=3.7,<3.11" },
-    { version = "^3.9.0", python = ">=3.11,<3.13" },
+    { version = "^3.9.0", python = ">=3.11,<3.14" },
 ]
 numpy = [
     { version = "~1.19.5", python = "~3.6.1" },
     { version = "~1.21.6", python = ">=3.7,<3.11" },
-    { version = "^2.0.0", python = ">=3.11,<3.13" },
+    { version = "^2.0.0", python = ">=3.11,<3.14" },
 ]
 pandas = [
     { version = "~1.1.5", python = ">=3.6.1,<3.7.1" },
     { version = "~1.3.5", python = ">=3.7.1,<3.11" },
-    { version = "^2.2.2", python = ">=3.11,<3.13" },
+    { version = "^2.2.2", python = ">=3.11,<3.14" },
 ]
 
 [tool.poetry.dev-dependencies]