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

Remove all references to the Kokkos QThreads backend #1238

Merged
merged 2 commits into from
Jan 7, 2022
Merged

Remove all references to the Kokkos QThreads backend #1238

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
165ed22
Remove mentions to QThreads backend that was removed since Kokkos 3.1
dalg24 Dec 17, 2021
76dd025
Remove other bogus reference to the QThreads backend
dalg24 Dec 17, 2021
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
9 changes: 1 addition & 8 deletions src/common/KokkosKernels_ExecSpaceUtils.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,6 @@ enum ExecSpaceType {
Exec_SERIAL,
Exec_OMP,
Exec_PTHREADS,
Exec_QTHREADS,
Exec_CUDA,
Exec_HIP,
Exec_SYCL
Expand Down Expand Up @@ -100,11 +99,6 @@ KOKKOS_FORCEINLINE_FUNCTION ExecSpaceType kk_get_exec_space_type() {
}
#endif

#if defined(KOKKOS_ENABLE_QTHREAD)
Copy link
Member Author

Choose a reason for hiding this comment

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

Note that it was misspelled KOKKOS_ENABLE_QTHREAD[S]

if (std::is_same<Kokkos::Qthread, ExecutionSpace>::value) {
exec_space = Exec_QTHREADS;
}
#endif
return exec_space;
}

Expand Down Expand Up @@ -218,8 +212,7 @@ inline int kk_get_suggested_vector_size(const size_t nr, const size_t nnz,
default: break;
case Exec_SERIAL:
case Exec_OMP:
case Exec_PTHREADS:
case Exec_QTHREADS: break;
case Exec_PTHREADS: break;
case Exec_CUDA:
case Exec_HIP:
if (nr > 0) suggested_vector_size_ = nnz / double(nr) + 0.5;
Expand Down
10 changes: 0 additions & 10 deletions src/sparse/KokkosSparse_spgemm_handle.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -568,16 +568,6 @@ class SPGEMMHandle {
#endif
}
#endif

#if defined(KOKKOS_ENABLE_QTHREAD)
if (std::is_same<Kokkos::Qthread, ExecutionSpace>::value) {
this->algorithm_type = SPGEMM_SERIAL;
#ifdef VERBOSE
std::cout << "Qthread Execution Space, Default Algorithm: SPGEMM_SERIAL"
<< std::endl;
#endif
}
#endif
}

