forgot to cntrl+S in editor :)

msu-sparta · Dec 14, 2023 · 44a0d2b · 44a0d2b
1 parent 5055690
commit 44a0d2b
Show file tree

Hide file tree

Showing 5 changed files with 1 addition and 29 deletions.
diff --git a/examples/basic_usage.cpp b/examples/basic_usage.cpp
@@ -25,11 +25,7 @@
 //********************************************************************************
 // @HEADER
 
-<<<<<<< HEAD
 #include <openrand/philox.h>
-=======
-#include <openrand/phillox.h>
->>>>>>> upstream/main
 #include <openrand/squares.h>
 #include <openrand/tyche.h>
 
@@ -57,11 +53,7 @@ int main() {
   double c = rng.rand<double>();
   float f = rng.rand<float>();
 
-<<<<<<< HEAD
   if constexpr (std::is_same_v<RNG, typename openrand::Philox>) {
-=======
-  if constexpr (std::is_same_v<RNG, typename openrand::Phillox>) {
->>>>>>> upstream/main
     // this function is not availabe for all generators.
     openrand::float4 f4 = rng.draw_float4();
 

diff --git a/examples/pi_cuda.cu b/examples/pi_cuda.cu
@@ -32,11 +32,7 @@
  */
 
 #include <curand_kernel.h>
-<<<<<<< HEAD
 #include <openrand/philox.h>
-=======
-#include <openrand/phillox.h>
->>>>>>> upstream/main
 #include <openrand/squares.h>
 #include <openrand/threefry.h>
 #include <openrand/tyche.h>

diff --git a/examples/pi_openmp.cpp b/examples/pi_openmp.cpp
@@ -27,11 +27,7 @@
 // @HEADER
 
 #include <omp.h>
-<<<<<<< HEAD
 #include <openrand/philox.h>
-=======
-#include <openrand/phillox.h>
->>>>>>> upstream/main
 #include <openrand/tyche.h>
 
 #include <atomic>

diff --git a/include/openrand/philox.h b/include/openrand/philox.h
@@ -51,11 +51,7 @@ namespace openrand {
 class Philox : public BaseRNG<Philox> {
  public:
   /**
-<<<<<<< HEAD:include/openrand/philox.h
-   * @brief Construct a new Philox object
-=======
-   * @brief Construct a new Phillox object
->>>>>>> upstream/main:include/openrand/phillox.h
+   * @brief Construct a new Philox generator
    *
    * @note Internally, global_seed is treated in the same way as other counters,
    * and can be treated as such depending on the application needs.
@@ -65,11 +61,7 @@ class Philox : public BaseRNG<Philox> {
    * @param global_seed (Optional) 32-bit global seed.
    * @param ctr1 (Optional) Another 32-bit counter exposed for advanced use.
    */
-<<<<<<< HEAD:include/openrand/philox.h
   DEVICE Philox(uint64_t seed, uint32_t ctr,
-=======
-  DEVICE Phillox(uint64_t seed, uint32_t ctr,
->>>>>>> upstream/main:include/openrand/phillox.h
                  uint32_t global_seed = openrand::DEFAULT_GLOBAL_SEED,
                  uint32_t ctr1 = 0x12345)
       : seed_hi((uint32_t)(seed >> 32)),

diff --git a/tests/test_uniform.cpp b/tests/test_uniform.cpp
@@ -104,11 +104,7 @@ void test_range() {
 }
 
 TEST(RNG, range) {
-<<<<<<< HEAD
   test_range<openrand::Philox>();
-=======
-  test_range<openrand::Phillox>();
->>>>>>> upstream/main
   test_range<openrand::Tyche>();
   test_range<openrand::Threefry>();
   test_range<openrand::Squares>();