From cb03388dff450ca6bd4315b44ed142434c398d19 Mon Sep 17 00:00:00 2001 From: Robin Scheibler Date: Thu, 8 Aug 2024 00:23:07 +0900 Subject: [PATCH] add flag to disable constexpr mutex, see https://github.com/microsoft/STL/issues/4875 --- .github/workflows/pythonpackage.yml | 5 ++--- setup.py | 9 ++++++++- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/.github/workflows/pythonpackage.yml b/.github/workflows/pythonpackage.yml index 5518df14..baf83628 100644 --- a/.github/workflows/pythonpackage.yml +++ b/.github/workflows/pythonpackage.yml @@ -12,7 +12,7 @@ jobs: matrix: #os: [ubuntu-latest, macos-13, macos-latest, windows-latest] #python-version: [3.8, 3.9, "3.10", "3.11", "3.12"] - os: [windows-2019] + os: [windows-latest] python-version: [3.8, 3.9] exclude: - os: macos-latest @@ -41,8 +41,7 @@ jobs: - name: Test with pytest run: | pip install -U pytest setuptools build wheel twine - python ./pyroomacoustics/tests/test_build_rir.py - # pytest + pytest - name: Test the universal wheels if: matrix.os == 'ubuntu-latest' run: | diff --git a/setup.py b/setup.py index ece0b76b..b0a9ce13 100644 --- a/setup.py +++ b/setup.py @@ -70,7 +70,14 @@ def __str__(self): os.path.join(libroom_src_dir, "ext/eigen"), ], language="c++", - extra_compile_args=["-DEIGEN_MPL2_ONLY", "-Wall", "-O3", "-DEIGEN_NO_DEBUG"], + extra_compile_args=[ + "-DEIGEN_MPL2_ONLY", + "-Wall", + "-O3", + "-DEIGEN_NO_DEBUG", + # see https://github.com/microsoft/STL/issues/4875 + "-D_DISABLE_CONSTEXPR_MUTEX_CONSTRUCTOR", + ], ), Extension( "pyroomacoustics.build_rir",