⬆️ Bump the submodules group across 1 directory with 5 updates (#459)

* ⬆️ Bump the submodules group across 1 directory with 5 updates Bumps the submodules group with 5 updates in the / directory: | Package | From | To | | --- | --- | --- | | [libs/alice](https://github.com/marcelwa/alice) | ``544577f`` | ``a55415e`` | | [libs/parallel-hashmap](https://github.com/greg7mdp/parallel-hashmap) | ``1036816`` | ``d88c5e1`` | | [libs/tinyxml2](https://github.com/leethomason/tinyxml2) | ``312a809`` | ``a0f66fd`` | | [libs/pybind11](https://github.com/pybind/pybind11) | ``b07fddb`` | ``7c4ac91`` | | [libs/mockturtle](https://github.com/lsils/mockturtle) | ``b7fe3a7`` | ``bfcee23`` | Updates `libs/alice` from `544577f` to `a55415e` - [Commits](marcelwa/alice@544577f...a55415e) Updates `libs/parallel-hashmap` from `1036816` to `d88c5e1` - [Release notes](https://github.com/greg7mdp/parallel-hashmap/releases) - [Commits](greg7mdp/parallel-hashmap@1036816...d88c5e1) Updates `libs/tinyxml2` from `312a809` to `a0f66fd` - [Release notes](https://github.com/leethomason/tinyxml2/releases) - [Commits](leethomason/tinyxml2@312a809...a0f66fd) Updates `libs/pybind11` from `b07fddb` to `7c4ac91` - [Release notes](https://github.com/pybind/pybind11/releases) - [Commits](pybind/pybind11@b07fddb...7c4ac91) Updates `libs/mockturtle` from `b7fe3a7` to `bfcee23` - [Release notes](https://github.com/lsils/mockturtle/releases) - [Commits](lsils/mockturtle@b7fe3a7...bfcee23) --- updated-dependencies: - dependency-name: libs/alice dependency-type: direct:production dependency-group: submodules - dependency-name: libs/parallel-hashmap dependency-type: direct:production dependency-group: submodules - dependency-name: libs/tinyxml2 dependency-type: direct:production dependency-group: submodules - dependency-name: libs/pybind11 dependency-type: direct:production dependency-group: submodules - dependency-name: libs/mockturtle dependency-type: direct:production dependency-group: submodules ... Signed-off-by: dependabot[bot] <support@github.com> * 💚 Remove fmt from the macOS runners via homebrew because of clashes with alice * 👷 Remove more unused packages when cleaning up before CodeQL * 👷 Guess fmt was not installed via brew * 💚 Remove fmt manually if found * Fix formatter const correctness * Updated alice version * ⬆️ Update mockturtle to my own fork that contains library adjustments and bug fixes * ⬆️ Fix branch * ⬆️ Update mockturtle to include fix for JSON formatting * ✅ Adjusted test cases to new {fmt} version * 💚 Fix compilation of Python wheels for Windows (#465) * 💚 try to fix wheel test issue on windows. * 💚 conduct renaming. * 💚 use normal threads instead of ``std::future``. * 💚 update test. * 💚 trial and error. * 💚 delete thread count option. * 🎨 Incorporated pre-commit fixes * 💚 delete thread count option. * 💚 trial and error. * 💚 only one thread. * 💚 small changes in multithreading. * 💚 use ``future`` for multithreading. * 💚 use sanitizer. * 💚 revert use of sanitizer. * 🎨 revert changes. * 🎨 using old quicksim code * 💚 use windows-2019. * 💚 revert code changes. * 💚 using windows-2019. * 💚 remove ``*-latest`` and use toolsets. * 💚 use toolsets. * 💚 update toolsets. * 💚 delete exclude part. * 💚 windows 2019. * 💚 remove toolset key. * 💚 use v143 for 2022. * 💚 use 2019. * :green_heart only using 2019. * 🎨 implement Marcel's comments. --------- Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Marcel Walter <marcel.walter@tum.de> Co-authored-by: Jan Drewniok <97012901+Drewniok@users.noreply.github.com> Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
cda-tum · Jun 28, 2024 · f390706 · f390706
1 parent 86ec324
commit f390706
Show file tree

Hide file tree

Showing 14 changed files with 45 additions and 28 deletions.
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
@@ -54,13 +54,13 @@ jobs:
       - name: Free Disk Space (Ubuntu)
         uses: jlumbroso/free-disk-space@main
         with:
-          tool-cache: false
+          tool-cache: true
           android: true
-          dotnet: false
-          haskell: false
-          large-packages: false
-          docker-images: false
-          swap-storage: false
+          dotnet: true
+          haskell: true
+          large-packages: true
+          docker-images: true
+          swap-storage: true
 
       - name: Install libraries and the respective compiler
         run: sudo apt-get update && sudo apt-get install -yq libtbb-dev ${{matrix.compiler}}

diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
@@ -72,6 +72,20 @@ jobs:
       - name: Setup TBB
         run: brew install tbb
 
+      # The fmt library pre-installed on the runners causes conflicts with the version shipped with alice
+      - name: Uninstall fmt
+        run: |
+          if [ -d "/usr/local/include/fmt" ]; then
+            if rm -rf /usr/local/include/fmt; then
+              echo "Pre-installed fmt removed successfully."
+            else
+              echo "Failed to remove pre-installed fmt."
+              exit 1
+            fi
+          else
+            echo "No pre-installed fmt found, skipping removal."
+          fi
+
       - name: Setup XCode version
         uses: maxim-lobanov/setup-xcode@v1
         with:

diff --git a/.github/workflows/pyfiction-pypi-deployment.yml b/.github/workflows/pyfiction-pypi-deployment.yml
@@ -50,10 +50,10 @@ jobs:
       fail-fast: false
       matrix:
         config:
-          - { os: ubuntu-latest, arch: x64 }
-          - { os: macos-latest, arch: x64 }
-          - { os: macos-latest, arch: arm64 }
-          - { os: windows-latest, arch: x64 }
+          - { os: ubuntu-22.04, arch: x64 }
+          - { os: macos-13, arch: x64 }
+          - { os: macos-14, arch: arm64 }
+          - { os: windows-2019, arch: x64 }
         python: ['cp38', 'cp39', 'cp310', 'cp311', 'cp312']
     steps:
       - uses: actions/checkout@v4

diff --git a/.github/workflows/python-bindings.yml b/.github/workflows/python-bindings.yml
@@ -44,16 +44,17 @@ jobs:
   build_and_test:
     strategy:
       matrix:
-        os: [ ubuntu-latest, macos-latest, windows-latest ]
+        os: [ ubuntu-22.04, macos-14, windows-2019 ]
         python_version: [ '3.8.x', '3.12.x' ]
         include:
-          - os: ubuntu-latest
+          - os: ubuntu-22.04
             z3_platform: linux
             architecture: x64
-          - os: macos-latest
+            toolset: v142
+          - os: macos-14
             z3_platform: macOS
             architecture: arm64
-          - os: windows-latest
+          - os: windows-2019
             z3_platform: windows
             architecture: x64
 

diff --git a/.gitmodules b/.gitmodules
@@ -18,4 +18,5 @@
 	url = https://github.com/nlohmann/json.git
 [submodule "libs/mockturtle"]
 	path = libs/mockturtle
-	url = https://github.com/lsils/mockturtle.git
+	url = https://github.com/marcelwa/mockturtle.git
+	branch = mnt
diff --git a/bindings/pyfiction/test/algorithms/simulation/sidb/test_critical_temperature.py b/bindings/pyfiction/test/algorithms/simulation/sidb/test_critical_temperature.py
@@ -61,7 +61,7 @@ def test_gate_based_simulation(self):
 
     def test_bestagon_inv(self):
         layout = read_sqd_layout_100(dir_path + "/../../../resources/hex_11_inputsdbp_inv_straight_v0_manual.sqd",
-                                 "inverter_input_0")
+                                     "inverter_input_0")
 
         params = critical_temperature_params()
         params.engine = simulation_engine.APPROXIMATE
@@ -78,7 +78,7 @@ def test_bestagon_inv(self):
 
     def test_bestagon_inv_with_different_mu(self):
         layout = read_sqd_layout_100(dir_path + "/../../../resources/hex_11_inputsdbp_inv_straight_v0_manual.sqd",
-                                 "inverter_input_0")
+                                     "inverter_input_0")
 
         params = critical_temperature_params()
         params.simulation_parameters.base = 2

