Skip to content

Use std::unique_ptr for samplers_ and likelihood_in_iter_ #4551

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sharwell merged 1 commit into from
Dec 9, 2019
Merged

Use std::unique_ptr for samplers_ and likelihood_in_iter_ #4551

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 10 additions & 30 deletions src/Native/LdaNative/lda_engine.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,6 @@ namespace lda {
mh_step_(mhstep),
alpha_sum_(alphaSum),
maxDocToken_(maxDocToken),
samplers_(nullptr),
document_buffer_(nullptr)
{
if (numThread > 0)
Expand All @@ -78,8 +77,6 @@ namespace lda {
for (int i = 0; i < num_threads_; i++)
document_buffer_[i] = new int32_t[maxDocToken_ * 2 + 1];

likelihood_in_iter_ = nullptr;

beta_sum_ = beta_ * V_;
}

Expand All @@ -92,7 +89,6 @@ namespace lda {
mh_step_(mh_step),
alpha_sum_(alpha_sum),
maxDocToken_(maxDocToken),
samplers_(nullptr),
document_buffer_(nullptr)
{
if (num_threads > 0)
Expand All @@ -115,7 +111,6 @@ namespace lda {
for (int i = 0; i < num_threads_; i++)
document_buffer_[i] = new int32_t[maxDocToken_ * 2 + 1];

likelihood_in_iter_ = nullptr;
beta_sum_ = beta_ * V_;
}

Expand All @@ -129,11 +124,7 @@ namespace lda {
model_block_.reset(nullptr);
samplerQueue_.reset(nullptr);

for (int i = 0; i < num_threads_; ++i)
{
delete samplers_[i];
}
delete[] samplers_;
Comment on lines -132 to -136

@sharwell sharwell Dec 8, 2019

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

📝 This block was responsible for some of the crashes observed in CI, and especially the crashes prior to 0cbfa54. The destructor is missing a null check for samplers_.

samplers_.reset(nullptr);

if (document_buffer_)
{
Expand All @@ -146,11 +137,7 @@ namespace lda {
document_buffer_ = nullptr;
}

if (likelihood_in_iter_)
{
delete[] likelihood_in_iter_;
likelihood_in_iter_ = nullptr;
}
likelihood_in_iter_.reset(nullptr);
}

bool LdaEngine::InitializeBeforeTrain()
Expand Down Expand Up @@ -184,12 +171,12 @@ namespace lda {
word_range_for_each_thread_[num_threads_] = V_;

//setup sampler
samplers_ = new LightDocSampler*[num_threads_];
samplers_.reset(new std::unique_ptr<LightDocSampler>[num_threads_]);
samplerQueue_->clear();

for (int i = 0; i < num_threads_; ++i)
{
samplers_[i] = new LightDocSampler(
samplers_[i].reset(new LightDocSampler(
K_,
V_,
num_threads_,
Expand All @@ -201,7 +188,7 @@ namespace lda {
global_alias_k_v_,
beta_height_,
beta_mass_,
beta_k_v_);
beta_k_v_));

samplerQueue_->push(i);
}
Expand Down Expand Up @@ -241,14 +228,7 @@ namespace lda {
word_range_for_each_thread_[num_threads_] = V_;

//setup sampler
if (samplers_)
{
for (int i = 0; i < num_threads_; ++i)
{
delete samplers_[i];
}
delete[] samplers_;
}
samplers_.reset(nullptr);
if (document_buffer_)
{
for (int i = 0; i < num_threads_; ++i)
Expand All @@ -260,13 +240,13 @@ namespace lda {
document_buffer_ = nullptr;
}

samplers_ = new LightDocSampler*[num_threads_];
samplers_.reset(new std::unique_ptr<LightDocSampler>[num_threads_]);
document_buffer_ = new int32_t*[num_threads_];
samplerQueue_->clear();

for (int i = 0; i < num_threads_; ++i)
{
samplers_[i] = new LightDocSampler(
samplers_[i].reset(new LightDocSampler(
K_,
V_,
num_threads_,
Expand All @@ -278,7 +258,7 @@ namespace lda {
global_alias_k_v_,
beta_height_,
beta_mass_,
beta_k_v_);
beta_k_v_));

samplers_[i]->AdaptAlphaSum(false);
document_buffer_[i] = new int32_t[maxDocToken_ * 2 + 1];
Expand Down Expand Up @@ -333,7 +313,7 @@ namespace lda {
atomic_stats_->thread_counter_ = 0;
burnin_iterations_ = burnin_iter;

likelihood_in_iter_ = new float[burnin_iterations_];
likelihood_in_iter_.reset(new float[burnin_iterations_]);
for (int i = 0; i < burnin_iterations_; i++)
{
likelihood_in_iter_[i] = 0.0;
Expand Down
4 changes: 2 additions & 2 deletions src/Native/LdaNative/lda_engine.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,8 +126,8 @@ namespace lda {
float beta_mass_;
std::vector<wood::alias_k_v> beta_k_v_;

LightDocSampler **samplers_;
float* likelihood_in_iter_;
std::unique_ptr<std::unique_ptr<LightDocSampler>[]> samplers_;
std::unique_ptr<float[]> likelihood_in_iter_;

// For TestDocSafe purpose
int32_t **document_buffer_;
Expand Down