void set_compression(bool compress_second_matrix_) {
Expand Down
4 changes: 0 additions & 4 deletions src/sparse/impl/KokkosSparse_spgemm_impl_compression.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -210,10 +210,6 @@ struct KokkosSPGEMM<HandleType, a_row_view_t_, a_lno_nnz_view_t_,
case KokkosKernels::Impl::Exec_PTHREADS:
return Kokkos::Threads::impl_hardware_thread_id();
#endif
#if defined(KOKKOS_ENABLE_QTHREAD)
case KokkosKernels::Impl::Exec_QTHREADS:
return 0; // Kokkos does not have a thread_id API for Qthreads
#endif
#if defined(KOKKOS_ENABLE_CUDA)
case KokkosKernels::Impl::Exec_CUDA: return row_index;
#endif
Expand Down
4 changes: 0 additions & 4 deletions src/sparse/impl/KokkosSparse_spgemm_impl_kkmem.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -261,10 +261,6 @@ struct KokkosSPGEMM<HandleType, a_row_view_t_, a_lno_nnz_view_t_,
case KokkosKernels::Impl::Exec_PTHREADS:
return Kokkos::Threads::impl_hardware_thread_id();
#endif
#if defined(KOKKOS_ENABLE_QTHREAD)
case KokkosKernels::Impl::Exec_QTHREADS:
return 0; // Kokkos does not have a thread_id API for Qthreads
#endif
#if defined(KOKKOS_ENABLE_CUDA)
case KokkosKernels::Impl::Exec_CUDA: return row_index;
#endif
Expand Down
4 changes: 0 additions & 4 deletions src/sparse/impl/KokkosSparse_spgemm_impl_speed.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,10 +125,6 @@ struct KokkosSPGEMM<HandleType, a_row_view_t_, a_lno_nnz_view_t_,
case KokkosKernels::Impl::Exec_PTHREADS:
return Kokkos::Threads::impl_hardware_thread_id();
#endif
#if defined(KOKKOS_ENABLE_QTHREAD)
case KokkosKernels::Impl::Exec_QTHREADS:
return 0; // Kokkos does not have a thread_id API for Qthreads
#endif
#if defined(KOKKOS_ENABLE_CUDA)
case KokkosKernels::Impl::Exec_CUDA: return row_index;
#endif
Expand Down
12 changes: 0 additions & 12 deletions src/sparse/impl/KokkosSparse_spgemm_impl_symbolic.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,10 +189,6 @@ struct KokkosSPGEMM<HandleType, a_row_view_t_, a_lno_nnz_view_t_,
case KokkosKernels::Impl::Exec_PTHREADS:
return Kokkos::Threads::impl_hardware_thread_id();
#endif
#if defined(KOKKOS_ENABLE_QTHREAD)
case KokkosKernels::Impl::Exec_QTHREADS:
return 0; // Kokkos does not have a thread_id API for Qthreads
#endif
#if defined(KOKKOS_ENABLE_CUDA)
case KokkosKernels::Impl::Exec_CUDA: return row_index;
#endif
Expand Down Expand Up @@ -746,10 +742,6 @@ struct KokkosSPGEMM<HandleType, a_row_view_t_, a_lno_nnz_view_t_,
case KokkosKernels::Impl::Exec_PTHREADS:
return Kokkos::Threads::impl_hardware_thread_id();
#endif
#if defined(KOKKOS_ENABLE_QTHREAD)
case KokkosKernels::Impl::Exec_QTHREADS:
return 0; // Kokkos does not have a thread_id API for Qthreads
#endif
#if defined(KOKKOS_ENABLE_CUDA)
case KokkosKernels::Impl::Exec_CUDA: return row_index;
#endif
Expand Down Expand Up @@ -2548,10 +2540,6 @@ struct KokkosSPGEMM<HandleType, a_row_view_t_, a_lno_nnz_view_t_,
case KokkosKernels::Impl::Exec_PTHREADS:
return Kokkos::Threads::impl_hardware_thread_id();
#endif
#if defined(KOKKOS_ENABLE_QTHREAD)
case KokkosKernels::Impl::Exec_QTHREADS:
return 0; // Kokkos does not have a thread_id API for Qthreads
#endif
#if defined(KOKKOS_ENABLE_CUDA)
case KokkosKernels::Impl::Exec_CUDA: return row_index;
#endif
Expand Down
4 changes: 0 additions & 4 deletions src/sparse/impl/KokkosSparse_spgemm_impl_triangle.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -200,10 +200,6 @@ struct KokkosSPGEMM<HandleType, a_row_view_t_, a_lno_nnz_view_t_,
case KokkosKernels::Impl::Exec_PTHREADS:
return Kokkos::Threads::impl_hardware_thread_id();
#endif
#if defined(KOKKOS_ENABLE_QTHREAD)
case KokkosKernels::Impl::Exec_QTHREADS:
return 0; // Kokkos does not have a thread_id API for Qthreads
#endif
#if defined(KOKKOS_ENABLE_CUDA)
case KokkosKernels::Impl::Exec_CUDA: return row_index;
#endif
Expand Down
4 changes: 0 additions & 4 deletions src/sparse/impl/KokkosSparse_spgemm_impl_triangle_no_compression.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -195,10 +195,6 @@ struct KokkosSPGEMM<HandleType, a_row_view_t_, a_lno_nnz_view_t_,
case KokkosKernels::Impl::Exec_PTHREADS:
return Kokkos::Threads::impl_hardware_thread_id();
#endif
#if defined(KOKKOS_ENABLE_QTHREAD)
case KokkosKernels::Impl::Exec_QTHREADS:
return 0; // Kokkos does not have a thread_id API for Qthreads
#endif
#if defined(KOKKOS_ENABLE_CUDA)
case KokkosKernels::Impl::Exec_CUDA: return row_index;
#endif
Expand Down
4 changes: 0 additions & 4 deletions src/sparse/impl/KokkosSparse_spgemm_jacobi_denseacc_impl.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,10 +127,6 @@ struct KokkosSPGEMM<HandleType, a_row_view_t_, a_lno_nnz_view_t_,
#if defined(KOKKOS_ENABLE_THREADS)
case KokkosKernels::Impl::Exec_PTHREADS:
return Kokkos::Threads::impl_hardware_thread_id();
#endif
#if defined(KOKKOS_ENABLE_QTHREAD)
case KokkosKernels::Impl::Exec_QTHREADS:
return 0; // Kokkos does not have a thread_id API for Qthreads
#endif
}
}
Expand Down
4 changes: 0 additions & 4 deletions src/sparse/impl/KokkosSparse_spgemm_jacobi_sparseacc_impl.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -261,10 +261,6 @@ struct KokkosSPGEMM<HandleType, a_row_view_t_, a_lno_nnz_view_t_,
case KokkosKernels::Impl::Exec_PTHREADS:
return Kokkos::Threads::impl_hardware_thread_id();
#endif
#if defined(KOKKOS_ENABLE_QTHREAD)
case KokkosKernels::Impl::Exec_QTHREADS:
return 0; // Kokkos does not have a thread_id API for Qthreads
#endif
#if defined(KOKKOS_ENABLE_CUDA)
case KokkosKernels::Impl::Exec_CUDA: return row_index;
#endif
Expand Down