From da31dfb2260fae382de410dbdb109e96d841c345 Mon Sep 17 00:00:00 2001 From: NguyenNhuDi Date: Tue, 12 Aug 2025 17:04:08 -0600 Subject: [PATCH 1/3] ported over fix from original branch --- .../rocprim/test/hipgraph/test_hipgraph_basic.cpp | 12 ++++++------ .../test/rocprim/test_device_merge_inplace.cpp | 1 + .../rocprim/test/rocprim/test_device_transform.cpp | 3 +++ 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/projects/rocprim/test/hipgraph/test_hipgraph_basic.cpp b/projects/rocprim/test/hipgraph/test_hipgraph_basic.cpp index cc473d680e06..bbeb5d45e166 100644 --- a/projects/rocprim/test/hipgraph/test_hipgraph_basic.cpp +++ b/projects/rocprim/test/hipgraph/test_hipgraph_basic.cpp @@ -99,10 +99,10 @@ void testStreamCapture() ASSERT_EQ(h_data, num_launches); // Clean up + HIP_CHECK(hipFreeAsync(d_data, stream)); + HIP_CHECK(hipStreamDestroy(stream)); HIP_CHECK(hipGraphDestroy(graph)); HIP_CHECK(hipGraphExecDestroy(instance)); - HIP_CHECK(hipFree(d_data)); - HIP_CHECK(hipStreamDestroy(stream)); } void testManualConstruction() @@ -159,10 +159,10 @@ void testManualConstruction() ASSERT_EQ(h_data, num_launches); // Clean up + HIP_CHECK(hipFreeAsync(d_data, stream)); + HIP_CHECK(hipStreamDestroy(stream)); HIP_CHECK(hipGraphDestroy(graph)); HIP_CHECK(hipGraphExecDestroy(instance)); - HIP_CHECK(hipFree(d_data)); - HIP_CHECK(hipStreamDestroy(stream)); } void testStreamCaptureWithAtomics() @@ -217,10 +217,10 @@ void testStreamCaptureWithAtomics() ASSERT_EQ(h_data, num_launches * num_blocks * num_threads); // Clean up + HIP_CHECK(hipStreamDestroy(stream)); + HIP_CHECK(hipFreeAsync(d_data, stream)); HIP_CHECK(hipGraphDestroy(graph)); HIP_CHECK(hipGraphExecDestroy(instance)); - HIP_CHECK(hipFree(d_data)); - HIP_CHECK(hipStreamDestroy(stream)); } TEST(TestHipGraphBasic, CaptureFromStream) diff --git a/projects/rocprim/test/rocprim/test_device_merge_inplace.cpp b/projects/rocprim/test/rocprim/test_device_merge_inplace.cpp index bc8623f053e6..395185c8c78b 100644 --- a/projects/rocprim/test/rocprim/test_device_merge_inplace.cpp +++ b/projects/rocprim/test/rocprim/test_device_merge_inplace.cpp @@ -90,6 +90,7 @@ TEST(RocprimDeviceMergeInplaceTests, Basic) h_data = d_data.load(); d_data.free_manually(); + d_temp_storage.free_manually(); test_utils::assert_eq(h_data, h_expected); } diff --git a/projects/rocprim/test/rocprim/test_device_transform.cpp b/projects/rocprim/test/rocprim/test_device_transform.cpp index 514b465720b9..1adf53f14f8a 100644 --- a/projects/rocprim/test/rocprim/test_device_transform.cpp +++ b/projects/rocprim/test/rocprim/test_device_transform.cpp @@ -596,6 +596,9 @@ TEST(RocprimDeviceTransformTests, UnalignedPointer) // Check if output values are as expected ASSERT_NO_FATAL_FAILURE( test_utils::assert_near(output, expected, test_utils::precision)); + + HIP_CHECK(hipFree(d_unaligned)); + HIP_CHECK(hipFree(d_input)); } } } From f9cd180ca1fa815d936b5b138ae43c2c98e5619a Mon Sep 17 00:00:00 2001 From: NguyenNhuDi Date: Wed, 13 Aug 2025 12:17:14 -0700 Subject: [PATCH 2/3] switched free order --- projects/rocprim/test/hipgraph/test_hipgraph_basic.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/rocprim/test/hipgraph/test_hipgraph_basic.cpp b/projects/rocprim/test/hipgraph/test_hipgraph_basic.cpp index bbeb5d45e166..13849d712e8a 100644 --- a/projects/rocprim/test/hipgraph/test_hipgraph_basic.cpp +++ b/projects/rocprim/test/hipgraph/test_hipgraph_basic.cpp @@ -217,8 +217,8 @@ void testStreamCaptureWithAtomics() ASSERT_EQ(h_data, num_launches * num_blocks * num_threads); // Clean up - HIP_CHECK(hipStreamDestroy(stream)); HIP_CHECK(hipFreeAsync(d_data, stream)); + HIP_CHECK(hipStreamDestroy(stream)); HIP_CHECK(hipGraphDestroy(graph)); HIP_CHECK(hipGraphExecDestroy(instance)); } From 67e564e8eacb96a688ddbc08f4bfaa1576ba1986 Mon Sep 17 00:00:00 2001 From: NguyenNhuDi Date: Mon, 18 Aug 2025 19:35:50 +0000 Subject: [PATCH 3/3] fixed device transform --- projects/rocprim/test/rocprim/test_device_transform.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/projects/rocprim/test/rocprim/test_device_transform.cpp b/projects/rocprim/test/rocprim/test_device_transform.cpp index 1adf53f14f8a..96eb9d829112 100644 --- a/projects/rocprim/test/rocprim/test_device_transform.cpp +++ b/projects/rocprim/test/rocprim/test_device_transform.cpp @@ -598,7 +598,6 @@ TEST(RocprimDeviceTransformTests, UnalignedPointer) test_utils::assert_near(output, expected, test_utils::precision)); HIP_CHECK(hipFree(d_unaligned)); - HIP_CHECK(hipFree(d_input)); } } }