Skip to content

Use quadrature rules from quadraturerules library #934

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 13 commits into
base: main
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions .github/workflows/clang-tidy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,16 @@ jobs:
sudo apt-get update
sudo apt-get install clang-tidy ninja-build libopenblas-dev liblapack-dev
pip install nanobind scikit-build-core[pyproject]
- name: Install quadraturerules
run: |
mkdir qr
cd qr
wget https://github.com/quadraturerules/quadraturerules/releases/download/v0.7.7/quadraturerules-cpp-v0.7.7.tar.gz
mkdir src
tar -xvf quadraturerules-cpp-v0.7.7.tar.gz -C src
cmake src
make
make install
- name: Run clang-tidy (C++)
working-directory: cpp
run: |
Expand Down
10 changes: 10 additions & 0 deletions .github/workflows/dolfinx-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,16 @@ jobs:

steps:
- uses: actions/checkout@v4
- name: Install quadraturerules
run: |
mkdir qr
cd qr
wget https://github.com/quadraturerules/quadraturerules/releases/download/v0.7.7/quadraturerules-cpp-v0.7.7.tar.gz
mkdir src
tar -xvf quadraturerules-cpp-v0.7.7.tar.gz -C src
cmake src
make
make install
- name: Install Basix
run: |
cmake -G Ninja -DCMAKE_BUILD_TYPE=Developer -B build-dir -S ./cpp
Expand Down
10 changes: 10 additions & 0 deletions .github/workflows/ffcx-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,16 @@ jobs:
python-version: '3.12'
- name: Install dependencies
run: sudo apt-get install -y libopenblas-dev liblapack-dev graphviz libgraphviz-dev ninja-build
- name: Install quadraturerules
run: |
mkdir qr
cd qr
wget https://github.com/quadraturerules/quadraturerules/releases/download/v0.7.7/quadraturerules-cpp-v0.7.7.tar.gz
mkdir src
tar -xvf quadraturerules-cpp-v0.7.7.tar.gz -C src
cmake src
make
make install
- name: Install UFL (default branch)
if: github.event_name != 'workflow_dispatch'
run: pip install git+https://github.com/FEniCS/ufl.git
Expand Down
10 changes: 10 additions & 0 deletions .github/workflows/pythonapp.yml
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,16 @@ jobs:
run: |
sudo apt-get update
sudo apt-get install -y doxygen graphviz libopenblas-dev liblapack-dev ninja-build
- name: Install quadraturerules
run: |
mkdir qr
cd qr
wget https://github.com/quadraturerules/quadraturerules/releases/download/v0.7.7/quadraturerules-cpp-v0.7.7.tar.gz
mkdir src
tar -xvf quadraturerules-cpp-v0.7.7.tar.gz -C src
cmake src
make
make install
- name: Install UFL branch
run: pip -v install git+https://github.com/FEniCS/ufl.git
- name: Install Basix
Expand Down
4 changes: 3 additions & 1 deletion cpp/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ if(SKBUILD AND UNIX)
endif()

if (SKBUILD)
# Make sure includes end up inside basix/ subdirectory in wheel.
# Make sure includes end up inside basix/ subdirectory in wheel.
set(CMAKE_INSTALL_INCLUDEDIR basix/include)
# Make sure all binaries end up inside basix/ subdirectory in wheel.
set(CMAKE_INSTALL_BINDIR basix)
Expand All @@ -30,6 +30,7 @@ add_feature_info(ENABLE_CLANG_TIDY ENABLE_CLANG_TIDY "Run clang-tidy while build

find_package(BLAS REQUIRED)
find_package(LAPACK REQUIRED)
find_package(QuadratureRules 0.7.7 REQUIRED)

feature_summary(WHAT ALL)

Expand Down Expand Up @@ -121,6 +122,7 @@ target_compile_definitions(basix PUBLIC MDSPAN_USE_BRACKET_OPERATOR=0)

target_link_libraries(basix PRIVATE BLAS::BLAS)
target_link_libraries(basix PRIVATE LAPACK::LAPACK)
target_link_libraries(basix PRIVATE QuadratureRules::quadraturerules)

if (UNIX)
list(APPEND BASIX_DEVELOPER_FLAGS -O2;-g;-pipe)
Expand Down
Loading
Loading