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

Fix out-of-bounds and timeout with bounds checking #193

Merged
merged 2 commits into from
Apr 2, 2018
Merged

Fix out-of-bounds and timeout with bounds checking #193

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
125d11d
Fix out-of-bounds and timeout with bounds checking
ibaned Mar 25, 2018
8dd54a9
Fix CMake logic to disable slow test
ibaned Mar 26, 2018
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
4 changes: 2 additions & 2 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 @@ -899,8 +899,8 @@ bool KokkosSPGEMM
nnz_lno_t compressed_maxNumRoughZeros = 0;
size_t compressedoverall_flops = 0;
Kokkos::Impl::Timer timer1_t;
auto new_row_mapB_begin = Kokkos::subview (out_row_map, std::make_pair (nnz_lno_t(0), b_row_cnt - 1));
auto new_row_mapB_end = Kokkos::subview (out_row_map, std::make_pair (nnz_lno_t(1), b_row_cnt));
auto new_row_mapB_begin = Kokkos::subview (out_row_map, std::make_pair (nnz_lno_t(0), b_row_cnt));
auto new_row_mapB_end = Kokkos::subview (out_row_map, std::make_pair (nnz_lno_t(1), b_row_cnt + 1));
row_lno_persistent_work_view_t compressed_flops_per_row(Kokkos::ViewAllocateWithoutInitializing("origianal row flops"), a_row_cnt);

compressed_maxNumRoughZeros = this->getMaxRoughRowNNZ(a_row_cnt, row_mapA, entriesA, new_row_mapB_begin, new_row_mapB_end, compressed_flops_per_row.data());
Expand Down
12 changes: 6 additions & 6 deletions src/sparse/impl/KokkosSparse_spgemm_impl_def.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,8 +96,8 @@ void KokkosSPGEMM
nnz_lno_t maxNumRoughZeros = 0;
size_t overall_flops = 0;
Kokkos::Impl::Timer timer1;
auto new_row_mapB_begin = Kokkos::subview (row_mapB, std::make_pair (nnz_lno_t(0), b_row_cnt - 1));
auto new_row_mapB_end = Kokkos::subview (row_mapB, std::make_pair (nnz_lno_t(1), b_row_cnt));
auto new_row_mapB_begin = Kokkos::subview (row_mapB, std::make_pair (nnz_lno_t(0), b_row_cnt));
auto new_row_mapB_end = Kokkos::subview (row_mapB, std::make_pair (nnz_lno_t(1), b_row_cnt + 1));
row_lno_persistent_work_view_t flops_per_row(Kokkos::ViewAllocateWithoutInitializing("origianal row flops"), a_row_cnt);

//get maximum row flops.
Expand Down Expand Up @@ -170,8 +170,8 @@ void KokkosSPGEMM
}
else {
nnz_lno_t begin = 0;
auto new_row_mapB_begin = Kokkos::subview (new_row_mapB, std::make_pair (begin, n - 1));
auto new_row_mapB_end = Kokkos::subview (new_row_mapB, std::make_pair (begin + 1, n));
auto new_row_mapB_begin = Kokkos::subview (new_row_mapB, std::make_pair (begin, n));
auto new_row_mapB_end = Kokkos::subview (new_row_mapB, std::make_pair (begin + 1, n + 1));

//calling symbolic structure
this->symbolic_c(a_row_cnt, row_mapA, entriesA,
Expand All @@ -189,8 +189,8 @@ void KokkosSPGEMM
std::cout << "SYMBOLIC PHASE -- NO COMPRESSION: maxNumRoughZeros:" << maxNumRoughZeros << std::endl;
}

auto new_row_mapB_begin = Kokkos::subview (this->row_mapB, std::make_pair (nnz_lno_t(0), n - 1));
auto new_row_mapB_end = Kokkos::subview (this->row_mapB, std::make_pair (nnz_lno_t(1), n));
auto new_row_mapB_begin = Kokkos::subview (this->row_mapB, std::make_pair (nnz_lno_t(0), n));
auto new_row_mapB_end = Kokkos::subview (this->row_mapB, std::make_pair (nnz_lno_t(1), n + 1));

//calling symbolic structure
this->symbolic_c_no_compression(
Expand Down
5 changes: 5 additions & 0 deletions unit_test/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,11 +136,16 @@ IF (Kokkos_ENABLE_Serial)

APPEND_GLOB(SERIAL_BLAS_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/serial/Test_Serial_Blas*.cpp)

IF (KOKKOS_ENABLE_DEBUG)
SET(DISABLE_SLOW_DGEMM_DOUBLE_TEST "--gtest_filter=-serial.gemm_double")
ENDIF()

TRIBITS_ADD_EXECUTABLE_AND_TEST(
blas_serial
SOURCES
Test_Main.cpp
${SERIAL_BLAS_SOURCES}
ARGS ${DISABLE_SLOW_DGEMM_DOUBLE_TEST}
COMM serial mpi
NUM_MPI_PROCS 1
TESTONLYLIBS kokkoskernels_gtest
Expand Down