diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 0ac59cb..aaa5a7e 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -43,10 +43,10 @@ jobs: mkdir -p ~/.compyle touch ~/.compyle/config.py echo "import os" >> ~/.compyle/config.py - echo "os.environ['CC'] = '$(brew --prefix llvm@15)/bin/clang'" >> ~/.compyle/config.py - echo "os.environ['CXX'] = '$(brew --prefix llvm@15)/bin/clang++'" >> ~/.compyle/config.py - export CPPFLAGS="-I$(brew --prefix libomp)/include -I$(brew --prefix llvm@15)/include -Xclang -fopenmp" - export LDFLAGS="-L$(brew --prefix libomp)/lib -L$(brew --prefix llvm@15)/lib -lomp" + echo "os.environ['CC'] = 'clang'" >> ~/.compyle/config.py + echo "os.environ['CXX'] = 'clang++'" >> ~/.compyle/config.py + export CPPFLAGS="-I$(brew --prefix libomp)/include -Xclang -fopenmp" + export LDFLAGS="-L$(brew --prefix libomp)/lib -lomp" python -c "import os; OMP_CFLAGS=os.environ.get('CPPFLAGS').split(' '); print(f'{OMP_CFLAGS=}')" >> ~/.compyle/config.py python -c "import os; OMP_LINK=os.environ.get('LDFLAGS').split(' '); print(f'{OMP_LINK=}')" >> ~/.compyle/config.py cat ~/.compyle/config.py diff --git a/compyle/tests/test_array.py b/compyle/tests/test_array.py index 0327ba6..bc2eb3d 100644 --- a/compyle/tests/test_array.py +++ b/compyle/tests/test_array.py @@ -449,9 +449,9 @@ def test_trapz(backend): y = array.linspace(0, 5, 6, dtype=np.float32, backend=backend) xn = np.linspace(0, 5, 6, dtype=np.float32) yn = np.linspace(0, 5, 6, dtype=np.float32) - assert(array.trapz(y) == np.trapz(yn)) - assert(array.trapz(y, x,) == np.trapz(yn, xn)) - assert(array.trapz(y, dx=3) == np.trapz(yn, dx=3)) + assert(array.trapz(y) == np.trapezoid(yn)) + assert(array.trapz(y, x,) == np.trapezoid(yn, xn)) + assert(array.trapz(y, dx=3) == np.trapezoid(yn, dx=3)) x = array.linspace(0, 5, 5, dtype=np.float32, backend=backend) with pytest.raises(Exception):