Skip to content

Commit

Permalink
Fix typo in spgemm perftest --help text
Browse files Browse the repository at this point in the history
Remove some deprecated stuff that no longer exists/works after kokkos#773
  • Loading branch information
brian-kelley committed Sep 21, 2020
1 parent 8d98bfb commit 4c07097
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 4 deletions.
2 changes: 1 addition & 1 deletion perf_test/sparse/KokkosSparse_spgemm.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ void print_options(){

std::cerr << "\t[Optional] BACKEND: '--threads [numThreads]' | '--openmp [numThreads]' | '--cuda [cudaDeviceIndex]' --> if none are specified, Serial is used (if enabled)" << std::endl;
std::cerr << "\t[Optional] '--algorithm [DEFAULT=KKDEFAULT=KKSPGEMM|KKMEM|KKDENSE|MKL|CUSPARSE|CUSP|VIENNA|MKL2]' --> to choose algorithm. KKMEM is outdated, use KKSPGEMM instead." << std::endl;
std::cerr << "\t[Optional] --bmtx [righ_hand_side.mtx]' for C = AxB" << std::endl;
std::cerr << "\t[Optional] --bmtx [right_hand_side.mtx]' for C = AxB" << std::endl;
std::cerr << "\t[Optional] OUTPUT MATRICES: '--cmtx [output_matrix.mtx]' --> to write output C=AxB" << std::endl;
std::cerr << "\t[Optional] --DENSEACCMAX: on CPUs default algorithm may choose to use dense accumulators. This parameter defaults to 250k, which is max k value to choose dense accumulators. This can be increased with more memory bandwidth." << std::endl;
std::cerr << "\tThe memory space used for each matrix: '--memspaces [0|1|....15]' --> Bits representing the use of HBM for Work, C, B, and A respectively. For example 12 = 1100, will store work arrays and C on HBM. A and B will be stored DDR. To use this enable multilevel memory in Kokkos, check generate_makefile.sh" << std::endl;
Expand Down
3 changes: 0 additions & 3 deletions src/sparse/KokkosSparse_spadd_handle.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -104,9 +104,6 @@ class SPADDHandle {
* \param result_nnz_size: size of the output matrix.
*/
void set_c_nnz(size_type result_nnz_size_){
#ifdef KOKKOS_ENABLE_DEPRECATED_CODE
this->max_nnz_inresult = result_nnz_size_;
#endif
this->result_nnz_size = result_nnz_size_;
}

Expand Down

0 comments on commit 4c07097

Please sign in to comment.