From f2ea261ebeab4f0514319b304ba8a1091108d739 Mon Sep 17 00:00:00 2001 From: Chris Hold Date: Mon, 7 Aug 2023 12:48:49 +0300 Subject: [PATCH 001/103] Create python-safpy.yml --- .github/workflows/python-safpy.yml | 39 ++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) create mode 100644 .github/workflows/python-safpy.yml diff --git a/.github/workflows/python-safpy.yml b/.github/workflows/python-safpy.yml new file mode 100644 index 0000000..330ab4b --- /dev/null +++ b/.github/workflows/python-safpy.yml @@ -0,0 +1,39 @@ +# This workflow will install Python dependencies, run tests and lint with a single version of Python +# For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-python + +name: Python application + +on: + push: + branches: [ "master" ] + pull_request: + branches: [ "master" ] + +permissions: + contents: read + +jobs: + build: + + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v3 + - name: Set up Python 3.10 + uses: actions/setup-python@v3 + with: + python-version: "3.10" + - name: Install dependencies + run: | + python -m pip install --upgrade pip + pip install flake8 pytest + if [ -f requirements.txt ]; then pip install -r requirements.txt; fi + - name: Lint with flake8 + run: | + # stop the build if there are Python syntax errors or undefined names + flake8 . --count --select=E9,F63,F7,F82 --show-source --statistics + # exit-zero treats all errors as warnings. The GitHub editor is 127 chars wide + flake8 . --count --exit-zero --max-complexity=10 --max-line-length=127 --statistics + - name: Test with pytest + run: | + pytest -vvv From f13ec9cac47ee09e52b3873d812f13bc24f52314 Mon Sep 17 00:00:00 2001 From: Chris Hold Date: Mon, 7 Aug 2023 12:51:34 +0300 Subject: [PATCH 002/103] Update python-safpy.yml --- .github/workflows/python-safpy.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/python-safpy.yml b/.github/workflows/python-safpy.yml index 330ab4b..74ef1ba 100644 --- a/.github/workflows/python-safpy.yml +++ b/.github/workflows/python-safpy.yml @@ -28,6 +28,7 @@ jobs: python -m pip install --upgrade pip pip install flake8 pytest if [ -f requirements.txt ]; then pip install -r requirements.txt; fi + pip install cffi numpy spaudiopy - name: Lint with flake8 run: | # stop the build if there are Python syntax errors or undefined names From 37b431a9a41b83955987b3ed75931102f346ecc9 Mon Sep 17 00:00:00 2001 From: Chris Hold Date: Mon, 7 Aug 2023 12:54:19 +0300 Subject: [PATCH 003/103] Update python-safpy.yml --- .github/workflows/python-safpy.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/python-safpy.yml b/.github/workflows/python-safpy.yml index 74ef1ba..a3aaba6 100644 --- a/.github/workflows/python-safpy.yml +++ b/.github/workflows/python-safpy.yml @@ -35,6 +35,9 @@ jobs: flake8 . --count --select=E9,F63,F7,F82 --show-source --statistics # exit-zero treats all errors as warnings. The GitHub editor is 127 chars wide flake8 . --count --exit-zero --max-complexity=10 --max-line-length=127 --statistics + + - name: Install package + run: python -m pip install -e . - name: Test with pytest run: | pytest -vvv From e0fd68728515664229abdd1382d8c87b4f500e4f Mon Sep 17 00:00:00 2001 From: Chris Hold Date: Mon, 7 Aug 2023 12:58:16 +0300 Subject: [PATCH 004/103] Add SAF submodule --- .gitmodules | 3 +++ Spatial_Audio_Framework | 1 + 2 files changed, 4 insertions(+) create mode 100644 .gitmodules create mode 160000 Spatial_Audio_Framework diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000..aaa0c9c --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "Spatial_Audio_Framework"] + path = Spatial_Audio_Framework + url = https://github.com/leomccormack/Spatial_Audio_Framework diff --git a/Spatial_Audio_Framework b/Spatial_Audio_Framework new file mode 160000 index 0000000..82e3b75 --- /dev/null +++ b/Spatial_Audio_Framework @@ -0,0 +1 @@ +Subproject commit 82e3b75a9e4b9deb098e01416b1e91f6feeafb7f From e4b6da75c7156f14680fc0da5601db9c9890209e Mon Sep 17 00:00:00 2001 From: Chris Hold Date: Mon, 7 Aug 2023 12:59:40 +0300 Subject: [PATCH 005/103] Adapt build path to reflect submodule --- safpy_build.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/safpy_build.py b/safpy_build.py index a4f1ac6..14568ed 100644 --- a/safpy_build.py +++ b/safpy_build.py @@ -5,7 +5,7 @@ home_dir = os.path.expanduser('~') this_dir = os.path.abspath(os.path.dirname(__file__)) # define saf_path here, assumes SAF parallel to safpy by default. -saf_path = os.path.join(this_dir, '..', 'Spatial_Audio_Framework') +saf_path = os.path.join(this_dir, '.', 'Spatial_Audio_Framework') # cdef() expects a single string declaring the C types, functions and # globals needed to use the shared object. It must be in valid C syntax. From 4557f9bb7ed296f225735e9ffd5096001387918a Mon Sep 17 00:00:00 2001 From: Chris Hold Date: Mon, 7 Aug 2023 13:06:44 +0300 Subject: [PATCH 006/103] Update python-safpy.yml --- .github/workflows/python-safpy.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/python-safpy.yml b/.github/workflows/python-safpy.yml index a3aaba6..dc42b89 100644 --- a/.github/workflows/python-safpy.yml +++ b/.github/workflows/python-safpy.yml @@ -29,6 +29,8 @@ jobs: pip install flake8 pytest if [ -f requirements.txt ]; then pip install -r requirements.txt; fi pip install cffi numpy spaudiopy + - name: Checkout submodules + run: git submodule update --init --recursive - name: Lint with flake8 run: | # stop the build if there are Python syntax errors or undefined names From c39a566c2fc71b8ea1affffcae975d71c6b8b841 Mon Sep 17 00:00:00 2001 From: Chris Hold Date: Mon, 7 Aug 2023 13:14:56 +0300 Subject: [PATCH 007/103] Update python-safpy.yml --- .github/workflows/python-safpy.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/python-safpy.yml b/.github/workflows/python-safpy.yml index dc42b89..0fcd346 100644 --- a/.github/workflows/python-safpy.yml +++ b/.github/workflows/python-safpy.yml @@ -31,6 +31,10 @@ jobs: pip install cffi numpy spaudiopy - name: Checkout submodules run: git submodule update --init --recursive + + - name: Build SAF + uses: ./Spatial_Audio_Framework/.github/workflows/cmake.yml@v1 + - name: Lint with flake8 run: | # stop the build if there are Python syntax errors or undefined names From d3bcca2b84f62d732f1ea1d0bced0280e378df4f Mon Sep 17 00:00:00 2001 From: Chris Hold Date: Mon, 7 Aug 2023 13:17:59 +0300 Subject: [PATCH 008/103] Update python-safpy.yml --- .github/workflows/python-safpy.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/python-safpy.yml b/.github/workflows/python-safpy.yml index 0fcd346..332bf53 100644 --- a/.github/workflows/python-safpy.yml +++ b/.github/workflows/python-safpy.yml @@ -33,7 +33,7 @@ jobs: run: git submodule update --init --recursive - name: Build SAF - uses: ./Spatial_Audio_Framework/.github/workflows/cmake.yml@v1 + uses: ./Spatial_Audio_Framework/.github/workflows/cmake.yml@main - name: Lint with flake8 run: | From 84f1c2cd8abfd0c3efa8252008fdd2002fa5ff2c Mon Sep 17 00:00:00 2001 From: Chris Hold Date: Mon, 7 Aug 2023 13:28:15 +0300 Subject: [PATCH 009/103] Update python-safpy.yml --- .github/workflows/python-safpy.yml | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/.github/workflows/python-safpy.yml b/.github/workflows/python-safpy.yml index 332bf53..8be109d 100644 --- a/.github/workflows/python-safpy.yml +++ b/.github/workflows/python-safpy.yml @@ -32,8 +32,29 @@ jobs: - name: Checkout submodules run: git submodule update --init --recursive + - name: Dependecy packages + run: | + sudo apt-get update && sudo apt-get install liblapack3 liblapack-dev libopenblas-base libopenblas-dev liblapacke-dev + + - name: Create Build Environment + + + - name: Configure CMake (Linux) + # Use a bash shell so we can use the same syntax for environment variable + # access regardless of the host operating system + shell: bash + working-directory: ${{runner.workspace}}/build + # Note the current convention is to use the -S and -B options here to specify source + # and build directories, but this is only available with CMake 3.13 and higher. + # The CMake binaries on the Github Actions machines are (as of this writing) 3.12 + run: | + cmake -E make_directory ${{runner.workspace}}/build + cmake $GITHUB_WORKSPACE -DSAF_PERFORMANCE_LIB=SAF_USE_OPEN_BLAS_AND_LAPACKE -DSAF_BUILD_EXAMPLES=0 - name: Build SAF - uses: ./Spatial_Audio_Framework/.github/workflows/cmake.yml@main + working-directory: ${{runner.workspace}}/build + shell: bash + # Execute the build. You can specify a specific target with "--target " + run: cmake --build . - name: Lint with flake8 run: | From e813cf5f1c298f6eb04c2f1fabe9e999bace8e60 Mon Sep 17 00:00:00 2001 From: Chris Hold Date: Mon, 7 Aug 2023 13:30:56 +0300 Subject: [PATCH 010/103] Update python-safpy.yml --- .github/workflows/python-safpy.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.github/workflows/python-safpy.yml b/.github/workflows/python-safpy.yml index 8be109d..853590e 100644 --- a/.github/workflows/python-safpy.yml +++ b/.github/workflows/python-safpy.yml @@ -36,9 +36,6 @@ jobs: run: | sudo apt-get update && sudo apt-get install liblapack3 liblapack-dev libopenblas-base libopenblas-dev liblapacke-dev - - name: Create Build Environment - - - name: Configure CMake (Linux) # Use a bash shell so we can use the same syntax for environment variable # access regardless of the host operating system From 1375b78a57fd2ea9d64427b460480d6c34bdbbf0 Mon Sep 17 00:00:00 2001 From: Chris Hold Date: Mon, 7 Aug 2023 13:39:00 +0300 Subject: [PATCH 011/103] Update python-safpy.yml --- .github/workflows/python-safpy.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/python-safpy.yml b/.github/workflows/python-safpy.yml index 853590e..c3c5481 100644 --- a/.github/workflows/python-safpy.yml +++ b/.github/workflows/python-safpy.yml @@ -40,18 +40,18 @@ jobs: # Use a bash shell so we can use the same syntax for environment variable # access regardless of the host operating system shell: bash - working-directory: ${{runner.workspace}}/build + working-directory: ./Spatial_Audio_Framework/build # Note the current convention is to use the -S and -B options here to specify source # and build directories, but this is only available with CMake 3.13 and higher. # The CMake binaries on the Github Actions machines are (as of this writing) 3.12 run: | - cmake -E make_directory ${{runner.workspace}}/build - cmake $GITHUB_WORKSPACE -DSAF_PERFORMANCE_LIB=SAF_USE_OPEN_BLAS_AND_LAPACKE -DSAF_BUILD_EXAMPLES=0 + cmake -E make_directory ./Spatial_Audio_Framework/build + cmake ./Spatial_Audio_Framework -DSAF_PERFORMANCE_LIB=SAF_USE_OPEN_BLAS_AND_LAPACKE -DSAF_BUILD_EXAMPLES=0 - name: Build SAF - working-directory: ${{runner.workspace}}/build + working-directory: ./Spatial_Audio_Framework/build shell: bash # Execute the build. You can specify a specific target with "--target " - run: cmake --build . + run: cmake --build ./Spatial_Audio_Framework - name: Lint with flake8 run: | From 2b45650fca7eda95f5b433f87f8c3b20d33e1200 Mon Sep 17 00:00:00 2001 From: Chris Hold Date: Mon, 7 Aug 2023 13:44:51 +0300 Subject: [PATCH 012/103] Update python-safpy.yml --- .github/workflows/python-safpy.yml | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/.github/workflows/python-safpy.yml b/.github/workflows/python-safpy.yml index c3c5481..487e3f1 100644 --- a/.github/workflows/python-safpy.yml +++ b/.github/workflows/python-safpy.yml @@ -37,21 +37,15 @@ jobs: sudo apt-get update && sudo apt-get install liblapack3 liblapack-dev libopenblas-base libopenblas-dev liblapacke-dev - name: Configure CMake (Linux) - # Use a bash shell so we can use the same syntax for environment variable - # access regardless of the host operating system - shell: bash - working-directory: ./Spatial_Audio_Framework/build # Note the current convention is to use the -S and -B options here to specify source # and build directories, but this is only available with CMake 3.13 and higher. # The CMake binaries on the Github Actions machines are (as of this writing) 3.12 run: | cmake -E make_directory ./Spatial_Audio_Framework/build - cmake ./Spatial_Audio_Framework -DSAF_PERFORMANCE_LIB=SAF_USE_OPEN_BLAS_AND_LAPACKE -DSAF_BUILD_EXAMPLES=0 + cmake -S ./Spatial_Audio_Framework/ -B ./Spatial_Audio_Framework/build -DSAF_PERFORMANCE_LIB=SAF_USE_OPEN_BLAS_AND_LAPACKE -DSAF_BUILD_EXAMPLES=0 - name: Build SAF - working-directory: ./Spatial_Audio_Framework/build - shell: bash # Execute the build. You can specify a specific target with "--target " - run: cmake --build ./Spatial_Audio_Framework + run: cmake --build ./Spatial_Audio_Framework/build - name: Lint with flake8 run: | From 7a3e6c8525b42be5f0ed219b23b22174bc291a16 Mon Sep 17 00:00:00 2001 From: Chris Hold Date: Mon, 7 Aug 2023 13:55:20 +0300 Subject: [PATCH 013/103] Update python-safpy.yml --- .github/workflows/python-safpy.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/python-safpy.yml b/.github/workflows/python-safpy.yml index 487e3f1..e519dc6 100644 --- a/.github/workflows/python-safpy.yml +++ b/.github/workflows/python-safpy.yml @@ -32,9 +32,9 @@ jobs: - name: Checkout submodules run: git submodule update --init --recursive - - name: Dependecy packages + - name: Dependency packages run: | - sudo apt-get update && sudo apt-get install liblapack3 liblapack-dev libopenblas-base libopenblas-dev liblapacke-dev + sudo apt-get update && sudo apt-get install libsndfile1 liblapack3 liblapack-dev libopenblas-base libopenblas-dev liblapacke-dev - name: Configure CMake (Linux) # Note the current convention is to use the -S and -B options here to specify source @@ -46,6 +46,8 @@ jobs: - name: Build SAF # Execute the build. You can specify a specific target with "--target " run: cmake --build ./Spatial_Audio_Framework/build + - name: Test SAF + run: ./Spatial_Audio_Framework/build/test/saf_test - name: Lint with flake8 run: | From 2e9e1e5bd4eaaecbbca1f9dd6437c2aa93ace1cb Mon Sep 17 00:00:00 2001 From: Chris Hold Date: Mon, 7 Aug 2023 13:59:24 +0300 Subject: [PATCH 014/103] Change branch in SAF --- .gitmodules | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitmodules b/.gitmodules index aaa0c9c..238f3d6 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,4 @@ [submodule "Spatial_Audio_Framework"] path = Spatial_Audio_Framework url = https://github.com/leomccormack/Spatial_Audio_Framework + branch = develop From acc1c160ab29eb6fdbe50a41bf5173ee24182833 Mon Sep 17 00:00:00 2001 From: Chris Hold Date: Mon, 7 Aug 2023 14:59:25 +0300 Subject: [PATCH 015/103] Add develop branch to SAF --- Spatial_Audio_Framework | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Spatial_Audio_Framework b/Spatial_Audio_Framework index 82e3b75..c34b9af 160000 --- a/Spatial_Audio_Framework +++ b/Spatial_Audio_Framework @@ -1 +1 @@ -Subproject commit 82e3b75a9e4b9deb098e01416b1e91f6feeafb7f +Subproject commit c34b9af4319b303699b83e4c962d49bd5c065329 From e818cc83c81a997016b440b420bbf14421dcb536 Mon Sep 17 00:00:00 2001 From: Chris Hold Date: Mon, 7 Aug 2023 17:48:43 +0300 Subject: [PATCH 016/103] Update python-safpy.yml --- .github/workflows/python-safpy.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/python-safpy.yml b/.github/workflows/python-safpy.yml index e519dc6..eb959d5 100644 --- a/.github/workflows/python-safpy.yml +++ b/.github/workflows/python-safpy.yml @@ -35,6 +35,7 @@ jobs: - name: Dependency packages run: | sudo apt-get update && sudo apt-get install libsndfile1 liblapack3 liblapack-dev libopenblas-base libopenblas-dev liblapacke-dev + sudo ldconfig - name: Configure CMake (Linux) # Note the current convention is to use the -S and -B options here to specify source From 7954081cecc0e0859cbc634aa72ec6d8e9a0528a Mon Sep 17 00:00:00 2001 From: Chris Hold Date: Mon, 7 Aug 2023 18:14:45 +0300 Subject: [PATCH 017/103] Update python-safpy.yml --- .github/workflows/python-safpy.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/python-safpy.yml b/.github/workflows/python-safpy.yml index eb959d5..c0e7a3b 100644 --- a/.github/workflows/python-safpy.yml +++ b/.github/workflows/python-safpy.yml @@ -35,6 +35,7 @@ jobs: - name: Dependency packages run: | sudo apt-get update && sudo apt-get install libsndfile1 liblapack3 liblapack-dev libopenblas-base libopenblas-dev liblapacke-dev + export LD_LIBRARY_PATH=/usr/lib/x86_64-linux-gnu/ sudo ldconfig - name: Configure CMake (Linux) From 26b4cebcd3e3b7e368841666a7169dc2a034fc6a Mon Sep 17 00:00:00 2001 From: Chris Hold Date: Mon, 7 Aug 2023 19:37:30 +0300 Subject: [PATCH 018/103] Update python-safpy.yml --- .github/workflows/python-safpy.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/python-safpy.yml b/.github/workflows/python-safpy.yml index c0e7a3b..25659bd 100644 --- a/.github/workflows/python-safpy.yml +++ b/.github/workflows/python-safpy.yml @@ -35,7 +35,7 @@ jobs: - name: Dependency packages run: | sudo apt-get update && sudo apt-get install libsndfile1 liblapack3 liblapack-dev libopenblas-base libopenblas-dev liblapacke-dev - export LD_LIBRARY_PATH=/usr/lib/x86_64-linux-gnu/ + export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/local/lib:/usr/lib/x86_64-linux-gnu/ sudo ldconfig - name: Configure CMake (Linux) @@ -49,7 +49,9 @@ jobs: # Execute the build. You can specify a specific target with "--target " run: cmake --build ./Spatial_Audio_Framework/build - name: Test SAF - run: ./Spatial_Audio_Framework/build/test/saf_test + run: | + ldd ./Spatial_Audio_Framework/build/test/saf_test + ./Spatial_Audio_Framework/build/test/saf_test - name: Lint with flake8 run: | From 2085020cf0da8ab98900986971788c42491c04a0 Mon Sep 17 00:00:00 2001 From: Chris Hold Date: Mon, 7 Aug 2023 19:50:58 +0300 Subject: [PATCH 019/103] Update python-safpy.yml --- .github/workflows/python-safpy.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/python-safpy.yml b/.github/workflows/python-safpy.yml index 25659bd..ddfe25b 100644 --- a/.github/workflows/python-safpy.yml +++ b/.github/workflows/python-safpy.yml @@ -64,4 +64,5 @@ jobs: run: python -m pip install -e . - name: Test with pytest run: | + echo $LD_LIBRARY_PATH pytest -vvv From 8677869332b2464322ffa8c96cd782996ba2a2ad Mon Sep 17 00:00:00 2001 From: Chris Hold Date: Mon, 7 Aug 2023 19:55:57 +0300 Subject: [PATCH 020/103] Update python-safpy.yml --- .github/workflows/python-safpy.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/python-safpy.yml b/.github/workflows/python-safpy.yml index ddfe25b..bac67ab 100644 --- a/.github/workflows/python-safpy.yml +++ b/.github/workflows/python-safpy.yml @@ -35,7 +35,6 @@ jobs: - name: Dependency packages run: | sudo apt-get update && sudo apt-get install libsndfile1 liblapack3 liblapack-dev libopenblas-base libopenblas-dev liblapacke-dev - export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/local/lib:/usr/lib/x86_64-linux-gnu/ sudo ldconfig - name: Configure CMake (Linux) @@ -64,5 +63,6 @@ jobs: run: python -m pip install -e . - name: Test with pytest run: | + export LD_LIBRARY_PATH=/usr/local/lib:/usr/lib/x86_64-linux-gnu/:$LD_LIBRARY_PATH echo $LD_LIBRARY_PATH pytest -vvv From 6d5e2d954fbbeafa9cc411dc11425838ed6ad55d Mon Sep 17 00:00:00 2001 From: Chris Hold Date: Mon, 7 Aug 2023 19:59:43 +0300 Subject: [PATCH 021/103] Update python-safpy.yml --- .github/workflows/python-safpy.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/python-safpy.yml b/.github/workflows/python-safpy.yml index bac67ab..18a6ccb 100644 --- a/.github/workflows/python-safpy.yml +++ b/.github/workflows/python-safpy.yml @@ -63,6 +63,6 @@ jobs: run: python -m pip install -e . - name: Test with pytest run: | - export LD_LIBRARY_PATH=/usr/local/lib:/usr/lib/x86_64-linux-gnu/:$LD_LIBRARY_PATH + export LD_LIBRARY_PATH=/lib/x86_64-linux-gnu/:/usr/lib/x86_64-linux-gnu/:$LD_LIBRARY_PATH echo $LD_LIBRARY_PATH pytest -vvv From e945d393995a75083d4fe52a45d0cd45a698d7e7 Mon Sep 17 00:00:00 2001 From: Chris Hold Date: Tue, 8 Aug 2023 14:51:23 +0300 Subject: [PATCH 022/103] Link saf_performance lib explicitly --- .github/workflows/python-safpy.yml | 2 -- safpy_build.py | 5 ++++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/python-safpy.yml b/.github/workflows/python-safpy.yml index 18a6ccb..f71b5d6 100644 --- a/.github/workflows/python-safpy.yml +++ b/.github/workflows/python-safpy.yml @@ -63,6 +63,4 @@ jobs: run: python -m pip install -e . - name: Test with pytest run: | - export LD_LIBRARY_PATH=/lib/x86_64-linux-gnu/:/usr/lib/x86_64-linux-gnu/:$LD_LIBRARY_PATH - echo $LD_LIBRARY_PATH pytest -vvv diff --git a/safpy_build.py b/safpy_build.py index 14568ed..fb25333 100644 --- a/safpy_build.py +++ b/safpy_build.py @@ -5,7 +5,8 @@ home_dir = os.path.expanduser('~') this_dir = os.path.abspath(os.path.dirname(__file__)) # define saf_path here, assumes SAF parallel to safpy by default. -saf_path = os.path.join(this_dir, '.', 'Spatial_Audio_Framework') +saf_path = os.path.join(this_dir, ".", "Spatial_Audio_Framework") +saf_performance_lib = ["openblas", "lapacke"] # cdef() expects a single string declaring the C types, functions and # globals needed to use the shared object. It must be in valid C syntax. @@ -186,6 +187,8 @@ """ libraries.append(saf_path + "/build/framework/saf") # lib name, for the linker +libraries.extend(saf_performance_lib) + print("Compiling _safpy with:") print(f"C_Header_Source: {c_header_source}") print(f"include_dirs: {include_dirs}") From 80cdba5c2a4d6e3356394c3a9ae0ebdf72a9f4e7 Mon Sep 17 00:00:00 2001 From: Chris Hold Date: Tue, 8 Aug 2023 14:59:17 +0300 Subject: [PATCH 023/103] Split into two jobs --- .github/workflows/python-safpy.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/python-safpy.yml b/.github/workflows/python-safpy.yml index f71b5d6..2283c24 100644 --- a/.github/workflows/python-safpy.yml +++ b/.github/workflows/python-safpy.yml @@ -51,6 +51,10 @@ jobs: run: | ldd ./Spatial_Audio_Framework/build/test/saf_test ./Spatial_Audio_Framework/build/test/saf_test + + test: + needs: build + runs-on: ubuntu-latest - name: Lint with flake8 run: | @@ -59,7 +63,7 @@ jobs: # exit-zero treats all errors as warnings. The GitHub editor is 127 chars wide flake8 . --count --exit-zero --max-complexity=10 --max-line-length=127 --statistics - - name: Install package + - name: Build and install package run: python -m pip install -e . - name: Test with pytest run: | From 6f9a9d4dcfc45cb9352bc218ad28ca26dbc2caee Mon Sep 17 00:00:00 2001 From: Chris Hold Date: Tue, 8 Aug 2023 15:02:48 +0300 Subject: [PATCH 024/103] Update python-safpy.yml --- .github/workflows/python-safpy.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/python-safpy.yml b/.github/workflows/python-safpy.yml index 2283c24..b58a196 100644 --- a/.github/workflows/python-safpy.yml +++ b/.github/workflows/python-safpy.yml @@ -14,7 +14,6 @@ permissions: jobs: build: - runs-on: ubuntu-latest steps: @@ -52,10 +51,12 @@ jobs: ldd ./Spatial_Audio_Framework/build/test/saf_test ./Spatial_Audio_Framework/build/test/saf_test + test: needs: build runs-on: ubuntu-latest - + + steps: - name: Lint with flake8 run: | # stop the build if there are Python syntax errors or undefined names From 773f096683c0768236eeccd4257e54c9db3a5582 Mon Sep 17 00:00:00 2001 From: Chris Hold Date: Tue, 8 Aug 2023 15:11:31 +0300 Subject: [PATCH 025/103] Revert needs same job --- .github/workflows/python-safpy.yml | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/.github/workflows/python-safpy.yml b/.github/workflows/python-safpy.yml index b58a196..c623ffc 100644 --- a/.github/workflows/python-safpy.yml +++ b/.github/workflows/python-safpy.yml @@ -13,7 +13,7 @@ permissions: contents: read jobs: - build: + build-and-test: runs-on: ubuntu-latest steps: @@ -51,12 +51,6 @@ jobs: ldd ./Spatial_Audio_Framework/build/test/saf_test ./Spatial_Audio_Framework/build/test/saf_test - - test: - needs: build - runs-on: ubuntu-latest - - steps: - name: Lint with flake8 run: | # stop the build if there are Python syntax errors or undefined names From 8c6131c69bef59c7a6633dce6851f2c7d013feb0 Mon Sep 17 00:00:00 2001 From: Chris Hold Date: Mon, 29 Jan 2024 18:27:14 +0200 Subject: [PATCH 026/103] CI: run python version matrix --- .github/workflows/python-safpy.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/python-safpy.yml b/.github/workflows/python-safpy.yml index c623ffc..41f81d8 100644 --- a/.github/workflows/python-safpy.yml +++ b/.github/workflows/python-safpy.yml @@ -16,6 +16,11 @@ jobs: build-and-test: runs-on: ubuntu-latest + strategy: + fail-fast: false + matrix: + python-version: ["3.9", "3.10", "3.11"] + steps: - uses: actions/checkout@v3 - name: Set up Python 3.10 From c677f55844948e019173ad06b91c13291a457f95 Mon Sep 17 00:00:00 2001 From: Chris Hold Date: Mon, 29 Jan 2024 18:29:17 +0200 Subject: [PATCH 027/103] CI: Use Python versions --- .github/workflows/python-safpy.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/python-safpy.yml b/.github/workflows/python-safpy.yml index 41f81d8..ce28709 100644 --- a/.github/workflows/python-safpy.yml +++ b/.github/workflows/python-safpy.yml @@ -23,10 +23,10 @@ jobs: steps: - uses: actions/checkout@v3 - - name: Set up Python 3.10 + - name: Set up Python ${{ matrix.python-version }} uses: actions/setup-python@v3 with: - python-version: "3.10" + python-version: ${{ matrix.python-version }} - name: Install dependencies run: | python -m pip install --upgrade pip From 565b0a8562dc4640634a1861ca3fbbe77438983b Mon Sep 17 00:00:00 2001 From: Chris Hold Date: Mon, 29 Jan 2024 18:47:25 +0200 Subject: [PATCH 028/103] CI: Introduce macOS --- .github/workflows/python-safpy.yml | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/.github/workflows/python-safpy.yml b/.github/workflows/python-safpy.yml index ce28709..16f484d 100644 --- a/.github/workflows/python-safpy.yml +++ b/.github/workflows/python-safpy.yml @@ -14,12 +14,14 @@ permissions: jobs: build-and-test: - runs-on: ubuntu-latest + name: Test on ${{ matrix.os }} with Python ${{ matrix.python-version }} + runs-on: ${{ matrix.os }} strategy: - fail-fast: false - matrix: - python-version: ["3.9", "3.10", "3.11"] + fail-fast: false + matrix: + os: [ubuntu-latest, macOS-latest, windows-latest] + python-version: ["3.8", "3.9", "3.10", "3.11"] steps: - uses: actions/checkout@v3 @@ -37,11 +39,17 @@ jobs: run: git submodule update --init --recursive - name: Dependency packages + # LINUX + - if: ${{ contains( runner.os, 'Linux' ) }} run: | sudo apt-get update && sudo apt-get install libsndfile1 liblapack3 liblapack-dev libopenblas-base libopenblas-dev liblapacke-dev sudo ldconfig + # MACOS + - if: ${{ contains( runner.os, 'macOS' ) }} + run: | + brew install openblas - - name: Configure CMake (Linux) + - name: Configure CMake # Note the current convention is to use the -S and -B options here to specify source # and build directories, but this is only available with CMake 3.13 and higher. # The CMake binaries on the Github Actions machines are (as of this writing) 3.12 From c38086a162f3d5f1e2b462a12fd3370239a0820a Mon Sep 17 00:00:00 2001 From: Chris Hold Date: Mon, 29 Jan 2024 18:52:17 +0200 Subject: [PATCH 029/103] Update python-safpy.yml --- .github/workflows/python-safpy.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/python-safpy.yml b/.github/workflows/python-safpy.yml index 16f484d..b0cb4c7 100644 --- a/.github/workflows/python-safpy.yml +++ b/.github/workflows/python-safpy.yml @@ -38,7 +38,6 @@ jobs: - name: Checkout submodules run: git submodule update --init --recursive - - name: Dependency packages # LINUX - if: ${{ contains( runner.os, 'Linux' ) }} run: | From 087fdf7f4b5192ea443f4ee7a8acb7d753331ff6 Mon Sep 17 00:00:00 2001 From: Chris Hold Date: Mon, 29 Jan 2024 19:04:01 +0200 Subject: [PATCH 030/103] Update python-safpy.yml --- .github/workflows/python-safpy.yml | 29 +++++++++++++++++------------ 1 file changed, 17 insertions(+), 12 deletions(-) diff --git a/.github/workflows/python-safpy.yml b/.github/workflows/python-safpy.yml index b0cb4c7..5abdb45 100644 --- a/.github/workflows/python-safpy.yml +++ b/.github/workflows/python-safpy.yml @@ -21,7 +21,7 @@ jobs: fail-fast: false matrix: os: [ubuntu-latest, macOS-latest, windows-latest] - python-version: ["3.8", "3.9", "3.10", "3.11"] + python-version: ["3.10", "3.11"] steps: - uses: actions/checkout@v3 @@ -29,7 +29,7 @@ jobs: uses: actions/setup-python@v3 with: python-version: ${{ matrix.python-version }} - - name: Install dependencies + - name: Install Python package dependencies run: | python -m pip install --upgrade pip pip install flake8 pytest @@ -37,16 +37,21 @@ jobs: pip install cffi numpy spaudiopy - name: Checkout submodules run: git submodule update --init --recursive - - # LINUX - - if: ${{ contains( runner.os, 'Linux' ) }} - run: | - sudo apt-get update && sudo apt-get install libsndfile1 liblapack3 liblapack-dev libopenblas-base libopenblas-dev liblapacke-dev - sudo ldconfig - # MACOS - - if: ${{ contains( runner.os, 'macOS' ) }} - run: | - brew install openblas + + - name: Install system dependencies + run: | + if [ "$RUNNER_OS" == "Linux" ]; then + sudo apt-get update && sudo apt-get install libsndfile1 liblapack3 liblapack-dev libopenblas-base libopenblas-dev liblapacke-dev + sudo ldconfig + elif [ "$RUNNER_OS" == "macOS" ]; then + brew install openblas + elif [ "$RUNNER_OS" == "Windows" ]; then + install openblas + else + echo "$RUNNER_OS not supported" + exit 1 + fi + shell: bash - name: Configure CMake # Note the current convention is to use the -S and -B options here to specify source From 9ce25d790e00bb3b36840e15bffbed3b6d34b49b Mon Sep 17 00:00:00 2001 From: Chris Hold Date: Mon, 29 Jan 2024 19:11:27 +0200 Subject: [PATCH 031/103] Update python-safpy.yml --- .github/workflows/python-safpy.yml | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/.github/workflows/python-safpy.yml b/.github/workflows/python-safpy.yml index 5abdb45..73eb5f3 100644 --- a/.github/workflows/python-safpy.yml +++ b/.github/workflows/python-safpy.yml @@ -33,10 +33,9 @@ jobs: run: | python -m pip install --upgrade pip pip install flake8 pytest - if [ -f requirements.txt ]; then pip install -r requirements.txt; fi pip install cffi numpy spaudiopy - name: Checkout submodules - run: git submodule update --init --recursive + run: git submodule update --init --recursive --depth=1 - name: Install system dependencies run: | @@ -59,7 +58,11 @@ jobs: # The CMake binaries on the Github Actions machines are (as of this writing) 3.12 run: | cmake -E make_directory ./Spatial_Audio_Framework/build - cmake -S ./Spatial_Audio_Framework/ -B ./Spatial_Audio_Framework/build -DSAF_PERFORMANCE_LIB=SAF_USE_OPEN_BLAS_AND_LAPACKE -DSAF_BUILD_EXAMPLES=0 + if [ "$RUNNER_OS" == "Linux" ]; then + cmake -S ./Spatial_Audio_Framework/ -B ./Spatial_Audio_Framework/build -DSAF_PERFORMANCE_LIB=SAF_USE_OPEN_BLAS_AND_LAPACKE -DSAF_BUILD_EXAMPLES=0 + elif [ "$RUNNER_OS" == "macOS" ]; then + cmake -S ./Spatial_Audio_Framework/ -B ./Spatial_Audio_Framework/build -DSAF_PERFORMANCE_LIB=SAF_USE_OPEN_BLAS_AND_LAPACKE -DOPENBLAS_LIBRARY=/usr/local/opt/openblas/lib/libopenblas.dylib -DSAF_BUILD_EXAMPLES=0 + - name: Build SAF # Execute the build. You can specify a specific target with "--target " run: cmake --build ./Spatial_Audio_Framework/build From 379df6e9b24aa4db20ed2105cb10882fe9a0c64f Mon Sep 17 00:00:00 2001 From: Chris Hold Date: Mon, 29 Jan 2024 19:13:11 +0200 Subject: [PATCH 032/103] Update python-safpy.yml --- .github/workflows/python-safpy.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/python-safpy.yml b/.github/workflows/python-safpy.yml index 73eb5f3..c3f5d10 100644 --- a/.github/workflows/python-safpy.yml +++ b/.github/workflows/python-safpy.yml @@ -62,7 +62,7 @@ jobs: cmake -S ./Spatial_Audio_Framework/ -B ./Spatial_Audio_Framework/build -DSAF_PERFORMANCE_LIB=SAF_USE_OPEN_BLAS_AND_LAPACKE -DSAF_BUILD_EXAMPLES=0 elif [ "$RUNNER_OS" == "macOS" ]; then cmake -S ./Spatial_Audio_Framework/ -B ./Spatial_Audio_Framework/build -DSAF_PERFORMANCE_LIB=SAF_USE_OPEN_BLAS_AND_LAPACKE -DOPENBLAS_LIBRARY=/usr/local/opt/openblas/lib/libopenblas.dylib -DSAF_BUILD_EXAMPLES=0 - + fi - name: Build SAF # Execute the build. You can specify a specific target with "--target " run: cmake --build ./Spatial_Audio_Framework/build From 0ae91b2f79968c29af620300a107b9e7899df023 Mon Sep 17 00:00:00 2001 From: Chris Hold Date: Mon, 29 Jan 2024 19:15:19 +0200 Subject: [PATCH 033/103] Update python-safpy.yml --- .github/workflows/python-safpy.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/python-safpy.yml b/.github/workflows/python-safpy.yml index c3f5d10..9c51706 100644 --- a/.github/workflows/python-safpy.yml +++ b/.github/workflows/python-safpy.yml @@ -61,7 +61,7 @@ jobs: if [ "$RUNNER_OS" == "Linux" ]; then cmake -S ./Spatial_Audio_Framework/ -B ./Spatial_Audio_Framework/build -DSAF_PERFORMANCE_LIB=SAF_USE_OPEN_BLAS_AND_LAPACKE -DSAF_BUILD_EXAMPLES=0 elif [ "$RUNNER_OS" == "macOS" ]; then - cmake -S ./Spatial_Audio_Framework/ -B ./Spatial_Audio_Framework/build -DSAF_PERFORMANCE_LIB=SAF_USE_OPEN_BLAS_AND_LAPACKE -DOPENBLAS_LIBRARY=/usr/local/opt/openblas/lib/libopenblas.dylib -DSAF_BUILD_EXAMPLES=0 + cmake -S ./Spatial_Audio_Framework/ -B ./Spatial_Audio_Framework/build -DSAF_PERFORMANCE_LIB=SAF_USE_OPEN_BLAS_AND_LAPACKE -DOPENBLAS_LIBRARY=/usr/local/opt/openblas/lib/libopenblas.dylib -DLAPACKE_LIBRARY=/usr/local/opt/openblas/lib/libopenblas.dylib -DOPENBLAS_HEADER_PATH=/usr/local/opt/openblas/include -DSAF_BUILD_EXAMPLES=0 fi - name: Build SAF # Execute the build. You can specify a specific target with "--target " From 068bbebe4d6de1082188892d96f22e897fa4a204 Mon Sep 17 00:00:00 2001 From: Chris Hold Date: Mon, 29 Jan 2024 19:19:31 +0200 Subject: [PATCH 034/103] Update python-safpy.yml --- .github/workflows/python-safpy.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/python-safpy.yml b/.github/workflows/python-safpy.yml index 9c51706..fe549c6 100644 --- a/.github/workflows/python-safpy.yml +++ b/.github/workflows/python-safpy.yml @@ -66,9 +66,13 @@ jobs: - name: Build SAF # Execute the build. You can specify a specific target with "--target " run: cmake --build ./Spatial_Audio_Framework/build + + - name: Print shared object dependencies + run: ldd ./Spatial_Audio_Framework/build/test/saf_test + if: ${{ contains( runner.os, 'Linux' ) }} + - name: Test SAF run: | - ldd ./Spatial_Audio_Framework/build/test/saf_test ./Spatial_Audio_Framework/build/test/saf_test - name: Lint with flake8 From 54291f51e334805bb11c7684422625000d9bb983 Mon Sep 17 00:00:00 2001 From: Chris Hold Date: Mon, 29 Jan 2024 19:31:00 +0200 Subject: [PATCH 035/103] Update python-safpy.yml --- .github/workflows/python-safpy.yml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/.github/workflows/python-safpy.yml b/.github/workflows/python-safpy.yml index fe549c6..221d501 100644 --- a/.github/workflows/python-safpy.yml +++ b/.github/workflows/python-safpy.yml @@ -45,7 +45,7 @@ jobs: elif [ "$RUNNER_OS" == "macOS" ]; then brew install openblas elif [ "$RUNNER_OS" == "Windows" ]; then - install openblas + #install openblas else echo "$RUNNER_OS not supported" exit 1 @@ -61,11 +61,13 @@ jobs: if [ "$RUNNER_OS" == "Linux" ]; then cmake -S ./Spatial_Audio_Framework/ -B ./Spatial_Audio_Framework/build -DSAF_PERFORMANCE_LIB=SAF_USE_OPEN_BLAS_AND_LAPACKE -DSAF_BUILD_EXAMPLES=0 elif [ "$RUNNER_OS" == "macOS" ]; then - cmake -S ./Spatial_Audio_Framework/ -B ./Spatial_Audio_Framework/build -DSAF_PERFORMANCE_LIB=SAF_USE_OPEN_BLAS_AND_LAPACKE -DOPENBLAS_LIBRARY=/usr/local/opt/openblas/lib/libopenblas.dylib -DLAPACKE_LIBRARY=/usr/local/opt/openblas/lib/libopenblas.dylib -DOPENBLAS_HEADER_PATH=/usr/local/opt/openblas/include -DSAF_BUILD_EXAMPLES=0 + cmake -S ./Spatial_Audio_Framework/ -B ./Spatial_Audio_Framework/build -DSAF_PERFORMANCE_LIB=SAF_USE_APPLE_ACCELERATE -DSAF_BUILD_EXAMPLES=0 + elif [ "$RUNNER_OS" == "Windows" ]; then + cmake -S ./Spatial_Audio_Framework/ -B ./Spatial_Audio_Framework/build -DSAF_PERFORMANCE_LIB=SAF_USE_OPEN_BLAS_AND_LAPACKE -DOPENBLAS_LIBRARY=C:/Program Files/OpenBLAS/lib/libopenblas.dylib -DLAPACKE_LIBRARY=C:/Program Files/OpenBLAS/lib/libopenblas.dylib -DOPENBLAS_HEADER_PATH=C:/Program Files/OpenBLAS/include -DSAF_BUILD_EXAMPLES=0 fi - name: Build SAF # Execute the build. You can specify a specific target with "--target " - run: cmake --build ./Spatial_Audio_Framework/build + run: cmake --build ./Spatial_Audio_Framework/build -j2 - name: Print shared object dependencies run: ldd ./Spatial_Audio_Framework/build/test/saf_test From 012cb379e888aaff09a7028de87623afde37fa6d Mon Sep 17 00:00:00 2001 From: Chris Hold Date: Mon, 29 Jan 2024 19:33:58 +0200 Subject: [PATCH 036/103] Update python-safpy.yml --- .github/workflows/python-safpy.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/python-safpy.yml b/.github/workflows/python-safpy.yml index 221d501..0632df9 100644 --- a/.github/workflows/python-safpy.yml +++ b/.github/workflows/python-safpy.yml @@ -44,8 +44,6 @@ jobs: sudo ldconfig elif [ "$RUNNER_OS" == "macOS" ]; then brew install openblas - elif [ "$RUNNER_OS" == "Windows" ]; then - #install openblas else echo "$RUNNER_OS not supported" exit 1 From b56cfabe71b9c116c6eafb8cbffef9cc23c5c33f Mon Sep 17 00:00:00 2001 From: Chris Hold Date: Mon, 29 Jan 2024 19:37:59 +0200 Subject: [PATCH 037/103] Update python-safpy.yml --- .github/workflows/python-safpy.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/python-safpy.yml b/.github/workflows/python-safpy.yml index 0632df9..3db9994 100644 --- a/.github/workflows/python-safpy.yml +++ b/.github/workflows/python-safpy.yml @@ -44,6 +44,8 @@ jobs: sudo ldconfig elif [ "$RUNNER_OS" == "macOS" ]; then brew install openblas + elif [ "$RUNNER_OS" == "Windows" ]; then + curl.exe --output tmp.zip --url https://github.com/OpenMathLib/OpenBLAS/releases/download/v0.3.26/OpenBLAS-0.3.26-x64.zip else echo "$RUNNER_OS not supported" exit 1 From 8ccb6b047b5973ced075d31a385fcf01830985e5 Mon Sep 17 00:00:00 2001 From: Chris Hold Date: Mon, 29 Jan 2024 19:56:10 +0200 Subject: [PATCH 038/103] Update python-safpy.yml --- .github/workflows/python-safpy.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/python-safpy.yml b/.github/workflows/python-safpy.yml index 3db9994..d712932 100644 --- a/.github/workflows/python-safpy.yml +++ b/.github/workflows/python-safpy.yml @@ -65,13 +65,15 @@ jobs: elif [ "$RUNNER_OS" == "Windows" ]; then cmake -S ./Spatial_Audio_Framework/ -B ./Spatial_Audio_Framework/build -DSAF_PERFORMANCE_LIB=SAF_USE_OPEN_BLAS_AND_LAPACKE -DOPENBLAS_LIBRARY=C:/Program Files/OpenBLAS/lib/libopenblas.dylib -DLAPACKE_LIBRARY=C:/Program Files/OpenBLAS/lib/libopenblas.dylib -DOPENBLAS_HEADER_PATH=C:/Program Files/OpenBLAS/include -DSAF_BUILD_EXAMPLES=0 fi + shell: bash + - name: Build SAF # Execute the build. You can specify a specific target with "--target " run: cmake --build ./Spatial_Audio_Framework/build -j2 - - name: Print shared object dependencies - run: ldd ./Spatial_Audio_Framework/build/test/saf_test + - name: Print shared object dependencies if: ${{ contains( runner.os, 'Linux' ) }} + run: ldd ./Spatial_Audio_Framework/build/test/saf_test - name: Test SAF run: | From e812ef674ecec5d0c85a14157906d45ab532ad0d Mon Sep 17 00:00:00 2001 From: Chris Hold Date: Mon, 29 Jan 2024 20:01:55 +0200 Subject: [PATCH 039/103] Update python-safpy.yml --- .github/workflows/python-safpy.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/python-safpy.yml b/.github/workflows/python-safpy.yml index d712932..dc1a75b 100644 --- a/.github/workflows/python-safpy.yml +++ b/.github/workflows/python-safpy.yml @@ -63,7 +63,7 @@ jobs: elif [ "$RUNNER_OS" == "macOS" ]; then cmake -S ./Spatial_Audio_Framework/ -B ./Spatial_Audio_Framework/build -DSAF_PERFORMANCE_LIB=SAF_USE_APPLE_ACCELERATE -DSAF_BUILD_EXAMPLES=0 elif [ "$RUNNER_OS" == "Windows" ]; then - cmake -S ./Spatial_Audio_Framework/ -B ./Spatial_Audio_Framework/build -DSAF_PERFORMANCE_LIB=SAF_USE_OPEN_BLAS_AND_LAPACKE -DOPENBLAS_LIBRARY=C:/Program Files/OpenBLAS/lib/libopenblas.dylib -DLAPACKE_LIBRARY=C:/Program Files/OpenBLAS/lib/libopenblas.dylib -DOPENBLAS_HEADER_PATH=C:/Program Files/OpenBLAS/include -DSAF_BUILD_EXAMPLES=0 + cmake -S ./Spatial_Audio_Framework/ -B ./Spatial_Audio_Framework/build -DSAF_PERFORMANCE_LIB=SAF_USE_OPEN_BLAS_AND_LAPACKE -DOPENBLAS_LIBRARY="C:/Program Files/OpenBLAS/lib/libopenblas.dll" -DLAPACKE_LIBRARY="C:/Program Files/OpenBLAS/lib/libopenblas.dll" -DOPENBLAS_HEADER_PATH="C:/Program Files/OpenBLAS/include" -DSAF_BUILD_EXAMPLES=0 fi shell: bash From 7b56bb1fb49b10a0d0c85c789837009bfbf5fa6c Mon Sep 17 00:00:00 2001 From: Chris Hold Date: Mon, 29 Jan 2024 22:57:16 +0200 Subject: [PATCH 040/103] Update python-safpy.yml --- .github/workflows/python-safpy.yml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.github/workflows/python-safpy.yml b/.github/workflows/python-safpy.yml index dc1a75b..dda8cd8 100644 --- a/.github/workflows/python-safpy.yml +++ b/.github/workflows/python-safpy.yml @@ -45,7 +45,10 @@ jobs: elif [ "$RUNNER_OS" == "macOS" ]; then brew install openblas elif [ "$RUNNER_OS" == "Windows" ]; then - curl.exe --output tmp.zip --url https://github.com/OpenMathLib/OpenBLAS/releases/download/v0.3.26/OpenBLAS-0.3.26-x64.zip + curl --output ./tmp.zip --url https://github.com/OpenMathLib/OpenBLAS/releases/download/v0.3.26/OpenBLAS-0.3.26-x64.zip + 7z x ./tmp.zip ./openBLAS + ls + ls ./openBLAS else echo "$RUNNER_OS not supported" exit 1 @@ -63,7 +66,7 @@ jobs: elif [ "$RUNNER_OS" == "macOS" ]; then cmake -S ./Spatial_Audio_Framework/ -B ./Spatial_Audio_Framework/build -DSAF_PERFORMANCE_LIB=SAF_USE_APPLE_ACCELERATE -DSAF_BUILD_EXAMPLES=0 elif [ "$RUNNER_OS" == "Windows" ]; then - cmake -S ./Spatial_Audio_Framework/ -B ./Spatial_Audio_Framework/build -DSAF_PERFORMANCE_LIB=SAF_USE_OPEN_BLAS_AND_LAPACKE -DOPENBLAS_LIBRARY="C:/Program Files/OpenBLAS/lib/libopenblas.dll" -DLAPACKE_LIBRARY="C:/Program Files/OpenBLAS/lib/libopenblas.dll" -DOPENBLAS_HEADER_PATH="C:/Program Files/OpenBLAS/include" -DSAF_BUILD_EXAMPLES=0 + cmake -S ./Spatial_Audio_Framework/ -B ./Spatial_Audio_Framework/build -DSAF_PERFORMANCE_LIB=SAF_USE_OPEN_BLAS_AND_LAPACKE -DOPENBLAS_LIBRARY="./OpenBLAS/lib/libopenblas.dll" -DLAPACKE_LIBRARY="./OpenBLAS/lib/libopenblas.dll" -DOPENBLAS_HEADER_PATH="./OpenBLAS/include" -DSAF_BUILD_EXAMPLES=0 fi shell: bash From df6dbbd5c6cd2cbe8a927526c1d6be691648b1b3 Mon Sep 17 00:00:00 2001 From: Chris Hold Date: Mon, 29 Jan 2024 23:10:30 +0200 Subject: [PATCH 041/103] Update python-safpy.yml --- .github/workflows/python-safpy.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/python-safpy.yml b/.github/workflows/python-safpy.yml index dda8cd8..40e6eb6 100644 --- a/.github/workflows/python-safpy.yml +++ b/.github/workflows/python-safpy.yml @@ -45,8 +45,9 @@ jobs: elif [ "$RUNNER_OS" == "macOS" ]; then brew install openblas elif [ "$RUNNER_OS" == "Windows" ]; then - curl --output ./tmp.zip --url https://github.com/OpenMathLib/OpenBLAS/releases/download/v0.3.26/OpenBLAS-0.3.26-x64.zip - 7z x ./tmp.zip ./openBLAS + curl -O -K -L https://github.com/OpenMathLib/OpenBLAS/releases/download/v0.3.26/OpenBLAS-0.3.26-x64.zip -o ./tmp.zip + ls + 7z x ./tmp.zip -oopenBLAS ls ls ./openBLAS else From 07e4ea24ea578ed8decaca90742e1c2faa36c1c9 Mon Sep 17 00:00:00 2001 From: Chris Hold Date: Mon, 29 Jan 2024 23:15:00 +0200 Subject: [PATCH 042/103] Update python-safpy.yml --- .github/workflows/python-safpy.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/python-safpy.yml b/.github/workflows/python-safpy.yml index 40e6eb6..bf9a218 100644 --- a/.github/workflows/python-safpy.yml +++ b/.github/workflows/python-safpy.yml @@ -45,7 +45,7 @@ jobs: elif [ "$RUNNER_OS" == "macOS" ]; then brew install openblas elif [ "$RUNNER_OS" == "Windows" ]; then - curl -O -K -L https://github.com/OpenMathLib/OpenBLAS/releases/download/v0.3.26/OpenBLAS-0.3.26-x64.zip -o ./tmp.zip + curl https://github.com/OpenMathLib/OpenBLAS/releases/download/v0.3.26/OpenBLAS-0.3.26-x64.zip -O -L -o ./tmp.zip ls 7z x ./tmp.zip -oopenBLAS ls From 45ab05e3a163f3a3edde15e33f5a444401dab2be Mon Sep 17 00:00:00 2001 From: Chris Hold Date: Mon, 29 Jan 2024 23:20:17 +0200 Subject: [PATCH 043/103] Update python-safpy.yml --- .github/workflows/python-safpy.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/python-safpy.yml b/.github/workflows/python-safpy.yml index bf9a218..c52a750 100644 --- a/.github/workflows/python-safpy.yml +++ b/.github/workflows/python-safpy.yml @@ -45,9 +45,9 @@ jobs: elif [ "$RUNNER_OS" == "macOS" ]; then brew install openblas elif [ "$RUNNER_OS" == "Windows" ]; then - curl https://github.com/OpenMathLib/OpenBLAS/releases/download/v0.3.26/OpenBLAS-0.3.26-x64.zip -O -L -o ./tmp.zip + curl https://github.com/OpenMathLib/OpenBLAS/releases/download/v0.3.26/OpenBLAS-0.3.26-x64.zip -L ls - 7z x ./tmp.zip -oopenBLAS + 7z x ./OpenBLAS-0.3.26-x64.zip -oopenBLAS ls ls ./openBLAS else From c8b9015a3bdf218bcea84a86551da70f404c0a77 Mon Sep 17 00:00:00 2001 From: Chris Hold Date: Mon, 29 Jan 2024 23:35:07 +0200 Subject: [PATCH 044/103] Update python-safpy.yml --- .github/workflows/python-safpy.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/python-safpy.yml b/.github/workflows/python-safpy.yml index c52a750..dd80fc6 100644 --- a/.github/workflows/python-safpy.yml +++ b/.github/workflows/python-safpy.yml @@ -45,9 +45,9 @@ jobs: elif [ "$RUNNER_OS" == "macOS" ]; then brew install openblas elif [ "$RUNNER_OS" == "Windows" ]; then - curl https://github.com/OpenMathLib/OpenBLAS/releases/download/v0.3.26/OpenBLAS-0.3.26-x64.zip -L + curl https://github.com/OpenMathLib/OpenBLAS/releases/download/v0.3.26/OpenBLAS-0.3.26-x64.zip -L -o tmp.zip ls - 7z x ./OpenBLAS-0.3.26-x64.zip -oopenBLAS + 7z x ./tmp.zip -oopenBLAS ls ls ./openBLAS else From 54c34426c6c9df8737e5b8572f6f0a7a64c10cb2 Mon Sep 17 00:00:00 2001 From: Chris Hold Date: Mon, 29 Jan 2024 23:42:17 +0200 Subject: [PATCH 045/103] Update python-safpy.yml --- .github/workflows/python-safpy.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/python-safpy.yml b/.github/workflows/python-safpy.yml index dd80fc6..04d5add 100644 --- a/.github/workflows/python-safpy.yml +++ b/.github/workflows/python-safpy.yml @@ -46,10 +46,8 @@ jobs: brew install openblas elif [ "$RUNNER_OS" == "Windows" ]; then curl https://github.com/OpenMathLib/OpenBLAS/releases/download/v0.3.26/OpenBLAS-0.3.26-x64.zip -L -o tmp.zip - ls 7z x ./tmp.zip -oopenBLAS ls - ls ./openBLAS else echo "$RUNNER_OS not supported" exit 1 @@ -67,7 +65,7 @@ jobs: elif [ "$RUNNER_OS" == "macOS" ]; then cmake -S ./Spatial_Audio_Framework/ -B ./Spatial_Audio_Framework/build -DSAF_PERFORMANCE_LIB=SAF_USE_APPLE_ACCELERATE -DSAF_BUILD_EXAMPLES=0 elif [ "$RUNNER_OS" == "Windows" ]; then - cmake -S ./Spatial_Audio_Framework/ -B ./Spatial_Audio_Framework/build -DSAF_PERFORMANCE_LIB=SAF_USE_OPEN_BLAS_AND_LAPACKE -DOPENBLAS_LIBRARY="./OpenBLAS/lib/libopenblas.dll" -DLAPACKE_LIBRARY="./OpenBLAS/lib/libopenblas.dll" -DOPENBLAS_HEADER_PATH="./OpenBLAS/include" -DSAF_BUILD_EXAMPLES=0 + cmake -S ./Spatial_Audio_Framework/ -B ./Spatial_Audio_Framework/build -DSAF_PERFORMANCE_LIB=SAF_USE_OPEN_BLAS_AND_LAPACKE -DOPENBLAS_LIBRARY="../OpenBLAS/lib/libopenblas.dll" -DLAPACKE_LIBRARY="../OpenBLAS/lib/libopenblas.dll" -DOPENBLAS_HEADER_PATH="../OpenBLAS/include" -DSAF_BUILD_EXAMPLES=0 fi shell: bash From 6dda6e525d6121d9c053f364fd1ea3bd280e4ded Mon Sep 17 00:00:00 2001 From: Chris Hold Date: Mon, 29 Jan 2024 23:47:08 +0200 Subject: [PATCH 046/103] Update python-safpy.yml --- .github/workflows/python-safpy.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/python-safpy.yml b/.github/workflows/python-safpy.yml index 04d5add..9e6dc2d 100644 --- a/.github/workflows/python-safpy.yml +++ b/.github/workflows/python-safpy.yml @@ -46,8 +46,9 @@ jobs: brew install openblas elif [ "$RUNNER_OS" == "Windows" ]; then curl https://github.com/OpenMathLib/OpenBLAS/releases/download/v0.3.26/OpenBLAS-0.3.26-x64.zip -L -o tmp.zip - 7z x ./tmp.zip -oopenBLAS + 7z x ./tmp.zip -oOpenBLAS ls + echo $PWD else echo "$RUNNER_OS not supported" exit 1 From 8aaa0d0d5398d4c67f6bba4b7b1e002e58fe926e Mon Sep 17 00:00:00 2001 From: Chris Hold Date: Mon, 29 Jan 2024 23:51:51 +0200 Subject: [PATCH 047/103] Update python-safpy.yml --- .github/workflows/python-safpy.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/python-safpy.yml b/.github/workflows/python-safpy.yml index 9e6dc2d..8a7f57e 100644 --- a/.github/workflows/python-safpy.yml +++ b/.github/workflows/python-safpy.yml @@ -48,6 +48,7 @@ jobs: curl https://github.com/OpenMathLib/OpenBLAS/releases/download/v0.3.26/OpenBLAS-0.3.26-x64.zip -L -o tmp.zip 7z x ./tmp.zip -oOpenBLAS ls + ls OpenBLAS echo $PWD else echo "$RUNNER_OS not supported" @@ -66,7 +67,7 @@ jobs: elif [ "$RUNNER_OS" == "macOS" ]; then cmake -S ./Spatial_Audio_Framework/ -B ./Spatial_Audio_Framework/build -DSAF_PERFORMANCE_LIB=SAF_USE_APPLE_ACCELERATE -DSAF_BUILD_EXAMPLES=0 elif [ "$RUNNER_OS" == "Windows" ]; then - cmake -S ./Spatial_Audio_Framework/ -B ./Spatial_Audio_Framework/build -DSAF_PERFORMANCE_LIB=SAF_USE_OPEN_BLAS_AND_LAPACKE -DOPENBLAS_LIBRARY="../OpenBLAS/lib/libopenblas.dll" -DLAPACKE_LIBRARY="../OpenBLAS/lib/libopenblas.dll" -DOPENBLAS_HEADER_PATH="../OpenBLAS/include" -DSAF_BUILD_EXAMPLES=0 + cmake -S ./Spatial_Audio_Framework/ -B ./Spatial_Audio_Framework/build -DSAF_PERFORMANCE_LIB=SAF_USE_OPEN_BLAS_AND_LAPACKE -DOPENBLAS_LIBRARY="/d/a/SAFpy/SAFpy/OpenBLAS/lib/libopenblas.dll" -DLAPACKE_LIBRARY="/d/a/SAFpy/SAFpy/OpenBLAS/lib/libopenblas.dll" -DOPENBLAS_HEADER_PATH="/d/a/SAFpy/SAFpy/OpenBLAS/include" -DSAF_BUILD_EXAMPLES=0 fi shell: bash From 93f4c85f0ba283ee0a268c74779b60309aa15754 Mon Sep 17 00:00:00 2001 From: Chris Hold Date: Tue, 30 Jan 2024 00:09:24 +0200 Subject: [PATCH 048/103] Update python-safpy.yml --- .github/workflows/python-safpy.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/python-safpy.yml b/.github/workflows/python-safpy.yml index 8a7f57e..ffb0baa 100644 --- a/.github/workflows/python-safpy.yml +++ b/.github/workflows/python-safpy.yml @@ -45,10 +45,9 @@ jobs: elif [ "$RUNNER_OS" == "macOS" ]; then brew install openblas elif [ "$RUNNER_OS" == "Windows" ]; then - curl https://github.com/OpenMathLib/OpenBLAS/releases/download/v0.3.26/OpenBLAS-0.3.26-x64.zip -L -o tmp.zip + curl https://github.com/OpenMathLib/OpenBLAS/releases/download/v0.3.23/OpenBLAS-0.3.23-x64.zip -L -o tmp.zip 7z x ./tmp.zip -oOpenBLAS ls - ls OpenBLAS echo $PWD else echo "$RUNNER_OS not supported" @@ -67,7 +66,7 @@ jobs: elif [ "$RUNNER_OS" == "macOS" ]; then cmake -S ./Spatial_Audio_Framework/ -B ./Spatial_Audio_Framework/build -DSAF_PERFORMANCE_LIB=SAF_USE_APPLE_ACCELERATE -DSAF_BUILD_EXAMPLES=0 elif [ "$RUNNER_OS" == "Windows" ]; then - cmake -S ./Spatial_Audio_Framework/ -B ./Spatial_Audio_Framework/build -DSAF_PERFORMANCE_LIB=SAF_USE_OPEN_BLAS_AND_LAPACKE -DOPENBLAS_LIBRARY="/d/a/SAFpy/SAFpy/OpenBLAS/lib/libopenblas.dll" -DLAPACKE_LIBRARY="/d/a/SAFpy/SAFpy/OpenBLAS/lib/libopenblas.dll" -DOPENBLAS_HEADER_PATH="/d/a/SAFpy/SAFpy/OpenBLAS/include" -DSAF_BUILD_EXAMPLES=0 + cmake -S ./Spatial_Audio_Framework/ -B ./Spatial_Audio_Framework/build -DSAF_PERFORMANCE_LIB=SAF_USE_OPEN_BLAS_AND_LAPACKE -DOPENBLAS_LIBRARY=/d/a/SAFpy/SAFpy/OpenBLAS/lib/libopenblas.dll -DLAPACKE_LIBRARY=/d/a/SAFpy/SAFpy/OpenBLAS/lib/libopenblas.dll -DOPENBLAS_HEADER_PATH=/d/a/SAFpy/SAFpy/OpenBLAS/include/ -DSAF_BUILD_EXAMPLES=0 fi shell: bash From a65a4db868100acf5f94c9483480e4fb530bd7fc Mon Sep 17 00:00:00 2001 From: Chris Hold Date: Tue, 30 Jan 2024 01:02:01 +0200 Subject: [PATCH 049/103] Update python-safpy.yml --- .github/workflows/python-safpy.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/python-safpy.yml b/.github/workflows/python-safpy.yml index ffb0baa..0d7ea87 100644 --- a/.github/workflows/python-safpy.yml +++ b/.github/workflows/python-safpy.yml @@ -45,7 +45,7 @@ jobs: elif [ "$RUNNER_OS" == "macOS" ]; then brew install openblas elif [ "$RUNNER_OS" == "Windows" ]; then - curl https://github.com/OpenMathLib/OpenBLAS/releases/download/v0.3.23/OpenBLAS-0.3.23-x64.zip -L -o tmp.zip + curl https://github.com/OpenMathLib/OpenBLAS/releases/download/v0.3.26/OpenBLAS-0.3.26-x64.zip -L -o tmp.zip 7z x ./tmp.zip -oOpenBLAS ls echo $PWD From e130808f9b1aefc96ca61c9a2b7c486222173e00 Mon Sep 17 00:00:00 2001 From: Chris Hold Date: Tue, 30 Jan 2024 11:07:10 +0200 Subject: [PATCH 050/103] Update python-safpy.yml --- .github/workflows/python-safpy.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/python-safpy.yml b/.github/workflows/python-safpy.yml index 0d7ea87..87bac20 100644 --- a/.github/workflows/python-safpy.yml +++ b/.github/workflows/python-safpy.yml @@ -66,7 +66,7 @@ jobs: elif [ "$RUNNER_OS" == "macOS" ]; then cmake -S ./Spatial_Audio_Framework/ -B ./Spatial_Audio_Framework/build -DSAF_PERFORMANCE_LIB=SAF_USE_APPLE_ACCELERATE -DSAF_BUILD_EXAMPLES=0 elif [ "$RUNNER_OS" == "Windows" ]; then - cmake -S ./Spatial_Audio_Framework/ -B ./Spatial_Audio_Framework/build -DSAF_PERFORMANCE_LIB=SAF_USE_OPEN_BLAS_AND_LAPACKE -DOPENBLAS_LIBRARY=/d/a/SAFpy/SAFpy/OpenBLAS/lib/libopenblas.dll -DLAPACKE_LIBRARY=/d/a/SAFpy/SAFpy/OpenBLAS/lib/libopenblas.dll -DOPENBLAS_HEADER_PATH=/d/a/SAFpy/SAFpy/OpenBLAS/include/ -DSAF_BUILD_EXAMPLES=0 + cmake -S ./Spatial_Audio_Framework/ -B ./Spatial_Audio_Framework/build -DSAF_PERFORMANCE_LIB=SAF_USE_OPEN_BLAS_AND_LAPACKE -DOPENBLAS_LIBRARY=/d/a/SAFpy/SAFpy/OpenBLAS/lib/libopenblas.dll -DLAPACKE_LIBRARY=/d/a/SAFpy/SAFpy/OpenBLAS/lib/libopenblas.dll -DOPENBLAS_HEADER_PATH=/d/a/SAFpy/SAFpy/OpenBLAS/include/ -Dlapack_complex_float="std::complex -Dlapack_complex_double="std::complex -DSAF_BUILD_EXAMPLES=0 fi shell: bash From bf9101102a2b70f224808ecd5bd09b276f5373a0 Mon Sep 17 00:00:00 2001 From: Chris Hold Date: Tue, 30 Jan 2024 11:10:02 +0200 Subject: [PATCH 051/103] Update python-safpy.yml --- .github/workflows/python-safpy.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/python-safpy.yml b/.github/workflows/python-safpy.yml index 87bac20..434586c 100644 --- a/.github/workflows/python-safpy.yml +++ b/.github/workflows/python-safpy.yml @@ -66,7 +66,7 @@ jobs: elif [ "$RUNNER_OS" == "macOS" ]; then cmake -S ./Spatial_Audio_Framework/ -B ./Spatial_Audio_Framework/build -DSAF_PERFORMANCE_LIB=SAF_USE_APPLE_ACCELERATE -DSAF_BUILD_EXAMPLES=0 elif [ "$RUNNER_OS" == "Windows" ]; then - cmake -S ./Spatial_Audio_Framework/ -B ./Spatial_Audio_Framework/build -DSAF_PERFORMANCE_LIB=SAF_USE_OPEN_BLAS_AND_LAPACKE -DOPENBLAS_LIBRARY=/d/a/SAFpy/SAFpy/OpenBLAS/lib/libopenblas.dll -DLAPACKE_LIBRARY=/d/a/SAFpy/SAFpy/OpenBLAS/lib/libopenblas.dll -DOPENBLAS_HEADER_PATH=/d/a/SAFpy/SAFpy/OpenBLAS/include/ -Dlapack_complex_float="std::complex -Dlapack_complex_double="std::complex -DSAF_BUILD_EXAMPLES=0 + cmake -S ./Spatial_Audio_Framework/ -B ./Spatial_Audio_Framework/build -DSAF_PERFORMANCE_LIB=SAF_USE_OPEN_BLAS_AND_LAPACKE -DOPENBLAS_LIBRARY=/d/a/SAFpy/SAFpy/OpenBLAS/lib/libopenblas.dll -DLAPACKE_LIBRARY=/d/a/SAFpy/SAFpy/OpenBLAS/lib/libopenblas.dll -DOPENBLAS_HEADER_PATH=/d/a/SAFpy/SAFpy/OpenBLAS/include/ -Dlapack_complex_float="std::complex" -Dlapack_complex_double="std::complex" -DSAF_BUILD_EXAMPLES=0 fi shell: bash From 8b168b4bc554740ed23c22672922599f087f1787 Mon Sep 17 00:00:00 2001 From: Chris Hold Date: Tue, 30 Jan 2024 11:35:14 +0200 Subject: [PATCH 052/103] Update python-safpy.yml --- .github/workflows/python-safpy.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/python-safpy.yml b/.github/workflows/python-safpy.yml index 434586c..8851d93 100644 --- a/.github/workflows/python-safpy.yml +++ b/.github/workflows/python-safpy.yml @@ -66,7 +66,7 @@ jobs: elif [ "$RUNNER_OS" == "macOS" ]; then cmake -S ./Spatial_Audio_Framework/ -B ./Spatial_Audio_Framework/build -DSAF_PERFORMANCE_LIB=SAF_USE_APPLE_ACCELERATE -DSAF_BUILD_EXAMPLES=0 elif [ "$RUNNER_OS" == "Windows" ]; then - cmake -S ./Spatial_Audio_Framework/ -B ./Spatial_Audio_Framework/build -DSAF_PERFORMANCE_LIB=SAF_USE_OPEN_BLAS_AND_LAPACKE -DOPENBLAS_LIBRARY=/d/a/SAFpy/SAFpy/OpenBLAS/lib/libopenblas.dll -DLAPACKE_LIBRARY=/d/a/SAFpy/SAFpy/OpenBLAS/lib/libopenblas.dll -DOPENBLAS_HEADER_PATH=/d/a/SAFpy/SAFpy/OpenBLAS/include/ -Dlapack_complex_float="std::complex" -Dlapack_complex_double="std::complex" -DSAF_BUILD_EXAMPLES=0 + cmake -S ./Spatial_Audio_Framework/ -B ./Spatial_Audio_Framework/build -DSAF_PERFORMANCE_LIB=SAF_USE_OPEN_BLAS_AND_LAPACKE -DOPENBLAS_LIBRARY=/d/a/SAFpy/SAFpy/OpenBLAS/lib/libopenblas.dll -DLAPACKE_LIBRARY=/d/a/SAFpy/SAFpy/OpenBLAS/lib/libopenblas.dll -DOPENBLAS_HEADER_PATH=/d/a/SAFpy/SAFpy/OpenBLAS/include/ -DHAVE_LAPACK_CONFIG_H -DSAF_BUILD_EXAMPLES=0 fi shell: bash From 8f48d9b93bfeef8e897b43d9aa5f1970cfe14ae1 Mon Sep 17 00:00:00 2001 From: Chris Hold Date: Tue, 30 Jan 2024 11:39:47 +0200 Subject: [PATCH 053/103] Update python-safpy.yml --- .github/workflows/python-safpy.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/python-safpy.yml b/.github/workflows/python-safpy.yml index 8851d93..04046b4 100644 --- a/.github/workflows/python-safpy.yml +++ b/.github/workflows/python-safpy.yml @@ -66,7 +66,7 @@ jobs: elif [ "$RUNNER_OS" == "macOS" ]; then cmake -S ./Spatial_Audio_Framework/ -B ./Spatial_Audio_Framework/build -DSAF_PERFORMANCE_LIB=SAF_USE_APPLE_ACCELERATE -DSAF_BUILD_EXAMPLES=0 elif [ "$RUNNER_OS" == "Windows" ]; then - cmake -S ./Spatial_Audio_Framework/ -B ./Spatial_Audio_Framework/build -DSAF_PERFORMANCE_LIB=SAF_USE_OPEN_BLAS_AND_LAPACKE -DOPENBLAS_LIBRARY=/d/a/SAFpy/SAFpy/OpenBLAS/lib/libopenblas.dll -DLAPACKE_LIBRARY=/d/a/SAFpy/SAFpy/OpenBLAS/lib/libopenblas.dll -DOPENBLAS_HEADER_PATH=/d/a/SAFpy/SAFpy/OpenBLAS/include/ -DHAVE_LAPACK_CONFIG_H -DSAF_BUILD_EXAMPLES=0 + cmake -S ./Spatial_Audio_Framework/ -B ./Spatial_Audio_Framework/build -DSAF_PERFORMANCE_LIB=SAF_USE_OPEN_BLAS_AND_LAPACKE -DOPENBLAS_LIBRARY=/d/a/SAFpy/SAFpy/OpenBLAS/lib/libopenblas.dll -DLAPACKE_LIBRARY=/d/a/SAFpy/SAFpy/OpenBLAS/lib/libopenblas.dll -DOPENBLAS_HEADER_PATH=/d/a/SAFpy/SAFpy/OpenBLAS/include/ -DHAVE_LAPACK_CONFIG_H=1 -DSAF_BUILD_EXAMPLES=0 fi shell: bash From ae31b62c99c4d0b9ad93757f7b052d37da9227e4 Mon Sep 17 00:00:00 2001 From: Chris Hold Date: Tue, 30 Jan 2024 11:51:59 +0200 Subject: [PATCH 054/103] Update python-safpy.yml --- .github/workflows/python-safpy.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/python-safpy.yml b/.github/workflows/python-safpy.yml index 04046b4..4faf578 100644 --- a/.github/workflows/python-safpy.yml +++ b/.github/workflows/python-safpy.yml @@ -66,7 +66,7 @@ jobs: elif [ "$RUNNER_OS" == "macOS" ]; then cmake -S ./Spatial_Audio_Framework/ -B ./Spatial_Audio_Framework/build -DSAF_PERFORMANCE_LIB=SAF_USE_APPLE_ACCELERATE -DSAF_BUILD_EXAMPLES=0 elif [ "$RUNNER_OS" == "Windows" ]; then - cmake -S ./Spatial_Audio_Framework/ -B ./Spatial_Audio_Framework/build -DSAF_PERFORMANCE_LIB=SAF_USE_OPEN_BLAS_AND_LAPACKE -DOPENBLAS_LIBRARY=/d/a/SAFpy/SAFpy/OpenBLAS/lib/libopenblas.dll -DLAPACKE_LIBRARY=/d/a/SAFpy/SAFpy/OpenBLAS/lib/libopenblas.dll -DOPENBLAS_HEADER_PATH=/d/a/SAFpy/SAFpy/OpenBLAS/include/ -DHAVE_LAPACK_CONFIG_H=1 -DSAF_BUILD_EXAMPLES=0 + cmake -S ./Spatial_Audio_Framework/ -B ./Spatial_Audio_Framework/build -DSAF_PERFORMANCE_LIB=SAF_USE_OPEN_BLAS_AND_LAPACKE -DOPENBLAS_LIBRARY=/d/a/SAFpy/SAFpy/OpenBLAS/lib/libopenblas.dll -DLAPACKE_LIBRARY=/d/a/SAFpy/SAFpy/OpenBLAS/lib/libopenblas.dll -DOPENBLAS_HEADER_PATH=/d/a/SAFpy/SAFpy/OpenBLAS/include/ -DHAVE_LAPACK_CONFIG_H=1 -DLAPACK_COMPLEX_STRUCTURE=1 -DSAF_BUILD_EXAMPLES=0 fi shell: bash From 4e77acd121ec12077ca7287f4bffd498b8eaf8a8 Mon Sep 17 00:00:00 2001 From: Chris Hold Date: Tue, 30 Jan 2024 12:50:43 +0200 Subject: [PATCH 055/103] Update Spatial_Audio_Framework --- Spatial_Audio_Framework | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Spatial_Audio_Framework b/Spatial_Audio_Framework index c34b9af..ac2269a 160000 --- a/Spatial_Audio_Framework +++ b/Spatial_Audio_Framework @@ -1 +1 @@ -Subproject commit c34b9af4319b303699b83e4c962d49bd5c065329 +Subproject commit ac2269aacf80e96fe5f3746e18bae4faabcaf732 From 6269d0181d34c4f307128c8d16a2227f84af216f Mon Sep 17 00:00:00 2001 From: Chris Hold Date: Tue, 30 Jan 2024 13:59:42 +0200 Subject: [PATCH 056/103] Update python-safpy.yml --- .github/workflows/python-safpy.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/python-safpy.yml b/.github/workflows/python-safpy.yml index 4faf578..95acc99 100644 --- a/.github/workflows/python-safpy.yml +++ b/.github/workflows/python-safpy.yml @@ -66,7 +66,7 @@ jobs: elif [ "$RUNNER_OS" == "macOS" ]; then cmake -S ./Spatial_Audio_Framework/ -B ./Spatial_Audio_Framework/build -DSAF_PERFORMANCE_LIB=SAF_USE_APPLE_ACCELERATE -DSAF_BUILD_EXAMPLES=0 elif [ "$RUNNER_OS" == "Windows" ]; then - cmake -S ./Spatial_Audio_Framework/ -B ./Spatial_Audio_Framework/build -DSAF_PERFORMANCE_LIB=SAF_USE_OPEN_BLAS_AND_LAPACKE -DOPENBLAS_LIBRARY=/d/a/SAFpy/SAFpy/OpenBLAS/lib/libopenblas.dll -DLAPACKE_LIBRARY=/d/a/SAFpy/SAFpy/OpenBLAS/lib/libopenblas.dll -DOPENBLAS_HEADER_PATH=/d/a/SAFpy/SAFpy/OpenBLAS/include/ -DHAVE_LAPACK_CONFIG_H=1 -DLAPACK_COMPLEX_STRUCTURE=1 -DSAF_BUILD_EXAMPLES=0 + cmake -S ./Spatial_Audio_Framework/ -B ./Spatial_Audio_Framework/build -DSAF_PERFORMANCE_LIB=SAF_USE_OPEN_BLAS_AND_LAPACKE -DOPENBLAS_LIBRARY=/d/a/SAFpy/SAFpy/OpenBLAS/lib/libopenblas.dll -DLAPACKE_LIBRARY=/d/a/SAFpy/SAFpy/OpenBLAS/lib/libopenblas.dll -DOPENBLAS_HEADER_PATH=/d/a/SAFpy/SAFpy/OpenBLAS/include/ -DLAPACK_COMPLEX_CUSTOM=1 -Dlapack_complex_float="_Fcomplex" -Dlapack_complex_double="_Dcomplex" -DSAF_BUILD_EXAMPLES=0 fi shell: bash From 36602bb479e424b52777c9427a837871d4b265f1 Mon Sep 17 00:00:00 2001 From: Chris Hold Date: Tue, 30 Jan 2024 14:19:10 +0200 Subject: [PATCH 057/103] Update python-safpy.yml --- .github/workflows/python-safpy.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/python-safpy.yml b/.github/workflows/python-safpy.yml index 95acc99..bf014d8 100644 --- a/.github/workflows/python-safpy.yml +++ b/.github/workflows/python-safpy.yml @@ -20,7 +20,7 @@ jobs: strategy: fail-fast: false matrix: - os: [ubuntu-latest, macOS-latest, windows-latest] + os: [ubuntu-latest, macOS-latest, windows-2019] python-version: ["3.10", "3.11"] steps: From 60fcc290f6536d2c9db18e69b8b6a7c165824299 Mon Sep 17 00:00:00 2001 From: Chris Hold Date: Tue, 30 Jan 2024 14:28:54 +0200 Subject: [PATCH 058/103] Update python-safpy.yml --- .github/workflows/python-safpy.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/python-safpy.yml b/.github/workflows/python-safpy.yml index bf014d8..b49ccf0 100644 --- a/.github/workflows/python-safpy.yml +++ b/.github/workflows/python-safpy.yml @@ -66,7 +66,7 @@ jobs: elif [ "$RUNNER_OS" == "macOS" ]; then cmake -S ./Spatial_Audio_Framework/ -B ./Spatial_Audio_Framework/build -DSAF_PERFORMANCE_LIB=SAF_USE_APPLE_ACCELERATE -DSAF_BUILD_EXAMPLES=0 elif [ "$RUNNER_OS" == "Windows" ]; then - cmake -S ./Spatial_Audio_Framework/ -B ./Spatial_Audio_Framework/build -DSAF_PERFORMANCE_LIB=SAF_USE_OPEN_BLAS_AND_LAPACKE -DOPENBLAS_LIBRARY=/d/a/SAFpy/SAFpy/OpenBLAS/lib/libopenblas.dll -DLAPACKE_LIBRARY=/d/a/SAFpy/SAFpy/OpenBLAS/lib/libopenblas.dll -DOPENBLAS_HEADER_PATH=/d/a/SAFpy/SAFpy/OpenBLAS/include/ -DLAPACK_COMPLEX_CUSTOM=1 -Dlapack_complex_float="_Fcomplex" -Dlapack_complex_double="_Dcomplex" -DSAF_BUILD_EXAMPLES=0 + cmake -S ./Spatial_Audio_Framework/ -B ./Spatial_Audio_Framework/build -DSAF_PERFORMANCE_LIB=SAF_USE_OPEN_BLAS_AND_LAPACKE -DOPENBLAS_LIBRARY=$GITHUB_WORKSPACE/OpenBLAS/bin/libopenblas.dll -DLAPACKE_LIBRARY=$GITHUB_WORKSPACE/OpenBLAS/bin/libopenblas.dll -DOPENBLAS_HEADER_PATH=$GITHUB_WORKSPACE/OpenBLAS/include/ -DSAF_BUILD_EXAMPLES=0 fi shell: bash From ce7b66310b55f42b9e8cb45539e95277b401d9f0 Mon Sep 17 00:00:00 2001 From: Chris Hold Date: Tue, 30 Jan 2024 15:01:03 +0200 Subject: [PATCH 059/103] Update Spatial_Audio_Framework --- Spatial_Audio_Framework | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Spatial_Audio_Framework b/Spatial_Audio_Framework index ac2269a..2cc6617 160000 --- a/Spatial_Audio_Framework +++ b/Spatial_Audio_Framework @@ -1 +1 @@ -Subproject commit ac2269aacf80e96fe5f3746e18bae4faabcaf732 +Subproject commit 2cc661727161fd2cca27802992486203c95d32f6 From a013ab58ffe1ee5616c5690b39706c241d26905c Mon Sep 17 00:00:00 2001 From: Chris Hold Date: Tue, 30 Jan 2024 15:09:36 +0200 Subject: [PATCH 060/103] Update python-safpy.yml --- .github/workflows/python-safpy.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/python-safpy.yml b/.github/workflows/python-safpy.yml index b49ccf0..3111351 100644 --- a/.github/workflows/python-safpy.yml +++ b/.github/workflows/python-safpy.yml @@ -66,7 +66,7 @@ jobs: elif [ "$RUNNER_OS" == "macOS" ]; then cmake -S ./Spatial_Audio_Framework/ -B ./Spatial_Audio_Framework/build -DSAF_PERFORMANCE_LIB=SAF_USE_APPLE_ACCELERATE -DSAF_BUILD_EXAMPLES=0 elif [ "$RUNNER_OS" == "Windows" ]; then - cmake -S ./Spatial_Audio_Framework/ -B ./Spatial_Audio_Framework/build -DSAF_PERFORMANCE_LIB=SAF_USE_OPEN_BLAS_AND_LAPACKE -DOPENBLAS_LIBRARY=$GITHUB_WORKSPACE/OpenBLAS/bin/libopenblas.dll -DLAPACKE_LIBRARY=$GITHUB_WORKSPACE/OpenBLAS/bin/libopenblas.dll -DOPENBLAS_HEADER_PATH=$GITHUB_WORKSPACE/OpenBLAS/include/ -DSAF_BUILD_EXAMPLES=0 + cmake -S ./Spatial_Audio_Framework/ -B ./Spatial_Audio_Framework/build -DSAF_PERFORMANCE_LIB=SAF_USE_OPEN_BLAS_AND_LAPACKE -DOPENBLAS_LIBRARY=$GITHUB_WORKSPACE/OpenBLAS/lib/libopenblas.lib -DLAPACKE_LIBRARY=$GITHUB_WORKSPACE/OpenBLAS/lib/libopenblas.lib -DOPENBLAS_HEADER_PATH=$GITHUB_WORKSPACE/OpenBLAS/include/ -DSAF_BUILD_EXAMPLES=0 fi shell: bash From 4b01ff77788e678090693f9fd4b8324ed6cfc5c9 Mon Sep 17 00:00:00 2001 From: Chris Hold Date: Tue, 30 Jan 2024 15:22:57 +0200 Subject: [PATCH 061/103] Update python-safpy.yml --- .github/workflows/python-safpy.yml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.github/workflows/python-safpy.yml b/.github/workflows/python-safpy.yml index 3111351..f964972 100644 --- a/.github/workflows/python-safpy.yml +++ b/.github/workflows/python-safpy.yml @@ -80,7 +80,12 @@ jobs: - name: Test SAF run: | - ./Spatial_Audio_Framework/build/test/saf_test + if [ "$RUNNER_OS" == "Windows" ]; then + ./Spatial_Audio_Framework/build/test/saf_test.exe + else + ./Spatial_Audio_Framework/build/test/saf_test + fi + shell: bash - name: Lint with flake8 run: | From ac1600bb25d51d46859c7ef5c6fdff42d72b0983 Mon Sep 17 00:00:00 2001 From: Chris Hold Date: Tue, 30 Jan 2024 15:28:25 +0200 Subject: [PATCH 062/103] Update python-safpy.yml --- .github/workflows/python-safpy.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/python-safpy.yml b/.github/workflows/python-safpy.yml index f964972..2c24924 100644 --- a/.github/workflows/python-safpy.yml +++ b/.github/workflows/python-safpy.yml @@ -81,7 +81,7 @@ jobs: - name: Test SAF run: | if [ "$RUNNER_OS" == "Windows" ]; then - ./Spatial_Audio_Framework/build/test/saf_test.exe + ./Spatial_Audio_Framework/build/test/Debug/saf_test.exe else ./Spatial_Audio_Framework/build/test/saf_test fi From 2d04445860a619152dd9c6d5cebe7274eeb0bc65 Mon Sep 17 00:00:00 2001 From: Chris Hold Date: Tue, 30 Jan 2024 15:40:46 +0200 Subject: [PATCH 063/103] Update python-safpy.yml --- .github/workflows/python-safpy.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/python-safpy.yml b/.github/workflows/python-safpy.yml index 2c24924..6e43162 100644 --- a/.github/workflows/python-safpy.yml +++ b/.github/workflows/python-safpy.yml @@ -81,7 +81,9 @@ jobs: - name: Test SAF run: | if [ "$RUNNER_OS" == "Windows" ]; then - ./Spatial_Audio_Framework/build/test/Debug/saf_test.exe + ls .\Spatial_Audio_Framework\build\test + ls .\Spatial_Audio_Framework\build\test\Debug\ + .\Spatial_Audio_Framework\build\test\Debug\saf_test.exe else ./Spatial_Audio_Framework/build/test/saf_test fi From ee76d6ce13f3662304c8a05129e57f84ac3e954a Mon Sep 17 00:00:00 2001 From: Chris Hold Date: Tue, 30 Jan 2024 15:44:29 +0200 Subject: [PATCH 064/103] Update python-safpy.yml --- .github/workflows/python-safpy.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/python-safpy.yml b/.github/workflows/python-safpy.yml index 6e43162..e249218 100644 --- a/.github/workflows/python-safpy.yml +++ b/.github/workflows/python-safpy.yml @@ -20,7 +20,7 @@ jobs: strategy: fail-fast: false matrix: - os: [ubuntu-latest, macOS-latest, windows-2019] + os: [ubuntu-latest, macOS-latest, windows-latest] python-version: ["3.10", "3.11"] steps: @@ -81,9 +81,9 @@ jobs: - name: Test SAF run: | if [ "$RUNNER_OS" == "Windows" ]; then - ls .\Spatial_Audio_Framework\build\test - ls .\Spatial_Audio_Framework\build\test\Debug\ - .\Spatial_Audio_Framework\build\test\Debug\saf_test.exe + ls ./Spatial_Audio_Framework/build/test/ + ls ./Spatial_Audio_Framework/build/test/Debug + ./Spatial_Audio_Framework/build/test/Debug/saf_test.exe else ./Spatial_Audio_Framework/build/test/saf_test fi From 18e9f5d257bc6c31cff5ccf4b21e72df7a3d8913 Mon Sep 17 00:00:00 2001 From: Chris Hold Date: Tue, 30 Jan 2024 15:54:15 +0200 Subject: [PATCH 065/103] Update python-safpy.yml --- .github/workflows/python-safpy.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/python-safpy.yml b/.github/workflows/python-safpy.yml index e249218..d17c6cd 100644 --- a/.github/workflows/python-safpy.yml +++ b/.github/workflows/python-safpy.yml @@ -79,15 +79,15 @@ jobs: run: ldd ./Spatial_Audio_Framework/build/test/saf_test - name: Test SAF + if: runner.os != 'Windows' run: | - if [ "$RUNNER_OS" == "Windows" ]; then - ls ./Spatial_Audio_Framework/build/test/ - ls ./Spatial_Audio_Framework/build/test/Debug - ./Spatial_Audio_Framework/build/test/Debug/saf_test.exe - else + ls -lh ./Spatial_Audio_Framework/build/test ./Spatial_Audio_Framework/build/test/saf_test - fi - shell: bash + + - name: Test SAF (Windows) + if: runner.os == 'Windows' + run: | + .\Spatial_Audio_Framework\build\test\Debug\saf_test.exe - name: Lint with flake8 run: | From cff810a63cf67315b02f69699df8131f520761ee Mon Sep 17 00:00:00 2001 From: Chris Hold Date: Tue, 30 Jan 2024 16:07:37 +0200 Subject: [PATCH 066/103] Update python-safpy.yml --- .github/workflows/python-safpy.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/python-safpy.yml b/.github/workflows/python-safpy.yml index d17c6cd..d49f637 100644 --- a/.github/workflows/python-safpy.yml +++ b/.github/workflows/python-safpy.yml @@ -83,11 +83,14 @@ jobs: run: | ls -lh ./Spatial_Audio_Framework/build/test ./Spatial_Audio_Framework/build/test/saf_test + shell: bash - name: Test SAF (Windows) if: runner.os == 'Windows' run: | - .\Spatial_Audio_Framework\build\test\Debug\saf_test.exe + ls -lh ./Spatial_Audio_Framework/build/test/saf_test/Debug/ + ./Spatial_Audio_Framework/build/test/saf_test/Debug/saf_test.exe + shell: bash - name: Lint with flake8 run: | From dd610ccd7f83a159518fac60d8e7419fd3ffd097 Mon Sep 17 00:00:00 2001 From: Chris Hold Date: Tue, 30 Jan 2024 16:15:47 +0200 Subject: [PATCH 067/103] Update python-safpy.yml --- .github/workflows/python-safpy.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/python-safpy.yml b/.github/workflows/python-safpy.yml index d49f637..62b5f04 100644 --- a/.github/workflows/python-safpy.yml +++ b/.github/workflows/python-safpy.yml @@ -88,8 +88,8 @@ jobs: - name: Test SAF (Windows) if: runner.os == 'Windows' run: | - ls -lh ./Spatial_Audio_Framework/build/test/saf_test/Debug/ - ./Spatial_Audio_Framework/build/test/saf_test/Debug/saf_test.exe + ls -lh ./Spatial_Audio_Framework/build/test/Debug/ + ./Spatial_Audio_Framework/build/test/Debug/saf_test.exe shell: bash - name: Lint with flake8 From a0994f38c7c1c009e8ef614f055bfec78057b8a2 Mon Sep 17 00:00:00 2001 From: Chris Hold Date: Tue, 30 Jan 2024 16:24:04 +0200 Subject: [PATCH 068/103] Update python-safpy.yml --- .github/workflows/python-safpy.yml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/.github/workflows/python-safpy.yml b/.github/workflows/python-safpy.yml index 62b5f04..248407c 100644 --- a/.github/workflows/python-safpy.yml +++ b/.github/workflows/python-safpy.yml @@ -88,8 +88,12 @@ jobs: - name: Test SAF (Windows) if: runner.os == 'Windows' run: | - ls -lh ./Spatial_Audio_Framework/build/test/Debug/ - ./Spatial_Audio_Framework/build/test/Debug/saf_test.exe + cp ./Spatial_Audio_Framework/build/framework/Debug/saf.lib ./Spatial_Audio_Framework/build/framework/ + cp ./Spatial_Audio_Framework/build/test/Debug/saf_test.exe ./Spatial_Audio_Framework/build/test/ + ls -lh ./Spatial_Audio_Framework/build/test/ + cd ./Spatial_Audio_Framework/build/test/ + saf_test.exe + cd $GITHUB_WORKSPACE shell: bash - name: Lint with flake8 From 2682c7ecb75306fe2426d16d7c9dd20b39b304ed Mon Sep 17 00:00:00 2001 From: Chris Hold Date: Tue, 30 Jan 2024 16:27:53 +0200 Subject: [PATCH 069/103] Update python-safpy.yml --- .github/workflows/python-safpy.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/python-safpy.yml b/.github/workflows/python-safpy.yml index 248407c..b4b3dec 100644 --- a/.github/workflows/python-safpy.yml +++ b/.github/workflows/python-safpy.yml @@ -92,7 +92,8 @@ jobs: cp ./Spatial_Audio_Framework/build/test/Debug/saf_test.exe ./Spatial_Audio_Framework/build/test/ ls -lh ./Spatial_Audio_Framework/build/test/ cd ./Spatial_Audio_Framework/build/test/ - saf_test.exe + ls -lh + ./saf_test.exe cd $GITHUB_WORKSPACE shell: bash From f098d2723e1a69921ed073478ef13064cfd9e1cf Mon Sep 17 00:00:00 2001 From: Chris Hold Date: Tue, 30 Jan 2024 16:33:02 +0200 Subject: [PATCH 070/103] Update python-safpy.yml --- .github/workflows/python-safpy.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/python-safpy.yml b/.github/workflows/python-safpy.yml index b4b3dec..6e09029 100644 --- a/.github/workflows/python-safpy.yml +++ b/.github/workflows/python-safpy.yml @@ -90,10 +90,9 @@ jobs: run: | cp ./Spatial_Audio_Framework/build/framework/Debug/saf.lib ./Spatial_Audio_Framework/build/framework/ cp ./Spatial_Audio_Framework/build/test/Debug/saf_test.exe ./Spatial_Audio_Framework/build/test/ - ls -lh ./Spatial_Audio_Framework/build/test/ cd ./Spatial_Audio_Framework/build/test/ ls -lh - ./saf_test.exe + # ./saf_test.exe # Not working cd $GITHUB_WORKSPACE shell: bash From b5e598c3f9bf0705fce1d20a898a67f19a8d6441 Mon Sep 17 00:00:00 2001 From: Chris Hold Date: Tue, 30 Jan 2024 16:55:43 +0200 Subject: [PATCH 071/103] Introduce MSVC complex type to safpy_build.py --- safpy_build.py | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/safpy_build.py b/safpy_build.py index 597b964..ce9e86c 100644 --- a/safpy_build.py +++ b/safpy_build.py @@ -33,8 +33,15 @@ #define SAF_VERSION ... -typedef float _Complex float_complex; -typedef double _Complex double_complex; +#if defined(_MSC_VER) + #define _CRT_USE_C_COMPLEX_H + #include + typedef _Fcomplex float_complex; + typedef _Dcomplex double_complex; +#else + typedef float _Complex float_complex; + typedef double _Complex double_complex; +#endif typedef enum _AFSTFT_FDDATA_FORMAT{ AFSTFT_BANDS_CH_TIME, /**< nBands x nChannels x nTimeHops */ From d5b0844f6913a8d31926edd101b2aac76be38ef3 Mon Sep 17 00:00:00 2001 From: Chris Hold Date: Tue, 30 Jan 2024 17:05:28 +0200 Subject: [PATCH 072/103] Move complex typedef in safpy_build.py --- safpy_build.py | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/safpy_build.py b/safpy_build.py index ce9e86c..472c8da 100644 --- a/safpy_build.py +++ b/safpy_build.py @@ -33,15 +33,6 @@ #define SAF_VERSION ... -#if defined(_MSC_VER) - #define _CRT_USE_C_COMPLEX_H - #include - typedef _Fcomplex float_complex; - typedef _Dcomplex double_complex; -#else - typedef float _Complex float_complex; - typedef double _Complex double_complex; -#endif typedef enum _AFSTFT_FDDATA_FORMAT{ AFSTFT_BANDS_CH_TIME, /**< nBands x nChannels x nTimeHops */ @@ -202,6 +193,16 @@ # to make the declarated functions, types and globals available, # so it is often just the "#include". c_header_source += f""" + #if defined(_MSC_VER) + #define _CRT_USE_C_COMPLEX_H + #include + typedef _Fcomplex float_complex; + typedef _Dcomplex double_complex; + #else + typedef float _Complex float_complex; + typedef double _Complex double_complex; + #endif + #include "{saf_path}/framework/include/saf.h" // the C header of the lib """ libraries.append(saf_path + "/build/framework/saf") # lib name, for the linker From b0d91dcae67522743674cf367ef78044ec83e5b7 Mon Sep 17 00:00:00 2001 From: Chris Hold Date: Tue, 30 Jan 2024 17:19:34 +0200 Subject: [PATCH 073/103] Use _Complex in safpy_build.py --- safpy_build.py | 30 ++++++++++-------------------- 1 file changed, 10 insertions(+), 20 deletions(-) diff --git a/safpy_build.py b/safpy_build.py index 472c8da..89ba0ed 100644 --- a/safpy_build.py +++ b/safpy_build.py @@ -95,7 +95,7 @@ float* dirs_rad, int nDirs, /* Output Arguments */ - float_complex* Y); + float _Complex * Y); void generateVBAPgainTable3D(/* Input arguments */ float* ls_dirs_deg, @@ -134,20 +134,20 @@ void afSTFT_forward(void * const hSTFT, float** dataTD, int framesize, - float_complex*** dataFD); + float _Complex *** dataFD); void afSTFT_backward(void * const hSTFT, - float_complex*** dataFD, + float _Complex *** dataFD, int framesize, float** dataTD); void afSTFT_forward_flat(void * const hSTFT, float* dataTD, int framesize, - float_complex* dataFD); + float _Complex * dataFD); void afSTFT_backward_flat(void * const hSTFT, - float_complex* dataFD, + float _Complex * dataFD, int framesize, float* dataTD); @@ -169,9 +169,9 @@ void latticeDecorrelator_reset(void * hDecor); void latticeDecorrelator_apply(void * hDecor, - float_complex *** inFrame, + float _Complex *** inFrame, int nTimeSlots, - float_complex *** decorFrame); + float _Complex *** decorFrame); void transientDucker_create(void ** phDucker, int nCH, int nBands); @@ -179,12 +179,12 @@ void transientDucker_destroy(void ** phDucker); void transientDucker_apply(void * hDucker, - float_complex *** inFrame, + float _Complex *** inFrame, int nTimeSlots, float alpha, float beta, - float_complex *** residualFrame, - float_complex *** transientFrame); + float _Complex *** residualFrame, + float _Complex *** transientFrame); """) @@ -193,16 +193,6 @@ # to make the declarated functions, types and globals available, # so it is often just the "#include". c_header_source += f""" - #if defined(_MSC_VER) - #define _CRT_USE_C_COMPLEX_H - #include - typedef _Fcomplex float_complex; - typedef _Dcomplex double_complex; - #else - typedef float _Complex float_complex; - typedef double _Complex double_complex; - #endif - #include "{saf_path}/framework/include/saf.h" // the C header of the lib """ libraries.append(saf_path + "/build/framework/saf") # lib name, for the linker From 42ed8c18c980ca186b23b7689437f3c07da45163 Mon Sep 17 00:00:00 2001 From: Chris Hold Date: Tue, 30 Jan 2024 17:29:15 +0200 Subject: [PATCH 074/103] Revert "Use _Complex in safpy_build.py" This reverts commit b0d91dcae67522743674cf367ef78044ec83e5b7. --- safpy_build.py | 30 ++++++++++++++++++++---------- 1 file changed, 20 insertions(+), 10 deletions(-) diff --git a/safpy_build.py b/safpy_build.py index 89ba0ed..472c8da 100644 --- a/safpy_build.py +++ b/safpy_build.py @@ -95,7 +95,7 @@ float* dirs_rad, int nDirs, /* Output Arguments */ - float _Complex * Y); + float_complex* Y); void generateVBAPgainTable3D(/* Input arguments */ float* ls_dirs_deg, @@ -134,20 +134,20 @@ void afSTFT_forward(void * const hSTFT, float** dataTD, int framesize, - float _Complex *** dataFD); + float_complex*** dataFD); void afSTFT_backward(void * const hSTFT, - float _Complex *** dataFD, + float_complex*** dataFD, int framesize, float** dataTD); void afSTFT_forward_flat(void * const hSTFT, float* dataTD, int framesize, - float _Complex * dataFD); + float_complex* dataFD); void afSTFT_backward_flat(void * const hSTFT, - float _Complex * dataFD, + float_complex* dataFD, int framesize, float* dataTD); @@ -169,9 +169,9 @@ void latticeDecorrelator_reset(void * hDecor); void latticeDecorrelator_apply(void * hDecor, - float _Complex *** inFrame, + float_complex *** inFrame, int nTimeSlots, - float _Complex *** decorFrame); + float_complex *** decorFrame); void transientDucker_create(void ** phDucker, int nCH, int nBands); @@ -179,12 +179,12 @@ void transientDucker_destroy(void ** phDucker); void transientDucker_apply(void * hDucker, - float _Complex *** inFrame, + float_complex *** inFrame, int nTimeSlots, float alpha, float beta, - float _Complex *** residualFrame, - float _Complex *** transientFrame); + float_complex *** residualFrame, + float_complex *** transientFrame); """) @@ -193,6 +193,16 @@ # to make the declarated functions, types and globals available, # so it is often just the "#include". c_header_source += f""" + #if defined(_MSC_VER) + #define _CRT_USE_C_COMPLEX_H + #include + typedef _Fcomplex float_complex; + typedef _Dcomplex double_complex; + #else + typedef float _Complex float_complex; + typedef double _Complex double_complex; + #endif + #include "{saf_path}/framework/include/saf.h" // the C header of the lib """ libraries.append(saf_path + "/build/framework/saf") # lib name, for the linker From fa6bd9a4b6312272995dd20bf4ec34efe5839a0d Mon Sep 17 00:00:00 2001 From: Chris Hold Date: Tue, 30 Jan 2024 17:29:18 +0200 Subject: [PATCH 075/103] Revert "Move complex typedef in safpy_build.py" This reverts commit d5b0844f6913a8d31926edd101b2aac76be38ef3. --- safpy_build.py | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/safpy_build.py b/safpy_build.py index 472c8da..ce9e86c 100644 --- a/safpy_build.py +++ b/safpy_build.py @@ -33,6 +33,15 @@ #define SAF_VERSION ... +#if defined(_MSC_VER) + #define _CRT_USE_C_COMPLEX_H + #include + typedef _Fcomplex float_complex; + typedef _Dcomplex double_complex; +#else + typedef float _Complex float_complex; + typedef double _Complex double_complex; +#endif typedef enum _AFSTFT_FDDATA_FORMAT{ AFSTFT_BANDS_CH_TIME, /**< nBands x nChannels x nTimeHops */ @@ -193,16 +202,6 @@ # to make the declarated functions, types and globals available, # so it is often just the "#include". c_header_source += f""" - #if defined(_MSC_VER) - #define _CRT_USE_C_COMPLEX_H - #include - typedef _Fcomplex float_complex; - typedef _Dcomplex double_complex; - #else - typedef float _Complex float_complex; - typedef double _Complex double_complex; - #endif - #include "{saf_path}/framework/include/saf.h" // the C header of the lib """ libraries.append(saf_path + "/build/framework/saf") # lib name, for the linker From 9a4c3bfb5d3f7c781bed413faadb410e0eaf044e Mon Sep 17 00:00:00 2001 From: Chris Hold Date: Tue, 30 Jan 2024 17:29:27 +0200 Subject: [PATCH 076/103] Revert "Introduce MSVC complex type to safpy_build.py" This reverts commit b5e598c3f9bf0705fce1d20a898a67f19a8d6441. --- safpy_build.py | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/safpy_build.py b/safpy_build.py index ce9e86c..597b964 100644 --- a/safpy_build.py +++ b/safpy_build.py @@ -33,15 +33,8 @@ #define SAF_VERSION ... -#if defined(_MSC_VER) - #define _CRT_USE_C_COMPLEX_H - #include - typedef _Fcomplex float_complex; - typedef _Dcomplex double_complex; -#else - typedef float _Complex float_complex; - typedef double _Complex double_complex; -#endif +typedef float _Complex float_complex; +typedef double _Complex double_complex; typedef enum _AFSTFT_FDDATA_FORMAT{ AFSTFT_BANDS_CH_TIME, /**< nBands x nChannels x nTimeHops */ From 9d94942c3619cd5f7dc1a95ef4fe361de0d46364 Mon Sep 17 00:00:00 2001 From: Chris Hold Date: Tue, 30 Jan 2024 18:15:02 +0200 Subject: [PATCH 077/103] Use Ninja on Windows --- .github/workflows/python-safpy.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/python-safpy.yml b/.github/workflows/python-safpy.yml index 6e09029..123873b 100644 --- a/.github/workflows/python-safpy.yml +++ b/.github/workflows/python-safpy.yml @@ -45,6 +45,7 @@ jobs: elif [ "$RUNNER_OS" == "macOS" ]; then brew install openblas elif [ "$RUNNER_OS" == "Windows" ]; then + choco install ninja curl https://github.com/OpenMathLib/OpenBLAS/releases/download/v0.3.26/OpenBLAS-0.3.26-x64.zip -L -o tmp.zip 7z x ./tmp.zip -oOpenBLAS ls @@ -66,7 +67,7 @@ jobs: elif [ "$RUNNER_OS" == "macOS" ]; then cmake -S ./Spatial_Audio_Framework/ -B ./Spatial_Audio_Framework/build -DSAF_PERFORMANCE_LIB=SAF_USE_APPLE_ACCELERATE -DSAF_BUILD_EXAMPLES=0 elif [ "$RUNNER_OS" == "Windows" ]; then - cmake -S ./Spatial_Audio_Framework/ -B ./Spatial_Audio_Framework/build -DSAF_PERFORMANCE_LIB=SAF_USE_OPEN_BLAS_AND_LAPACKE -DOPENBLAS_LIBRARY=$GITHUB_WORKSPACE/OpenBLAS/lib/libopenblas.lib -DLAPACKE_LIBRARY=$GITHUB_WORKSPACE/OpenBLAS/lib/libopenblas.lib -DOPENBLAS_HEADER_PATH=$GITHUB_WORKSPACE/OpenBLAS/include/ -DSAF_BUILD_EXAMPLES=0 + cmake -S ./Spatial_Audio_Framework/ -B ./Spatial_Audio_Framework/build -DSAF_PERFORMANCE_LIB=SAF_USE_OPEN_BLAS_AND_LAPACKE -DOPENBLAS_LIBRARY=$GITHUB_WORKSPACE/OpenBLAS/lib/libopenblas.lib -DLAPACKE_LIBRARY=$GITHUB_WORKSPACE/OpenBLAS/lib/libopenblas.lib -DOPENBLAS_HEADER_PATH=$GITHUB_WORKSPACE/OpenBLAS/include/ -GNinja -DSAF_BUILD_EXAMPLES=0 fi shell: bash @@ -92,7 +93,7 @@ jobs: cp ./Spatial_Audio_Framework/build/test/Debug/saf_test.exe ./Spatial_Audio_Framework/build/test/ cd ./Spatial_Audio_Framework/build/test/ ls -lh - # ./saf_test.exe # Not working + ./saf_test.exe cd $GITHUB_WORKSPACE shell: bash From 8b3a5a20b9ff5c7ad57d3c8feacd3b2362d42f98 Mon Sep 17 00:00:00 2001 From: Chris Hold Date: Tue, 30 Jan 2024 18:19:44 +0200 Subject: [PATCH 078/103] Same test run for all --- .github/workflows/python-safpy.yml | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/.github/workflows/python-safpy.yml b/.github/workflows/python-safpy.yml index 123873b..7065e93 100644 --- a/.github/workflows/python-safpy.yml +++ b/.github/workflows/python-safpy.yml @@ -80,23 +80,11 @@ jobs: run: ldd ./Spatial_Audio_Framework/build/test/saf_test - name: Test SAF - if: runner.os != 'Windows' run: | ls -lh ./Spatial_Audio_Framework/build/test ./Spatial_Audio_Framework/build/test/saf_test shell: bash - - name: Test SAF (Windows) - if: runner.os == 'Windows' - run: | - cp ./Spatial_Audio_Framework/build/framework/Debug/saf.lib ./Spatial_Audio_Framework/build/framework/ - cp ./Spatial_Audio_Framework/build/test/Debug/saf_test.exe ./Spatial_Audio_Framework/build/test/ - cd ./Spatial_Audio_Framework/build/test/ - ls -lh - ./saf_test.exe - cd $GITHUB_WORKSPACE - shell: bash - - name: Lint with flake8 run: | # stop the build if there are Python syntax errors or undefined names From 5493de3fe79de05115a39a2b8c06ab8886d416ba Mon Sep 17 00:00:00 2001 From: Chris Hold Date: Tue, 30 Jan 2024 18:25:25 +0200 Subject: [PATCH 079/103] Update python-safpy.yml --- .github/workflows/python-safpy.yml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/.github/workflows/python-safpy.yml b/.github/workflows/python-safpy.yml index 7065e93..f102af1 100644 --- a/.github/workflows/python-safpy.yml +++ b/.github/workflows/python-safpy.yml @@ -82,7 +82,13 @@ jobs: - name: Test SAF run: | ls -lh ./Spatial_Audio_Framework/build/test - ./Spatial_Audio_Framework/build/test/saf_test + if [ "$RUNNER_OS" != "Windows" ]; then + ./Spatial_Audio_Framework/build/test/saf_test + else + cd ./Spatial_Audio_Framework/build/test/ + ./saf_test.exe + cd $GITHUB_WORKSPACE + fi shell: bash - name: Lint with flake8 From 84d9722210d68765df1cb50ef1d4716cf5711512 Mon Sep 17 00:00:00 2001 From: Chris Hold Date: Tue, 30 Jan 2024 18:29:48 +0200 Subject: [PATCH 080/103] Update python-safpy.yml --- .github/workflows/python-safpy.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/python-safpy.yml b/.github/workflows/python-safpy.yml index f102af1..e6512e4 100644 --- a/.github/workflows/python-safpy.yml +++ b/.github/workflows/python-safpy.yml @@ -85,9 +85,8 @@ jobs: if [ "$RUNNER_OS" != "Windows" ]; then ./Spatial_Audio_Framework/build/test/saf_test else - cd ./Spatial_Audio_Framework/build/test/ - ./saf_test.exe - cd $GITHUB_WORKSPACE + echo "pass" + # ./Spatial_Audio_Framework/build/test/saf_test.exe # fails with 127 fi shell: bash From 92224d9b2e04e244cd28a2934f472bd6bee39f76 Mon Sep 17 00:00:00 2001 From: Chris Hold Date: Tue, 30 Jan 2024 18:52:41 +0200 Subject: [PATCH 081/103] Update python-safpy.yml --- .github/workflows/python-safpy.yml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/.github/workflows/python-safpy.yml b/.github/workflows/python-safpy.yml index e6512e4..a317fce 100644 --- a/.github/workflows/python-safpy.yml +++ b/.github/workflows/python-safpy.yml @@ -81,6 +81,7 @@ jobs: - name: Test SAF run: | + ls -lh ./Spatial_Audio_Framework/build/framework ls -lh ./Spatial_Audio_Framework/build/test if [ "$RUNNER_OS" != "Windows" ]; then ./Spatial_Audio_Framework/build/test/saf_test @@ -97,6 +98,15 @@ jobs: # exit-zero treats all errors as warnings. The GitHub editor is 127 chars wide flake8 . --count --exit-zero --max-complexity=10 --max-line-length=127 --statistics + - name: Build package + run: | + if [ "$RUNNER_OS" != "Windows" ]; then + python setup.py build + else + python setup.py build --compiler=mingw32 + fi + shell: bash + - name: Build and install package run: python -m pip install -e . - name: Test with pytest From 87f831374e53fd9851d439982e73817273c503a3 Mon Sep 17 00:00:00 2001 From: Chris Hold Date: Tue, 30 Jan 2024 19:05:44 +0200 Subject: [PATCH 082/103] Update safpy_build.py --- safpy_build.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/safpy_build.py b/safpy_build.py index 597b964..a42ef64 100644 --- a/safpy_build.py +++ b/safpy_build.py @@ -24,7 +24,7 @@ extra_link_args.extend(['-Wl,-framework', '-Wl,Accelerate']) else: print("SAFPY using default OpenBLAS/LAPACKE") - saf_performance_lib.extend(["openblas", "lapacke"]) + #saf_performance_lib.extend(["openblas", "lapacke"]) # cdef() expects a single string declaring the C types, functions and From ec114c6a0ea5d547c4d0c464e797a37ca9411746 Mon Sep 17 00:00:00 2001 From: Chris Hold Date: Tue, 30 Jan 2024 19:11:16 +0200 Subject: [PATCH 083/103] Update python-safpy.yml --- .github/workflows/python-safpy.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/python-safpy.yml b/.github/workflows/python-safpy.yml index a317fce..61c892b 100644 --- a/.github/workflows/python-safpy.yml +++ b/.github/workflows/python-safpy.yml @@ -103,7 +103,7 @@ jobs: if [ "$RUNNER_OS" != "Windows" ]; then python setup.py build else - python setup.py build --compiler=mingw32 + python setup.py build --compiler=mingw64 fi shell: bash From 93f0e365afe43b59394cbcf8f9ddacfc166722ae Mon Sep 17 00:00:00 2001 From: Chris Hold Date: Tue, 30 Jan 2024 19:17:25 +0200 Subject: [PATCH 084/103] Link only openBLAS --- .github/workflows/python-safpy.yml | 2 +- safpy_build.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/python-safpy.yml b/.github/workflows/python-safpy.yml index 61c892b..a317fce 100644 --- a/.github/workflows/python-safpy.yml +++ b/.github/workflows/python-safpy.yml @@ -103,7 +103,7 @@ jobs: if [ "$RUNNER_OS" != "Windows" ]; then python setup.py build else - python setup.py build --compiler=mingw64 + python setup.py build --compiler=mingw32 fi shell: bash diff --git a/safpy_build.py b/safpy_build.py index a42ef64..c0b3a95 100644 --- a/safpy_build.py +++ b/safpy_build.py @@ -24,7 +24,7 @@ extra_link_args.extend(['-Wl,-framework', '-Wl,Accelerate']) else: print("SAFPY using default OpenBLAS/LAPACKE") - #saf_performance_lib.extend(["openblas", "lapacke"]) + saf_performance_lib.extend(["openblas"]) # cdef() expects a single string declaring the C types, functions and From d91f656ecaa2829b69055a1f165d97be17d54f90 Mon Sep 17 00:00:00 2001 From: Chris Hold Date: Tue, 30 Jan 2024 19:23:21 +0200 Subject: [PATCH 085/103] Update safpy_build.py --- safpy_build.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/safpy_build.py b/safpy_build.py index c0b3a95..597b964 100644 --- a/safpy_build.py +++ b/safpy_build.py @@ -24,7 +24,7 @@ extra_link_args.extend(['-Wl,-framework', '-Wl,Accelerate']) else: print("SAFPY using default OpenBLAS/LAPACKE") - saf_performance_lib.extend(["openblas"]) + saf_performance_lib.extend(["openblas", "lapacke"]) # cdef() expects a single string declaring the C types, functions and From ffff16abd43cbdb796a9f8f7f3ac0d1487f80df7 Mon Sep 17 00:00:00 2001 From: Chris Hold Date: Tue, 6 Feb 2024 11:01:11 +0200 Subject: [PATCH 086/103] Safpy_build: switch typedef complex on win32 --- safpy_build.py | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) diff --git a/safpy_build.py b/safpy_build.py index 597b964..94f84c1 100644 --- a/safpy_build.py +++ b/safpy_build.py @@ -19,6 +19,7 @@ # Sensible default, please adjust if needed. # In case of doubt, you can also check numpy.show_config() for its BLAS +print("Detected platform: " + sys.platform) if sys.platform == "darwin": print("SAFPY using default Apple Accelerate") extra_link_args.extend(['-Wl,-framework', '-Wl,Accelerate']) @@ -32,9 +33,25 @@ ffibuilder.cdef(""" #define SAF_VERSION ... + +""") + +if sys.platform != "win32": + ffibuilder.cdef(""" + + typedef float _Complex float_complex; + typedef double _Complex double_complex; + + """) +else: + ffibuilder.cdef(""" + + typedef _Fcomplex float_complex; + typedef _Dcomplex double_complex; -typedef float _Complex float_complex; -typedef double _Complex double_complex; + """) + +ffibuilder.cdef(""" typedef enum _AFSTFT_FDDATA_FORMAT{ AFSTFT_BANDS_CH_TIME, /**< nBands x nChannels x nTimeHops */ @@ -42,7 +59,6 @@ }AFSTFT_FDDATA_FORMAT; - void *malloc(size_t size); void free(void *ptr); From 47d115890bd2e068256309a93674caacda1b63f5 Mon Sep 17 00:00:00 2001 From: Chris Hold Date: Tue, 6 Feb 2024 11:05:38 +0200 Subject: [PATCH 087/103] CI: use msvc again --- .github/workflows/python-safpy.yml | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/.github/workflows/python-safpy.yml b/.github/workflows/python-safpy.yml index a317fce..87f3c3c 100644 --- a/.github/workflows/python-safpy.yml +++ b/.github/workflows/python-safpy.yml @@ -45,7 +45,6 @@ jobs: elif [ "$RUNNER_OS" == "macOS" ]; then brew install openblas elif [ "$RUNNER_OS" == "Windows" ]; then - choco install ninja curl https://github.com/OpenMathLib/OpenBLAS/releases/download/v0.3.26/OpenBLAS-0.3.26-x64.zip -L -o tmp.zip 7z x ./tmp.zip -oOpenBLAS ls @@ -100,11 +99,7 @@ jobs: - name: Build package run: | - if [ "$RUNNER_OS" != "Windows" ]; then - python setup.py build - else - python setup.py build --compiler=mingw32 - fi + python setup.py build shell: bash - name: Build and install package From 0a9e57c76532ff7af95dbcb34f9ee240f36905ac Mon Sep 17 00:00:00 2001 From: Chris Hold Date: Tue, 6 Feb 2024 11:07:52 +0200 Subject: [PATCH 088/103] Update python-safpy.yml --- .github/workflows/python-safpy.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/python-safpy.yml b/.github/workflows/python-safpy.yml index 87f3c3c..390688d 100644 --- a/.github/workflows/python-safpy.yml +++ b/.github/workflows/python-safpy.yml @@ -66,7 +66,7 @@ jobs: elif [ "$RUNNER_OS" == "macOS" ]; then cmake -S ./Spatial_Audio_Framework/ -B ./Spatial_Audio_Framework/build -DSAF_PERFORMANCE_LIB=SAF_USE_APPLE_ACCELERATE -DSAF_BUILD_EXAMPLES=0 elif [ "$RUNNER_OS" == "Windows" ]; then - cmake -S ./Spatial_Audio_Framework/ -B ./Spatial_Audio_Framework/build -DSAF_PERFORMANCE_LIB=SAF_USE_OPEN_BLAS_AND_LAPACKE -DOPENBLAS_LIBRARY=$GITHUB_WORKSPACE/OpenBLAS/lib/libopenblas.lib -DLAPACKE_LIBRARY=$GITHUB_WORKSPACE/OpenBLAS/lib/libopenblas.lib -DOPENBLAS_HEADER_PATH=$GITHUB_WORKSPACE/OpenBLAS/include/ -GNinja -DSAF_BUILD_EXAMPLES=0 + cmake -S ./Spatial_Audio_Framework/ -B ./Spatial_Audio_Framework/build -DSAF_PERFORMANCE_LIB=SAF_USE_OPEN_BLAS_AND_LAPACKE -DOPENBLAS_LIBRARY=$GITHUB_WORKSPACE/OpenBLAS/lib/libopenblas.lib -DLAPACKE_LIBRARY=$GITHUB_WORKSPACE/OpenBLAS/lib/libopenblas.lib -DOPENBLAS_HEADER_PATH=$GITHUB_WORKSPACE/OpenBLAS/include/ -DSAF_BUILD_EXAMPLES=0 fi shell: bash From 9ec0509442ae2a0dc62b5c0ad3ed4e4d4727ad43 Mon Sep 17 00:00:00 2001 From: Chris Hold Date: Tue, 6 Feb 2024 11:30:43 +0200 Subject: [PATCH 089/103] Update safpy_build.py --- safpy_build.py | 1 + 1 file changed, 1 insertion(+) diff --git a/safpy_build.py b/safpy_build.py index 94f84c1..5c41c5b 100644 --- a/safpy_build.py +++ b/safpy_build.py @@ -211,6 +211,7 @@ # to make the declarated functions, types and globals available, # so it is often just the "#include". c_header_source += f""" + #include #include "{saf_path}/framework/include/saf.h" // the C header of the lib """ libraries.append(saf_path + "/build/framework/saf") # lib name, for the linker From 6932d600418d757220c637a8dedf8b2440f3d9d4 Mon Sep 17 00:00:00 2001 From: Chris Hold Date: Tue, 6 Feb 2024 11:54:55 +0200 Subject: [PATCH 090/103] Trying to use the native _Complex --- safpy/afstft.py | 16 ++++++++-------- safpy/decorrelator.py | 30 +++++++++++++++--------------- safpy/sh.py | 2 +- safpy_build.py | 35 ++++++++++------------------------- 4 files changed, 34 insertions(+), 49 deletions(-) diff --git a/safpy/afstft.py b/safpy/afstft.py index 9e35801..ab5d5c2 100644 --- a/safpy/afstft.py +++ b/safpy/afstft.py @@ -188,7 +188,7 @@ def forward(self, in_frame_td): lib.afSTFT_forward_flat(self._afstft_phandle[0], ffi.from_buffer("float *", in_frame_td), framesize, - ffi.from_buffer("float_complex *", data_fd)) + ffi.from_buffer("float _Complex *", data_fd)) return data_fd def backward(self, in_frame_fd): @@ -224,7 +224,7 @@ def backward(self, in_frame_fd): data_td = np.empty((num_ch_out, framesize), dtype=np.float32) lib.afSTFT_backward_flat(self._afstft_phandle[0], - ffi.from_buffer("float_complex *", + ffi.from_buffer("float _Complex *", in_frame_fd), framesize, ffi.from_buffer("float *", data_td)) @@ -249,16 +249,16 @@ def forward_nd(self, in_frame_td): data_td_ptr[idx_ch] = ffi.from_buffer("float *", in_frame_td[idx_ch, :]) - data_fd_ptr = ffi.cast("float_complex ***", + data_fd_ptr = ffi.cast("float _Complex ***", lib.malloc3d(num_bands, num_ch_in, num_hops, - ffi.sizeof("float_complex"))) + ffi.sizeof("float _Complex"))) lib.afSTFT_forward(self._afstft_phandle[0], data_td_ptr, framesize, data_fd_ptr) # unpack data_fd = np.reshape(np.frombuffer(ffi.buffer(data_fd_ptr[0][0], num_bands*num_ch_in*num_hops * - ffi.sizeof("float_complex")), + ffi.sizeof("float _Complex")), dtype=np.complex64), (num_bands, num_ch_in, num_hops)) @@ -277,13 +277,13 @@ def backward_nd(self, in_frame_fd): num_bands = self.num_bands # populate - data_fd_ptr = ffi.cast("float_complex ***", + data_fd_ptr = ffi.cast("float _Complex ***", lib.malloc2d(num_bands, num_ch_out, - ffi.sizeof("float_complex*"))) + ffi.sizeof("float _Complex*"))) for idx_band in range(num_bands): for idx_ch in range(num_ch_out): data_fd_ptr[idx_band][idx_ch] = \ - ffi.from_buffer("float_complex *", + ffi.from_buffer("float _Complex *", in_frame_fd[idx_band, idx_ch, :]) data_td_ptr = ffi.cast("float **", lib.malloc2d(num_ch_out, framesize, diff --git a/safpy/decorrelator.py b/safpy/decorrelator.py index 71a6fe0..f605756 100644 --- a/safpy/decorrelator.py +++ b/safpy/decorrelator.py @@ -140,25 +140,25 @@ def apply(self, in_frame_fd): num_t_slots = in_frame_fd.shape[2] # populate - data_in_ptr = ffi.cast("float_complex ***", + data_in_ptr = ffi.cast("float _Complex ***", lib.malloc2d(num_bands, num_ch, - ffi.sizeof("float_complex *"))) + ffi.sizeof("float _Complex *"))) for idx_band in range(num_bands): for idx_ch in range(num_ch): data_in_ptr[idx_band][idx_ch] = \ - ffi.from_buffer("float_complex *", + ffi.from_buffer("float _Complex *", in_frame_fd[idx_band, idx_ch, :]) - data_out_ptr = ffi.cast("float_complex ***", + data_out_ptr = ffi.cast("float _Complex ***", lib.malloc3d(num_bands, num_ch, num_t_slots, - ffi.sizeof("float_complex *"))) + ffi.sizeof("float _Complex *"))) lib.latticeDecorrelator_apply(self._decorrelator_phandle[0], data_in_ptr, num_t_slots, data_out_ptr) # unpack data_out = np.reshape(np.frombuffer(ffi.buffer(data_out_ptr[0][0], num_bands*num_ch*num_t_slots * - ffi.sizeof("float_complex")), + ffi.sizeof("float _Complex")), dtype=np.complex64), (num_bands, num_ch, num_t_slots)) @@ -240,22 +240,22 @@ def apply(self, in_frame_fd, alpha=0.95, beta=0.995): num_t_slots = in_frame_fd.shape[2] # populate - data_in_ptr = ffi.cast("float_complex ***", + data_in_ptr = ffi.cast("float _Complex ***", lib.malloc2d(num_bands, num_ch, - ffi.sizeof("float_complex *"))) + ffi.sizeof("float _Complex *"))) for idx_band in range(num_bands): for idx_ch in range(num_ch): data_in_ptr[idx_band][idx_ch] = \ - ffi.from_buffer("float_complex *", + ffi.from_buffer("float _Complex *", in_frame_fd[idx_band, idx_ch, :]) - data_res_ptr = ffi.cast("float_complex ***", + data_res_ptr = ffi.cast("float _Complex ***", lib.malloc3d(num_bands, num_ch, num_t_slots, - ffi.sizeof("float_complex *"))) + ffi.sizeof("float _Complex *"))) - data_trs_ptr = ffi.cast("float_complex ***", + data_trs_ptr = ffi.cast("float _Complex ***", lib.malloc3d(num_bands, num_ch, num_t_slots, - ffi.sizeof("float_complex *"))) + ffi.sizeof("float _Complex *"))) lib.transientDucker_apply(self._ducker_phandle[0], data_in_ptr, num_t_slots, alpha, beta, data_res_ptr, data_trs_ptr) @@ -263,12 +263,12 @@ def apply(self, in_frame_fd, alpha=0.95, beta=0.995): # unpack data_res = np.reshape(np.frombuffer(ffi.buffer(data_res_ptr[0][0], num_bands*num_ch*num_t_slots * - ffi.sizeof("float_complex")), + ffi.sizeof("float _Complex")), dtype=np.complex64), (num_bands, num_ch, num_t_slots)) data_trs = np.reshape(np.frombuffer(ffi.buffer(data_trs_ptr[0][0], num_bands*num_ch*num_t_slots * - ffi.sizeof("float_complex")), + ffi.sizeof("float _Complex")), dtype=np.complex64), (num_bands, num_ch, num_t_slots)) lib.free(data_in_ptr) diff --git a/safpy/sh.py b/safpy/sh.py index ce216d8..5f9de77 100644 --- a/safpy/sh.py +++ b/safpy/sh.py @@ -109,5 +109,5 @@ def getSHcomplex(order, dirs): nDirs = np.shape(dirs)[0] Y = np.empty(((order+1)**2, nDirs), dtype=np.complex64) lib.getSHcomplex(order, ffi.from_buffer("float *", dirs), - nDirs, ffi.from_buffer("float_complex *", Y)) + nDirs, ffi.from_buffer("float _Complex *", Y)) return Y diff --git a/safpy_build.py b/safpy_build.py index 5c41c5b..7e5703e 100644 --- a/safpy_build.py +++ b/safpy_build.py @@ -36,21 +36,6 @@ """) -if sys.platform != "win32": - ffibuilder.cdef(""" - - typedef float _Complex float_complex; - typedef double _Complex double_complex; - - """) -else: - ffibuilder.cdef(""" - - typedef _Fcomplex float_complex; - typedef _Dcomplex double_complex; - - """) - ffibuilder.cdef(""" typedef enum _AFSTFT_FDDATA_FORMAT{ @@ -113,7 +98,7 @@ float* dirs_rad, int nDirs, /* Output Arguments */ - float_complex* Y); + float _Complex* Y); void generateVBAPgainTable3D(/* Input arguments */ float* ls_dirs_deg, @@ -152,20 +137,20 @@ void afSTFT_forward(void * const hSTFT, float** dataTD, int framesize, - float_complex*** dataFD); + float _Complex*** dataFD); void afSTFT_backward(void * const hSTFT, - float_complex*** dataFD, + float _Complex*** dataFD, int framesize, float** dataTD); void afSTFT_forward_flat(void * const hSTFT, float* dataTD, int framesize, - float_complex* dataFD); + float _Complex* dataFD); void afSTFT_backward_flat(void * const hSTFT, - float_complex* dataFD, + float _Complex* dataFD, int framesize, float* dataTD); @@ -187,9 +172,9 @@ void latticeDecorrelator_reset(void * hDecor); void latticeDecorrelator_apply(void * hDecor, - float_complex *** inFrame, + float _Complex *** inFrame, int nTimeSlots, - float_complex *** decorFrame); + float _Complex *** decorFrame); void transientDucker_create(void ** phDucker, int nCH, int nBands); @@ -197,12 +182,12 @@ void transientDucker_destroy(void ** phDucker); void transientDucker_apply(void * hDucker, - float_complex *** inFrame, + float _Complex *** inFrame, int nTimeSlots, float alpha, float beta, - float_complex *** residualFrame, - float_complex *** transientFrame); + float _Complex *** residualFrame, + float _Complex *** transientFrame); """) From 160f9b52c4ad6c059a0bb68aa0f54d42a27d7aef Mon Sep 17 00:00:00 2001 From: Chris Hold Date: Tue, 6 Feb 2024 11:55:25 +0200 Subject: [PATCH 091/103] Update safpy_build.py --- safpy_build.py | 1 - 1 file changed, 1 deletion(-) diff --git a/safpy_build.py b/safpy_build.py index 7e5703e..55c3473 100644 --- a/safpy_build.py +++ b/safpy_build.py @@ -196,7 +196,6 @@ # to make the declarated functions, types and globals available, # so it is often just the "#include". c_header_source += f""" - #include #include "{saf_path}/framework/include/saf.h" // the C header of the lib """ libraries.append(saf_path + "/build/framework/saf") # lib name, for the linker From 93397b1770900cdd68ca6ee62ed99888e69687b9 Mon Sep 17 00:00:00 2001 From: Chris Hold Date: Tue, 6 Feb 2024 12:06:22 +0200 Subject: [PATCH 092/103] Revert "Trying to use the native _Complex" This reverts commit 6932d600418d757220c637a8dedf8b2440f3d9d4. --- safpy/afstft.py | 16 ++++++++-------- safpy/decorrelator.py | 30 +++++++++++++++--------------- safpy/sh.py | 2 +- safpy_build.py | 35 +++++++++++++++++++++++++---------- 4 files changed, 49 insertions(+), 34 deletions(-) diff --git a/safpy/afstft.py b/safpy/afstft.py index ab5d5c2..9e35801 100644 --- a/safpy/afstft.py +++ b/safpy/afstft.py @@ -188,7 +188,7 @@ def forward(self, in_frame_td): lib.afSTFT_forward_flat(self._afstft_phandle[0], ffi.from_buffer("float *", in_frame_td), framesize, - ffi.from_buffer("float _Complex *", data_fd)) + ffi.from_buffer("float_complex *", data_fd)) return data_fd def backward(self, in_frame_fd): @@ -224,7 +224,7 @@ def backward(self, in_frame_fd): data_td = np.empty((num_ch_out, framesize), dtype=np.float32) lib.afSTFT_backward_flat(self._afstft_phandle[0], - ffi.from_buffer("float _Complex *", + ffi.from_buffer("float_complex *", in_frame_fd), framesize, ffi.from_buffer("float *", data_td)) @@ -249,16 +249,16 @@ def forward_nd(self, in_frame_td): data_td_ptr[idx_ch] = ffi.from_buffer("float *", in_frame_td[idx_ch, :]) - data_fd_ptr = ffi.cast("float _Complex ***", + data_fd_ptr = ffi.cast("float_complex ***", lib.malloc3d(num_bands, num_ch_in, num_hops, - ffi.sizeof("float _Complex"))) + ffi.sizeof("float_complex"))) lib.afSTFT_forward(self._afstft_phandle[0], data_td_ptr, framesize, data_fd_ptr) # unpack data_fd = np.reshape(np.frombuffer(ffi.buffer(data_fd_ptr[0][0], num_bands*num_ch_in*num_hops * - ffi.sizeof("float _Complex")), + ffi.sizeof("float_complex")), dtype=np.complex64), (num_bands, num_ch_in, num_hops)) @@ -277,13 +277,13 @@ def backward_nd(self, in_frame_fd): num_bands = self.num_bands # populate - data_fd_ptr = ffi.cast("float _Complex ***", + data_fd_ptr = ffi.cast("float_complex ***", lib.malloc2d(num_bands, num_ch_out, - ffi.sizeof("float _Complex*"))) + ffi.sizeof("float_complex*"))) for idx_band in range(num_bands): for idx_ch in range(num_ch_out): data_fd_ptr[idx_band][idx_ch] = \ - ffi.from_buffer("float _Complex *", + ffi.from_buffer("float_complex *", in_frame_fd[idx_band, idx_ch, :]) data_td_ptr = ffi.cast("float **", lib.malloc2d(num_ch_out, framesize, diff --git a/safpy/decorrelator.py b/safpy/decorrelator.py index f605756..71a6fe0 100644 --- a/safpy/decorrelator.py +++ b/safpy/decorrelator.py @@ -140,25 +140,25 @@ def apply(self, in_frame_fd): num_t_slots = in_frame_fd.shape[2] # populate - data_in_ptr = ffi.cast("float _Complex ***", + data_in_ptr = ffi.cast("float_complex ***", lib.malloc2d(num_bands, num_ch, - ffi.sizeof("float _Complex *"))) + ffi.sizeof("float_complex *"))) for idx_band in range(num_bands): for idx_ch in range(num_ch): data_in_ptr[idx_band][idx_ch] = \ - ffi.from_buffer("float _Complex *", + ffi.from_buffer("float_complex *", in_frame_fd[idx_band, idx_ch, :]) - data_out_ptr = ffi.cast("float _Complex ***", + data_out_ptr = ffi.cast("float_complex ***", lib.malloc3d(num_bands, num_ch, num_t_slots, - ffi.sizeof("float _Complex *"))) + ffi.sizeof("float_complex *"))) lib.latticeDecorrelator_apply(self._decorrelator_phandle[0], data_in_ptr, num_t_slots, data_out_ptr) # unpack data_out = np.reshape(np.frombuffer(ffi.buffer(data_out_ptr[0][0], num_bands*num_ch*num_t_slots * - ffi.sizeof("float _Complex")), + ffi.sizeof("float_complex")), dtype=np.complex64), (num_bands, num_ch, num_t_slots)) @@ -240,22 +240,22 @@ def apply(self, in_frame_fd, alpha=0.95, beta=0.995): num_t_slots = in_frame_fd.shape[2] # populate - data_in_ptr = ffi.cast("float _Complex ***", + data_in_ptr = ffi.cast("float_complex ***", lib.malloc2d(num_bands, num_ch, - ffi.sizeof("float _Complex *"))) + ffi.sizeof("float_complex *"))) for idx_band in range(num_bands): for idx_ch in range(num_ch): data_in_ptr[idx_band][idx_ch] = \ - ffi.from_buffer("float _Complex *", + ffi.from_buffer("float_complex *", in_frame_fd[idx_band, idx_ch, :]) - data_res_ptr = ffi.cast("float _Complex ***", + data_res_ptr = ffi.cast("float_complex ***", lib.malloc3d(num_bands, num_ch, num_t_slots, - ffi.sizeof("float _Complex *"))) + ffi.sizeof("float_complex *"))) - data_trs_ptr = ffi.cast("float _Complex ***", + data_trs_ptr = ffi.cast("float_complex ***", lib.malloc3d(num_bands, num_ch, num_t_slots, - ffi.sizeof("float _Complex *"))) + ffi.sizeof("float_complex *"))) lib.transientDucker_apply(self._ducker_phandle[0], data_in_ptr, num_t_slots, alpha, beta, data_res_ptr, data_trs_ptr) @@ -263,12 +263,12 @@ def apply(self, in_frame_fd, alpha=0.95, beta=0.995): # unpack data_res = np.reshape(np.frombuffer(ffi.buffer(data_res_ptr[0][0], num_bands*num_ch*num_t_slots * - ffi.sizeof("float _Complex")), + ffi.sizeof("float_complex")), dtype=np.complex64), (num_bands, num_ch, num_t_slots)) data_trs = np.reshape(np.frombuffer(ffi.buffer(data_trs_ptr[0][0], num_bands*num_ch*num_t_slots * - ffi.sizeof("float _Complex")), + ffi.sizeof("float_complex")), dtype=np.complex64), (num_bands, num_ch, num_t_slots)) lib.free(data_in_ptr) diff --git a/safpy/sh.py b/safpy/sh.py index 5f9de77..ce216d8 100644 --- a/safpy/sh.py +++ b/safpy/sh.py @@ -109,5 +109,5 @@ def getSHcomplex(order, dirs): nDirs = np.shape(dirs)[0] Y = np.empty(((order+1)**2, nDirs), dtype=np.complex64) lib.getSHcomplex(order, ffi.from_buffer("float *", dirs), - nDirs, ffi.from_buffer("float _Complex *", Y)) + nDirs, ffi.from_buffer("float_complex *", Y)) return Y diff --git a/safpy_build.py b/safpy_build.py index 55c3473..94f84c1 100644 --- a/safpy_build.py +++ b/safpy_build.py @@ -36,6 +36,21 @@ """) +if sys.platform != "win32": + ffibuilder.cdef(""" + + typedef float _Complex float_complex; + typedef double _Complex double_complex; + + """) +else: + ffibuilder.cdef(""" + + typedef _Fcomplex float_complex; + typedef _Dcomplex double_complex; + + """) + ffibuilder.cdef(""" typedef enum _AFSTFT_FDDATA_FORMAT{ @@ -98,7 +113,7 @@ float* dirs_rad, int nDirs, /* Output Arguments */ - float _Complex* Y); + float_complex* Y); void generateVBAPgainTable3D(/* Input arguments */ float* ls_dirs_deg, @@ -137,20 +152,20 @@ void afSTFT_forward(void * const hSTFT, float** dataTD, int framesize, - float _Complex*** dataFD); + float_complex*** dataFD); void afSTFT_backward(void * const hSTFT, - float _Complex*** dataFD, + float_complex*** dataFD, int framesize, float** dataTD); void afSTFT_forward_flat(void * const hSTFT, float* dataTD, int framesize, - float _Complex* dataFD); + float_complex* dataFD); void afSTFT_backward_flat(void * const hSTFT, - float _Complex* dataFD, + float_complex* dataFD, int framesize, float* dataTD); @@ -172,9 +187,9 @@ void latticeDecorrelator_reset(void * hDecor); void latticeDecorrelator_apply(void * hDecor, - float _Complex *** inFrame, + float_complex *** inFrame, int nTimeSlots, - float _Complex *** decorFrame); + float_complex *** decorFrame); void transientDucker_create(void ** phDucker, int nCH, int nBands); @@ -182,12 +197,12 @@ void transientDucker_destroy(void ** phDucker); void transientDucker_apply(void * hDucker, - float _Complex *** inFrame, + float_complex *** inFrame, int nTimeSlots, float alpha, float beta, - float _Complex *** residualFrame, - float _Complex *** transientFrame); + float_complex *** residualFrame, + float_complex *** transientFrame); """) From 807993a9cba7046f08246e4bcd6d3d40c9c17eea Mon Sep 17 00:00:00 2001 From: Chris Hold Date: Tue, 6 Feb 2024 15:41:01 +0200 Subject: [PATCH 093/103] Trying typedef struct float_complex --- safpy_build.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/safpy_build.py b/safpy_build.py index 94f84c1..c371d9a 100644 --- a/safpy_build.py +++ b/safpy_build.py @@ -38,16 +38,18 @@ if sys.platform != "win32": ffibuilder.cdef(""" - + typedef float _Complex float_complex; typedef double _Complex double_complex; """) else: ffibuilder.cdef(""" - - typedef _Fcomplex float_complex; - typedef _Dcomplex double_complex; + + typedef struct + { + float re, im; + } float_complex; """) From f76bb564a688605921fa27a658e8ea2353bf50ae Mon Sep 17 00:00:00 2001 From: Chris Hold Date: Tue, 6 Feb 2024 15:48:15 +0200 Subject: [PATCH 094/103] Update safpy_build.py --- safpy_build.py | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/safpy_build.py b/safpy_build.py index c371d9a..8204985 100644 --- a/safpy_build.py +++ b/safpy_build.py @@ -46,10 +46,7 @@ else: ffibuilder.cdef(""" - typedef struct - { - float re, im; - } float_complex; + typedef _C_float_complex float_complex; """) From b0e608c4a9cebc296e35241a0caf576a4561f094 Mon Sep 17 00:00:00 2001 From: Chris Hold Date: Tue, 6 Feb 2024 15:55:59 +0200 Subject: [PATCH 095/103] Update safpy_build.py --- safpy_build.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/safpy_build.py b/safpy_build.py index 8204985..c84b27c 100644 --- a/safpy_build.py +++ b/safpy_build.py @@ -46,7 +46,10 @@ else: ffibuilder.cdef(""" - typedef _C_float_complex float_complex; + typedef struct + { + float _Val[2]; + } float_complex; """) From 82ee0a0fe858e948fe0f74c82fff2864b2759946 Mon Sep 17 00:00:00 2001 From: Chris Hold Date: Tue, 6 Feb 2024 16:09:55 +0200 Subject: [PATCH 096/103] Update safpy_build.py --- safpy_build.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/safpy_build.py b/safpy_build.py index c84b27c..34364a4 100644 --- a/safpy_build.py +++ b/safpy_build.py @@ -219,6 +219,9 @@ libraries.extend(saf_performance_lib) +library_dirs.extend([saf_path, home_dir, this_dir]) + + print("Compiling _safpy with:") print(f"C_Header_Source: {c_header_source}") print(f"include_dirs: {include_dirs}") From 604b926441e209c5745a7c4d6fd900ff2b711759 Mon Sep 17 00:00:00 2001 From: Chris Hold Date: Tue, 6 Feb 2024 16:29:29 +0200 Subject: [PATCH 097/103] Copy openblas on windows to safpy folder --- .github/workflows/python-safpy.yml | 1 + safpy_build.py | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/python-safpy.yml b/.github/workflows/python-safpy.yml index 390688d..dd2492c 100644 --- a/.github/workflows/python-safpy.yml +++ b/.github/workflows/python-safpy.yml @@ -47,6 +47,7 @@ jobs: elif [ "$RUNNER_OS" == "Windows" ]; then curl https://github.com/OpenMathLib/OpenBLAS/releases/download/v0.3.26/OpenBLAS-0.3.26-x64.zip -L -o tmp.zip 7z x ./tmp.zip -oOpenBLAS + cp ./OpenBLAS/lib/* ./ ls echo $PWD else diff --git a/safpy_build.py b/safpy_build.py index 34364a4..8ce5133 100644 --- a/safpy_build.py +++ b/safpy_build.py @@ -219,7 +219,7 @@ libraries.extend(saf_performance_lib) -library_dirs.extend([saf_path, home_dir, this_dir]) +library_dirs.extend([this_dir, saf_path]) print("Compiling _safpy with:") From 211d4d037b5391285a3ef0288473014c72c5d2ba Mon Sep 17 00:00:00 2001 From: Chris Hold Date: Tue, 6 Feb 2024 16:32:39 +0200 Subject: [PATCH 098/103] Update python-safpy.yml --- .github/workflows/python-safpy.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/python-safpy.yml b/.github/workflows/python-safpy.yml index dd2492c..819382d 100644 --- a/.github/workflows/python-safpy.yml +++ b/.github/workflows/python-safpy.yml @@ -47,7 +47,7 @@ jobs: elif [ "$RUNNER_OS" == "Windows" ]; then curl https://github.com/OpenMathLib/OpenBLAS/releases/download/v0.3.26/OpenBLAS-0.3.26-x64.zip -L -o tmp.zip 7z x ./tmp.zip -oOpenBLAS - cp ./OpenBLAS/lib/* ./ + cp ./OpenBLAS/lib/libopenblas.lib ./ ls echo $PWD else From 6d6c3bbeebe5bb76a788edaef8224d1668af096c Mon Sep 17 00:00:00 2001 From: Chris Hold Date: Tue, 6 Feb 2024 16:42:01 +0200 Subject: [PATCH 099/103] Update python-safpy.yml --- .github/workflows/python-safpy.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/python-safpy.yml b/.github/workflows/python-safpy.yml index 819382d..bd0fcdb 100644 --- a/.github/workflows/python-safpy.yml +++ b/.github/workflows/python-safpy.yml @@ -47,7 +47,7 @@ jobs: elif [ "$RUNNER_OS" == "Windows" ]; then curl https://github.com/OpenMathLib/OpenBLAS/releases/download/v0.3.26/OpenBLAS-0.3.26-x64.zip -L -o tmp.zip 7z x ./tmp.zip -oOpenBLAS - cp ./OpenBLAS/lib/libopenblas.lib ./ + cp ./OpenBLAS/lib/libopenblas.lib ./openblas.lib ls echo $PWD else @@ -86,7 +86,9 @@ jobs: if [ "$RUNNER_OS" != "Windows" ]; then ./Spatial_Audio_Framework/build/test/saf_test else - echo "pass" + cp ./Spatial_Audio_Framework/build/test/Debug/saf_test.exe ./Spatial_Audio_Framework/build/test/ + cp ./Spatial_Audio_Framework/build/framework/Debug/saf.lib ./Spatial_Audio_Framework/build/framework/ + # ./Spatial_Audio_Framework/build/test/saf_test.exe # fails with 127 fi shell: bash From 4a1e156e8a8663232173f4cbc6ba55f2221a5e13 Mon Sep 17 00:00:00 2001 From: Chris Hold Date: Tue, 6 Feb 2024 16:52:56 +0200 Subject: [PATCH 100/103] More defaults for win and openblas --- .github/workflows/python-safpy.yml | 2 +- safpy_build.py | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.github/workflows/python-safpy.yml b/.github/workflows/python-safpy.yml index bd0fcdb..ef68939 100644 --- a/.github/workflows/python-safpy.yml +++ b/.github/workflows/python-safpy.yml @@ -47,7 +47,7 @@ jobs: elif [ "$RUNNER_OS" == "Windows" ]; then curl https://github.com/OpenMathLib/OpenBLAS/releases/download/v0.3.26/OpenBLAS-0.3.26-x64.zip -L -o tmp.zip 7z x ./tmp.zip -oOpenBLAS - cp ./OpenBLAS/lib/libopenblas.lib ./openblas.lib + cp ./OpenBLAS/lib/libopenblas.lib ./libopenblas.lib ls echo $PWD else diff --git a/safpy_build.py b/safpy_build.py index 8ce5133..2774236 100644 --- a/safpy_build.py +++ b/safpy_build.py @@ -23,10 +23,14 @@ if sys.platform == "darwin": print("SAFPY using default Apple Accelerate") extra_link_args.extend(['-Wl,-framework', '-Wl,Accelerate']) -else: +elif sys.platform == "linux": print("SAFPY using default OpenBLAS/LAPACKE") saf_performance_lib.extend(["openblas", "lapacke"]) - +elif sys.platform == "win32": + print("SAFPY using default OpenBLAS/LAPACKE") + saf_performance_lib.extend(["libopenblas"]) # should include lapacke +else: + print("No defaults.") # cdef() expects a single string declaring the C types, functions and # globals needed to use the shared object. It must be in valid C syntax. From 18d3faa2bfc62e27415d92b516261e2bf69e822b Mon Sep 17 00:00:00 2001 From: Chris Hold Date: Tue, 6 Feb 2024 18:16:25 +0200 Subject: [PATCH 101/103] Update python-safpy.yml --- .github/workflows/python-safpy.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/python-safpy.yml b/.github/workflows/python-safpy.yml index ef68939..eafd962 100644 --- a/.github/workflows/python-safpy.yml +++ b/.github/workflows/python-safpy.yml @@ -47,7 +47,9 @@ jobs: elif [ "$RUNNER_OS" == "Windows" ]; then curl https://github.com/OpenMathLib/OpenBLAS/releases/download/v0.3.26/OpenBLAS-0.3.26-x64.zip -L -o tmp.zip 7z x ./tmp.zip -oOpenBLAS - cp ./OpenBLAS/lib/libopenblas.lib ./libopenblas.lib + cp ./OpenBLAS/lib/libopenblas.lib $GITHUB_WORKSPACE + cp ./OpenBLAS/bin/libopenblas.dll $GITHUB_WORKSPACE + echo "$GITHUB_WORKSPACE" >> $GITHUB_PATH ls echo $PWD else @@ -89,7 +91,7 @@ jobs: cp ./Spatial_Audio_Framework/build/test/Debug/saf_test.exe ./Spatial_Audio_Framework/build/test/ cp ./Spatial_Audio_Framework/build/framework/Debug/saf.lib ./Spatial_Audio_Framework/build/framework/ - # ./Spatial_Audio_Framework/build/test/saf_test.exe # fails with 127 + ./Spatial_Audio_Framework/build/test/saf_test.exe # fails with 127 fi shell: bash From c540ee959c40259031f509312605c6cfef6f97cb Mon Sep 17 00:00:00 2001 From: Chris Hold Date: Tue, 6 Feb 2024 18:35:44 +0200 Subject: [PATCH 102/103] Update Spatial_Audio_Framework --- Spatial_Audio_Framework | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Spatial_Audio_Framework b/Spatial_Audio_Framework index 2cc6617..018e06e 160000 --- a/Spatial_Audio_Framework +++ b/Spatial_Audio_Framework @@ -1 +1 @@ -Subproject commit 2cc661727161fd2cca27802992486203c95d32f6 +Subproject commit 018e06e86ccdbb37cc527ca511a3a26576126b71 From 2af574b895bd96ff1764436744db904a966b42e8 Mon Sep 17 00:00:00 2001 From: Chris Hold Date: Tue, 6 Feb 2024 18:48:55 +0200 Subject: [PATCH 103/103] Cleanup --- .github/workflows/python-safpy.yml | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/.github/workflows/python-safpy.yml b/.github/workflows/python-safpy.yml index eafd962..5c4e6e9 100644 --- a/.github/workflows/python-safpy.yml +++ b/.github/workflows/python-safpy.yml @@ -50,8 +50,6 @@ jobs: cp ./OpenBLAS/lib/libopenblas.lib $GITHUB_WORKSPACE cp ./OpenBLAS/bin/libopenblas.dll $GITHUB_WORKSPACE echo "$GITHUB_WORKSPACE" >> $GITHUB_PATH - ls - echo $PWD else echo "$RUNNER_OS not supported" exit 1 @@ -83,15 +81,13 @@ jobs: - name: Test SAF run: | - ls -lh ./Spatial_Audio_Framework/build/framework - ls -lh ./Spatial_Audio_Framework/build/test if [ "$RUNNER_OS" != "Windows" ]; then ./Spatial_Audio_Framework/build/test/saf_test else cp ./Spatial_Audio_Framework/build/test/Debug/saf_test.exe ./Spatial_Audio_Framework/build/test/ cp ./Spatial_Audio_Framework/build/framework/Debug/saf.lib ./Spatial_Audio_Framework/build/framework/ - ./Spatial_Audio_Framework/build/test/saf_test.exe # fails with 127 + ./Spatial_Audio_Framework/build/test/saf_test.exe fi shell: bash @@ -103,12 +99,10 @@ jobs: flake8 . --count --exit-zero --max-complexity=10 --max-line-length=127 --statistics - name: Build package - run: | - python setup.py build - shell: bash + run: python setup.py build - name: Build and install package run: python -m pip install -e . + - name: Test with pytest - run: | - pytest -vvv + run: pytest -vvv