diff --git a/.github/workflows/pyfiction-pypi-deployment.yml b/.github/workflows/pyfiction-pypi-deployment.yml index 25124cdec..1b88d5a11 100644 --- 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 index 787b34c43..8f0203685 100644 --- 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/bindings/pyfiction/test/algorithms/simulation/sidb/test_critical_temperature.py b/bindings/pyfiction/test/algorithms/simulation/sidb/test_critical_temperature.py index 5379b6fdf..ac6574928 100644 --- 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/test/benchmark/simulation.cpp b/test/benchmark/simulation.cpp index 320a59f4e..f5603e4d9 100644 --- a/test/benchmark/simulation.cpp +++ b/test/benchmark/simulation.cpp @@ -8,6 +8,7 @@ #include #include #include +#include #include using namespace fiction; @@ -61,7 +62,7 @@ TEST_CASE("Benchmark simulators", "[benchmark]") BENCHMARK("QuickExact") { - const quickexact_params sim_params{sidb_simulation_parameters{2, -0.32}}; + const quickexact_params> sim_params{sidb_simulation_parameters{2, -0.32}}; return quickexact(lyt, sim_params); };