Cleanups for random module

libcudacxx/include/cuda/std/__random/binomial_distribution.h

@@ -31,7 +31,7 @@ _CCCL_BEGIN_NAMESPACE_CUDA_STD
 template <class _IntType = int>
 class binomial_distribution
 {
-  static_assert(__libcpp_random_is_valid_inttype<_IntType>, "IntType must be a supported integer type");
+  static_assert(__cccl_random_is_valid_inttype<_IntType>, "IntType must be a supported integer type");
 
 public:
   // types

libcudacxx/include/cuda/std/__random/cauchy_distribution.h

@@ -32,7 +32,7 @@ _CCCL_BEGIN_NAMESPACE_CUDA_STD
 template <class _RealType = double>
 class cauchy_distribution
 {
-  static_assert(__libcpp_random_is_valid_realtype<_RealType>, "RealType must be a supported floating-point type");
+  static_assert(__cccl_random_is_valid_realtype<_RealType>, "RealType must be a supported floating-point type");
 
 public:
   // types

libcudacxx/include/cuda/std/__random/chi_squared_distribution.h

@@ -31,7 +31,7 @@ _CCCL_BEGIN_NAMESPACE_CUDA_STD
 template <class _RealType = double>
 class chi_squared_distribution
 {
-  static_assert(__libcpp_random_is_valid_realtype<_RealType>, "RealType must be a supported floating-point type");
+  static_assert(__cccl_random_is_valid_realtype<_RealType>, "RealType must be a supported floating-point type");
 
 public:
   // types

libcudacxx/include/cuda/std/__random/exponential_distribution.h

@@ -37,7 +37,7 @@ _CCCL_BEGIN_NAMESPACE_CUDA_STD
 template <class _RealType = double>
 class exponential_distribution
 {
-  static_assert(__libcpp_random_is_valid_realtype<_RealType>, "RealType must be a supported floating-point type");
+  static_assert(__cccl_random_is_valid_realtype<_RealType>, "RealType must be a supported floating-point type");
 
 public:
   // types

libcudacxx/include/cuda/std/__random/extreme_value_distribution.h

@@ -36,7 +36,7 @@ _CCCL_BEGIN_NAMESPACE_CUDA_STD
 template <class _RealType = double>
 class extreme_value_distribution
 {
-  static_assert(__libcpp_random_is_valid_realtype<_RealType>, "RealType must be a supported floating-point type");
+  static_assert(__cccl_random_is_valid_realtype<_RealType>, "RealType must be a supported floating-point type");
 
 public:
   // types

libcudacxx/include/cuda/std/__random/fisher_f_distribution.h

@@ -35,7 +35,7 @@ _CCCL_BEGIN_NAMESPACE_CUDA_STD
 template <class _RealType = double>
 class fisher_f_distribution
 {
-  static_assert(__libcpp_random_is_valid_realtype<_RealType>, "RealType must be a supported floating-point type");
+  static_assert(__cccl_random_is_valid_realtype<_RealType>, "RealType must be a supported floating-point type");
 
 public:
   // types

libcudacxx/include/cuda/std/__random/gamma_distribution.h

@@ -38,7 +38,7 @@ _CCCL_BEGIN_NAMESPACE_CUDA_STD
 template <class _RealType = double>
 class gamma_distribution
 {
-  static_assert(__libcpp_random_is_valid_realtype<_RealType>, "RealType must be a supported floating-point type");
+  static_assert(__cccl_random_is_valid_realtype<_RealType>, "RealType must be a supported floating-point type");
 
 public:
   // types

libcudacxx/include/cuda/std/__random/geometric_distribution.h

@@ -35,7 +35,7 @@ _CCCL_BEGIN_NAMESPACE_CUDA_STD
 template <class _IntType = int>
 class geometric_distribution
 {
-  static_assert(__libcpp_random_is_valid_inttype<_IntType>, "IntType must be a supported integer type");
+  static_assert(__cccl_random_is_valid_inttype<_IntType>, "IntType must be a supported integer type");
 
 public:
   // types

libcudacxx/include/cuda/std/__random/is_valid.h

@@ -21,11 +21,12 @@
 #endif // no system header
 
 #include <cuda/std/__type_traits/enable_if.h>
-#include <cuda/std/__type_traits/integral_constant.h>
+#include <cuda/std/__type_traits/is_const.h>
+#include <cuda/std/__type_traits/is_floating_point.h>
+#include <cuda/std/__type_traits/is_integer.h>
 #include <cuda/std/__type_traits/is_same.h>
 #include <cuda/std/__type_traits/is_unsigned.h>
 #include <cuda/std/__utility/declval.h>
-#include <cuda/std/cstdint>
 
 #include <cuda/std/__cccl/prologue.h>
 
@@ -36,52 +37,18 @@ _CCCL_BEGIN_NAMESPACE_CUDA_STD
 // named RealType is undefined unless the corresponding template argument is
 // cv-unqualified and is one of float, double, or long double.
 
-template <class>
-inline constexpr bool __libcpp_random_is_valid_realtype = false;
-
-template <>
-inline constexpr bool __libcpp_random_is_valid_realtype<float> = true;
-template <>
-inline constexpr bool __libcpp_random_is_valid_realtype<double> = true;
-#if _CCCL_HAS_LONG_DOUBLE()
-template <>
-inline constexpr bool __libcpp_random_is_valid_realtype<long double> = true;
-#endif // _CCCL_HAS_LONG_DOUBLE()
+template <class _Type>
+inline constexpr bool __cccl_random_is_valid_realtype =
+  ::cuda::std::is_floating_point_v<_Type> && !::cuda::std::is_const_v<_Type>;
 
 // [rand.req.genl]/1.5:
 // The effect of instantiating a template that has a template type parameter
 // named IntType is undefined unless the corresponding template argument is
 // cv-unqualified and is one of short, int, long, long long, unsigned short,
 // unsigned int, unsigned long, or unsigned long long.
-
-template <class>
-inline constexpr bool __libcpp_random_is_valid_inttype = false;
-template <> // extension
-inline constexpr bool __libcpp_random_is_valid_inttype<int8_t> = true;
-template <>
-inline constexpr bool __libcpp_random_is_valid_inttype<short> = true;
-template <>
-inline constexpr bool __libcpp_random_is_valid_inttype<int> = true;
-template <>
-inline constexpr bool __libcpp_random_is_valid_inttype<long> = true;
-template <>
-inline constexpr bool __libcpp_random_is_valid_inttype<long long> = true;
-template <> // extension
-inline constexpr bool __libcpp_random_is_valid_inttype<uint8_t> = true;
-template <>
-inline constexpr bool __libcpp_random_is_valid_inttype<unsigned short> = true;
-template <>
-inline constexpr bool __libcpp_random_is_valid_inttype<unsigned int> = true;
-template <>
-inline constexpr bool __libcpp_random_is_valid_inttype<unsigned long> = true;
-template <>
-inline constexpr bool __libcpp_random_is_valid_inttype<unsigned long long> = true;
-#if _CCCL_HAS_INT128()
-template <> // extension
-inline constexpr bool __libcpp_random_is_valid_inttype<__int128_t> = true;
-template <> // extension
-inline constexpr bool __libcpp_random_is_valid_inttype<__uint128_t> = true;
-#endif // _CCCL_HAS_INT128()
+template <class _Type>
+inline constexpr bool __cccl_random_is_valid_inttype =
+  ::cuda::std::__cccl_is_integer_v<_Type> && !::cuda::std::is_const_v<_Type>;
 
 // [rand.req.urng]/3:
 // A class G meets the uniform random bit generator requirements if G models

libcudacxx/include/cuda/std/__random/lognormal_distribution.h

@@ -36,7 +36,7 @@ _CCCL_BEGIN_NAMESPACE_CUDA_STD
 template <class _RealType = double>
 class lognormal_distribution
 {
-  static_assert(__libcpp_random_is_valid_realtype<_RealType>, "RealType must be a supported floating-point type");
+  static_assert(__cccl_random_is_valid_realtype<_RealType>, "RealType must be a supported floating-point type");
 
 public:
   // types

libcudacxx/include/cuda/std/__random/negative_binomial_distribution.h

@@ -36,7 +36,7 @@ _CCCL_BEGIN_NAMESPACE_CUDA_STD
 template <class _IntType = int>
 class negative_binomial_distribution
 {
-  static_assert(__libcpp_random_is_valid_inttype<_IntType>, "IntType must be a supported integer type");
+  static_assert(__cccl_random_is_valid_inttype<_IntType>, "IntType must be a supported integer type");
 
 public:
   // types

libcudacxx/include/cuda/std/__random/normal_distribution.h

@@ -37,7 +37,7 @@ _CCCL_BEGIN_NAMESPACE_CUDA_STD
 template <class _RealType = double>
 class normal_distribution
 {
-  static_assert(__libcpp_random_is_valid_realtype<_RealType>, "RealType must be a supported floating-point type");
+  static_assert(__cccl_random_is_valid_realtype<_RealType>, "RealType must be a supported floating-point type");
 
 public:
   // types

libcudacxx/include/cuda/std/__random/poisson_distribution.h

@@ -37,7 +37,7 @@ _CCCL_BEGIN_NAMESPACE_CUDA_STD
 template <class _IntType = int>
 class poisson_distribution
 {
-  static_assert(__libcpp_random_is_valid_inttype<_IntType>, "IntType must be a supported integer type");
+  static_assert(__cccl_random_is_valid_inttype<_IntType>, "IntType must be a supported integer type");
 
 public:
   // types

libcudacxx/include/cuda/std/__random/student_t_distribution.h

@@ -37,7 +37,7 @@ _CCCL_BEGIN_NAMESPACE_CUDA_STD
 template <class _RealType = double>
 class student_t_distribution
 {
-  static_assert(__libcpp_random_is_valid_realtype<_RealType>, "RealType must be a supported floating-point type");
+  static_assert(__cccl_random_is_valid_realtype<_RealType>, "RealType must be a supported floating-point type");
 
 public:
   // types

libcudacxx/include/cuda/std/__random/uniform_int_distribution.h

@@ -160,7 +160,7 @@ class __independent_bits_engine
 template <class _IntType = int>
 class uniform_int_distribution
 {
-  static_assert(__libcpp_random_is_valid_inttype<_IntType>, "IntType must be a supported integer type");
+  static_assert(__cccl_random_is_valid_inttype<_IntType>, "IntType must be a supported integer type");
 
 public:
   // types

libcudacxx/include/cuda/std/__random/uniform_real_distribution.h

@@ -35,7 +35,7 @@ _CCCL_BEGIN_NAMESPACE_CUDA_STD
 template <class _RealType = double>
 class uniform_real_distribution
 {
-  static_assert(__libcpp_random_is_valid_realtype<_RealType>, "RealType must be a supported floating-point type");
+  static_assert(__cccl_random_is_valid_realtype<_RealType>, "RealType must be a supported floating-point type");
 
 public:
   // types

libcudacxx/include/cuda/std/__random/weibull_distribution.h

@@ -36,7 +36,7 @@ _CCCL_BEGIN_NAMESPACE_CUDA_STD
 template <class _RealType = double>
 class weibull_distribution
 {
-  static_assert(__libcpp_random_is_valid_realtype<_RealType>, "RealType must be a supported floating-point type");
+  static_assert(__cccl_random_is_valid_realtype<_RealType>, "RealType must be a supported floating-point type");
 
 public:
   // types

libcudacxx/include/cuda/std/__random_

@@ -29,6 +29,7 @@
 #include <cuda/std/__random/extreme_value_distribution.h>
 #include <cuda/std/__random/fisher_f_distribution.h>
 #include <cuda/std/__random/gamma_distribution.h>
+#include <cuda/std/__random/generate_canonical.h>
 #include <cuda/std/__random/geometric_distribution.h>
 #include <cuda/std/__random/linear_congruential_engine.h>
 #include <cuda/std/__random/lognormal_distribution.h>

libcudacxx/test/libcudacxx/std/random/generate_canonical/generate_canonical.pass.cpp

@@ -0,0 +1,37 @@
+//===----------------------------------------------------------------------===//
+//
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+// SPDX-FileCopyrightText: Copyright (c) 2025 NVIDIA CORPORATION & AFFILIATES.
+//
+//===----------------------------------------------------------------------===//
+//
+
+#include <cuda/std/__random_>
+#include <cuda/std/array>
+#include <cuda/std/cassert>
+#include <cuda/std/numeric>
+
+#include "test_macros.h"
+
+template <class T>
+__host__ __device__ void test()
+{
+  cuda::std::array<T, 100> data;
+  cuda::std::philox4x64 g{};
+  for (auto& v : data)
+  {
+    v = cuda::std::generate_canonical<T, cuda::std::numeric_limits<T>::digits>(g);
+    assert(v >= T(0) && v < T(1));
+  }
+  auto mean = cuda::std::accumulate(data.begin(), data.end(), T(0)) / data.size();
+  assert(mean > T(0.4) && mean < T(0.6));
+}
+
+int main(int, char**)
+{
+  test<float>();
+  test<double>();
+  return 0;
+}