From ae31f37135e0366031086114a9116a761be36aca Mon Sep 17 00:00:00 2001 From: Ruipeng Li Date: Wed, 8 Jun 2022 12:40:43 -0700 Subject: [PATCH] change binned to be the default --- src/test/ij.c | 2 +- src/test/ij_mm.c | 2 +- src/utilities/device_utils.c | 5 +++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/test/ij.c b/src/test/ij.c index db5c69f0c..816fdade9 100644 --- a/src/test/ij.c +++ b/src/test/ij.c @@ -292,7 +292,7 @@ main( hypre_int argc, spgemm_use_vendor = 1; #endif HYPRE_Int spgemm_alg = 1; - HYPRE_Int spgemm_binned = 0; + HYPRE_Int spgemm_binned = 1; HYPRE_Int spgemm_rowest_mtd = 3; HYPRE_Int spgemm_rowest_nsamples = -1; /* default */ HYPRE_Real spgemm_rowest_mult = -1.0; /* default */ diff --git a/src/test/ij_mm.c b/src/test/ij_mm.c index 5f851ac4f..0154ec0aa 100644 --- a/src/test/ij_mm.c +++ b/src/test/ij_mm.c @@ -750,7 +750,7 @@ main( hypre_int argc, HYPRE_Int verify = 0; HYPRE_Int use_vendor = 0; HYPRE_Int spgemm_alg = 1; - HYPRE_Int spgemm_binned = 0; + HYPRE_Int spgemm_binned = 1; HYPRE_Int rowest_mtd = 3; HYPRE_Int rowest_nsamples = -1; /* default */ HYPRE_Real rowest_mult = -1.0; /* default */ diff --git a/src/utilities/device_utils.c b/src/utilities/device_utils.c index 1ff8ab1ad..11cef1e42 100644 --- a/src/utilities/device_utils.c +++ b/src/utilities/device_utils.c @@ -35,17 +35,18 @@ hypre_DeviceDataCreate() #else hypre_DeviceDataSpgemmUseVendor(data) = 0; #endif - /* for CUDA, it seems cusparse is slow due to memory allocation inside the transposition */ #if defined(HYPRE_USING_CUDA) hypre_DeviceDataSpTransUseVendor(data) = 0; #endif + /* hypre SpGEMM parameters */ const HYPRE_Int Nsamples = 64; const HYPRE_Real sigma = 1.0 / sqrt(Nsamples - 2.0); const HYPRE_Real multfactor = 1.0 / (1.0 - 3.0 * sigma); + hypre_DeviceDataSpgemmAlgorithm(data) = 1; - hypre_DeviceDataSpgemmBinned(data) = 0; + hypre_DeviceDataSpgemmBinned(data) = 1; hypre_DeviceDataSpgemmNumBin(data) = 0; hypre_DeviceDataSpgemmHighestBin(data)[0] = 0; hypre_DeviceDataSpgemmHighestBin(data)[1] = 0;