diff --git a/include/fiction/technology/cell_ports.hpp b/include/fiction/technology/cell_ports.hpp
@@ -252,7 +252,7 @@ struct formatter<fiction::port_position>
     }
 
     template <typename FormatContext>
-    auto format(const fiction::port_position& p, FormatContext& ctx)
+    auto format(const fiction::port_position& p, FormatContext& ctx) const
     {
         return format_to(ctx.out(), "({},{})", p.x, p.y);
     }
@@ -268,7 +268,7 @@ struct formatter<fiction::port_direction>
     }
 
     template <typename FormatContext>
-    auto format(const fiction::port_direction& p, FormatContext& ctx)
+    auto format(const fiction::port_direction& p, FormatContext& ctx) const
     {
         return format_to(ctx.out(), p.dir == fiction::port_direction::NORTH      ? "N" :
                                     p.dir == fiction::port_direction::NORTH_EAST ? "NE" :

diff --git a/libs/alice b/libs/alice
diff --git a/libs/mockturtle b/libs/mockturtle
diff --git a/libs/parallel-hashmap b/libs/parallel-hashmap
diff --git a/libs/pybind11 b/libs/pybind11
diff --git a/libs/tinyxml2 b/libs/tinyxml2
diff --git a/test/benchmark/simulation.cpp b/test/benchmark/simulation.cpp
@@ -8,6 +8,7 @@
 #include <fiction/algorithms/simulation/sidb/quickexact.hpp>
 #include <fiction/algorithms/simulation/sidb/quicksim.hpp>
 #include <fiction/technology/cell_technologies.hpp>
+#include <fiction/traits.hpp>
 #include <fiction/types.hpp>
 
 using namespace fiction;
@@ -61,7 +62,7 @@ TEST_CASE("Benchmark simulators", "[benchmark]")
 
     BENCHMARK("QuickExact")
     {
-        const quickexact_params<lattice> sim_params{sidb_simulation_parameters{2, -0.32}};
+        const quickexact_params<cell<lattice>> sim_params{sidb_simulation_parameters{2, -0.32}};
         return quickexact<lattice>(lyt, sim_params);
     };
 

diff --git a/test/io/write_sqd_sim_result.cpp b/test/io/write_sqd_sim_result.cpp
@@ -176,7 +176,7 @@ TEST_CASE("Write empty simulation result", "[sqd-sim-result]")
             "        <repo>{}</repo>\n"
             "        <return_code>0</return_code>\n"
             "        <timestamp>{}</timestamp>\n"
-            "        <time_elapsed_s>42.0</time_elapsed_s>\n"
+            "        <time_elapsed_s>42</time_elapsed_s>\n"
             "    </eng_info>\n"
             "    <sim_params>\n"
             "        <debye_length>{}</debye_length>\n"
@@ -207,7 +207,7 @@ TEST_CASE("Write empty simulation result", "[sqd-sim-result]")
             "        <repo>{}</repo>\n"
             "        <return_code>0</return_code>\n"
             "        <timestamp>{}</timestamp>\n"
-            "        <time_elapsed_s>42.0</time_elapsed_s>\n"
+            "        <time_elapsed_s>42</time_elapsed_s>\n"
             "    </eng_info>\n"
             "    <sim_params>\n"
             "        <debye_length>{}</debye_length>\n"
@@ -242,7 +242,7 @@ TEST_CASE("Write empty simulation result", "[sqd-sim-result]")
             "        <repo>{}</repo>\n"
             "        <return_code>0</return_code>\n"
             "        <timestamp>{}</timestamp>\n"
-            "        <time_elapsed_s>42.0</time_elapsed_s>\n"
+            "        <time_elapsed_s>42</time_elapsed_s>\n"
             "    </eng_info>\n"
             "    <sim_params>\n"
             "        <debye_length>{}</debye_length>\n"