From e316bbc4d44301d74d3f31b388f5d88d1d3d9d3b Mon Sep 17 00:00:00 2001 From: Matthew Scroggs Date: Mon, 13 Nov 2023 15:44:24 +0000 Subject: [PATCH 1/4] branch names --- .circleci/config.yml | 2 +- .github/workflows/ccpp.yml | 2 +- .github/workflows/macos.yml | 2 +- .github/workflows/oneapi.yml | 2 +- .github/workflows/pyvista.yml | 2 +- .github/workflows/redhat.yml | 2 +- .github/workflows/sonarcloud.yml | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index dd6a7c9c6cc..baf8af64e6a 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -3,7 +3,7 @@ version: 2.1 install-python-components: &install-python-components name: Install FEniCS Python components command: | - git clone https://github.com/FEniCS/basix.git --branch main --single-branch + git clone https://github.com/FEniCS/basix.git --branch mscroggs/rename-dof-transformation_functions --single-branch cmake -G Ninja -DCMAKE_BUILD_TYPE=Release -B build-dir -S ./basix/cpp cmake --build build-dir --parallel 3 cmake --install build-dir diff --git a/.github/workflows/ccpp.yml b/.github/workflows/ccpp.yml index 7d1a39bbde4..c697ab6c32d 100644 --- a/.github/workflows/ccpp.yml +++ b/.github/workflows/ccpp.yml @@ -51,7 +51,7 @@ jobs: if: github.event_name != 'workflow_dispatch' run: | python3 -m pip install git+https://github.com/FEniCS/ufl.git - python3 -m pip install git+https://github.com/FEniCS/basix.git + python3 -m pip install git+https://github.com/FEniCS/basix.git@mscroggs/rename-dof-transformation_functions python3 -m pip install git+https://github.com/FEniCS/ffcx.git - name: Install FEniCS Python components if: github.event_name == 'workflow_dispatch' diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index 0e391ff08c6..de608919175 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -50,7 +50,7 @@ jobs: - name: Install FEniCSx dependencies run: | - python -m pip install git+https://github.com/FEniCS/basix.git + python -m pip install git+https://github.com/FEniCS/basix.git@mscroggs/rename-dof-transformation_functions python -m pip install git+https://github.com/FEniCS/ufl.git python -m pip install git+https://github.com/FEniCS/ffcx.git diff --git a/.github/workflows/oneapi.yml b/.github/workflows/oneapi.yml index dc4963929be..ad84ef242b4 100644 --- a/.github/workflows/oneapi.yml +++ b/.github/workflows/oneapi.yml @@ -34,7 +34,7 @@ jobs: - name: Install Basix run: | . /opt/intel/oneapi/setvars.sh - pip install git+https://github.com/FEniCS/basix.git + pip install git+https://github.com/FEniCS/basix.git@mscroggs/rename-dof-transformation_functions - name: Clone FFCx uses: actions/checkout@v4 diff --git a/.github/workflows/pyvista.yml b/.github/workflows/pyvista.yml index f82d117c632..f4dee9cf91f 100644 --- a/.github/workflows/pyvista.yml +++ b/.github/workflows/pyvista.yml @@ -38,7 +38,7 @@ jobs: - name: Install FEniCS Python components run: | python3 -m pip install git+https://github.com/FEniCS/ufl.git - python3 -m pip install git+https://github.com/FEniCS/basix.git + python3 -m pip install git+https://github.com/FEniCS/basix.git@mscroggs/rename-dof-transformation_functions python3 -m pip install git+https://github.com/FEniCS/ffcx.git apt-get update apt-get install -y --no-install-recommends libgl1-mesa-dev xvfb # pyvista diff --git a/.github/workflows/redhat.yml b/.github/workflows/redhat.yml index 4182f6d6fc1..1fd6a9c607f 100644 --- a/.github/workflows/redhat.yml +++ b/.github/workflows/redhat.yml @@ -27,7 +27,7 @@ jobs: - name: Install FEniCS Python components run: | python3 -m pip install git+https://github.com/FEniCS/ufl.git - python3 -m pip install git+https://github.com/FEniCS/basix.git + python3 -m pip install git+https://github.com/FEniCS/basix.git@mscroggs/rename-dof-transformation_functions python3 -m pip install git+https://github.com/FEniCS/ffcx.git - name: Configure C++ diff --git a/.github/workflows/sonarcloud.yml b/.github/workflows/sonarcloud.yml index 808456ced4b..8a322be0856 100644 --- a/.github/workflows/sonarcloud.yml +++ b/.github/workflows/sonarcloud.yml @@ -59,7 +59,7 @@ jobs: - name: Install FEniCS Python components run: | python3 -m pip install git+https://github.com/FEniCS/ufl.git - python3 -m pip install git+https://github.com/FEniCS/basix.git + python3 -m pip install git+https://github.com/FEniCS/basix.git@mscroggs/rename-dof-transformation_functions python3 -m pip install git+https://github.com/FEniCS/ffcx.git - name: Run build-wrapper run: | From e46061f406b21462df353bda45da75b531d3fb19 Mon Sep 17 00:00:00 2001 From: Matthew Scroggs Date: Mon, 13 Nov 2023 16:20:10 +0000 Subject: [PATCH 2/4] Update function names --- cpp/dolfinx/fem/Expression.h | 5 +- cpp/dolfinx/fem/FiniteElement.h | 130 ++++++++++++------------- cpp/dolfinx/fem/Function.h | 3 +- cpp/dolfinx/fem/FunctionSpace.h | 2 +- cpp/dolfinx/fem/assemble_matrix_impl.h | 4 +- cpp/dolfinx/fem/assemble_vector_impl.h | 55 ++++++----- cpp/dolfinx/fem/discreteoperators.h | 7 +- cpp/dolfinx/fem/interpolate.h | 26 ++--- cpp/dolfinx/fem/utils.h | 2 +- cpp/dolfinx/io/vtk_utils.h | 2 +- python/dolfinx/wrappers/fem.cpp | 26 ++--- 11 files changed, 131 insertions(+), 131 deletions(-) diff --git a/cpp/dolfinx/fem/Expression.h b/cpp/dolfinx/fem/Expression.h index aab97a1b5d2..40fa0a343f2 100644 --- a/cpp/dolfinx/fem/Expression.h +++ b/cpp/dolfinx/fem/Expression.h @@ -194,8 +194,9 @@ class Expression mesh.topology_mutable()->create_entity_permutations(); cell_info = std::span(mesh.topology()->get_cell_permutation_info()); dof_transform_to_transpose - = element->template get_dof_transformation_to_transpose_function< - scalar_type>(); + = element + ->template get_post_dof_transformation_function( + false, true); } } diff --git a/cpp/dolfinx/fem/FiniteElement.h b/cpp/dolfinx/fem/FiniteElement.h index a70913d94db..0239f6cbed1 100644 --- a/cpp/dolfinx/fem/FiniteElement.h +++ b/cpp/dolfinx/fem/FiniteElement.h @@ -263,8 +263,9 @@ class FiniteElement template std::function&, const std::span&, std::int32_t, int)> - get_dof_transformation_function(bool inverse = false, bool transpose = false, - bool scalar_element = false) const + get_pre_dof_transformation_function(bool inverse = false, + bool transpose = false, + bool scalar_element = false) const { if (!needs_dof_transformations()) { @@ -289,7 +290,7 @@ class FiniteElement for (std::size_t i = 0; i < _sub_elements.size(); ++i) { sub_element_functions.push_back( - _sub_elements[i]->template get_dof_transformation_function( + _sub_elements[i]->template get_pre_dof_transformation_function( inverse, transpose)); dims.push_back(_sub_elements[i]->space_dimension()); } @@ -316,7 +317,7 @@ class FiniteElement const std::span&, std::int32_t, int)> sub_function - = _sub_elements[0]->template get_dof_transformation_function( + = _sub_elements[0]->template get_pre_dof_transformation_function( inverse, transpose); const int ebs = _bs; return @@ -334,8 +335,8 @@ class FiniteElement const std::span& cell_info, std::int32_t cell, int block_size) { - apply_inverse_transpose_dof_transformation(data, cell_info[cell], - block_size); + pre_apply_inverse_transpose_dof_transformation(data, cell_info[cell], + block_size); }; } else @@ -343,7 +344,8 @@ class FiniteElement return [this](const std::span& data, const std::span& cell_info, std::int32_t cell, int block_size) { - apply_transpose_dof_transformation(data, cell_info[cell], block_size); + pre_apply_transpose_dof_transformation(data, cell_info[cell], + block_size); }; } } @@ -354,7 +356,8 @@ class FiniteElement return [this](const std::span& data, const std::span& cell_info, std::int32_t cell, int block_size) { - apply_inverse_dof_transformation(data, cell_info[cell], block_size); + pre_apply_inverse_dof_transformation(data, cell_info[cell], + block_size); }; } else @@ -362,7 +365,7 @@ class FiniteElement return [this](const std::span& data, const std::span& cell_info, std::int32_t cell, int block_size) - { apply_dof_transformation(data, cell_info[cell], block_size); }; + { pre_apply_dof_transformation(data, cell_info[cell], block_size); }; } } } @@ -388,10 +391,9 @@ class FiniteElement template std::function&, const std::span&, std::int32_t, int)> - get_dof_transformation_to_transpose_function(bool inverse = false, - bool transpose = false, - bool scalar_element - = false) const + get_post_dof_transformation_function(bool inverse = false, + bool transpose = false, + bool scalar_element = false) const { if (!needs_dof_transformations()) { @@ -415,7 +417,7 @@ class FiniteElement { sub_element_functions.push_back( _sub_elements[i] - ->template get_dof_transformation_to_transpose_function( + ->template get_post_dof_transformation_function( inverse, transpose)); } @@ -440,7 +442,7 @@ class FiniteElement const std::span&, std::int32_t, int)> sub_function - = _sub_elements[0]->template get_dof_transformation_function( + = _sub_elements[0]->template get_pre_dof_transformation_function( inverse, transpose); return [this, sub_function](const std::span& data, @@ -466,18 +468,17 @@ class FiniteElement const std::span& cell_info, std::int32_t cell, int block_size) { - apply_inverse_transpose_dof_transformation_to_transpose( - data, cell_info[cell], block_size); + post_apply_inverse_transpose_dof_transformation(data, cell_info[cell], + block_size); }; } else { return [this](const std::span& data, const std::span& cell_info, - std::int32_t cell, int block_size) - { - apply_transpose_dof_transformation_to_transpose(data, cell_info[cell], - block_size); + std::int32_t cell, int block_size) { + post_apply_transpose_dof_transformation(data, cell_info[cell], + block_size); }; } } @@ -487,20 +488,17 @@ class FiniteElement { return [this](const std::span& data, const std::span& cell_info, - std::int32_t cell, int block_size) - { - apply_inverse_dof_transformation_to_transpose(data, cell_info[cell], - block_size); + std::int32_t cell, int block_size) { + post_apply_inverse_dof_transformation(data, cell_info[cell], + block_size); }; } else { return [this](const std::span& data, const std::span& cell_info, - std::int32_t cell, int block_size) { - apply_dof_transformation_to_transpose(data, cell_info[cell], - block_size); - }; + std::int32_t cell, int block_size) + { post_apply_dof_transformation(data, cell_info[cell], block_size); }; } } } @@ -512,12 +510,12 @@ class FiniteElement /// @param[in] cell_permutation Permutation data for the cell /// @param[in] block_size The block_size of the input data template - void apply_dof_transformation(const std::span& data, - std::uint32_t cell_permutation, - int block_size) const + void pre_apply_dof_transformation(const std::span& data, + std::uint32_t cell_permutation, + int block_size) const { assert(_element); - _element->apply_dof_transformation(data, block_size, cell_permutation); + _element->pre_apply_dof_transformation(data, block_size, cell_permutation); } /// Apply inverse transpose transformation to some data. For @@ -530,13 +528,13 @@ class FiniteElement /// @param[in] block_size The block_size of the input data template void - apply_inverse_transpose_dof_transformation(const std::span& data, - std::uint32_t cell_permutation, - int block_size) const + pre_apply_inverse_transpose_dof_transformation(const std::span& data, + std::uint32_t cell_permutation, + int block_size) const { assert(_element); - _element->apply_inverse_transpose_dof_transformation(data, block_size, - cell_permutation); + _element->pre_apply_inverse_transpose_dof_transformation(data, block_size, + cell_permutation); } /// Apply transpose transformation to some data. For VectorElements, @@ -547,13 +545,13 @@ class FiniteElement /// @param[in] cell_permutation Permutation data for the cell /// @param[in] block_size The block_size of the input data template - void apply_transpose_dof_transformation(const std::span& data, - std::uint32_t cell_permutation, - int block_size) const + void pre_apply_transpose_dof_transformation(const std::span& data, + std::uint32_t cell_permutation, + int block_size) const { assert(_element); - _element->apply_transpose_dof_transformation(data, block_size, - cell_permutation); + _element->pre_apply_transpose_dof_transformation(data, block_size, + cell_permutation); } /// Apply inverse transformation to some data. For VectorElements, @@ -564,13 +562,13 @@ class FiniteElement /// @param[in] cell_permutation Permutation data for the cell /// @param[in] block_size The block_size of the input data template - void apply_inverse_dof_transformation(const std::span& data, - std::uint32_t cell_permutation, - int block_size) const + void pre_apply_inverse_dof_transformation(const std::span& data, + std::uint32_t cell_permutation, + int block_size) const { assert(_element); - _element->apply_inverse_dof_transformation(data, block_size, - cell_permutation); + _element->pre_apply_inverse_dof_transformation(data, block_size, + cell_permutation); } /// Apply DOF transformation to some transposed data @@ -580,13 +578,12 @@ class FiniteElement /// @param[in] cell_permutation Permutation data for the cell /// @param[in] block_size The block_size of the input data template - void apply_dof_transformation_to_transpose(const std::span& data, - std::uint32_t cell_permutation, - int block_size) const + void post_apply_dof_transformation(const std::span& data, + std::uint32_t cell_permutation, + int block_size) const { assert(_element); - _element->apply_dof_transformation_to_transpose(data, block_size, - cell_permutation); + _element->post_apply_dof_transformation(data, block_size, cell_permutation); } /// Apply inverse of DOF transformation to some transposed data. @@ -596,14 +593,13 @@ class FiniteElement /// @param[in] cell_permutation Permutation data for the cell /// @param[in] block_size The block_size of the input data template - void - apply_inverse_dof_transformation_to_transpose(const std::span& data, - std::uint32_t cell_permutation, - int block_size) const + void post_apply_inverse_dof_transformation(const std::span& data, + std::uint32_t cell_permutation, + int block_size) const { assert(_element); - _element->apply_inverse_dof_transformation_to_transpose(data, block_size, - cell_permutation); + _element->post_apply_inverse_dof_transformation(data, block_size, + cell_permutation); } /// Apply transpose of transformation to some transposed data. @@ -613,13 +609,13 @@ class FiniteElement /// @param[in] cell_permutation Permutation data for the cell /// @param[in] block_size The block_size of the input data template - void apply_transpose_dof_transformation_to_transpose( - const std::span& data, std::uint32_t cell_permutation, - int block_size) const + void post_apply_transpose_dof_transformation(const std::span& data, + std::uint32_t cell_permutation, + int block_size) const { assert(_element); - _element->apply_transpose_dof_transformation_to_transpose(data, block_size, - cell_permutation); + _element->post_apply_transpose_dof_transformation(data, block_size, + cell_permutation); } /// Apply inverse transpose transformation to some transposed data @@ -629,13 +625,13 @@ class FiniteElement /// @param[in] cell_permutation Permutation data for the cell /// @param[in] block_size The block_size of the input data template - void apply_inverse_transpose_dof_transformation_to_transpose( + void post_apply_inverse_transpose_dof_transformation( const std::span& data, std::uint32_t cell_permutation, int block_size) const { assert(_element); - _element->apply_inverse_transpose_dof_transformation_to_transpose( - data, block_size, cell_permutation); + _element->post_apply_inverse_transpose_dof_transformation(data, block_size, + cell_permutation); } /// Permute the DOFs of the element diff --git a/cpp/dolfinx/fem/Function.h b/cpp/dolfinx/fem/Function.h index 13f61d2cb00..c8758d3fed4 100644 --- a/cpp/dolfinx/fem/Function.h +++ b/cpp/dolfinx/fem/Function.h @@ -596,7 +596,8 @@ class Function = element->basix_element().template map_fn(); auto apply_dof_transformation - = element->template get_dof_transformation_function(); + = element + ->template get_pre_dof_transformation_function(); const std::size_t num_basis_values = space_dimension * reference_value_size; for (std::size_t p = 0; p < cells.size(); ++p) diff --git a/cpp/dolfinx/fem/FunctionSpace.h b/cpp/dolfinx/fem/FunctionSpace.h index b021f104f50..76d710f61d5 100644 --- a/cpp/dolfinx/fem/FunctionSpace.h +++ b/cpp/dolfinx/fem/FunctionSpace.h @@ -251,7 +251,7 @@ class FunctionSpace } auto apply_dof_transformation - = _element->template get_dof_transformation_function(); + = _element->template get_pre_dof_transformation_function(); const std::array phi_shape = cmap.tabulate_shape(0, Xshape[0]); diff --git a/cpp/dolfinx/fem/assemble_matrix_impl.h b/cpp/dolfinx/fem/assemble_matrix_impl.h index 33ba69c9d32..98c8a1bf3ce 100644 --- a/cpp/dolfinx/fem/assemble_matrix_impl.h +++ b/cpp/dolfinx/fem/assemble_matrix_impl.h @@ -390,11 +390,11 @@ void assemble_matrix( const std::function&, const std::span&, std::int32_t, int)>& dof_transform - = element0->template get_dof_transformation_function(); + = element0->template get_pre_dof_transformation_function(); const std::function&, const std::span&, std::int32_t, int)>& dof_transform_to_transpose - = element1->template get_dof_transformation_to_transpose_function(); + = element1->template get_post_dof_transformation_function(false, true); const bool needs_transformation_data = element0->needs_dof_transformations() diff --git a/cpp/dolfinx/fem/assemble_vector_impl.h b/cpp/dolfinx/fem/assemble_vector_impl.h index b5a75cb6978..2ce76809368 100644 --- a/cpp/dolfinx/fem/assemble_vector_impl.h +++ b/cpp/dolfinx/fem/assemble_vector_impl.h @@ -49,7 +49,7 @@ void _lift_bc_cells( mdspan2_t dofmap0, int bs0, const std::function&, const std::span&, - std::int32_t, int)>& dof_transform_to_transpose, + std::int32_t, int)>& post_dof_transpose, mdspan2_t dofmap1, int bs1, std::span constants, std::span coeffs, int cstride, std::span cell_info, std::span bc_values1, @@ -130,7 +130,7 @@ void _lift_bc_cells( kernel(Ae.data(), coeff_array, constants.data(), coordinate_dofs.data(), nullptr, nullptr); dof_transform(Ae, cell_info, c, num_cols); - dof_transform_to_transpose(Ae, cell_info, c, num_rows); + post_dof_transpose(Ae, cell_info, c, num_rows); // Size data structure for assembly be.resize(num_rows); @@ -205,7 +205,7 @@ void _lift_bc_exterior_facets( mdspan2_t dofmap0, int bs0, const std::function&, const std::span&, - std::int32_t, int)>& dof_transform_to_transpose, + std::int32_t, int)>& post_dof_transpose, mdspan2_t dofmap1, int bs1, std::span constants, std::span coeffs, int cstride, std::span cell_info, std::span bc_values1, @@ -269,7 +269,7 @@ void _lift_bc_exterior_facets( kernel(Ae.data(), coeff_array, constants.data(), coordinate_dofs.data(), &local_facet, nullptr); dof_transform(Ae, cell_info, cell, num_cols); - dof_transform_to_transpose(Ae, cell_info, cell, num_rows); + post_dof_transpose(Ae, cell_info, cell, num_rows); // Size data structure for assembly be.resize(num_rows); @@ -313,7 +313,7 @@ void _lift_bc_interior_facets( mdspan2_t dofmap0, int bs0, const std::function&, const std::span&, - std::int32_t, int)>& dof_transform_to_transpose, + std::int32_t, int)>& post_dof_transpose, mdspan2_t dofmap1, int bs1, std::span constants, std::span coeffs, int cstride, std::span cell_info, @@ -434,8 +434,8 @@ void _lift_bc_interior_facets( dof_transform(_Ae, cell_info, cells[0], num_cols); dof_transform(sub_Ae0, cell_info, cells[1], num_cols); - dof_transform_to_transpose(_Ae, cell_info, cells[0], num_rows); - dof_transform_to_transpose(sub_Ae1, cell_info, cells[1], num_rows); + post_dof_transpose(_Ae, cell_info, cells[0], num_rows); + post_dof_transpose(sub_Ae1, cell_info, cells[1], num_rows); be.resize(num_rows); std::fill(be.begin(), be.end(), 0); @@ -776,12 +776,13 @@ void lift_bc(std::span b, const Form& a, mdspan2_t x_dofmap, const std::function&, const std::span&, std::int32_t, int)> - dof_transform = element0->template get_dof_transformation_function(); + dof_transform + = element0->template get_pre_dof_transformation_function(); const std::function&, const std::span&, std::int32_t, int)> - dof_transform_to_transpose - = element1->template get_dof_transformation_to_transpose_function(); + post_dof_transpose + = element1->template get_post_dof_transformation_function(false, true); for (int i : a.integral_ids(IntegralType::cell)) { @@ -792,23 +793,22 @@ void lift_bc(std::span b, const Form& a, mdspan2_t x_dofmap, if (bs0 == 1 and bs1 == 1) { _lift_bc_cells(b, x_dofmap, x, kernel, cells, dof_transform, - dofmap0, bs0, dof_transform_to_transpose, dofmap1, - bs1, constants, coeffs, cstride, cell_info, - bc_values1, bc_markers1, x0, scale); + dofmap0, bs0, post_dof_transpose, dofmap1, bs1, + constants, coeffs, cstride, cell_info, bc_values1, + bc_markers1, x0, scale); } else if (bs0 == 3 and bs1 == 3) { _lift_bc_cells(b, x_dofmap, x, kernel, cells, dof_transform, - dofmap0, bs0, dof_transform_to_transpose, dofmap1, - bs1, constants, coeffs, cstride, cell_info, - bc_values1, bc_markers1, x0, scale); + dofmap0, bs0, post_dof_transpose, dofmap1, bs1, + constants, coeffs, cstride, cell_info, bc_values1, + bc_markers1, x0, scale); } else { _lift_bc_cells(b, x_dofmap, x, kernel, cells, dof_transform, dofmap0, bs0, - dof_transform_to_transpose, dofmap1, bs1, constants, - coeffs, cstride, cell_info, bc_values1, bc_markers1, x0, - scale); + post_dof_transpose, dofmap1, bs1, constants, coeffs, + cstride, cell_info, bc_values1, bc_markers1, x0, scale); } } @@ -818,11 +818,11 @@ void lift_bc(std::span b, const Form& a, mdspan2_t x_dofmap, assert(kernel); auto& [coeffs, cstride] = coefficients.at({IntegralType::exterior_facet, i}); - _lift_bc_exterior_facets( - b, x_dofmap, x, kernel, a.domain(IntegralType::exterior_facet, i), - dof_transform, dofmap0, bs0, dof_transform_to_transpose, dofmap1, bs1, - constants, coeffs, cstride, cell_info, bc_values1, bc_markers1, x0, - scale); + _lift_bc_exterior_facets(b, x_dofmap, x, kernel, + a.domain(IntegralType::exterior_facet, i), + dof_transform, dofmap0, bs0, post_dof_transpose, + dofmap1, bs1, constants, coeffs, cstride, + cell_info, bc_values1, bc_markers1, x0, scale); } if (a.num_integrals(IntegralType::interior_facet) > 0) @@ -852,8 +852,8 @@ void lift_bc(std::span b, const Form& a, mdspan2_t x_dofmap, _lift_bc_interior_facets( b, x_dofmap, x, num_cell_facets, kernel, a.domain(IntegralType::interior_facet, i), dof_transform, dofmap0, - bs0, dof_transform_to_transpose, dofmap1, bs1, constants, coeffs, - cstride, cell_info, get_perm, bc_values1, bc_markers1, x0, scale); + bs0, post_dof_transpose, dofmap1, bs1, constants, coeffs, cstride, + cell_info, get_perm, bc_values1, bc_markers1, x0, scale); } } } @@ -970,7 +970,8 @@ void assemble_vector( const std::function&, const std::span&, std::int32_t, int)> - dof_transform = element->template get_dof_transformation_function(); + dof_transform + = element->template get_pre_dof_transformation_function(); const bool needs_transformation_data = element->needs_dof_transformations() or L.needs_facet_permutations(); diff --git a/cpp/dolfinx/fem/discreteoperators.h b/cpp/dolfinx/fem/discreteoperators.h index d75d53957a9..ce7e2574f88 100644 --- a/cpp/dolfinx/fem/discreteoperators.h +++ b/cpp/dolfinx/fem/discreteoperators.h @@ -102,7 +102,7 @@ void discrete_gradient(mesh::Topology& topology, // Get inverse DOF transform function auto apply_inverse_dof_transform - = e1.template get_dof_transformation_function(true, true, false); + = e1.template get_pre_dof_transformation_function(true, true, false); // Generate cell permutations topology.create_entity_permutations(); @@ -185,9 +185,10 @@ void interpolation_matrix(const FunctionSpace& V0, const int bs0 = e0->block_size(); const int bs1 = e1->block_size(); auto apply_dof_transformation0 - = e0->template get_dof_transformation_function(false, false, false); + = e0->template get_pre_dof_transformation_function(false, false, + false); auto apply_inverse_dof_transform1 - = e1->template get_dof_transformation_function(true, true, false); + = e1->template get_pre_dof_transformation_function(true, true, false); // Get sizes of elements const std::size_t space_dim0 = e0->space_dimension(); diff --git a/cpp/dolfinx/fem/interpolate.h b/cpp/dolfinx/fem/interpolate.h index 363e0d13562..c47e91595be 100644 --- a/cpp/dolfinx/fem/interpolate.h +++ b/cpp/dolfinx/fem/interpolate.h @@ -367,11 +367,11 @@ void interpolate_same_map(Function& u1, const Function& u0, const int bs1 = dofmap1->bs(); const int bs0 = dofmap0->bs(); auto apply_dof_transformation - = element0->template get_dof_transformation_function(false, true, - false); + = element0->template get_pre_dof_transformation_function(false, true, + false); auto apply_inverse_dof_transform - = element1->template get_dof_transformation_function(true, true, - false); + = element1->template get_pre_dof_transformation_function(true, true, + false); // Create working array std::vector local0(element0->space_dimension()); @@ -458,11 +458,11 @@ void interpolate_nonmatching_maps(Function& u1, const Function& u0, const int bs0 = element0->block_size(); const int bs1 = element1->block_size(); auto apply_dof_transformation0 - = element0->template get_dof_transformation_function(false, false, - false); + = element0->template get_pre_dof_transformation_function(false, false, + false); auto apply_inverse_dof_transform1 - = element1->template get_dof_transformation_function(true, true, - false); + = element1->template get_pre_dof_transformation_function(true, true, + false); // Get sizes of elements const std::size_t dim0 = element0->space_dimension() / bs0; @@ -810,8 +810,8 @@ void interpolate(Function& u, std::span f, // e.g. not Piola mapped auto apply_inv_transpose_dof_transformation - = element->template get_dof_transformation_function(true, true, - true); + = element->template get_pre_dof_transformation_function(true, true, + true); // Loop over cells for (std::size_t c = 0; c < cells.size(); ++c) @@ -854,8 +854,8 @@ void interpolate(Function& u, std::span f, assert(Pi.extent(0) == num_scalar_dofs); auto apply_inv_transpose_dof_transformation - = element->template get_dof_transformation_function(true, true, - true); + = element->template get_pre_dof_transformation_function(true, true, + true); // Loop over cells std::vector ref_data_b(num_interp_points); @@ -949,7 +949,7 @@ void interpolate(Function& u, std::span f, const std::span&, std::int32_t, int)> apply_inverse_transpose_dof_transformation - = element->template get_dof_transformation_function(true, true); + = element->template get_pre_dof_transformation_function(true, true); // Get interpolation operator const auto [_Pi, pi_shape] = element->interpolation_operator(); diff --git a/cpp/dolfinx/fem/utils.h b/cpp/dolfinx/fem/utils.h index 54b0ae5c2b8..feb05e48725 100644 --- a/cpp/dolfinx/fem/utils.h +++ b/cpp/dolfinx/fem/utils.h @@ -864,7 +864,7 @@ void pack_coefficient_entity(std::span c, int cstride, assert(element); int space_dim = element->space_dimension(); auto transformation - = element->template get_dof_transformation_function(false, true); + = element->template get_pre_dof_transformation_function(false, true); const int bs = dofmap.bs(); switch (bs) { diff --git a/cpp/dolfinx/io/vtk_utils.h b/cpp/dolfinx/io/vtk_utils.h index 6b0126672d3..0840853e464 100644 --- a/cpp/dolfinx/io/vtk_utils.h +++ b/cpp/dolfinx/io/vtk_utils.h @@ -99,7 +99,7 @@ tabulate_lagrange_dof_coordinates(const fem::FunctionSpace& V) cell_info = std::span(mesh->topology()->get_cell_permutation_info()); } auto apply_dof_transformation - = element->template get_dof_transformation_function(); + = element->template get_pre_dof_transformation_function(); using mdspan2_t = MDSPAN_IMPL_STANDARD_NAMESPACE::mdspan< T, MDSPAN_IMPL_STANDARD_NAMESPACE::dextents>; diff --git a/python/dolfinx/wrappers/fem.cpp b/python/dolfinx/wrappers/fem.cpp index 9e988a32bcb..aa260d79f2d 100644 --- a/python/dolfinx/wrappers/fem.cpp +++ b/python/dolfinx/wrappers/fem.cpp @@ -130,64 +130,64 @@ void declare_function_space(nb::module_& m, std::string type) }, nb::rv_policy::reference_internal) .def( - "apply_dof_transformation", + "pre_apply_dof_transformation", [](const dolfinx::fem::FiniteElement& self, nb::ndarray, nb::c_contig> x, std::uint32_t cell_permutation, int dim) { - self.apply_dof_transformation(std::span(x.data(), x.size()), - cell_permutation, dim); + self.pre_apply_dof_transformation(std::span(x.data(), x.size()), + cell_permutation, dim); }, nb::arg("x"), nb::arg("cell_permutation"), nb::arg("dim")) .def( - "apply_transpose_dof_transformation", + "pre_apply_transpose_dof_transformation", [](const dolfinx::fem::FiniteElement& self, nb::ndarray, nb::c_contig> x, std::uint32_t cell_permutation, int dim) { - self.apply_transpose_dof_transformation( + self.pre_apply_transpose_dof_transformation( std::span(x.data(), x.size()), cell_permutation, dim); }, nb::arg("x"), nb::arg("cell_permutation"), nb::arg("dim")) .def( - "apply_inverse_transpose_dof_transformation", + "pre_apply_inverse_transpose_dof_transformation", [](const dolfinx::fem::FiniteElement& self, nb::ndarray, nb::c_contig> x, std::uint32_t cell_permutation, int dim) { - self.apply_inverse_transpose_dof_transformation( + self.pre_apply_inverse_transpose_dof_transformation( std::span(x.data(), x.size()), cell_permutation, dim); }, nb::arg("x"), nb::arg("cell_permutation"), nb::arg("dim")) .def( - "apply_dof_transformation", + "pre_apply_dof_transformation", [](const dolfinx::fem::FiniteElement& self, nb::ndarray, nb::ndim<1>, nb::c_contig> x, std::uint32_t cell_permutation, int dim) { - self.apply_dof_transformation( + self.pre_apply_dof_transformation( std::span((std::complex*)x.data(), x.size()), cell_permutation, dim); }, nb::arg("x"), nb::arg("cell_permutation"), nb::arg("dim")) .def( - "apply_transpose_dof_transformation", + "pre_apply_transpose_dof_transformation", [](const dolfinx::fem::FiniteElement& self, nb::ndarray, nb::ndim<1>, nb::c_contig> x, std::uint32_t cell_permutation, int dim) { - self.apply_transpose_dof_transformation( + self.pre_apply_transpose_dof_transformation( std::span((std::complex*)x.data(), x.size()), cell_permutation, dim); }, nb::arg("x"), nb::arg("cell_permutation"), nb::arg("dim")) .def( - "apply_inverse_transpose_dof_transformation", + "pre_apply_inverse_transpose_dof_transformation", [](const dolfinx::fem::FiniteElement& self, nb::ndarray, nb::ndim<1>, nb::c_contig> x, std::uint32_t cell_permutation, int dim) { - self.apply_inverse_transpose_dof_transformation( + self.pre_apply_inverse_transpose_dof_transformation( std::span(x.data(), x.shape(0) * x.shape(1)), cell_permutation, dim); }, From d26785a5ff57738bdcb6e1ebc29a06dd2ffe3fc5 Mon Sep 17 00:00:00 2001 From: Matthew Scroggs Date: Mon, 13 Nov 2023 16:26:13 +0000 Subject: [PATCH 3/4] update more names --- cpp/dolfinx/fem/Expression.h | 6 ++-- cpp/dolfinx/fem/assemble_matrix_impl.h | 40 +++++++++++++------------- cpp/dolfinx/fem/assemble_vector_impl.h | 26 ++++++++--------- 3 files changed, 36 insertions(+), 36 deletions(-) diff --git a/cpp/dolfinx/fem/Expression.h b/cpp/dolfinx/fem/Expression.h index 40fa0a343f2..53ab0b0418c 100644 --- a/cpp/dolfinx/fem/Expression.h +++ b/cpp/dolfinx/fem/Expression.h @@ -175,7 +175,7 @@ class Expression std::function&, const std::span&, std::int32_t, int)> - dof_transform_to_transpose + post_dof_transform = [](const std::span&, const std::span&, std::int32_t, int) { @@ -193,7 +193,7 @@ class Expression { mesh.topology_mutable()->create_entity_permutations(); cell_info = std::span(mesh.topology()->get_cell_permutation_info()); - dof_transform_to_transpose + post_dof_transform = element ->template get_post_dof_transformation_function( false, true); @@ -220,7 +220,7 @@ class Expression _fn(values_local.data(), coeff_cell, constant_data.data(), coord_dofs.data(), nullptr, nullptr); - dof_transform_to_transpose(values_local, cell_info, c, size0); + post_dof_transform(values_local, cell_info, c, size0); for (std::size_t j = 0; j < values_local.size(); ++j) values[c * vshape[1] + j] = values_local[j]; } diff --git a/cpp/dolfinx/fem/assemble_matrix_impl.h b/cpp/dolfinx/fem/assemble_matrix_impl.h index 98c8a1bf3ce..2198682ec5b 100644 --- a/cpp/dolfinx/fem/assemble_matrix_impl.h +++ b/cpp/dolfinx/fem/assemble_matrix_impl.h @@ -36,11 +36,11 @@ void assemble_cells( std::span cells, const std::function&, const std::span&, - std::int32_t, int)>& dof_transform, + std::int32_t, int)>& pre_dof_transform, mdspan2_t dofmap0, int bs0, const std::function&, const std::span&, - std::int32_t, int)>& dof_transform_to_transpose, + std::int32_t, int)>& post_dof_transform, mdspan2_t dofmap1, int bs1, std::span bc0, std::span bc1, FEkernel auto kernel, std::span coeffs, int cstride, std::span constants, @@ -78,8 +78,8 @@ void assemble_cells( kernel(Ae.data(), coeffs.data() + index * cstride, constants.data(), coordinate_dofs.data(), nullptr, nullptr); - dof_transform(_Ae, cell_info, c, ndim1); - dof_transform_to_transpose(_Ae, cell_info, c, ndim0); + pre_dof_transform(_Ae, cell_info, c, ndim1); + post_dof_transform(_Ae, cell_info, c, ndim0); // Zero rows/columns for essential bcs auto dofs0 = std::span(dofmap0.data_handle() + c * num_dofs0, num_dofs0); @@ -130,11 +130,11 @@ void assemble_exterior_facets( std::span facets, const std::function&, const std::span&, - std::int32_t, int)>& dof_transform, + std::int32_t, int)>& pre_dof_transform, mdspan2_t dofmap0, int bs0, const std::function&, const std::span&, - std::int32_t, int)>& dof_transform_to_transpose, + std::int32_t, int)>& post_dof_transform, mdspan2_t dofmap1, int bs1, std::span bc0, std::span bc1, FEkernel auto kernel, std::span coeffs, int cstride, std::span constants, @@ -172,8 +172,8 @@ void assemble_exterior_facets( kernel(Ae.data(), coeffs.data() + index / 2 * cstride, constants.data(), coordinate_dofs.data(), &local_facet, nullptr); - dof_transform(_Ae, cell_info, cell, ndim1); - dof_transform_to_transpose(_Ae, cell_info, cell, ndim0); + pre_dof_transform(_Ae, cell_info, cell, ndim1); + post_dof_transform(_Ae, cell_info, cell, ndim0); // Zero rows/columns for essential bcs auto dofs0 = std::span(dofmap0.data_handle() + cell * num_dofs0, num_dofs0); @@ -222,11 +222,11 @@ void assemble_interior_facets( std::span facets, const std::function&, const std::span&, - std::int32_t, int)>& dof_transform, + std::int32_t, int)>& pre_dof_transform, const DofMap& dofmap0, int bs0, const std::function&, const std::span&, - std::int32_t, int)>& dof_transform_to_transpose, + std::int32_t, int)>& post_dof_transform, const DofMap& dofmap1, int bs1, std::span bc0, std::span bc1, FEkernel auto kernel, std::span coeffs, int cstride, std::span offsets, @@ -314,10 +314,10 @@ void assemble_interior_facets( // (3 rows/columns for each cell). Subspans are used to offset to the right // blocks of the matrix - dof_transform(_Ae, cell_info, cells[0], num_cols); - dof_transform(sub_Ae0, cell_info, cells[1], num_cols); - dof_transform_to_transpose(_Ae, cell_info, cells[0], num_rows); - dof_transform_to_transpose(sub_Ae1, cell_info, cells[1], num_rows); + pre_dof_transform(_Ae, cell_info, cells[0], num_cols); + pre_dof_transform(sub_Ae0, cell_info, cells[1], num_cols); + post_dof_transform(_Ae, cell_info, cells[0], num_rows); + post_dof_transform(sub_Ae1, cell_info, cells[1], num_rows); // Zero rows/columns for essential bcs if (!bc0.empty()) @@ -389,11 +389,11 @@ void assemble_matrix( assert(element1); const std::function&, const std::span&, std::int32_t, - int)>& dof_transform + int)>& pre_dof_transform = element0->template get_pre_dof_transformation_function(); const std::function&, const std::span&, std::int32_t, - int)>& dof_transform_to_transpose + int)>& post_dof_transform = element1->template get_post_dof_transformation_function(false, true); const bool needs_transformation_data @@ -413,7 +413,7 @@ void assemble_matrix( assert(fn); auto& [coeffs, cstride] = coefficients.at({IntegralType::cell, i}); impl::assemble_cells(mat_set, x_dofmap, x, a.domain(IntegralType::cell, i), - dof_transform, dofs0, bs0, dof_transform_to_transpose, + pre_dof_transform, dofs0, bs0, post_dof_transform, dofs1, bs1, bc0, bc1, fn, coeffs, cstride, constants, cell_info); } @@ -426,7 +426,7 @@ void assemble_matrix( = coefficients.at({IntegralType::exterior_facet, i}); impl::assemble_exterior_facets( mat_set, x_dofmap, x, a.domain(IntegralType::exterior_facet, i), - dof_transform, dofs0, bs0, dof_transform_to_transpose, dofs1, bs1, bc0, + pre_dof_transform, dofs0, bs0, post_dof_transform, dofs1, bs1, bc0, bc1, fn, coeffs, cstride, constants, cell_info); } @@ -457,8 +457,8 @@ void assemble_matrix( = coefficients.at({IntegralType::interior_facet, i}); impl::assemble_interior_facets( mat_set, x_dofmap, x, num_cell_facets, - a.domain(IntegralType::interior_facet, i), dof_transform, *dofmap0, - bs0, dof_transform_to_transpose, *dofmap1, bs1, bc0, bc1, fn, coeffs, + a.domain(IntegralType::interior_facet, i), pre_dof_transform, *dofmap0, + bs0, post_dof_transform, *dofmap1, bs1, bc0, bc1, fn, coeffs, cstride, c_offsets, constants, cell_info, get_perm); } } diff --git a/cpp/dolfinx/fem/assemble_vector_impl.h b/cpp/dolfinx/fem/assemble_vector_impl.h index 2ce76809368..9057c27660c 100644 --- a/cpp/dolfinx/fem/assemble_vector_impl.h +++ b/cpp/dolfinx/fem/assemble_vector_impl.h @@ -45,7 +45,7 @@ void _lift_bc_cells( std::span cells, const std::function&, const std::span&, - std::int32_t, int)>& dof_transform, + std::int32_t, int)>& pre_dof_transform, mdspan2_t dofmap0, int bs0, const std::function&, const std::span&, @@ -129,7 +129,7 @@ void _lift_bc_cells( std::fill(Ae.begin(), Ae.end(), 0); kernel(Ae.data(), coeff_array, constants.data(), coordinate_dofs.data(), nullptr, nullptr); - dof_transform(Ae, cell_info, c, num_cols); + pre_dof_transform(Ae, cell_info, c, num_cols); post_dof_transpose(Ae, cell_info, c, num_rows); // Size data structure for assembly @@ -201,7 +201,7 @@ void _lift_bc_exterior_facets( std::span facets, const std::function&, const std::span&, - std::int32_t, int)>& dof_transform, + std::int32_t, int)>& pre_dof_transform, mdspan2_t dofmap0, int bs0, const std::function&, const std::span&, @@ -268,7 +268,7 @@ void _lift_bc_exterior_facets( std::fill(Ae.begin(), Ae.end(), 0); kernel(Ae.data(), coeff_array, constants.data(), coordinate_dofs.data(), &local_facet, nullptr); - dof_transform(Ae, cell_info, cell, num_cols); + pre_dof_transform(Ae, cell_info, cell, num_cols); post_dof_transpose(Ae, cell_info, cell, num_rows); // Size data structure for assembly @@ -309,7 +309,7 @@ void _lift_bc_interior_facets( FEkernel auto kernel, std::span facets, const std::function&, const std::span&, - std::int32_t, int)>& dof_transform, + std::int32_t, int)>& pre_dof_transform, mdspan2_t dofmap0, int bs0, const std::function&, const std::span&, @@ -432,8 +432,8 @@ void _lift_bc_interior_facets( = _Ae.subspan(bs1 * dmap1_cell0.size(), num_rows * num_cols - bs1 * dmap1_cell0.size()); - dof_transform(_Ae, cell_info, cells[0], num_cols); - dof_transform(sub_Ae0, cell_info, cells[1], num_cols); + pre_dof_transform(_Ae, cell_info, cells[0], num_cols); + pre_dof_transform(sub_Ae0, cell_info, cells[1], num_cols); post_dof_transpose(_Ae, cell_info, cells[0], num_rows); post_dof_transpose(sub_Ae1, cell_info, cells[1], num_rows); @@ -776,7 +776,7 @@ void lift_bc(std::span b, const Form& a, mdspan2_t x_dofmap, const std::function&, const std::span&, std::int32_t, int)> - dof_transform + pre_dof_transform = element0->template get_pre_dof_transformation_function(); const std::function&, const std::span&, std::int32_t, @@ -792,21 +792,21 @@ void lift_bc(std::span b, const Form& a, mdspan2_t x_dofmap, std::span cells = a.domain(IntegralType::cell, i); if (bs0 == 1 and bs1 == 1) { - _lift_bc_cells(b, x_dofmap, x, kernel, cells, dof_transform, + _lift_bc_cells(b, x_dofmap, x, kernel, cells, pre_dof_transform, dofmap0, bs0, post_dof_transpose, dofmap1, bs1, constants, coeffs, cstride, cell_info, bc_values1, bc_markers1, x0, scale); } else if (bs0 == 3 and bs1 == 3) { - _lift_bc_cells(b, x_dofmap, x, kernel, cells, dof_transform, + _lift_bc_cells(b, x_dofmap, x, kernel, cells, pre_dof_transform, dofmap0, bs0, post_dof_transpose, dofmap1, bs1, constants, coeffs, cstride, cell_info, bc_values1, bc_markers1, x0, scale); } else { - _lift_bc_cells(b, x_dofmap, x, kernel, cells, dof_transform, dofmap0, bs0, + _lift_bc_cells(b, x_dofmap, x, kernel, cells, pre_dof_transform, dofmap0, bs0, post_dof_transpose, dofmap1, bs1, constants, coeffs, cstride, cell_info, bc_values1, bc_markers1, x0, scale); } @@ -820,7 +820,7 @@ void lift_bc(std::span b, const Form& a, mdspan2_t x_dofmap, = coefficients.at({IntegralType::exterior_facet, i}); _lift_bc_exterior_facets(b, x_dofmap, x, kernel, a.domain(IntegralType::exterior_facet, i), - dof_transform, dofmap0, bs0, post_dof_transpose, + pre_dof_transform, dofmap0, bs0, post_dof_transpose, dofmap1, bs1, constants, coeffs, cstride, cell_info, bc_values1, bc_markers1, x0, scale); } @@ -851,7 +851,7 @@ void lift_bc(std::span b, const Form& a, mdspan2_t x_dofmap, = coefficients.at({IntegralType::interior_facet, i}); _lift_bc_interior_facets( b, x_dofmap, x, num_cell_facets, kernel, - a.domain(IntegralType::interior_facet, i), dof_transform, dofmap0, + a.domain(IntegralType::interior_facet, i), pre_dof_transform, dofmap0, bs0, post_dof_transpose, dofmap1, bs1, constants, coeffs, cstride, cell_info, get_perm, bc_values1, bc_markers1, x0, scale); } From 1169e54ad4e34d9dbd3113261a4d7c9460f09d6a Mon Sep 17 00:00:00 2001 From: Matthew Scroggs Date: Wed, 15 Nov 2023 14:37:51 +0000 Subject: [PATCH 4/4] basix main --- .circleci/config.yml | 2 +- .github/workflows/ccpp.yml | 2 +- .github/workflows/macos.yml | 2 +- .github/workflows/oneapi.yml | 2 +- .github/workflows/pyvista.yml | 2 +- .github/workflows/redhat.yml | 2 +- .github/workflows/sonarcloud.yml | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index baf8af64e6a..dd6a7c9c6cc 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -3,7 +3,7 @@ version: 2.1 install-python-components: &install-python-components name: Install FEniCS Python components command: | - git clone https://github.com/FEniCS/basix.git --branch mscroggs/rename-dof-transformation_functions --single-branch + git clone https://github.com/FEniCS/basix.git --branch main --single-branch cmake -G Ninja -DCMAKE_BUILD_TYPE=Release -B build-dir -S ./basix/cpp cmake --build build-dir --parallel 3 cmake --install build-dir diff --git a/.github/workflows/ccpp.yml b/.github/workflows/ccpp.yml index c697ab6c32d..7d1a39bbde4 100644 --- a/.github/workflows/ccpp.yml +++ b/.github/workflows/ccpp.yml @@ -51,7 +51,7 @@ jobs: if: github.event_name != 'workflow_dispatch' run: | python3 -m pip install git+https://github.com/FEniCS/ufl.git - python3 -m pip install git+https://github.com/FEniCS/basix.git@mscroggs/rename-dof-transformation_functions + python3 -m pip install git+https://github.com/FEniCS/basix.git python3 -m pip install git+https://github.com/FEniCS/ffcx.git - name: Install FEniCS Python components if: github.event_name == 'workflow_dispatch' diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index de608919175..0e391ff08c6 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -50,7 +50,7 @@ jobs: - name: Install FEniCSx dependencies run: | - python -m pip install git+https://github.com/FEniCS/basix.git@mscroggs/rename-dof-transformation_functions + python -m pip install git+https://github.com/FEniCS/basix.git python -m pip install git+https://github.com/FEniCS/ufl.git python -m pip install git+https://github.com/FEniCS/ffcx.git diff --git a/.github/workflows/oneapi.yml b/.github/workflows/oneapi.yml index ad84ef242b4..dc4963929be 100644 --- a/.github/workflows/oneapi.yml +++ b/.github/workflows/oneapi.yml @@ -34,7 +34,7 @@ jobs: - name: Install Basix run: | . /opt/intel/oneapi/setvars.sh - pip install git+https://github.com/FEniCS/basix.git@mscroggs/rename-dof-transformation_functions + pip install git+https://github.com/FEniCS/basix.git - name: Clone FFCx uses: actions/checkout@v4 diff --git a/.github/workflows/pyvista.yml b/.github/workflows/pyvista.yml index f4dee9cf91f..f82d117c632 100644 --- a/.github/workflows/pyvista.yml +++ b/.github/workflows/pyvista.yml @@ -38,7 +38,7 @@ jobs: - name: Install FEniCS Python components run: | python3 -m pip install git+https://github.com/FEniCS/ufl.git - python3 -m pip install git+https://github.com/FEniCS/basix.git@mscroggs/rename-dof-transformation_functions + python3 -m pip install git+https://github.com/FEniCS/basix.git python3 -m pip install git+https://github.com/FEniCS/ffcx.git apt-get update apt-get install -y --no-install-recommends libgl1-mesa-dev xvfb # pyvista diff --git a/.github/workflows/redhat.yml b/.github/workflows/redhat.yml index 1fd6a9c607f..4182f6d6fc1 100644 --- a/.github/workflows/redhat.yml +++ b/.github/workflows/redhat.yml @@ -27,7 +27,7 @@ jobs: - name: Install FEniCS Python components run: | python3 -m pip install git+https://github.com/FEniCS/ufl.git - python3 -m pip install git+https://github.com/FEniCS/basix.git@mscroggs/rename-dof-transformation_functions + python3 -m pip install git+https://github.com/FEniCS/basix.git python3 -m pip install git+https://github.com/FEniCS/ffcx.git - name: Configure C++ diff --git a/.github/workflows/sonarcloud.yml b/.github/workflows/sonarcloud.yml index 8a322be0856..808456ced4b 100644 --- a/.github/workflows/sonarcloud.yml +++ b/.github/workflows/sonarcloud.yml @@ -59,7 +59,7 @@ jobs: - name: Install FEniCS Python components run: | python3 -m pip install git+https://github.com/FEniCS/ufl.git - python3 -m pip install git+https://github.com/FEniCS/basix.git@mscroggs/rename-dof-transformation_functions + python3 -m pip install git+https://github.com/FEniCS/basix.git python3 -m pip install git+https://github.com/FEniCS/ffcx.git - name: Run build-wrapper run: |