Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Test icpx instead of icpc #15308

Merged
merged 4 commits into from
Jun 6, 2023
Merged

Test icpx instead of icpc #15308

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
cbec86e
Test icpx instead of icpc
masterleinad Jun 5, 2023
02ddd59
Avoid a couple compiler warnings
masterleinad Jun 5, 2023
2780dd9
Try making MSVC happy
masterleinad Jun 6, 2023
9662f5a
Another try for MSVC
masterleinad Jun 6, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/linux.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -330,8 +330,8 @@ jobs:
mkdir build
cd build
cmake -D CMAKE_BUILD_TYPE=Debug \
-D CMAKE_CXX_COMPILER=icpc \
-D DEAL_II_CXX_FLAGS='-Werror' \
-D CMAKE_CXX_COMPILER=icpx \
-D DEAL_II_CXX_FLAGS='-Werror -fno-finite-math-only' \
-D DEAL_II_EARLY_DEPRECATIONS=ON \
-D DEAL_II_WITH_MPI=ON \
-D DEAL_II_WITH_LAPACK=ON \
Expand Down
2 changes: 1 addition & 1 deletion include/deal.II/grid/grid_reordering.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ DEAL_II_NAMESPACE_OPEN
* this class. Usage of the old-style numbering is deprecated.
*/
template <int dim, int spacedim = dim>
class DEAL_II_DEPRECATED GridReordering
class GridReordering
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

?? Do we use this class anywhere so that we want to un-deprecate it?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah, forgot to hit send:
All its members are deprecated so this only avoids deprecation warnings when defining those in the *.cc file.

{
public:
/**
Expand Down
2 changes: 1 addition & 1 deletion include/deal.II/multigrid/mg_transfer_global_coarsening.templates.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3857,7 +3857,7 @@ MGTwoLevelTransferNonNested<dim, LinearAlgebra::distributed::Vector<Number>>::
// on element faces or vertices and therefore, the partitioner is fine
IndexSet locally_relevant_dofs(dof_handler_fine.n_dofs());
if (!this->fine_element_is_continuous &&
!dof_handler_fine.get_fe().degree == 0)
dof_handler_fine.get_fe().degree != 0)
locally_relevant_dofs.add_indices(global_dof_indices.begin(),
global_dof_indices.end());

Expand Down
10 changes: 5 additions & 5 deletions source/base/qprojector.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -769,11 +769,11 @@ QProjector<2>::project_to_all_faces(const ReferenceCell & reference_cell,
{
const auto support_points_line =
[](const auto &face, const auto &orientation) -> std::vector<Point<2>> {
std::array<Point<2>, 2> vertices;
std::copy_n(face.first.begin(), face.first.size(), vertices.begin());
const auto temp =
ReferenceCells::Line.permute_according_orientation(vertices,
orientation);
ArrayView<const Point<2>> vertices(face.first.begin(),
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice catch!

face.first.size());
const auto temp =
ReferenceCells::Line.permute_by_combined_orientation(vertices,
orientation);
return std::vector<Point<2>>(temp.begin(),
temp.begin() + face.first.size());
};
Expand Down