free should happen after omp_target_disassociate_ptr

Pramod Kumbhar · Pramod Kumbhar · commit 7cb13a11c74a · 2021-12-09T19:42:51.000-05:00
diff --git a/coreneuron/gpu/nrn_acc_manager.cpp b/coreneuron/gpu/nrn_acc_manager.cpp
@@ -82,9 +82,8 @@ void cnrn_target_delete(void* h_ptr, size_t len) {
     {
         d_ptr = h_ptr;
     }
-    // todo: disassociate first or free first
-    omp_target_free(d_ptr, device_id);
     omp_target_disassociate_ptr(h_ptr, device_id);
+    omp_target_free(d_ptr, device_id);
 #else
     throw std::runtime_error("cnrn_target_delete() not implemented without OpenACC/OpenMP and gpu build");
 #endif

Original file line number	Diff line number	Diff line change
`@@ -82,9 +82,8 @@ void cnrn_target_delete(void* h_ptr, size_t len) {`
`82`	`82`	`{`
`83`	`83`	`d_ptr = h_ptr;`
`84`	`84`	`}`
`85`		`- // todo: disassociate first or free first`
`86`		`- omp_target_free(d_ptr, device_id);`
`87`	`85`	`omp_target_disassociate_ptr(h_ptr, device_id);`
	`86`	`+ omp_target_free(d_ptr, device_id);`
`88`	`87`	`#else`
`89`	`88`	`throw std::runtime_error("cnrn_target_delete() not implemented without OpenACC/OpenMP and gpu build");`
`90`	`89`	`#endif`