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.

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

Phalanx: memory manager and utility cleanup #5730

Merged
merged 4 commits into from
Aug 19, 2019
Merged

Phalanx: memory manager and utility cleanup #5730

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1ad15b4
Phalanx: add field use range computation
rppawlo Aug 16, 2019
395d259
Phalanx: split out print from extent traits
rppawlo Aug 16, 2019
60f94eb
Phalanx: adding memory manager
rppawlo Aug 16, 2019
863dd2c
Phalanx/Panzer: deprecate some utilities
rppawlo Aug 16, 2019
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
2 changes: 1 addition & 1 deletion ...er/adapters-stk/src/responses/Panzer_STK_ResponseEvaluatorFactory_SolutionWriter_impl.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -320,7 +320,7 @@ template <typename EvalT>
bool ResponseEvaluatorFactory_SolutionWriter<EvalT>::
typeSupported() const
{
if(PHX::typeAsString<EvalT>()==PHX::typeAsString<panzer::Traits::Residual>())
if(PHX::print<EvalT>()==PHX::print<panzer::Traits::Residual>())
return true;

return false;
Expand Down
14 changes: 7 additions & 7 deletions packages/panzer/disc-fe/src/Panzer_AssemblyEngine_impl.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ evaluate(const panzer::AssemblyEngineInArgs& in, const EvaluationFlags flags)
GlobalEvaluationDataContainer gedc;

if ( flags.getValue() & EvaluationFlags::Initialize ) {
PANZER_FUNC_TIME_MONITOR_DIFF("panzer::AssemblyEngine::evaluate_gather("+PHX::typeAsString<EvalT>()+")", eval_gather);
PANZER_FUNC_TIME_MONITOR_DIFF("panzer::AssemblyEngine::evaluate_gather("+PHX::print<EvalT>()+")", eval_gather);

in.fillGlobalEvaluationDataContainer(gedc);
gedc.initialize(); // make sure all ghosted data is ready to go
Expand All @@ -89,7 +89,7 @@ evaluate(const panzer::AssemblyEngineInArgs& in, const EvaluationFlags flags)
// Volumetric fill
// *********************
if ( flags.getValue() & EvaluationFlags::VolumetricFill) {
PANZER_FUNC_TIME_MONITOR_DIFF("panzer::AssemblyEngine::evaluate_volume("+PHX::typeAsString<EvalT>()+")", eval_vol);
PANZER_FUNC_TIME_MONITOR_DIFF("panzer::AssemblyEngine::evaluate_volume("+PHX::print<EvalT>()+")", eval_vol);
this->evaluateVolume(in);
}

Expand All @@ -102,24 +102,24 @@ evaluate(const panzer::AssemblyEngineInArgs& in, const EvaluationFlags flags)

if ( flags.getValue() & EvaluationFlags::BoundaryFill) {
{
PANZER_FUNC_TIME_MONITOR_DIFF("panzer::AssemblyEngine::evaluate_neumannbcs("+PHX::typeAsString<EvalT>()+")",eval_neumannbcs);
PANZER_FUNC_TIME_MONITOR_DIFF("panzer::AssemblyEngine::evaluate_neumannbcs("+PHX::print<EvalT>()+")",eval_neumannbcs);
this->evaluateNeumannBCs(in);
}

{
PANZER_FUNC_TIME_MONITOR_DIFF("panzer::AssemblyEngine::evaluate_interfacebcs("+PHX::typeAsString<EvalT>()+")",eval_interfacebcs);
PANZER_FUNC_TIME_MONITOR_DIFF("panzer::AssemblyEngine::evaluate_interfacebcs("+PHX::print<EvalT>()+")",eval_interfacebcs);
this->evaluateInterfaceBCs(in);
}

// Dirchlet conditions require a global matrix
{
PANZER_FUNC_TIME_MONITOR_DIFF("panzer::AssemblyEngine::evaluate_dirichletbcs("+PHX::typeAsString<EvalT>()+")",eval_dirichletbcs);
PANZER_FUNC_TIME_MONITOR_DIFF("panzer::AssemblyEngine::evaluate_dirichletbcs("+PHX::print<EvalT>()+")",eval_dirichletbcs);
this->evaluateDirichletBCs(in);
}
}

if ( flags.getValue() & EvaluationFlags::Scatter) {
PANZER_FUNC_TIME_MONITOR_DIFF("panzer::AssemblyEngine::evaluate_scatter("+PHX::typeAsString<EvalT>()+")",eval_scatter);
PANZER_FUNC_TIME_MONITOR_DIFF("panzer::AssemblyEngine::evaluate_scatter("+PHX::print<EvalT>()+")",eval_scatter);
m_lin_obj_factory->ghostToGlobalContainer(*in.ghostedContainer_,*in.container_,LOC::F | LOC::Mat);

m_lin_obj_factory->beginFill(*in.container_);
Expand Down Expand Up @@ -212,7 +212,7 @@ evaluateVolume(const panzer::AssemblyEngineInArgs& in)
// double s = 0.;
// double p = 0.;
// fm->template analyzeGraph<EvalT>(s,p);
// std::cout << "Analyze Graph: " << PHX::typeAsString<EvalT>() << ",b=" << block << ", s=" << s << ", p=" << p << std::endl;
// std::cout << "Analyze Graph: " << PHX::print<EvalT>() << ",b=" << block << ", s=" << s << ", p=" << p << std::endl;

fm->template postEvaluate<EvalT>(NULL);
}
Expand Down
2 changes: 1 addition & 1 deletion packages/panzer/disc-fe/src/Panzer_Traits.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@
//#include "Panzer_GlobalEvaluationDataContainer.hpp"

// Debugging information
//#include "Phalanx_TypeStrings.hpp"
//#include "Phalanx_Print.hpp"

// forward declaration
namespace Intrepid2 {
Expand Down
8 changes: 4 additions & 4 deletions packages/panzer/disc-fe/src/evaluators/Panzer_DOFDiv_impl.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@ DOFDiv(const Teuchos::ParameterList & p) :
this->addEvaluatedField(dof_div);
this->addDependentField(dof_value);

std::string n = "DOFDiv: " + dof_div.fieldTag().name() + " ("+PHX::typeAsString<EvalT>()+")";
std::string n = "DOFDiv: " + dof_div.fieldTag().name() + " ("+PHX::print<EvalT>()+")";
this->setName(n);
}

Expand All @@ -198,7 +198,7 @@ DOFDiv(const PHX::FieldTag & input,
this->addEvaluatedField(dof_div);
this->addDependentField(dof_value);

std::string n = "DOFDiv: " + dof_div.fieldTag().name() + " ("+PHX::typeAsString<EvalT>()+")";
std::string n = "DOFDiv: " + dof_div.fieldTag().name() + " ("+PHX::print<EvalT>()+")";
this->setName(n);
}

Expand Down Expand Up @@ -271,7 +271,7 @@ DOFDiv(const Teuchos::ParameterList & p) :
this->addEvaluatedField(dof_div);
this->addDependentField(dof_value);

std::string n = "DOFDiv: " + dof_div.fieldTag().name() + " ("+PHX::typeAsString<panzer::Traits::Jacobian>()+")";
std::string n = "DOFDiv: " + dof_div.fieldTag().name() + " ("+PHX::print<panzer::Traits::Jacobian>()+")";
this->setName(n);
}

Expand All @@ -298,7 +298,7 @@ DOFDiv(const PHX::FieldTag & input,
this->addEvaluatedField(dof_div);
this->addDependentField(dof_value);

std::string n = "DOFDiv: " + dof_div.fieldTag().name() + " ("+PHX::typeAsString<panzer::Traits::Jacobian>()+")";
std::string n = "DOFDiv: " + dof_div.fieldTag().name() + " ("+PHX::print<panzer::Traits::Jacobian>()+")";
this->setName(n);
}

Expand Down
4 changes: 2 additions & 2 deletions packages/panzer/disc-fe/src/evaluators/Panzer_DOFGradient_impl.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,7 @@ DOFGradient(
this->addEvaluatedField(dof_gradient);
this->addDependentField(dof_value);

std::string n = "DOFGradient: " + dof_gradient.fieldTag().name() + " ("+PHX::typeAsString<EvalT>()+")";
std::string n = "DOFGradient: " + dof_gradient.fieldTag().name() + " ("+PHX::print<EvalT>()+")";
this->setName(n);
}

Expand All @@ -192,7 +192,7 @@ DOFGradient(const PHX::FieldTag & input,
this->addEvaluatedField(dof_gradient);
this->addDependentField(dof_value);

std::string n = "DOFGradient: " + dof_gradient.fieldTag().name() + " ("+PHX::typeAsString<EvalT>()+")";
std::string n = "DOFGradient: " + dof_gradient.fieldTag().name() + " ("+PHX::print<EvalT>()+")";
this->setName(n);
}

Expand Down
8 changes: 4 additions & 4 deletions packages/panzer/disc-fe/src/evaluators/Panzer_DOF_impl.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ DOF(const Teuchos::ParameterList & p) :

this->addDependentField(dof_basis);

std::string n = "DOF: " + dof_basis.fieldTag().name() + " ("+PHX::typeAsString<EvalT>()+")";
std::string n = "DOF: " + dof_basis.fieldTag().name() + " ("+PHX::print<EvalT>()+")";
this->setName(n);
}

