Skip to content

Commit

Permalink
Try to get OneAPI CI working again (#3350)
Browse files Browse the repository at this point in the history
* Try to get OneAPI CI working again

* Update ET

* Mark debug with maybe_unused

* More maybe_unused

* Allow run as root\!\!\!

* Change env vars

* Try adding ssh

* Got back to MPICH

* Remove libfabric each time

* Try adding to GITHUB_ENV

* try again

* try with I_MPI_OFI_LIBRARY_INTERNAL

* revert some things not needed
  • Loading branch information
chrisrichardson authored Aug 16, 2024
1 parent e44fbfb commit ce09b5e
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 8 deletions.
5 changes: 3 additions & 2 deletions .github/workflows/oneapi.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,9 @@ jobs:
env:
CC: icx
CXX: icpx
I_MPI_CC: icx
I_MPI_CXX: icpx
MPICH_CC: icx
MPICH_CXX: icpx
I_MPI_OFI_LIBRARY_INTERNAL: 0
OMP_NUM_THREADS: 1
OPENBLAS_NUM_THREADS: 1

Expand Down
4 changes: 2 additions & 2 deletions cpp/dolfinx/graph/partitioners.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -241,7 +241,7 @@ std::vector<int> adaptive_repartition(MPI_Comm comm,
std::vector<real_t> ubvec(ncon, 1.05);

// Call ParMETIS to repartition graph
int err = ParMETIS_V3_AdaptiveRepart(
[[maybe_unused]] int err = ParMETIS_V3_AdaptiveRepart(
adj_graph.node_distribution().data(), adj_graph.nodes().data(),
adj_graph.edges().data(), elmwgt, nullptr, vsize.data(), &wgtflag,
&numflag, &ncon, &nparts, tpwgts.data(), ubvec.data(), &_itr, options,
Expand Down Expand Up @@ -291,7 +291,7 @@ std::vector<int> refine(MPI_Comm comm, const graph::AdjacencyList<T>& adj_graph)

// Call ParMETIS to partition graph
common::Timer timer1("ParMETIS: call ParMETIS_V3_RefineKway");
int err = ParMETIS_V3_RefineKway(
[[maybe_unused]] int err = ParMETIS_V3_RefineKway(
adj_graph.node_distribution().data(), adj_graph.nodes().data(),
adj_graph.edges().data(), elmwgt, nullptr, &wgtflag, &numflag, &ncon,
&nparts, tpwgts.data(), ubvec.data(), options, &edgecut, part.data(),
Expand Down
4 changes: 2 additions & 2 deletions cpp/dolfinx/mesh/Topology.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -303,7 +303,7 @@ std::array<std::vector<std::int64_t>, 2> vertex_ownership_groups(
[](std::size_t s, auto& v) { return s + v.size(); }));
for (auto c : cells_owned)
local_vertex_set.insert(local_vertex_set.end(), c.begin(), c.end());

{
dolfinx::radix_sort(local_vertex_set);
auto [unique_end, range_end] = std::ranges::unique(local_vertex_set);
Expand Down Expand Up @@ -749,7 +749,7 @@ Topology::Topology(MPI_Comm comm, const std::vector<CellType>& cell_types)
assert(!cell_types.empty());
std::int8_t tdim = cell_dim(cell_types[0]);
assert(tdim > 0);
for (auto ct : cell_types)
for ([[maybe_unused]] auto ct : cell_types)
assert(cell_dim(ct) == tdim);
_interprocess_facets.resize(1);

Expand Down
2 changes: 1 addition & 1 deletion cpp/dolfinx/mesh/permutationcomputation.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -272,7 +272,7 @@ compute_face_permutations(const mesh::Topology& topology)
"Cannot compute permutations for mixed topology mesh.");
}

const int tdim = topology.dim();
[[maybe_unused]] const int tdim = topology.dim();
assert(tdim > 2);
if (!topology.index_map(2))
throw std::runtime_error("Faces have not been computed.");
Expand Down
2 changes: 1 addition & 1 deletion cpp/dolfinx/mesh/topologycomputation.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -617,7 +617,7 @@ compute_entities_by_key_matching(
for (std::size_t k = 0; k < cell_lists.size(); ++k)
{
auto cells = std::get<1>(cell_lists[k]);
const std::size_t num_cells = cells->num_nodes();
[[maybe_unused]] const std::size_t num_cells = cells->num_nodes();
auto cell_map = std::get<2>(cell_lists[k]);
int num_entities_per_cell = cell_type_entities[k].size();
assert(cell_map->size_local() + cell_map->num_ghosts() == (int)num_cells);
Expand Down

0 comments on commit ce09b5e

Please sign in to comment.