Merge branch 'main' into make_on_the_fly_more_accessible

# Conflicts: # bindings/mnt/pyfiction/include/pyfiction/pybind11_mkdoc_docstrings.hpp
cda-tum · Jan 15, 2025 · 83f354d · 83f354d
2 parents be59657 + af15694
commit 83f354d
Show file tree

Hide file tree

Showing 124 changed files with 6,826 additions and 3,011 deletions.
diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
@@ -38,28 +38,30 @@ jobs:
   build_and_test:
     strategy:
       matrix:
-        os: [macos-13, macos-14]
-        compiler: [g++-12, g++-13, g++-14, clang++]
+        os: [macos-13, macos-14, macos-15]
+        compiler: [g++-13, g++-14, clang++]
         include:
           - os: macos-13
             architecture: x64
           - os: macos-14
             architecture: arm64
+          - os: macos-15
+            architecture: arm64
           - compiler: clang++
             ccompiler: clang
-          - compiler: g++-12
-            ccompiler: gcc-12
           - compiler: g++-13
             ccompiler: gcc-13
           - compiler: g++-14
             ccompiler: gcc-14
         exclude:
-          - os: macos-14
-            compiler: g++-12
           - os: macos-14
             compiler: g++-13
           - os: macos-14
             compiler: g++-14
+          - os: macos-15
+            compiler: g++-13
+          - os: macos-15
+            compiler: g++-14
 
     name: 🍎 ${{matrix.os}} with ${{matrix.compiler}}
     runs-on: ${{matrix.os}}
@@ -75,7 +77,8 @@ jobs:
         with:
           python-version: "3.13.x"
 
-      # Setup TBB for parallel STL algorithms via Homebrew
+      # etup TBB for parallel STL algorithms via Homebrew
+
       - name: Setup TBB
         run: brew install tbb
 
@@ -104,7 +107,6 @@ jobs:
           GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
 
       # Build and test pipeline for Debug mode
-
       - name: Create Build Environment (Debug)
         run: cmake -E make_directory ${{github.workspace}}/build_debug
 
@@ -131,10 +133,9 @@ jobs:
 
       - name: Test (Debug)
         working-directory: ${{github.workspace}}/build_debug
-        run: ctest -C Debug --verbose --output-on-failure --repeat until-pass:3 --parallel 4 --exclude-regex "quality"
+        run: ctest -C Debug --verbose --output-on-failure --repeat until-pass:3 --parallel 4
 
       # Build and test pipeline for Release mode
-
       - name: Create Build Environment (Release)
         run: cmake -E make_directory ${{github.workspace}}/build_release
 

diff --git a/.github/workflows/python-bindings.yml b/.github/workflows/python-bindings.yml
@@ -46,7 +46,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        runs-on: [ubuntu-latest, macos-13, macos-14, windows-latest]
+        runs-on: [ubuntu-latest, macos-13, macos-15, windows-latest]
     steps:
       - name: Clone Repository
         uses: actions/checkout@v4

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -55,7 +55,7 @@ repos:
 
   # Python linting using ruff
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.8.6
+    rev: v0.9.1
     hooks:
       - id: ruff
         args: ["--fix", "--show-fixes"]
@@ -83,7 +83,7 @@ repos:
 
   # Check JSON schemata
   - repo: https://github.com/python-jsonschema/check-jsonschema
-    rev: 0.30.0
+    rev: 0.31.0
     hooks:
       - id: check-github-workflows
       - id: check-readthedocs

diff --git a/.readthedocs.yml b/.readthedocs.yml
@@ -5,9 +5,9 @@ submodules:
   recursive: true
 
 build:
-  os: ubuntu-22.04
+  os: ubuntu-24.04
   tools:
-    python: "3.10"
+    python: "3.12"
   apt_packages:
     - cmake
   jobs:

diff --git a/README.md b/README.md
@@ -176,9 +176,9 @@ physical simulation.
 
 ### Logic Synthesis
 
