Check all tdp return values

ludwig-cf · Oct 4, 2024 · 90dda90 · 90dda90
1 parent 9255199
commit 90dda90
Show file tree

Hide file tree

Showing 50 changed files with 570 additions and 554 deletions.
diff --git a/src/advection.c b/src/advection.c
@@ -191,7 +191,7 @@ __host__ int advflux_create(pe_t * pe, cs_t * cs, lees_edw_t * le, int nf,
 
   /* Allocate target copy of structure (or alias) */
 
-  tdpGetDeviceCount(&ndevice);
+  tdpAssert( tdpGetDeviceCount(&ndevice) );
 
   if (ndevice == 0) {
     obj->target = obj;
@@ -260,24 +260,30 @@ __host__ int advflux_free(advflux_t * obj) {
 
   assert(obj);
 
-  tdpGetDeviceCount(&ndevice);
+  tdpAssert( tdpGetDeviceCount(&ndevice) );
 
   if (ndevice > 0) {
     if (obj->le == NULL) {
-    tdpMemcpy(&tmp, &obj->target->fx, sizeof(double *), tdpMemcpyDeviceToHost);
-    tdpFree(tmp);
+      tdpAssert( tdpMemcpy(&tmp, &obj->target->fx, sizeof(double *),
+			   tdpMemcpyDeviceToHost) );
+      tdpAssert( tdpFree(tmp) );
     }
     else {
-    tdpMemcpy(&tmp, &obj->target->fe, sizeof(double *), tdpMemcpyDeviceToHost);
-    tdpFree(tmp);
-    tdpMemcpy(&tmp, &obj->target->fw, sizeof(double *), tdpMemcpyDeviceToHost);
-    tdpFree(tmp);
+      tdpAssert( tdpMemcpy(&tmp, &obj->target->fe, sizeof(double *),
+			   tdpMemcpyDeviceToHost) );
+      tdpAssert( tdpFree(tmp) );
+      tdpAssert( tdpMemcpy(&tmp, &obj->target->fw, sizeof(double *),
+			   tdpMemcpyDeviceToHost) );
+      tdpAssert( tdpFree(tmp) );
     }
-    tdpMemcpy(&tmp, &obj->target->fy, sizeof(double *), tdpMemcpyDeviceToHost);
-    tdpFree(tmp);
-    tdpMemcpy(&tmp, &obj->target->fz, sizeof(double *), tdpMemcpyDeviceToHost);
-    tdpFree(tmp);
-    tdpFree(obj->target);
+
+    tdpAssert( tdpMemcpy(&tmp, &obj->target->fy, sizeof(double *),
+			 tdpMemcpyDeviceToHost) );
+    tdpAssert( tdpFree(tmp) );
+    tdpAssert( tdpMemcpy(&tmp, &obj->target->fz, sizeof(double *),
+			 tdpMemcpyDeviceToHost) );
+    tdpAssert( tdpFree(tmp) );
+    tdpAssert( tdpFree(obj->target) );
   }
 
   if (obj->le == NULL) {
@@ -373,7 +379,7 @@ __host__ int advflux_memcpy(advflux_t * adv, tdpMemcpyKind flag) {
 
   assert(adv);
 
-  tdpGetDeviceCount(&ndevice);
+  tdpAssert( tdpGetDeviceCount(&ndevice) );
 
   if (ndevice == 0) {
     /* Ensure we alias */

diff --git a/src/blue_phase.c b/src/blue_phase.c
@@ -118,7 +118,7 @@ __host__ int fe_lc_create(pe_t * pe, cs_t * cs, lees_edw_t * le,
 
   /* Allocate device memory, or alias */
 
-  tdpGetDeviceCount(&ndevice);
+  tdpAssert( tdpGetDeviceCount(&ndevice) );
 
   if (ndevice == 0) {
     fe->target = fe;
@@ -167,7 +167,7 @@ __host__ int fe_lc_free(fe_lc_t * fe) {
 
   assert(fe);
 
-  tdpGetDeviceCount(&ndevice);
+  tdpAssert( tdpGetDeviceCount(&ndevice) );
 
   if (ndevice > 0) tdpAssert(tdpFree(fe->target));
 

diff --git a/src/blue_phase_beris_edwards.c b/src/blue_phase_beris_edwards.c
@@ -144,7 +144,7 @@ __host__ int beris_edw_create(pe_t * pe, cs_t * cs, lees_edw_t * le,
 
   /* Allocate a target copy, or alias */
 
-  tdpGetDeviceCount(&ndevice);
+  tdpAssert( tdpGetDeviceCount(&ndevice) );
 
   if (ndevice == 0) {
     obj->target = obj;
@@ -190,7 +190,7 @@ __host__ int beris_edw_free(beris_edw_t * be) {
 
   assert(be);
 
-  tdpGetDeviceCount(&ndevice);
+  tdpAssert( tdpGetDeviceCount(&ndevice) );
 
   if (ndevice > 0) {
     double * htmp;

diff --git a/src/brazovskii.c b/src/brazovskii.c
@@ -125,27 +125,27 @@ __host__ int fe_brazovskii_create(pe_t * pe, cs_t * cs, field_t * phi,
 
   /* Allocate device memory, or alias */
 
-  tdpGetDeviceCount(&ndevice);
+  tdpAssert( tdpGetDeviceCount(&ndevice) );
 
   if (ndevice == 0) {
     obj->target = obj;
   }
   else {
     fe_brazovskii_param_t * tmp;
     fe_vt_t * vt;
-    tdpMalloc((void **) &obj->target, sizeof(fe_brazovskii_t));
-    tdpMemset(obj->target, 0, sizeof(fe_brazovskii_t));
+    tdpAssert( tdpMalloc((void **) &obj->target, sizeof(fe_brazovskii_t)) );
+    tdpAssert( tdpMemset(obj->target, 0, sizeof(fe_brazovskii_t)) );
     tdpGetSymbolAddress((void **) &tmp, tdpSymbol(const_param));
-    tdpMemcpy(&obj->target->param, &tmp, sizeof(fe_brazovskii_t *),
-	      tdpMemcpyHostToDevice);
+    tdpAssert( tdpMemcpy(&obj->target->param, &tmp, sizeof(fe_brazovskii_t *),
+			 tdpMemcpyHostToDevice) );
     tdpGetSymbolAddress((void **) &vt, tdpSymbol(fe_braz_dvt));
-    tdpMemcpy(&obj->target->super.func, &vt, sizeof(fe_vt_t *),
-	      tdpMemcpyHostToDevice);
+    tdpAssert( tdpMemcpy(&obj->target->super.func, &vt, sizeof(fe_vt_t *),
+			 tdpMemcpyHostToDevice) );
 
-    tdpMemcpy(&obj->target->phi, &phi->target, sizeof(field_t *),
-	      tdpMemcpyHostToDevice);
-    tdpMemcpy(&obj->target->dphi, &dphi->target, sizeof(field_grad_t *),
-	      tdpMemcpyHostToDevice);
+    tdpAssert( tdpMemcpy(&obj->target->phi, &phi->target, sizeof(field_t *),
+			 tdpMemcpyHostToDevice) );
+    tdpAssert( tdpMemcpy(&obj->target->dphi, &dphi->target,
+			 sizeof(field_grad_t *), tdpMemcpyHostToDevice) );
   }
 
   *p = obj;
@@ -165,8 +165,8 @@ __host__ int fe_brazovskii_free(fe_brazovskii_t * fe) {
 
   assert(fe);
 
-  tdpGetDeviceCount(&ndevice);
-  if (ndevice > 0) tdpFree(fe->target);
+  tdpAssert( tdpGetDeviceCount(&ndevice) );
+  if (ndevice > 0) tdpAssert( tdpFree(fe->target) );
 
   free(fe->param);
   free(fe);

diff --git a/src/cahn_hilliard.c b/src/cahn_hilliard.c
@@ -71,7 +71,7 @@ __host__ int ch_create(pe_t * pe, cs_t * cs, ch_info_t info, ch_t ** ch) {
   advflux_cs_create(pe, cs, info.nfield, &obj->flux);
   assert(obj->flux);
 
-  tdpGetDeviceCount(&ndevice);
+  tdpAssert( tdpGetDeviceCount(&ndevice) );
 
   if (ndevice == 0) {
     obj->target = obj;
@@ -109,7 +109,7 @@ __host__ int ch_free(ch_t * ch) {
   {
     int ndevice = 0;
 
-    tdpGetDeviceCount(&ndevice);
+    tdpAssert( tdpGetDeviceCount(&ndevice) );
     if (ndevice > 0) tdpAssert(tdpFree(ch->target));
   }
 

diff --git a/src/cahn_hilliard_stats.c b/src/cahn_hilliard_stats.c
@@ -209,7 +209,7 @@ __host__ int cahn_stats_reduce(phi_ch_t * pch, field_t * phi,
   MPI_Reduce(&local.max, &stats->max, 1, MPI_DOUBLE, MPI_MAX, root, comm);
   MPI_Reduce(&local.vol, &stats->vol, 1, MPI_DOUBLE, MPI_SUM, root, comm);
 
-  tdpFree(stats_d);
+  tdpAssert( tdpFree(stats_d) );
 
   return 0;
 }

diff --git a/src/colloids.c b/src/colloids.c
@@ -81,7 +81,7 @@ __host__ int colloids_info_create(pe_t * pe, cs_t * cs, int ncell[3],
   obj->rho0 = RHO_DEFAULT;
   obj->drmax = DRMAX_DEFAULT;
 
-  tdpGetDeviceCount(&ndevice);
+  tdpAssert( tdpGetDeviceCount(&ndevice) );
 
   if (ndevice == 0) {
     obj->target = obj;
@@ -184,7 +184,7 @@ __host__ int colloids_memcpy(colloids_info_t * info, int flag) {
   assert(info);
   assert(info->map_new);
 
-  tdpGetDeviceCount(&ndevice);
+  tdpAssert( tdpGetDeviceCount(&ndevice) );
 
   if (ndevice == 0) {
     /* Bare pointer equality causes HIPCC to choke, hence explicit (()) */
@@ -284,7 +284,7 @@ __host__ int colloids_info_map_init(colloids_info_t * info) {
 
   /* Allocate data space on target */
 
-  tdpGetDeviceCount(&ndevice);
+  tdpAssert( tdpGetDeviceCount(&ndevice) );
 
   if (ndevice > 0) {
     void * tmp;

diff --git a/src/coords.c b/src/coords.c
@@ -7,7 +7,7 @@
  *  Edinburgh Soft Matter and Statistical Physics and
  *  Edinburgh Parallel Computing Centre
  *
- *  (c) 2010-2022 The University of Edinburgh
+ *  (c) 2010-2024 The University of Edinburgh
  *
  *  Contributing authors:
  *  Kevin Stratford ([email protected])
@@ -216,18 +216,18 @@ __host__ int cs_init(cs_t * cs) {
 
   /* Device side */
 
-  tdpGetDeviceCount(&ndevice);
+  tdpAssert( tdpGetDeviceCount(&ndevice) );
 
   if (ndevice == 0) {
     cs->target = cs;
   }
   else {
     cs_param_t * tmp;
-    tdpMalloc((void **) &cs->target, sizeof(cs_t));
-    tdpMemset(cs->target, 0, sizeof(cs_t));
+    tdpAssert( tdpMalloc((void **) &cs->target, sizeof(cs_t)) );
+    tdpAssert( tdpMemset(cs->target, 0, sizeof(cs_t)) );
     tdpGetSymbolAddress((void **) &tmp, tdpSymbol(const_param));
-    tdpMemcpy(&cs->target->param, (const void *) &tmp, sizeof(cs_param_t *),
-	      tdpMemcpyHostToDevice);
+    tdpAssert( tdpMemcpy(&cs->target->param, (const void *) &tmp,
+			 sizeof(cs_param_t *), tdpMemcpyHostToDevice) );
     cs_commit(cs);
   }
 

diff --git a/src/distribution_rt.c b/src/distribution_rt.c
@@ -179,7 +179,7 @@ int lb_run_time_prev(pe_t * pe, cs_t * cs, rt_t * rt, lb_t ** lb) {
      * not as to disrupt the regression tests. */
     {
       int ndevice = 0;
-      tdpGetDeviceCount(&ndevice);
+      tdpAssert( tdpGetDeviceCount(&ndevice) );
       if (ndevice > 0) options.halo = LB_HALO_TARGET;
     }
 

diff --git a/src/fe_electro.c b/src/fe_electro.c
@@ -27,7 +27,7 @@
  *  Edinburgh Soft Matter and Statistical Physics Group and
  *  Edinburgh Parallel Computing Centre
  *
- *  (c) 2013-2023 The University of Edinburgh
+ *  (c) 2013-2024 The University of Edinburgh
  *
  *  Contributing authors:
  *  Oliver Henrich  ([email protected])
@@ -120,7 +120,7 @@ __host__ int fe_electro_create(pe_t * pe, psi_t * psi, fe_electro_t ** pobj) {
   fe->super.func = &fe_electro_hvt;
   fe->super.id = FE_ELECTRO;
 
-  tdpGetDeviceCount(&ndevice);
+  tdpAssert( tdpGetDeviceCount(&ndevice) );
 
   if (ndevice == 0) {
     fe->target = fe;
@@ -131,7 +131,7 @@ __host__ int fe_electro_create(pe_t * pe, psi_t * psi, fe_electro_t ** pobj) {
     fe_vt_t * vt = NULL;
 
     tdpAssert(tdpMalloc((void **) &fe->target, sizeof(fe_electro_t)));
-    tdpMemset(fe->target, 0, sizeof(fe_electro_t));
+    tdpAssert( tdpMemset(fe->target, 0, sizeof(fe_electro_t)) );
 
     tdpGetSymbolAddress((void **) &vt, tdpSymbol(fe_electro_dvt));
     tdpAssert(tdpMemcpy(&fe->target->super.func, &vt, sizeof(fe_vt_t *),
@@ -155,7 +155,7 @@ __host__ int fe_electro_free(fe_electro_t * fe) {
 
   assert(fe);
 
-  tdpGetDeviceCount(&ndevice);
+  tdpAssert( tdpGetDeviceCount(&ndevice) );
   if (ndevice > 0) tdpAssert(tdpFree(fe->target));
 
   if (fe->mu_ref) free(fe->mu_ref);

diff --git a/src/fe_electro_symmetric.c b/src/fe_electro_symmetric.c
@@ -30,7 +30,7 @@
  *  Edinburgh Soft Matter and Statistical Physics Group and
  *  Edinburgh Parallel Computing Centre
  *
- *  (c) 2013-2018 The University of Edinburgh
+ *  (c) 2013-2024 The University of Edinburgh
  *
  *  Contributing authors:
  *    Kevin Stratford ([email protected])
@@ -138,7 +138,7 @@ __host__ int fe_es_create(pe_t * pe, cs_t * cs, fe_symm_t * symm,
   psi_nk(psi, &fe->param->nk);
   fe_es_epsilon_set(fe, psi->epsilon, psi->epsilon2);
 
-  tdpGetDeviceCount(&ndevice);
+  tdpAssert( tdpGetDeviceCount(&ndevice) );
 
   if (ndevice == 0) {
     fe->target = fe;
@@ -147,10 +147,10 @@ __host__ int fe_es_create(pe_t * pe, cs_t * cs, fe_symm_t * symm,
     fe_vt_t * vt;
     fe_es_param_t * tmp;
 
-    tdpMalloc((void **) &fe->target, sizeof(fe_es_t));
+    tdpAssert( tdpMalloc((void **) &fe->target, sizeof(fe_es_t)) );
     tdpGetSymbolAddress((void **) &tmp, tdpSymbol(const_param));
-    tdpMemcpy(&fe->target->param, tmp, sizeof(fe_es_param_t *),
-	      tdpMemcpyHostToDevice);
+    tdpAssert( tdpMemcpy(&fe->target->param, tmp, sizeof(fe_es_param_t *),
+			 tdpMemcpyHostToDevice) );
     tdpGetSymbolAddress((void **) &vt, tdpSymbol(fe_es_dvt));
   }
 
@@ -169,7 +169,7 @@ __host__ int fe_es_free(fe_es_t * fe) {
 
   assert(fe);
 
-  if (fe->target != fe) tdpFree(fe->target);
+  if (fe->target != fe) tdpAssert( tdpFree(fe->target) );
 
   free(fe->param);
   free(fe);

diff --git a/src/fe_null.c b/src/fe_null.c
@@ -8,7 +8,7 @@
  *  Edinburgh Soft Matter and Statistical Physics Group
  *  and Edinburgh Parallel Computing Centre
  *
- *  (c) 2022 The University of Edinburgh
+ *  (c) 2022-2024 The University of Edinburgh
  *
  *  Contributing authors:
  *  Kevin Stratford ([email protected])
@@ -79,7 +79,7 @@ __host__ int fe_null_create(pe_t * pe, fe_null_t ** p) {
 
   /* Allocate target memory, or alias */
 
-  tdpGetDeviceCount(&ndevice);
+  tdpAssert( tdpGetDeviceCount(&ndevice) );
 
   if (ndevice == 0) {
     fe->target = fe;
@@ -112,9 +112,9 @@ __host__ int fe_null_free(fe_null_t * fe) {
 
   assert(fe);
 
-  tdpGetDeviceCount(&ndevice);
+  tdpAssert( tdpGetDeviceCount(&ndevice) );
 
-  if (ndevice > 0) tdpFree(fe->target);
+  if (ndevice > 0) tdpAssert( tdpFree(fe->target) );
   free(fe);
 
   return 0;

diff --git a/src/fe_ternary.c b/src/fe_ternary.c
@@ -17,7 +17,7 @@
  *  Edinburgh Soft Matter and Statistical Physics Group
  *  and Edinburgh Parallel Computing Centre
  *
- *  (c) 2019-2021 The University of Edinburgh
+ *  (c) 2019-2024 The University of Edinburgh
  *
  *  Contributing authors:
  *  Shan Chen ([email protected])
@@ -111,7 +111,7 @@ int fe_ternary_create(pe_t * pe, cs_t * cs, field_t * phi,
 
   /* Allocate target memory, or alias */
 
-  tdpGetDeviceCount(&ndevice);
+  tdpAssert( tdpGetDeviceCount(&ndevice) );
 
   if (ndevice == 0) {
     obj->target = obj;
@@ -163,7 +163,7 @@ __host__ int fe_ternary_free(fe_ternary_t * fe) {
 
   assert(fe);
 
-  tdpGetDeviceCount(&ndevice);
+  tdpAssert( tdpGetDeviceCount(&ndevice) );
   if (ndevice > 0) tdpAssert(tdpFree(fe->target));
 
   free(fe->param);