Skip to content

SST Master Branch Merger: Auto Create Pull Request to Promote from devel to master - All Tests Ran Clean #1234

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
sst-autotester merged 2 commits into from
Mar 6, 2025
Merged

SST Master Branch Merger: Auto Create Pull Request to Promote from devel to master - All Tests Ran Clean #1234

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
eb6d708
Fix missed override in statnull.h (#1227)
gvoskuilen Mar 4, 2025
80ff4b9
Use std::unique_ptr for modelGen (#1230)
leekillough Mar 5, 2025
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
13 changes: 3 additions & 10 deletions src/sst/core/main.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -293,9 +293,8 @@ start_graph_creation(
}
}


// Create the model generator
SSTModelDescription* modelGen = nullptr;
std::unique_ptr<SSTModelDescription> modelGen;

force_rank_sequential_start(cfg.rank_seq_startup(), myRank, world_size);

Expand All @@ -320,8 +319,8 @@ start_graph_creation(
}

if ( myRank.rank == 0 || cfg.parallel_load() ) {
modelGen = factory->Create<SSTModelDescription>(
model_name, cfg.configFile(), cfg.verbose(), &cfg, sst_get_cpu_time());
modelGen.reset(factory->Create<SSTModelDescription>(
model_name, cfg.configFile(), cfg.verbose(), &cfg, sst_get_cpu_time()));
}
}

Expand Down Expand Up @@ -357,12 +356,6 @@ start_graph_creation(
}
#endif

// Delete the model generator
if ( modelGen ) {
delete modelGen;
modelGen = nullptr;
}

return start_graph_gen;
}

Expand Down
8 changes: 4 additions & 4 deletions src/sst/core/statapi/statnull.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ class NullStatisticBase<T, true> : public Statistic<T>

void addData_impl_Ntimes(uint64_t UNUSED(N), T UNUSED(data)) override {}

virtual const std::string& getStatTypeName() const { return stat_type_; }
virtual const std::string& getStatTypeName() const override { return stat_type_; }

private:
inline static const std::string stat_type_ = "NULL";
Expand All @@ -70,7 +70,7 @@ class NullStatisticBase<std::tuple<Args...>, false> : public Statistic<std::tupl

void addData_impl_Ntimes(uint64_t UNUSED(N), Args... UNUSED(data)) override {}

virtual const std::string& getStatTypeName() const { return stat_type_; }
virtual const std::string& getStatTypeName() const override { return stat_type_; }

private:
inline static const std::string stat_type_ = "NULL";
Expand All @@ -91,7 +91,7 @@ class NullStatisticBase<T, false> : public Statistic<T>
void addData_impl_Ntimes(uint64_t UNUSED(N), T&& UNUSED(data)) override {}
void addData_impl_Ntimes(uint64_t UNUSED(N), const T& UNUSED(data)) override {}

virtual const std::string& getStatTypeName() const { return stat_type_; }
virtual const std::string& getStatTypeName() const override { return stat_type_; }

private:
inline static const std::string stat_type_ = "NULL";
Expand Down Expand Up @@ -164,7 +164,7 @@ class NullStatistic<void> : public Statistic<void>

virtual std::string getELIName() const override { return "sst.NullStatistic"; }

virtual const std::string& getStatTypeName() const { return stat_type_; }
virtual const std::string& getStatTypeName() const override { return stat_type_; }

private:
inline static const std::string stat_type_ = "NULL";
Expand Down
Loading