From ca4d7b3b9d9e84ff4724f87bf7f1d6b2baf98e8f Mon Sep 17 00:00:00 2001 From: Sebastian Grimberg Date: Mon, 17 Jun 2024 13:42:55 -0700 Subject: [PATCH 1/2] Remove duplicate macro definition and fix infinite recursion --- src/findpts_imp.h | 1 - src/findpts_local_imp.h | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/src/findpts_imp.h b/src/findpts_imp.h index b9759af..3820d20 100644 --- a/src/findpts_imp.h +++ b/src/findpts_imp.h @@ -38,7 +38,6 @@ #define findpts_free TOKEN_PASTE(PREFIXED_NAME(findpts_free_ ),D) #define findpts TOKEN_PASTE(PREFIXED_NAME(findpts_ ),D) #define findpts_eval TOKEN_PASTE(PREFIXED_NAME(findpts_eval_ ),D) -#define findpts_local_eval TOKEN_PASTE(PREFIXED_NAME(findpts_local_eval_ ),D) #define setup_fev_aux TOKEN_PASTE(setup_fev_aux_,D) struct hash_data { diff --git a/src/findpts_local_imp.h b/src/findpts_local_imp.h index e5310b1..74b3a66 100644 --- a/src/findpts_local_imp.h +++ b/src/findpts_local_imp.h @@ -466,7 +466,7 @@ void findpts_local_eval( const uint npt, const double *const in, struct findpts_local_data *const fd) { - findpts_local_eval( + findptsms_local_eval( out_base,out_stride, el_base,el_stride, r_base,r_stride, From 982ed9f574dcc5e1c9ff6fb0e2bce6fb0d5cc89a Mon Sep 17 00:00:00 2001 From: Sebastian Grimberg Date: Mon, 17 Jun 2024 13:52:19 -0700 Subject: [PATCH 2/2] Fix misleading indentation --- src/findpts_imp.h | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/findpts_imp.h b/src/findpts_imp.h index 3820d20..61bfeb3 100644 --- a/src/findpts_imp.h +++ b/src/findpts_imp.h @@ -278,7 +278,10 @@ void findptsms( uint *const code_base, const unsigned code const uint *const session_id_match, const uint npt, struct findpts_data *const fd) { - if (fd->fevsetup==1) array_free(&fd->savpt); fd->fevsetup=0; + if (fd->fevsetup==1) { + array_free(&fd->savpt); + fd->fevsetup=0; + } const uint np = fd->cr.comm.np, id=fd->cr.comm.id; struct array hash_pt, src_pt, out_pt; double *distv = tmalloc(double,npt);