Skip to content

Commit

Permalink
use previous libfaust 2.69.3
Browse files Browse the repository at this point in the history
  • Loading branch information
DBraun committed Sep 7, 2024
1 parent 93091f3 commit 9fa3461
Show file tree
Hide file tree
Showing 5 changed files with 15 additions and 22 deletions.
21 changes: 7 additions & 14 deletions .github/workflows/all.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
build-ubuntu:
runs-on: ubuntu-22.04
strategy:
# fail-fast: false
fail-fast: false
matrix:
include:
# - { python-version: "3.8", pythonLibPath: "/opt/python/cp39-cp38/lib", pythonInclude: "/opt/python/cp38-cp38/include/python3.8", cibwbuild: "cp38-manylinux_x86_64"}
Expand All @@ -29,19 +29,12 @@ jobs:
with:
submodules: true

# - name: Set up QEMU for aarch64 on Linux
# if: endsWith(${{matrix.cibwbuild}}, "aarch64")
# uses: docker/setup-qemu-action@v3
# with:
# platforms: all

- name: Install dependencies
run: |
sudo apt-get install -y zstd libncurses-dev libxml2-dev
- name: Install dependencies
run: |
sudo apt-get install -y libllvm15 llvm-15 llvm-15-dev
- name: Set up QEMU for aarch64 on Linux
# if: endsWith(${{matrix.cibwbuild}}, "aarch64")
if: runner.os == 'Linux'
uses: docker/setup-qemu-action@v3
with:
platforms: all

- name: clean faust libraries
run: |
Expand Down
4 changes: 2 additions & 2 deletions test-requirements.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
librosa>=0.8.1
numpy==1.26.*
numpy>=1.21.2
pytest>=6.2.4
scipy>=1.7.0
requests>=2.26.0
requests>=2.26.0
6 changes: 4 additions & 2 deletions tests/test_libfaust_box.py
Original file line number Diff line number Diff line change
Expand Up @@ -620,7 +620,8 @@ def test_bus(n):
test_bus(2)

@pytest.mark.parametrize("backend",
['c', 'cpp', 'cmajor', 'codebox', 'csharp', 'dlang', 'fir', 'interp', 'java', 'jax', 'jsfx', 'julia', 'llvm', 'rust', 'wast']
['c', 'cpp', 'cmajor', 'codebox', 'csharp', 'dlang', 'java', 'jax', 'jsfx', 'julia', 'rust', 'wasm', 'wast']
# ['c', 'cpp', 'cmajor', 'codebox', 'csharp', 'dlang', 'fir', 'interp', 'java', 'jax', 'jsfx', 'julia', 'llvm', 'rust', 'wast']
)
def test25a(backend):

Expand All @@ -641,7 +642,8 @@ def test25a(backend):


@pytest.mark.parametrize("backend",
['c', 'cpp', 'cmajor', 'codebox', 'csharp', 'dlang', 'fir', 'interp', 'java', 'jax', 'jsfx', 'julia', 'llvm', 'rust', 'wast']
['c', 'cpp', 'cmajor', 'codebox', 'csharp', 'dlang', 'java', 'jax', 'jsfx', 'julia', 'rust', 'wasm', 'wast']
# ['c', 'cpp', 'cmajor', 'codebox', 'csharp', 'dlang', 'fir', 'interp', 'java', 'jax', 'jsfx', 'julia', 'llvm', 'rust', 'wast']
)
def test26a(backend):

Expand Down
2 changes: 1 addition & 1 deletion thirdparty/faust
Submodule faust updated 703 files
4 changes: 1 addition & 3 deletions thirdparty/libfaust/download_libfaust.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,6 @@ def install_windows(version: str) -> None:
if download_file(f"https://github.com/grame-cncm/faust/releases/download/{version}/{exe_file}", exe_file):
cwd = str(Path(__file__).parent)
subprocess.run([exe_file, "/S", f"/D={cwd}\\win64\\Release"], check=True)
libfaustwithllvm = f"{Path(__file__).parent}/win64/Release/lib/libfaustwithllvm.lib"
assert os.path.isfile(libfaustwithllvm), f"Missing file: {libfaustwithllvm}"

def install_macos(version: str) -> None:
for arch in ["arm64", "x64"]:
Expand Down Expand Up @@ -60,7 +58,7 @@ def main(version: str) -> None:
sys.exit("Python %s.%s or later is required.\n" % MIN_PYTHON)

parser = argparse.ArgumentParser(description="Download and install Libfaust.")
parser.add_argument("-v", "--version", default="2.74.6", help="Specify the version of Faust to download.")
parser.add_argument("-v", "--version", default="2.69.3", help="Specify the version of Faust to download.")
parser.add_argument("--force", action="store_true", help="Force download even if files already exist.")
args = parser.parse_args()

Expand Down

0 comments on commit 9fa3461

Please sign in to comment.