Rename into_vector to into_vec

Author: stijnh

include/kernel_float/prelude.h

@@ -82,9 +82,14 @@ static constexpr extent<N> kextent = {};
 
 template<typename... Args>
 KERNEL_FLOAT_INLINE kvec<promote_t<Args...>, sizeof...(Args)> make_kvec(Args&&... args) {
-    return make_vec(std::forward<Args>(args)...);
+    return ::kernel_float::make_vec(std::forward<Args>(args)...);
 };
 
+template<typename V>
+KERNEL_FLOAT_INLINE into_vector_type<V> into_kvec(V&& input) {
+    return ::kernel_float::into_vec(std::forward<V>(input));
+}
+
 template<typename T = double>
 using kconstant = constant<T>;
 

include/kernel_float/vector.h

@@ -279,7 +279,7 @@ struct vector: public S {
  * - For vector-like types (e.g., `int2`, `dim3`), it returns `vec<T, N>`.
  */
 template<typename V>
-KERNEL_FLOAT_INLINE into_vector_type<V> into_vector(V&& input) {
+KERNEL_FLOAT_INLINE into_vector_type<V> into_vec(V&& input) {
     return into_vector_impl<V>::call(std::forward<V>(input));
 }
 

single_include/kernel_float.h

@@ -16,8 +16,8 @@
 
 //================================================================================
 // this file has been auto-generated, do not modify its contents!
-// date: 2023-09-28 09:58:58.074478
-// git hash: 46d598cbca2b9e15abe91848fdcb417d69f0820a
+// date: 2023-09-28 11:56:39.597009
+// git hash: f2078d86464553ef3c024dde759e5c4ab46fdf6e
 //================================================================================
 
 #ifndef KERNEL_FLOAT_MACROS_H
@@ -3099,7 +3099,7 @@ struct vector: public S {
  * - For vector-like types (e.g., `int2`, `dim3`), it returns `vec<T, N>`.
  */
 template<typename V>
-KERNEL_FLOAT_INLINE into_vector_type<V> into_vector(V&& input) {
+KERNEL_FLOAT_INLINE into_vector_type<V> into_vec(V&& input) {
     return into_vector_impl<V>::call(std::forward<V>(input));
 }
 
@@ -3909,9 +3909,14 @@ static constexpr extent<N> kextent = {};
 
 template<typename... Args>
 KERNEL_FLOAT_INLINE kvec<promote_t<Args...>, sizeof...(Args)> make_kvec(Args&&... args) {
-    return make_vec(std::forward<Args>(args)...);
+    return ::kernel_float::make_vec(std::forward<Args>(args)...);
 };
 
+template<typename V>
+KERNEL_FLOAT_INLINE into_vector_type<V> into_kvec(V&& input) {
+    return ::kernel_float::into_vec(std::forward<V>(input));
+}
+
 template<typename T = double>
 using kconstant = constant<T>;
 

tests/basics.cu

@@ -57,39 +57,39 @@ REGISTER_TEST_CASE("basics", basics_tests, int, float)
 
 struct creation_tests {
     __host__ __device__ void operator()(generator<int> gen) {
-        using kernel_float::into_vector;
+        using kernel_float::into_vec;
         using kernel_float::make_vec;
 
-        // into_vector on scalar
+        // into_vec on scalar
         {
-            kf::vec<int, 1> a = into_vector(int(5));
+            kf::vec<int, 1> a = into_vec(int(5));
             ASSERT(a[0] == 5);
         }
 
-        // into_vector on CUDA vector types
+        // into_vec on CUDA vector types
         {
-            kf::vec<int, 1> a = into_vector(make_int1(5));
-            kf::vec<int, 2> b = into_vector(make_int2(5, 4));
-            kf::vec<int, 3> c = into_vector(make_int3(5, 4, -1));
-            kf::vec<int, 4> d = into_vector(make_int4(5, 4, -1, 0));
+            kf::vec<int, 1> a = into_vec(make_int1(5));
+            kf::vec<int, 2> b = into_vec(make_int2(5, 4));
+            kf::vec<int, 3> c = into_vec(make_int3(5, 4, -1));
+            kf::vec<int, 4> d = into_vec(make_int4(5, 4, -1, 0));
 
             ASSERT(a[0] == 5);
             ASSERT(b[0] == 5 && b[1] == 4);
             ASSERT(c[0] == 5 && c[1] == 4 && c[2] == -1);
             ASSERT(d[0] == 5 && d[1] == 4 && d[2] == -1 && d[3] == 0);
         }
 
-        // into_vector on C-style array
+        // into_vec on C-style array
         {
             int items[3] = {1, 2, 3};
-            kf::vec<int, 3> a = into_vector(items);
+            kf::vec<int, 3> a = into_vec(items);
             ASSERT(a[0] == 1 && a[1] == 2 && a[2] == 3);
         }
 
-        // into_vector on kf array
+        // into_vec on kf array
         {
             kf::vec<int, 3> items = {1, 2, 3};
-            kf::vec<int, 3> a = into_vector(items);
+            kf::vec<int, 3> a = into_vec(items);
             ASSERT(a[0] == 1 && a[1] == 2 && a[2] == 3);
         }
 
@@ -101,39 +101,39 @@ struct creation_tests {
     }
 
     __host__ __device__ void operator()(generator<float> gen) {
-        using kernel_float::into_vector;
+        using kernel_float::into_vec;
         using kernel_float::make_vec;
 
-        // into_vector on scalar
+        // into_vec on scalar
         {
-            kf::vec<float, 1> a = into_vector(float(5.0f));
+            kf::vec<float, 1> a = into_vec(float(5.0f));
             ASSERT(a[0] == 5.0f);
         }
 
-        // into_vector on CUDA vector types
+        // into_vec on CUDA vector types
         {
-            kf::vec<float, 1> a = into_vector(make_float1(5.0f));
-            kf::vec<float, 2> b = into_vector(make_float2(5.0f, 4.0f));
-            kf::vec<float, 3> c = into_vector(make_float3(5.0f, 4.0f, -1.0f));
-            kf::vec<float, 4> d = into_vector(make_float4(5.0f, 4.0f, -1.0f, 0.0f));
+            kf::vec<float, 1> a = into_vec(make_float1(5.0f));
+            kf::vec<float, 2> b = into_vec(make_float2(5.0f, 4.0f));
+            kf::vec<float, 3> c = into_vec(make_float3(5.0f, 4.0f, -1.0f));
+            kf::vec<float, 4> d = into_vec(make_float4(5.0f, 4.0f, -1.0f, 0.0f));
 
             ASSERT(a[0] == 5.0f);
             ASSERT(b[0] == 5.0f && b[1] == 4.0f);
             ASSERT(c[0] == 5.0f && c[1] == 4.0f && c[2] == -1.0f);
             ASSERT(d[0] == 5.0f && d[1] == 4.0f && d[2] == -1.0f && d[3] == 0.0f);
         }
 
-        // into_vector on C-style array
+        // into_vec on C-style array
         {
             float items[3] = {1.0f, 2.0f, 3.0f};
-            kf::vec<float, 3> a = into_vector(items);
+            kf::vec<float, 3> a = into_vec(items);
             ASSERT(a[0] == 1.0f && a[1] == 2.0f && a[2] == 3.0f);
         }
 
-        // into_vector on kf array
+        // into_vec on kf array
         {
             kf::vec<float, 3> items = {1.0f, 2.0f, 3.0f};
-            kf::vec<float, 3> a = into_vector(items);
+            kf::vec<float, 3> a = into_vec(items);
             ASSERT(a[0] == 1.0f && a[1] == 2.0f && a[2] == 3.0f);
         }
 
@@ -145,4 +145,4 @@ struct creation_tests {
     }
 };
 
-REGISTER_TEST_CASE("into_vec and make_vec", creation_tests, int, float)
+REGISTER_TEST_CASE("into_vec and make_vec", creation_tests, int, float)