Skip to content
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.

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

Remove deprecated functions and classes #1076

Merged
merged 4 commits into from
May 14, 2024
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
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
3 changes: 0 additions & 3 deletions src/sst/core/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,6 @@ nobase_dist_sst_HEADERS = \
profile/syncProfileTool.h \
profile/componentProfileTool.h \
rankInfo.h \
simulation.h \
sparseVectorMap.h \
sst_types.h \
sstpart.h \
Expand Down Expand Up @@ -112,7 +111,6 @@ nobase_dist_sst_HEADERS = \
serialization/statics.h \
interfaces/TestEvent.h \
interfaces/stringEvent.h \
interfaces/simpleMem.h \
interfaces/stdMem.h \
interfaces/simpleNetwork.h \
interprocess/tunneldef.h \
Expand Down Expand Up @@ -218,7 +216,6 @@ sst_core_sources = \
serialization/statics.cc \
sstinfo.h \
interfaces/TestEvent.cc \
interfaces/simpleMem.cc \
interfaces/stdMem.cc \
interfaces/simpleNetwork.cc \
interprocess/ipctunnel.cc \
Expand Down
6 changes: 0 additions & 6 deletions src/sst/core/baseComponent.cc
Original file line number Diff line number Diff line change
Expand Up @@ -625,12 +625,6 @@ BaseComponent::doesSubComponentExist(const std::string& type)
return Factory::getFactory()->doesSubComponentExist(type);
}

Simulation*
BaseComponent::getSimulation() const
{
return sim_;
}

uint8_t
BaseComponent::getComponentInfoStatisticEnableLevel(const std::string& statisticName) const
{
Expand Down
8 changes: 0 additions & 8 deletions src/sst/core/baseComponent.h
Original file line number Diff line number Diff line change
Expand Up @@ -866,14 +866,6 @@ class BaseComponent : public SST::Core::Serialization::serializable

bool doesSubComponentExist(const std::string& type);

/* Get the Simulation */
#if !SST_BUILDING_CORE
[[deprecated("getSimulation is deprecated because the Simulation object is being removed as part of the public API "
"and simulation.h will be removed in SST 14")]]
#endif
Simulation*
getSimulation() const;

// Does the statisticName exist in the ElementInfoStatistic
bool doesComponentInfoStatisticExist(const std::string& statisticName) const;
// Return the EnableLevel for the statisticName from the ElementInfoStatistic
Expand Down
4 changes: 2 additions & 2 deletions src/sst/core/component.cc
Original file line number Diff line number Diff line change
Expand Up @@ -41,14 +41,14 @@ Component::registerAsPrimaryComponent()
void
Component::primaryComponentDoNotEndSim()
{
int thread = getSimulation()->getRank().thread;
int thread = Simulation_impl::getSimulation()->getRank().thread;
Simulation_impl::getSimulation()->getExit()->refInc(getId(), thread);
}

void
Component::primaryComponentOKToEndSim()
{
int thread = getSimulation()->getRank().thread;
int thread = Simulation_impl::getSimulation()->getRank().thread;
Simulation_impl::getSimulation()->getExit()->refDec(getId(), thread);
}

Expand Down
3 changes: 1 addition & 2 deletions src/sst/core/interfaces/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,7 @@
# ~~~
#

set(SSTInterfacesHeaders simpleMem.h simpleNetwork.h stdMem.h stringEvent.h
TestEvent.h)
set(SSTInterfacesHeaders simpleNetwork.h stdMem.h stringEvent.h TestEvent.h)

install(FILES ${SSTInterfacesHeaders} DESTINATION "include/sst/core/interfaces")

Expand Down
17 changes: 0 additions & 17 deletions src/sst/core/interfaces/simpleMem.cc

This file was deleted.

Loading
Loading