Skip to content

Commit

Permalink
Remove obsolete and broken Daint builders
Browse files Browse the repository at this point in the history
  • Loading branch information
hkaiser committed Aug 19, 2023
1 parent c90f93e commit ea003a1
Show file tree
Hide file tree
Showing 13 changed files with 10 additions and 205 deletions.
2 changes: 1 addition & 1 deletion .jenkins/cscs/Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ pipeline {
// number of node-hours consumed
axis {
name 'configuration_name'
values 'gcc-11', 'gcc-cuda', 'clang-10', 'clang-13', 'clang-cuda', 'clang-apex'
values 'gcc-11', 'clang-10', 'clang-13', 'clang-apex'
}
axis {
name 'build_type'
Expand Down
41 changes: 0 additions & 41 deletions .jenkins/cscs/env-clang-12.sh

This file was deleted.

46 changes: 0 additions & 46 deletions .jenkins/cscs/env-clang-cuda.sh

This file was deleted.

34 changes: 0 additions & 34 deletions .jenkins/cscs/env-gcc-10.sh

This file was deleted.

28 changes: 0 additions & 28 deletions .jenkins/cscs/env-gcc-cuda.sh

This file was deleted.

7 changes: 0 additions & 7 deletions .jenkins/cscs/slurm-constraint-clang-12.sh

This file was deleted.

7 changes: 0 additions & 7 deletions .jenkins/cscs/slurm-constraint-clang-9.sh

This file was deleted.

7 changes: 0 additions & 7 deletions .jenkins/cscs/slurm-constraint-clang-cuda.sh

This file was deleted.

7 changes: 0 additions & 7 deletions .jenkins/cscs/slurm-constraint-gcc-10.sh

This file was deleted.

7 changes: 0 additions & 7 deletions .jenkins/cscs/slurm-constraint-gcc-8.sh

This file was deleted.

7 changes: 0 additions & 7 deletions .jenkins/cscs/slurm-constraint-gcc-cuda.sh

This file was deleted.

7 changes: 0 additions & 7 deletions .jenkins/cscs/slurm-constraint-icc.sh

This file was deleted.

15 changes: 9 additions & 6 deletions libs/full/collectives/tests/regressions/barrier_3792.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -20,28 +20,28 @@
#include <vector>

///////////////////////////////////////////////////////////////////////////////
void run_barrier_test1(std::vector<size_t> locs)
void run_barrier_test1(std::vector<size_t> const& locs)
{
auto loc_it = std::find(locs.begin(), locs.end(), hpx::get_locality_id());
if (loc_it == locs.end())
return;

std::size_t barrier_rank = std::distance(locs.begin(), loc_it);

std::string barrier_name =
"/loc_list/barrier" + std::to_string(locs[0]) + std::to_string(locs[1]);
std::string barrier_name = "/loc_list/barrier1" + std::to_string(locs[0]) +
std::to_string(locs[1]);
hpx::distributed::barrier b(barrier_name, locs.size(), barrier_rank);
b.wait();
}

void run_barrier_test2(std::vector<size_t> locs)
void run_barrier_test2(std::vector<size_t> const& locs)
{
auto loc_it = std::find(locs.begin(), locs.end(), hpx::get_locality_id());
if (loc_it == locs.end())
return;

std::string barrier_name =
"/loc_list/barrier" + std::to_string(locs[0]) + std::to_string(locs[1]);
std::string barrier_name = "/loc_list/barrier2" + std::to_string(locs[0]) +
std::to_string(locs[1]);
hpx::distributed::barrier b(barrier_name, locs, hpx::get_locality_id());
b.wait();
}
Expand All @@ -53,12 +53,15 @@ int hpx_main()
std::vector<size_t> locs_0{0, 1};
run_barrier_test1(locs_0);
run_barrier_test2(locs_0);

std::vector<size_t> locs_1{0, 2};
run_barrier_test1(locs_1);
run_barrier_test2(locs_1);

std::vector<size_t> locs_2{1, 2};
run_barrier_test1(locs_2);
run_barrier_test2(locs_2);

return hpx::finalize();
}

Expand Down

0 comments on commit ea003a1

Please sign in to comment.