-For logic synthesis, _fiction_ relies on the [mockturtle library](https://github.com/lsils/mockturtle) that offers a
-multitude of logic network types and optimization algorithms. Logic synthesis can be performed in external tools and
-resulting Verilog/AIGER/BLIF/... files can be parsed by _fiction_. Alternatively, since _mockturtle_ is included in
+For logic synthesis, _fiction_ utilizes [ABC](https://github.com/berkeley-abc/abc) and the [mockturtle library](https://github.com/lsils/mockturtle) that
+offer a multitude of logic network types and optimization algorithms. Logic synthesis can be performed in external tools
+and resulting Verilog/AIGER/BLIF/... files can be parsed by _fiction_. Alternatively, since _mockturtle_ is included in
 _fiction_, synthesis can be applied in the same evaluation script.
 
 ### Physical Design

diff --git a/bindings/mnt/pyfiction/__init__.py b/bindings/mnt/pyfiction/__init__.py
@@ -36,8 +36,6 @@
     apply_topolinano_library,
     # Technology
     area,
-    assess_physical_population_stability,
-    assess_physical_population_stability_params,
     automatic_base_number_detection,
     bdl_input_iterator_100,
     bdl_input_iterator_111,
@@ -69,10 +67,7 @@
     color_mode,
     color_routing,
     color_routing_params,
-    compute_operational_ratio,
-    compute_operational_ratio_params,
     convert_layout_to_siqad_coordinates,
-    convert_potential_to_distance,
     create_and3_tt,
     create_and_tt,
     create_and_xor_tt,
@@ -120,8 +115,6 @@
     detect_bdl_wires_params,
     determine_displacement_robustness_domain_100,
     determine_displacement_robustness_domain_111,
-    determine_groundstate_from_simulation_results,
-    determine_physically_valid_parameters,
     dimer_displacement_policy,
     displacement_analysis_mode,
     displacement_robustness_domain_100,
@@ -162,6 +155,7 @@
     graph_oriented_layout_design,
     graph_oriented_layout_design_params,
     graph_oriented_layout_design_stats,
+    groundstate_from_simulation_result,
     has_high_degree_fanin_nodes,
     hexagonal_gate_layout,
     hexagonal_layout,
@@ -207,6 +201,8 @@
     operational_domain_grid_search,
     operational_domain_params,
     operational_domain_random_sampling,
+    operational_domain_ratio,
+    operational_domain_ratio_params,
     operational_domain_stats,
     operational_domain_value_range,
     operational_input_patterns,
@@ -216,13 +212,19 @@
     orthogonal_stats,
     out_of_cell_names_exception,
     parameter_point,
+    physical_population_stability_100,
+    physical_population_stability_111,
+    physical_population_stability_params,
+    physically_valid_parameters,
     physically_valid_parameters_domain,
     place,
-    population_stability_information,
+    population_stability_information_100,
+    population_stability_information_111,
     positive_charges,
     post_layout_optimization,
     post_layout_optimization_params,
     post_layout_optimization_stats,
+    potential_to_distance_conversion,
     qca_layout,
     qca_technology,
     quickexact,
@@ -336,8 +338,6 @@
     "apply_topolinano_library",
     # Technology
     "area",
-    "assess_physical_population_stability",
-    "assess_physical_population_stability_params",
     "automatic_base_number_detection",
     "bdl_input_iterator_100",
     "bdl_input_iterator_111",
@@ -369,10 +369,7 @@
     "color_mode",
     "color_routing",
     "color_routing_params",
-    "compute_operational_ratio",
-    "compute_operational_ratio_params",
     "convert_layout_to_siqad_coordinates",
-    "convert_potential_to_distance",
     "create_and3_tt",
     "create_and_tt",
     "create_and_xor_tt",
@@ -420,8 +417,6 @@
     "detect_bdl_wires_params",
     "determine_displacement_robustness_domain_100",
     "determine_displacement_robustness_domain_111",
-    "determine_groundstate_from_simulation_results",
-    "determine_physically_valid_parameters",
     "dimer_displacement_policy",
     "displacement_analysis_mode",
     "displacement_robustness_domain_100",
@@ -462,6 +457,7 @@
     "graph_oriented_layout_design",
     "graph_oriented_layout_design_params",
     "graph_oriented_layout_design_stats",
+    "groundstate_from_simulation_result",
     "has_high_degree_fanin_nodes",
     "hexagonal_gate_layout",
     "hexagonal_layout",
@@ -507,6 +503,8 @@
     "operational_domain_grid_search",
     "operational_domain_params",
     "operational_domain_random_sampling",
+    "operational_domain_ratio",
+    "operational_domain_ratio_params",
     "operational_domain_stats",
     "operational_domain_value_range",
     "operational_input_patterns",
@@ -516,13 +514,19 @@
     "orthogonal_stats",
     "out_of_cell_names_exception",
     "parameter_point",
+    "physical_population_stability_100",
+    "physical_population_stability_111",
+    "physical_population_stability_params",
+    "physically_valid_parameters",
     "physically_valid_parameters_domain",
     "place",
-    "population_stability_information",
+    "population_stability_information_100",
+    "population_stability_information_111",
     "positive_charges",
     "post_layout_optimization",
     "post_layout_optimization_params",
     "post_layout_optimization_stats",
+    "potential_to_distance_conversion",
     "qca_layout",
     "qca_technology",
     "quickexact",

diff --git a/...ion/include/pyfiction/algorithms/simulation/sidb/assess_physical_population_stability.hpp b/...ion/include/pyfiction/algorithms/simulation/sidb/assess_physical_population_stability.hpp
diff --git a/...mnt/pyfiction/include/pyfiction/algorithms/simulation/sidb/can_positive_charges_occur.hpp b/...mnt/pyfiction/include/pyfiction/algorithms/simulation/sidb/can_positive_charges_occur.hpp
@@ -13,8 +13,6 @@
 #include <pybind11/pybind11.h>
 #include <pybind11/stl.h>
 
-#include <string>
-
 namespace pyfiction
 {
 

diff --git a/...ck_simulation_results_for_equivalence.hpp → ...eck_simulation_result_for_equivalence.hpp b/...ck_simulation_results_for_equivalence.hpp → ...eck_simulation_result_for_equivalence.hpp
@@ -8,7 +8,7 @@
 #include "pyfiction/documentation.hpp"
 #include "pyfiction/types.hpp"
 
-#include <fiction/algorithms/simulation/sidb/check_simulation_results_for_equivalence.hpp>
+#include <fiction/algorithms/simulation/sidb/equivalence_check_for_simulation_results.hpp>
 
 #include <pybind11/pybind11.h>
 #include <pybind11/stl.h>

diff --git a/.../pyfiction/include/pyfiction/algorithms/simulation/sidb/convert_potential_to_distance.hpp b/.../pyfiction/include/pyfiction/algorithms/simulation/sidb/convert_potential_to_distance.hpp