From cd03620c28be7a71bd798081ac9d650166177ae2 Mon Sep 17 00:00:00 2001
From: Daniel Juenger <2955913+sleeepyjack@users.noreply.github.com>
Date: Tue, 10 Oct 2023 23:24:35 +0000
Subject: [PATCH] CTAD is our friend

---
 tests/static_map/heterogeneous_lookup_test.cu | 16 ++++++----------
 tests/static_set/heterogeneous_lookup_test.cu |  7 ++-----
 2 files changed, 8 insertions(+), 15 deletions(-)

diff --git a/tests/static_map/heterogeneous_lookup_test.cu b/tests/static_map/heterogeneous_lookup_test.cu
index b21b7d2ca..ed1ace9bd 100644
--- a/tests/static_map/heterogeneous_lookup_test.cu
+++ b/tests/static_map/heterogeneous_lookup_test.cu
@@ -105,16 +105,12 @@ TEMPLATE_TEST_CASE_SIG("Heterogeneous lookup",
   constexpr std::size_t num      = 100;
   constexpr std::size_t capacity = num * 2;
   auto const probe               = probe_type{custom_hasher{}, custom_hasher{}};
-  auto my_map                    = cuco::experimental::static_map<Key,
-                                               Value,
-                                               cuco::experimental::extent<std::size_t>,
-                                               cuda::thread_scope_device,
-                                               custom_key_equal,
-                                               probe_type>{capacity,
-                                                           cuco::empty_key<Key>{sentinel_key},
-                                                           cuco::empty_value{sentinel_value},
-                                                           custom_key_equal{},
-                                                           probe};
+
+  auto my_map = cuco::experimental::static_map{capacity,
+                                               cuco::empty_key<Key>{sentinel_key},
+                                               cuco::empty_value{sentinel_value},
+                                               custom_key_equal{},
+                                               probe};
 
   auto insert_pairs = thrust::make_transform_iterator(
     thrust::counting_iterator<int>(0),
diff --git a/tests/static_set/heterogeneous_lookup_test.cu b/tests/static_set/heterogeneous_lookup_test.cu
index ddc799ed3..2875d5a6a 100644
--- a/tests/static_set/heterogeneous_lookup_test.cu
+++ b/tests/static_set/heterogeneous_lookup_test.cu
@@ -94,11 +94,8 @@ TEMPLATE_TEST_CASE_SIG(
   constexpr std::size_t num      = 100;
   constexpr std::size_t capacity = num * 2;
   auto const probe               = probe_type{custom_hasher{}, custom_hasher{}};
-  auto my_set                    = cuco::experimental::static_set<Key,
-                                               cuco::experimental::extent<std::size_t>,
-                                               cuda::thread_scope_device,
-                                               custom_key_equal,
-                                               probe_type>{
+
+  auto my_set = cuco::experimental::static_set{
     capacity, cuco::empty_key<Key>{sentinel_key}, custom_key_equal{}, probe};
 
   auto insert_keys = thrust::make_transform_iterator(