From a29774c01cae3c2a0b3297d87c11c51f3bca6e35 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?FEL=C5=A0=C3=96CI=20Marek?= <marek.felsoci@inria.fr> Date: Sun, 5 Nov 2023 18:23:42 +0100 Subject: [PATCH] Remove HMAT divider minimum and maximum options --- include/main.h | 12 ------------ src/help.c | 2 -- src/hmat.c | 12 ------------ src/main.c | 5 ----- 4 files changed, 31 deletions(-) diff --git a/include/main.h b/include/main.h index 8420c70..85d12ef 100644 --- a/include/main.h +++ b/include/main.h @@ -45,18 +45,6 @@ extern ScalarType stype; /*! \brief Wavelength (for oscillatory kernels). */ extern double lambda; -/*! \brief Value of the Hmat shuffle clustering minimum divider (minimum number of children per box, default is 2) - - It can be changed with "--hmat_divider_min" (read in readFlagsTestHMAT() in hmat.c) -*/ -extern int divider_min; - -/*! \brief Value of the Hmat shuffle clustering maximum divider (maximum number of children per box, default is 4) - - It can be changed with "--hmat_divider_max" (read in readFlagsTestHMAT() in hmat.c) -*/ -extern int divider_max; - /*! \brief Flag to use HODLR storage and algorithms (default is 0). It can be changed with "--hodlr" (read in readFlagsTestHMAT() in hmat.c) diff --git a/src/help.c b/src/help.c index d20e494..67991ff 100644 --- a/src/help.c +++ b/src/help.c @@ -26,8 +26,6 @@ int printHelp() { "\n" " Options for HMAT tests\n" " --use_hmat_shuffle: Using Hmat shuffle clustering. Default: NO.\n" - " --hmat_divider_min: Value of the Hmat shuffle clustering minimum divider (minimum number of children per box). Default: 2.\n" - " --hmat_divider_max: Value of the Hmat shuffle clustering maximum divider (maximum number of children per box). Default: 4.\n" " --hodlr: Using HODLR. Default: NO.\n" " --hmat-eps-assemb: Compression epsilon. Default: 1e-4.\n" " --hmat-eps-recompr: Recompression epsilon. Default: 1e-4.\n" diff --git a/src/hmat.c b/src/hmat.c index 339a6ba..4a0e89b 100644 --- a/src/hmat.c +++ b/src/hmat.c @@ -20,18 +20,6 @@ int init_hmat_interface() { } int readFlagsTestHMAT(int *argc, char ***argv) { - /* Value of the Hmat shuffle clustering minimum divider (minimum number of children per box) */ - if (MpfArgGetInt(argc, *argv, 1, "--hmat_divider_min", ÷r_min)) { - printf("Reading Hmat shuffle clustering minimum divider = %d\n", divider_min) ; - } - - /* Value of the Hmat shuffle clustering maximum divider (maximum number of children per box) */ - if (MpfArgGetInt(argc, *argv, 1, "--hmat_divider_max", ÷r_max)) { - printf("Reading Hmat shuffle clustering maximum divider = %d\n", divider_max) ; - ASSERTQ(divider_max>1); - ASSERTQ(divider_max>=divider_min); - } - /* Flag to use HODLR storage and algorithms */ if (MpfArgHasName(argc, *argv, 1, "--hodlr")) { use_hodlr=1; diff --git a/src/main.c b/src/main.c index 8f5fcba..a420a57 100644 --- a/src/main.c +++ b/src/main.c @@ -19,12 +19,7 @@ int simplePrec = 0; int complexALGO = 1; ScalarType stype = DOUBLE_COMPLEX; double lambda; -int divider_min = 2; -int divider_max = 4; int use_hodlr = 0; -size_t nnz_FEM = 0; -ZnonZero *z_matComp_FEM = NULL; -size_t *ptr_ordered_FEM = NULL; /*! \brief Main routine \return 0 for success -- GitLab