Add cusp benchmark

benchmark/CMakeLists.txt

@@ -9,7 +9,6 @@ add_subdirectory(matrix_statistics)
 add_subdirectory(preconditioner)
 add_subdirectory(solver)
 add_subdirectory(spmv)
-add_subdirectory(spmv_comparison_cuda)
 
 add_custom_target(make_run_all_benchmarks ALL)
 add_custom_command(

benchmark/matrix_generator/matrix_generator.cpp

@@ -158,7 +158,7 @@ int main(int argc, char *argv[])
             auto mdata = generator[type](config["problem"], engine);
             std::ofstream ofs(filename);
             gko::write_raw(ofs, mdata, gko::layout_type::coordinate);
-        } catch (std::exception &e) {
+        } catch (const std::exception &e) {
             std::cerr << "Error generating matrix, what(): " << e.what()
                       << std::endl;
         }

benchmark/matrix_statistics/matrix_statistics.cpp

@@ -243,7 +243,7 @@ int main(int argc, char *argv[])
             extract_matrix_statistics(matrix, test_case["problem"], allocator);
 
             backup_results(test_cases);
-        } catch (std::exception &e) {
+        } catch (const std::exception &e) {
             std::cerr << "Error extracting statistics, what(): " << e.what()
                       << std::endl;
         }

benchmark/preconditioner/preconditioner.cpp

@@ -281,7 +281,7 @@ void run_preconditioner(const char *precond_name,
     }
 
     add_or_set_member(this_precond_data, "completed", true, allocator);
-} catch (std::exception e) {
+} catch (const std::exception &e) {
     auto encoded_name = encode_parameters(precond_name);
     add_or_set_member(test_case["preconditioner"], encoded_name.c_str(),
                       rapidjson::Value(rapidjson::kObjectType), allocator);
@@ -352,7 +352,7 @@ int main(int argc, char *argv[])
                           << test_cases << std::endl;
                 backup_results(test_cases);
             }
-        } catch (std::exception &e) {
+        } catch (const std::exception &e) {
             std::cerr << "Error setting up preconditioner, what(): " << e.what()
                       << std::endl;
         }

benchmark/run_all_benchmarks.sh

@@ -35,6 +35,11 @@ if [ ! "${SYSTEM_NAME}" ]; then
     SYSTEM_NAME="unknown"
 fi
 
+if [ ! "${DEVICE_ID}" ]; then
+    echo "DEVICE_ID environment variable not set - assuming \"0\"" 1>&2
+    DEVICE_ID="0"
+fi
+
 
 ################################################################################
 # Utilities
@@ -83,6 +88,7 @@ run_spmv_benchmarks() {
     cp "$1" "$1.imd" # make sure we're not loosing the original input
     ./spmv/spmv --backup="$1.bkp" --double_buffer="$1.bkp2" \
                 --executor="${EXECUTOR}" --formats="csr,coo,hybrid,sellp,ell" \
+                --device_id="${DEVICE_ID}" \
                 <"$1.imd" 2>&1 >"$1"
     keep_latest "$1" "$1.bkp" "$1.bkp2" "$1.imd"
 }
@@ -100,6 +106,7 @@ run_solver_benchmarks() {
                     --executor="${EXECUTOR}" --solvers="cg,bicgstab,cgs,fcg" \
                     --preconditioners="${PRECONDS}" \
                     --max_iters=10000 --rel_res_goal=1e-6 \
+                    --device_id="${DEVICE_ID}" \
                     <"$1.imd" 2>&1 >"$1"
     keep_latest "$1" "$1.bkp" "$1.bkp2" "$1.imd"
 }
@@ -125,6 +132,7 @@ run_preconditioner_benchmarks() {
                 --executor="${EXECUTOR}" --preconditioners="jacobi" \
                 --max_block_size="${bsize}" \
                 --storage_optimization="${prec}" \
+                --device_id="${DEVICE_ID}" \
                 <"$1.imd" 2>&1 >"$1"
             keep_latest "$1" "$1.bkp" "$1.bkp2" "$1.imd"
         done

benchmark/solver/solver.cpp

@@ -370,7 +370,7 @@ void solve_system(
 
     // compute and write benchmark data
     add_or_set_member(solver_json, "completed", true, allocator);
-} catch (std::exception e) {
+} catch (const std::exception &e) {
     add_or_set_member(test_case["solver"][precond_solver_name], "completed",
                       false, allocator);
     std::cerr << "Error when processing test case " << test_case << "\n"
@@ -451,7 +451,7 @@ int main(int argc, char *argv[])
                     ++precond_solver_name;
                 }
             }
-        } catch (std::exception &e) {
+        } catch (const std::exception &e) {
             std::cerr << "Error setting up solver, what(): " << e.what()
                       << std::endl;
         }

benchmark/spmv/CMakeLists.txt

@@ -1,2 +1,11 @@
 add_executable(spmv spmv.cpp)
 target_link_libraries(spmv ginkgo gflags rapidjson)
+if (GINKGO_BUILD_CUDA)
+    target_compile_definitions(spmv PRIVATE HAS_CUDA=1)
+    target_link_libraries(spmv ginkgo ${CUDA_RUNTIME_LIBS}
+        ${CUBLAS} ${CUSPARSE})
+    target_include_directories(spmv SYSTEM PRIVATE ${CUDA_INCLUDE_DIRS})
+    if(CMAKE_CUDA_COMPILER_VERSION GREATER_EQUAL "9.2")
+        target_compile_definitions(spmv PRIVATE ALLOWMP=1)
+    endif()
+endif()