Commit 0bddb26d authored by Jaikrishnan Menon's avatar Jaikrishnan Menon Committed by Scott Cyphers

Make pool alignment a constexpr (#1369)

* Make pool alignment a constexpr

* Fix ODR-use
parent 19bdb2ff
...@@ -322,9 +322,6 @@ static const runtime::cpu::OpMap dispatcher{ ...@@ -322,9 +322,6 @@ static const runtime::cpu::OpMap dispatcher{
{TI(ngraph::op::LRN), &runtime::cpu::CPU_Emitter::emit<ngraph::op::LRN>}, {TI(ngraph::op::LRN), &runtime::cpu::CPU_Emitter::emit<ngraph::op::LRN>},
}; };
const size_t runtime::cpu::CPU_ExternalFunction::CPU_ExternalFunction::s_memory_pool_alignment =
4096;
runtime::cpu::CPU_ExternalFunction::CPU_ExternalFunction( runtime::cpu::CPU_ExternalFunction::CPU_ExternalFunction(
const shared_ptr<ngraph::Function>& function, bool release_function) const shared_ptr<ngraph::Function>& function, bool release_function)
: m_function(function) : m_function(function)
...@@ -384,7 +381,7 @@ void runtime::cpu::CPU_ExternalFunction::compile() ...@@ -384,7 +381,7 @@ void runtime::cpu::CPU_ExternalFunction::compile()
pass_manager.register_pass<ngraph::pass::CommonFunctionCollection>( pass_manager.register_pass<ngraph::pass::CommonFunctionCollection>(
femitter, node_function_map, common_function_string); femitter, node_function_map, common_function_string);
pass_manager.register_pass<ngraph::pass::Liveness>(); pass_manager.register_pass<ngraph::pass::Liveness>();
pass_manager.register_pass<ngraph::pass::MemoryLayout>(s_memory_pool_alignment, true); pass_manager.register_pass<ngraph::pass::MemoryLayout>(size_t(s_memory_pool_alignment), true);
pass_manager.run_passes(m_function); pass_manager.run_passes(m_function);
unordered_map<shared_ptr<Function>, list<shared_ptr<Node>>> function_ordered_ops; unordered_map<shared_ptr<Function>, list<shared_ptr<Node>>> function_ordered_ops;
...@@ -1084,7 +1081,7 @@ void runtime::cpu::CPU_ExternalFunction::build() ...@@ -1084,7 +1081,7 @@ void runtime::cpu::CPU_ExternalFunction::build()
pass_manager.register_pass<ngraph::pass::ResultCopyElimination>(); pass_manager.register_pass<ngraph::pass::ResultCopyElimination>();
pass_manager.register_pass<ngraph::pass::GetOutputElementElimination>(); pass_manager.register_pass<ngraph::pass::GetOutputElementElimination>();
pass_manager.register_pass<ngraph::pass::Liveness>(); pass_manager.register_pass<ngraph::pass::Liveness>();
pass_manager.register_pass<ngraph::pass::MemoryLayout>(s_memory_pool_alignment, true); pass_manager.register_pass<ngraph::pass::MemoryLayout>(size_t(s_memory_pool_alignment), true);
pass_manager.run_passes(m_function, false); pass_manager.run_passes(m_function, false);
// Store layouts assigned for arguments // Store layouts assigned for arguments
......
...@@ -94,7 +94,7 @@ namespace ngraph ...@@ -94,7 +94,7 @@ namespace ngraph
const std::string& get_function_name() const { return m_function_name; } const std::string& get_function_name() const { return m_function_name; }
const std::shared_ptr<ngraph::Function> get_function() { return m_function; } const std::shared_ptr<ngraph::Function> get_function() { return m_function; }
// Temporary Memory Pool alignment // Temporary Memory Pool alignment
static const size_t s_memory_pool_alignment; static constexpr size_t s_memory_pool_alignment = 4096;
std::list<std::function<void(CPURuntimeContext*)>>& get_functors() std::list<std::function<void(CPURuntimeContext*)>>& get_functors()
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment