Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

💚 Fix compilation of Python wheels for Windows #462

Closed
wants to merge 53 commits into from
Closed
Show file tree
Hide file tree
Changes from 46 commits
Commits
Show all changes
53 commits
Select commit Hold shift + click to select a range
4c2b335
:green_heart: try to fix wheel test issue on windows.
Drewniok Jun 20, 2024
8140ced
:green_heart: try to fix wheel test issue on windows.
Drewniok Jun 20, 2024
3bd6423
:green_heart: conduct renaming.
Drewniok Jun 20, 2024
bc9e362
:green_heart: conduct renaming.
Drewniok Jun 20, 2024
6fe9c2b
:green_heart: conduct renaming.
Drewniok Jun 20, 2024
64a389e
:green_heart: use normal threads instead of ``std::future``.
Drewniok Jun 20, 2024
3e12d21
:green_heart: update test.
Drewniok Jun 20, 2024
43a8e69
:green_heart: trial and error.
Drewniok Jun 20, 2024
006b07b
:green_heart: trial and error.
Drewniok Jun 20, 2024
48779b2
:green_heart: trial and error.
Drewniok Jun 20, 2024
8622f40
:green_heart: trial and error.
Drewniok Jun 20, 2024
cc01ea4
:green_heart: trial and error.
Drewniok Jun 20, 2024
b9b94ba
:green_heart: trial and error.
Drewniok Jun 20, 2024
b64ba05
:green_heart: trial and error.
Drewniok Jun 20, 2024
82b65ee
:green_heart: trial and error.
Drewniok Jun 20, 2024
7cdfc68
:green_heart: trial and error.
Drewniok Jun 20, 2024
93a1531
:green_heart: trial and error.
Drewniok Jun 20, 2024
9b08a1f
:green_heart: trial and error.
Drewniok Jun 20, 2024
88e6234
:green_heart: delete thread count option.
Drewniok Jun 20, 2024
3a63a15
🎨 Incorporated pre-commit fixes
pre-commit-ci[bot] Jun 20, 2024
27fac5e
:green_heart: delete thread count option.
Drewniok Jun 20, 2024
3dd9dba
Merge remote-tracking branch 'origin/fix_wheel_test_issue_windows' in…
Drewniok Jun 20, 2024
383de5f
:green_heart: trial and error.
Drewniok Jun 20, 2024
d6ab97d
:green_heart: trial and error.
Drewniok Jun 21, 2024
7ef2e86
:green_heart: trial and error.
Drewniok Jun 24, 2024
b4aca91
:green_heart: trial and error.
Drewniok Jun 24, 2024
71d9374
:green_heart: trial and error.
Drewniok Jun 25, 2024
9724870
:green_heart: trial and error.
Drewniok Jun 25, 2024
bd68799
:green_heart: trial and error.
Drewniok Jun 25, 2024
594db7a
:green_heart: trial and error.
Drewniok Jun 25, 2024
f77bb9c
:green_heart: only one thread.
Drewniok Jun 25, 2024
d2de859
:green_heart: small changes in multithreading.
Drewniok Jun 25, 2024
9e63dc5
:green_heart: use ``future`` for multithreading.
Drewniok Jun 25, 2024
559fa86
:green_heart: use sanitizer.
Drewniok Jun 25, 2024
c736f9a
:green_heart: revert use of sanitizer.
Drewniok Jun 26, 2024
1ba9e9f
:art: revert changes.
Drewniok Jun 27, 2024
7364f7b
:art: revert changes.
Drewniok Jun 27, 2024
ea54c9d
:art: using old quicksim code
Drewniok Jun 27, 2024
95dd32d
:green_heart: use windows-2019.
Drewniok Jun 27, 2024
b377eca
:green_heart: revert code changes.
Drewniok Jun 27, 2024
dd64d5b
:green_heart: using windows-2019.
Drewniok Jun 27, 2024
f0a2c47
:green_heart: remove ``*-latest`` and use toolsets.
Drewniok Jun 27, 2024
b178e89
:green_heart: use toolsets.
Drewniok Jun 27, 2024
aa694c4
:green_heart: update toolsets.
Drewniok Jun 27, 2024
fa336e5
:green_heart: delete exclude part.
Drewniok Jun 27, 2024
808f9e8
:green_heart: windows 2019.
Drewniok Jun 27, 2024
b44f7a9
:green_heart: remove toolset key.
Drewniok Jun 27, 2024
369b987
:green_heart: use v143 for 2022.
Drewniok Jun 27, 2024
816ad08
:green_heart: use v143 for 2022.
Drewniok Jun 27, 2024
01dc07f
:green_heart: use v143 for 2022.
Drewniok Jun 27, 2024
2581a43
:green_heart: use 2019.
Drewniok Jun 27, 2024
bfc5a30
:green_heart only using 2019.
Drewniok Jun 27, 2024
71560f1
:art: implement Marcel's comments.
Drewniok Jun 28, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/pyfiction-pypi-deployment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ jobs:
- { os: ubuntu-latest, arch: x64 }
- { os: macos-latest, arch: x64 }
- { os: macos-latest, arch: arm64 }
Drewniok marked this conversation as resolved.
Show resolved Hide resolved
- { os: windows-latest, arch: x64 }
- { os: windows-2019, arch: x64 }
python: ['cp38', 'cp39', 'cp310', 'cp311', 'cp312']
steps:
- uses: actions/checkout@v4
Expand Down
16 changes: 11 additions & 5 deletions .github/workflows/python-bindings.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,18 +44,24 @@ 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
toolset: v142
- os: windows-2019
z3_platform: windows
architecture: x64
toolset: v143

name: 🐍 on ${{matrix.os}} with Python ${{matrix.python_version}}
runs-on: ${{matrix.os}}
Expand All @@ -69,7 +75,7 @@ jobs:
- name: Setup ccache
uses: hendrikmuhs/[email protected]
with:
key: '${{matrix.os}}-pyfiction'
key: '${{matrix.os}}-${{matrix.toolset}}-pyfiction'
Drewniok marked this conversation as resolved.
Show resolved Hide resolved
variant: ccache
save: true
max-size: 10G
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,9 +44,7 @@ inline void quicksim(pybind11::module& m)
DOC(fiction_quicksim_params_iteration_steps))
.def_readwrite("alpha", &fiction::quicksim_params::alpha, DOC(fiction_quicksim_params_alpha))
.def_readwrite("number_threads", &fiction::quicksim_params::number_threads,
DOC(fiction_quicksim_params_number_threads))

;
DOC(fiction_quicksim_params_number_threads));
Drewniok marked this conversation as resolved.
Show resolved Hide resolved

// NOTE be careful with the order of the following calls! Python will resolve the first matching overload!

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
3 changes: 2 additions & 1 deletion test/benchmark/simulation.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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}};
Drewniok marked this conversation as resolved.
Show resolved Hide resolved
return quickexact<lattice>(lyt, sim_params);
};

Expand Down
Loading