Skip to content

Commit d2c80a1

Browse files
committed
Move engine builder to separate folder
1 parent f27927b commit d2c80a1

File tree

8 files changed

+23
-22
lines changed

8 files changed

+23
-22
lines changed

dpnp/backend/extensions/rng/device/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ endif()
4141
set_target_properties(${python_module_name} PROPERTIES CMAKE_POSITION_INDEPENDENT_CODE ON)
4242

4343
target_include_directories(${python_module_name} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})
44+
target_include_directories(${python_module_name} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/engine)
4445
target_include_directories(${python_module_name} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/../../include)
4546
target_include_directories(${python_module_name} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/../../src)
4647

dpnp/backend/extensions/rng/device/engine/base_builder.hpp renamed to dpnp/backend/extensions/rng/device/engine/builder/base.hpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
#include "engine_base.hpp"
2929

3030

31-
namespace dpnp::backend::ext::rng::device::engine
31+
namespace dpnp::backend::ext::rng::device::engine::builder
3232
{
3333
template <typename EngineT, typename SeedT, typename OffsetT>
3434
class BaseBuilder {
@@ -102,4 +102,4 @@ class BaseBuilder {
102102
std::cout << std::endl;
103103
}
104104
};
105-
} // dpnp::backend::ext::rng::device::engine
105+
} // dpnp::backend::ext::rng::device::engine::builder

dpnp/backend/extensions/rng/device/engine/engine_builder.hpp renamed to dpnp/backend/extensions/rng/device/engine/builder/builder.hpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,13 +26,13 @@
2626
#pragma once
2727

2828

29-
namespace dpnp::backend::ext::rng::device::engine
29+
namespace dpnp::backend::ext::rng::device::engine::builder
3030
{
3131
template <typename Type>
3232
class Builder {};
33-
} // dpnp::backend::ext::rng::device::engine
33+
} // dpnp::backend::ext::rng::device::engine::builder
3434

35-
#include "mrg32k3a_builder.hpp"
36-
#include "philox4x32x10_builder.hpp"
37-
#include "mcg31m1_builder.hpp"
38-
#include "mcg59_builder.hpp"
35+
#include "mrg32k3a.hpp"
36+
#include "philox4x32x10.hpp"
37+
#include "mcg31m1.hpp"
38+
#include "mcg59.hpp"

dpnp/backend/extensions/rng/device/engine/mcg31m1_builder.hpp renamed to dpnp/backend/extensions/rng/device/engine/builder/mcg31m1.hpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,9 @@
2828
#include <oneapi/mkl/rng/device.hpp>
2929

3030
#include "engine_base.hpp"
31-
#include "base_builder.hpp"
31+
#include "base.hpp"
3232

33-
namespace dpnp::backend::ext::rng::device::engine
33+
namespace dpnp::backend::ext::rng::device::engine::builder
3434
{
3535
namespace mkl_rng_dev = oneapi::mkl::rng::device;
3636

@@ -41,4 +41,4 @@ class Builder<mkl_rng_dev::mcg31m1<VecSize>> : public BaseBuilder<mkl_rng_dev::m
4141

4242
Builder(EngineBase *engine) : BaseBuilder<EngineType, std::uint32_t, std::uint64_t>(engine) {}
4343
};
44-
} // dpnp::backend::ext::rng::device::engine
44+
} // dpnp::backend::ext::rng::device::engine::builder

dpnp/backend/extensions/rng/device/engine/mcg59_builder.hpp renamed to dpnp/backend/extensions/rng/device/engine/builder/mcg59.hpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,9 @@
2828
#include <oneapi/mkl/rng/device.hpp>
2929

3030
#include "engine_base.hpp"
31-
#include "base_builder.hpp"
31+
#include "base.hpp"
3232

33-
namespace dpnp::backend::ext::rng::device::engine
33+
namespace dpnp::backend::ext::rng::device::engine::builder
3434
{
3535
namespace mkl_rng_dev = oneapi::mkl::rng::device;
3636

@@ -41,4 +41,4 @@ class Builder<mkl_rng_dev::mcg59<VecSize>> : public BaseBuilder<mkl_rng_dev::mcg
4141

4242
Builder(EngineBase *engine) : BaseBuilder<EngineType, std::uint32_t, std::uint64_t>(engine) {}
4343
};
44-
} // dpnp::backend::ext::rng::device::engine
44+
} // dpnp::backend::ext::rng::device::engine::builder

dpnp/backend/extensions/rng/device/engine/mrg32k3a_builder.hpp renamed to dpnp/backend/extensions/rng/device/engine/builder/mrg32k3a.hpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,9 @@
2828
#include <oneapi/mkl/rng/device.hpp>
2929

3030
#include "engine_base.hpp"
31-
#include "base_builder.hpp"
31+
#include "base.hpp"
3232

33-
namespace dpnp::backend::ext::rng::device::engine
33+
namespace dpnp::backend::ext::rng::device::engine::builder
3434
{
3535
namespace mkl_rng_dev = oneapi::mkl::rng::device;
3636

@@ -41,4 +41,4 @@ class Builder<mkl_rng_dev::mrg32k3a<VecSize>> : public BaseBuilder<mkl_rng_dev::
4141

4242
Builder(EngineBase *engine) : BaseBuilder<EngineType, std::uint32_t, std::uint64_t>(engine) {}
4343
};
44-
} // dpnp::backend::ext::rng::device::engine
44+
} // dpnp::backend::ext::rng::device::engine::builder

dpnp/backend/extensions/rng/device/engine/philox4x32x10_builder.hpp renamed to dpnp/backend/extensions/rng/device/engine/builder/philox4x32x10.hpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,9 @@
2828
#include <oneapi/mkl/rng/device.hpp>
2929

3030
#include "engine_base.hpp"
31-
#include "base_builder.hpp"
31+
#include "base.hpp"
3232

33-
namespace dpnp::backend::ext::rng::device::engine
33+
namespace dpnp::backend::ext::rng::device::engine::builder
3434
{
3535
namespace mkl_rng_dev = oneapi::mkl::rng::device;
3636

@@ -41,4 +41,4 @@ class Builder<mkl_rng_dev::philox4x32x10<VecSize>> : public BaseBuilder<mkl_rng_
4141

4242
Builder(EngineBase *engine) : BaseBuilder<EngineType, std::uint32_t, std::uint64_t>(engine) {}
4343
};
44-
} // dpnp::backend::ext::rng::device::engine
44+
} // dpnp::backend::ext::rng::device::engine::builder

dpnp/backend/extensions/rng/device/gaussian.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
#include "gaussian.hpp"
3838

3939
#include "engine/engine_base.hpp"
40-
#include "engine/engine_builder.hpp"
40+
#include "engine/builder/builder.hpp"
4141

4242
#include "dispatch/matrix.hpp"
4343
#include "dispatch/table_builder.hpp"
@@ -127,7 +127,7 @@ static sycl::event gaussian_impl(engine::EngineBase *engine,
127127
distr_event = exec_q.submit([&](sycl::handler &cgh) {
128128
cgh.depends_on(depends);
129129

130-
using EngineBuilderT = engine::Builder<EngineT>;
130+
using EngineBuilderT = engine::builder::Builder<EngineT>;
131131
EngineBuilderT eng_builder(engine);
132132
eng_builder.print(); // TODO: remove
133133

0 commit comments

Comments
 (0)