Expand Down Expand Up @@ -127,7 +127,7 @@ DOF(const PHX::FieldTag & input,

this->addDependentField(dof_basis);

std::string n = "DOF: " + dof_basis.fieldTag().name() + " ("+PHX::typeAsString<EvalT>()+")";
std::string n = "DOF: " + dof_basis.fieldTag().name() + " ("+PHX::print<EvalT>()+")";
this->setName(n);
}

Expand Down Expand Up @@ -233,7 +233,7 @@ DOF(const Teuchos::ParameterList & p) :

std::string n = "DOF: " + dof_basis.fieldTag().name()
+ ( accelerate_jacobian_enabled ? " accel_jac " : "slow_jac" )
+ " ("+PHX::typeAsString<panzer::Traits::Jacobian>()+")";
+ " ("+PHX::print<panzer::Traits::Jacobian>()+")";
this->setName(n);
}

Expand Down Expand Up @@ -268,7 +268,7 @@ DOF(const PHX::FieldTag & input,

this->addDependentField(dof_basis);

std::string n = "DOF: " + dof_basis.fieldTag().name() + " slow_jac(descriptor) ("+PHX::typeAsString<typename TRAITS::Jacobian>()+")";
std::string n = "DOF: " + dof_basis.fieldTag().name() + " slow_jac(descriptor) ("+PHX::print<typename TRAITS::Jacobian>()+")";
this->setName(n);
}

