Skip to content

Commit

Permalink
Debugging builds
Browse files Browse the repository at this point in the history
  • Loading branch information
peekxc committed Dec 6, 2023
1 parent a3ed713 commit fd0e4b5
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 8 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build_windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ jobs:
python-version: ${{ matrix.python-version }}
- name: Install dependencies
run: |
python -m pip install --upgrade pip build
python -m pip install --upgrade pip build delvewheel
python -m pip install pytest pytest-cov coverage-badge coveralls pytest-benchmark
- name: Install package
run: |
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/wheels.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
# [os-image, os-name, os-arch]
- [ubuntu-latest, manylinux, x86_64]
- [macos-latest, macosx, x86_64]
- [windows-latest, win, AMD64]
- [windows-2019, win, AMD64]
# os: [windows-latest]
# cibw_arch: ["AMD64"]
# cibw_python: ["cp38-*", "cp39-*", "cp310-*", "cp311-*"]
Expand Down Expand Up @@ -65,7 +65,7 @@ jobs:
Get-Command rc.exe | Format-Table -AutoSize
- name: Build wheels via cibuildwheel
uses: pypa/cibuildwheel@v2.15.0
uses: pypa/cibuildwheel@v2.16.2
env:
CIBW_BUILD: ${{ matrix.python[0] }}-${{ matrix.buildplat[1] }}*
CIBW_ARCHS: ${{ matrix.buildplat[2] }}
Expand Down
2 changes: 1 addition & 1 deletion include/_random_generator/threadedrng64.h
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ struct ThreadedRNG64 {
};
~ThreadedRNG64(){
for (int i = 0; i < num_threads; ++i){
delete generators[i];
// delete generators[i]; // todo: see if this is causing heap corruption
}
}
auto next(int thread_id) -> std::uint64_t {
Expand Down
10 changes: 6 additions & 4 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,9 @@ setup = ['--default-library=static']

[tool.cibuildwheel]
test-requires = ["pytest", "pytest-cov", "pytest-benchmark"] # coverage-badge
test-command = ["coverage run --source={package} -m pytest {package}/tests", "coverage report -m"]
build-verbosity = 2
# test-command = "coverage run --source={package} -m pytest {package}/tests" # "coverage report -m"
test-command = "python -m pytest {package}/tests/ --cov={package} --benchmark-skip"
build-verbosity = 1
skip = "cp36-* pp* cp37-* *_ppc64le *_i686 *_s390x *-musllinux*" # todo: revisit musllinux

[tool.cibuildwheel.macos]
Expand All @@ -44,8 +45,9 @@ environment = { CC="/usr/local/opt/llvm/bin/clang", CXX="/usr/local/opt/llvm/bin
before-build = "bash {project}/tools/cibw_windows.sh"
# before-build = "choco install rtools -y --no-progress --force --version=4.0.0.20220206 && set PATH=C:\\rtools40\\ucrt64\\bin\\;%PATH%"
environment = { PKG_CONFIG_PATH="C:/opt/64/lib/pkgconfig", CXX="g++", CC="gcc" }
repair-wheel-command = "bash ./tools/repair_windows.sh {wheel} {dest_dir}"
repair-wheel-command = "delvewheel repair -w {dest_dir} {wheel}"
# repair-wheel-command = "bash ./tools/repair_windows.sh {wheel} {dest_dir}"

[tool.cibuildwheel.linux]
before-build = "bash {project}/tools/cibw_linux.sh {project}"
# before-build = "bash {project}/tools/cibw_linux.sh {project}"
environment = { CC="clang", CXX="clang" }

0 comments on commit fd0e4b5

Please sign in to comment.