Expand Down
2 changes: 1 addition & 1 deletion packages/panzer/disc-fe/src/evaluators/Panzer_Dirichlet_Residual_EdgeBasis_impl.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
#include "Intrepid2_CellTools.hpp"
#include "Intrepid2_OrientationTools.hpp"

#include "Phalanx_TypeStrings.hpp"
#include "Phalanx_Print.hpp"

#include "Panzer_CommonArrayFactories.hpp"
#include "Kokkos_ViewFactory.hpp"
Expand Down
4 changes: 2 additions & 2 deletions packages/panzer/disc-fe/src/evaluators/Panzer_GatherSolution_BlockedEpetra_Hessian_impl.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ GatherSolution_BlockedEpetra(
{
using panzer::PureBasis;
using PHX::MDField;
using PHX::typeAsString;
using PHX::print;
using std::size_t;
using std::string;
using std::vector;
Expand Down Expand Up @@ -122,7 +122,7 @@ GatherSolution_BlockedEpetra(
firstName = names[0];
if (not firstSensitivitiesAvailable_)
n += ", No First Sensitivities";
n += "): " + firstName + " (" + typeAsString<EvalT>() + ")";
n += "): " + firstName + " (" + print<EvalT>() + ")";
this->setName(n);
} // end of Initializing Constructor (Hessian Specialization)

Expand Down
4 changes: 2 additions & 2 deletions packages/panzer/disc-fe/src/evaluators/Panzer_GatherSolution_BlockedEpetra_decl.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,11 +164,11 @@ namespace panzer
evaluateFields(
typename TRAITS::EvalData d)
{
using PHX::typeAsString;
using PHX::print;
using std::cout;
using std::endl;
cout << "Unspecialized version of \"GatherSolution_BlockedEpetra::" \
"evaluateFields\" on " + typeAsString<EvalT>() + "\" should not " \
"evaluateFields\" on " + print<EvalT>() + "\" should not " \
"be used!" << endl;
TEUCHOS_ASSERT(false);
} // end of evaluateFields()
Expand Down
12 changes: 6 additions & 6 deletions packages/panzer/disc-fe/src/evaluators/Panzer_GatherSolution_BlockedEpetra_impl.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ GatherSolution_BlockedEpetra(
{
using panzer::PureBasis;
using PHX::MDField;
using PHX::typeAsString;
using PHX::print;
using std::size_t;
using std::string;
using std::vector;
Expand Down Expand Up @@ -137,7 +137,7 @@ GatherSolution_BlockedEpetra(
if (numFields > 0)
firstName = names[0];
string n("GatherSolution (BlockedEpetra): " + firstName + " (" +
typeAsString<EvalT>() + ")");
print<EvalT>() + ")");
this->setName(n);
} // end of Initializing Constructor (Residual Specialization)

Expand Down Expand Up @@ -338,7 +338,7 @@ GatherSolution_BlockedEpetra(
{
using panzer::PureBasis;
using PHX::MDField;
using PHX::typeAsString;
using PHX::print;
using std::size_t;
using std::string;
using std::vector;
Expand Down Expand Up @@ -388,7 +388,7 @@ GatherSolution_BlockedEpetra(
if (numFields > 0)
firstName = names[0];
string n("GatherSolution Tangent (BlockedEpetra): " + firstName + " (" +
typeAsString<EvalT>() + ")");
print<EvalT>() + ")");
this->setName(n);
} // end of Initializing Constructor (Tangent Specialization)

Expand Down Expand Up @@ -617,7 +617,7 @@ GatherSolution_BlockedEpetra(
{
using panzer::PureBasis;
using PHX::MDField;
using PHX::typeAsString;
using PHX::print;
using std::size_t;
using std::string;
using std::vector;
Expand Down Expand Up @@ -649,7 +649,7 @@ GatherSolution_BlockedEpetra(
firstName = names[0];
if (disableSensitivities_)
n += ", No Sensitivities";
n += "): " + firstName + " (" + typeAsString<EvalT>() + ")";
n += "): " + firstName + " (" + print<EvalT>() + ")";
this->setName(n);
} // end of Initializing Constructor (Jacobian Specialization)

Expand Down
2 changes: 1 addition & 1 deletion packages/panzer/disc-fe/src/evaluators/Panzer_GatherSolution_BlockedTpetra.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ class GatherSolution_BlockedTpetra
{ }

void evaluateFields(typename TRAITS::EvalData d)
{ std::cout << "unspecialized version of \"GatherSolution_BlockedTpetra::evaluateFields\" on \""+PHX::typeAsString<EvalT>()+"\" should not be used!" << std::endl;
{ std::cout << "unspecialized version of \"GatherSolution_BlockedTpetra::evaluateFields\" on \""+PHX::print<EvalT>()+"\" should not be used!" << std::endl;
TEUCHOS_ASSERT(false); }
};

Expand Down
2 changes: 1 addition & 1 deletion packages/panzer/disc-fe/src/evaluators/Panzer_GatherSolution_BlockedTpetra_impl.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -441,7 +441,7 @@ GatherSolution_BlockedTpetra(
this->setName(n);
}
else {
std::string n = "GatherSolution (BlockedTpetra): "+firstName+" ("+PHX::typeAsString<EvalT>()+") ";
std::string n = "GatherSolution (BlockedTpetra): "+firstName+" ("+PHX::print<EvalT>()+") ";
this->setName(n);
}
}
Expand Down
4 changes: 2 additions & 2 deletions packages/panzer/disc-fe/src/evaluators/Panzer_GatherSolution_Epetra_Hessian_impl.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ GatherSolution_Epetra(
{
using panzer::PureBasis;
using PHX::MDField;
using PHX::typeAsString;
using PHX::print;
using std::size_t;
using std::string;
using std::vector;
Expand Down Expand Up @@ -123,7 +123,7 @@ GatherSolution_Epetra(
firstName = names[0];
if (not firstSensitivitiesAvailable_)
n += ", No First Sensitivities";
n += "): " + firstName + " (" + typeAsString<EvalT>() + ") ";
n += "): " + firstName + " (" + print<EvalT>() + ") ";
this->setName(n);
} // end of Initializing Constructor (Hessian Specialization)

Expand Down
12 changes: 6 additions & 6 deletions packages/panzer/disc-fe/src/evaluators/Panzer_GatherSolution_Epetra_impl.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ GatherSolution_Epetra(
{
using panzer::PureBasis;
using PHX::MDField;
using PHX::typeAsString;
using PHX::print;
using std::size_t;
using std::vector;
using std::string;
Expand Down Expand Up @@ -133,7 +133,7 @@ GatherSolution_Epetra(
if (numFields > 0)
firstName = names[0];
string n("GatherSolution (Epetra): " + firstName + " (" +
typeAsString<EvalT>() + ")");
print<EvalT>() + ")");
this->setName(n);
} // end of Initializing Constructor (Residual Specialization)

Expand Down Expand Up @@ -324,7 +324,7 @@ GatherSolution_Epetra(
{
using panzer::PureBasis;
using PHX::MDField;
using PHX::typeAsString;
using PHX::print;
using std::size_t;
using std::string;
using std::vector;
Expand Down Expand Up @@ -374,7 +374,7 @@ GatherSolution_Epetra(
if (numFields > 0)
firstName = names[0];
string n("GatherSolution (Epetra): " + firstName + " (" +
typeAsString<EvalT>() + ")");
print<EvalT>() + ")");
this->setName(n);
} // end of Initializing Constructor (Tangent Specialization)

Expand Down Expand Up @@ -592,7 +592,7 @@ GatherSolution_Epetra(
{
using panzer::PureBasis;
using PHX::MDField;
using PHX::typeAsString;
using PHX::print;
using std::size_t;
using std::string;
using std::vector;
Expand Down Expand Up @@ -624,7 +624,7 @@ GatherSolution_Epetra(
firstName = names[0];
if (disableSensitivities_)
n += ", No Sensitivities";
n += "): " + firstName + " (" + typeAsString<EvalT>() + ")";
n += "): " + firstName + " (" + print<EvalT>() + ")";
this->setName(n);
} // end of Initializing Constructor (Jacobian Specialization)

Expand Down
2 changes: 1 addition & 1 deletion packages/panzer/disc-fe/src/evaluators/Panzer_GatherSolution_Tpetra_impl.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -429,7 +429,7 @@ GatherSolution_Tpetra(
this->setName(n);
}
else {
std::string n = "GatherSolution (Tpetra): "+firstName+" ("+PHX::typeAsString<EvalT>()+") ";
std::string n = "GatherSolution (Tpetra): "+firstName+" ("+PHX::print<EvalT>()+") ";
this->setName(n);
}
}
Expand Down
4 changes: 2 additions & 2 deletions packages/panzer/disc-fe/src/evaluators/Panzer_GatherTangent_BlockedEpetra_impl.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ GatherTangent_BlockedEpetra(
{
using panzer::PureBasis;
using PHX::MDField;
using PHX::typeAsString;
using PHX::print;
using std::size_t;
using std::string;
using std::vector;
Expand Down Expand Up @@ -120,7 +120,7 @@ GatherTangent_BlockedEpetra(
if (numFields > 0)
firstName = names[0];
string n("GatherTangent (Blocked Epetra): " + firstName + " (" +
typeAsString<EvalT>() + ")");
print<EvalT>() + ")");
this->setName(n);
} // end of Initializing Constructor

Expand Down
4 changes: 2 additions & 2 deletions packages/panzer/disc-fe/src/evaluators/Panzer_GatherTangent_Epetra_impl.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ GatherTangent_Epetra(
{
using panzer::PureBasis;
using PHX::MDField;
using PHX::typeAsString;
using PHX::print;
using std::size_t;
using std::string;
using std::vector;
Expand Down Expand Up @@ -117,7 +117,7 @@ GatherTangent_Epetra(
if (numFields > 0)
firstName = names[0];
string n("GatherTangent (Epetra): " + firstName + " (" +
typeAsString<EvalT>() + ")");
print<EvalT>() + ")");
this->setName(n);
} // end of Initializing Constructor

Expand Down
Loading