Skip to content

[tmva][sofie] Use this pointer when accessing Session data members #21491

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
guitargeek merged 1 commit into from
Mar 4, 2026
Merged

[tmva][sofie] Use this pointer when accessing Session data members #21491

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
28 changes: 14 additions & 14 deletions tmva/sofie/inc/TMVA/ROperator_LSTM.icc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -295,7 +295,7 @@ auto ROperator_LSTM<T>::Generate(std::string OpName)
out << SP << fType << " const *" << OpName << "_input = tensor_" << fNX << ";\n";
} else {
if (fUseSession)
out << SP << fType << " * " << OpName << "_input = fVec_" << OpName << "_input.data();\n";
out << SP << fType << " * " << OpName << "_input = this->fVec_" << OpName << "_input.data();\n";
else
out << SP << fType << " " << OpName << "_input[" << seq_length * batch_size * input_size << "] = {0};\n";

Expand All @@ -317,7 +317,7 @@ auto ROperator_LSTM<T>::Generate(std::string OpName)
<< fNInitial_h << ";\n";
} else {
if (fUseSession)
out << SP << fType << " * " << OpName << "_initial_hidden_state = fVec_" << OpName
out << SP << fType << " * " << OpName << "_initial_hidden_state = this->fVec_" << OpName
<< "_initial_hidden_state.data();\n";
else
out << SP << fType << " " << OpName << "_initial_hidden_state[" << num_directions * batch_size *
Expand All @@ -343,7 +343,7 @@ auto ROperator_LSTM<T>::Generate(std::string OpName)
<< fNInitial_c << ";\n";
} else {
if (fUseSession)
out << SP << fType << " * " << OpName << "_initial_cell_state = fVec_" << OpName
out << SP << fType << " * " << OpName << "_initial_cell_state = this->fVec_" << OpName
<< "_initial_cell_state.data();\n";
else
out << SP << fType << " " << OpName << "_initial_cell_state[" << num_directions * batch_size *
Expand All @@ -365,11 +365,11 @@ auto ROperator_LSTM<T>::Generate(std::string OpName)
// Set the feedforward
size_t ff_size = seq_length * batch_size * fAttrHiddenSize;
if (fUseSession) {
out << SP << fType << " * " << OpName << "_ff_input_gate = fVec_" << OpName << "_ff_input_gate.data();\n";
out << SP << fType << " * " << OpName << "_ff_output_gate = fVec_" << OpName << "_ff_output_gate.data();\n";
out << SP << fType << " * " << OpName << "_ff_cell_gate = fVec_" << OpName << "_ff_cell_gate.data();\n";
out << SP << fType << " * " << OpName << "_ff_input_gate = this->fVec_" << OpName << "_ff_input_gate.data();\n";
out << SP << fType << " * " << OpName << "_ff_output_gate = this->fVec_" << OpName << "_ff_output_gate.data();\n";
out << SP << fType << " * " << OpName << "_ff_cell_gate = this->fVec_" << OpName << "_ff_cell_gate.data();\n";
if (fAttrInputForget == 0) {
out << SP << fType << " * " << OpName << "_ff_forget_gate = fVec_" << OpName << "_ff_forget_gate.data();\n";
out << SP << fType << " * " << OpName << "_ff_forget_gate = this->fVec_" << OpName << "_ff_forget_gate.data();\n";
}
} else {
out << SP << fType << " " << OpName << "_ff_input_gate[" << ff_size << "] = {0};\n";
Expand All @@ -382,11 +382,11 @@ auto ROperator_LSTM<T>::Generate(std::string OpName)
// Set the gates
size_t hidden_state_size = seq_length * num_directions * batch_size * fAttrHiddenSize;
if (fUseSession) {
out << SP << fType << " * " << OpName << "_input_gate = fVec_" << OpName << "_input_gate.data();\n";
out << SP << fType << " * " << OpName << "_output_gate = fVec_" << OpName << "_output_gate.data();\n";
out << SP << fType << " * " << OpName << "_cell_gate = fVec_" << OpName << "_cell_gate.data();\n";
out << SP << fType << " * " << OpName << "_input_gate = this->fVec_" << OpName << "_input_gate.data();\n";
out << SP << fType << " * " << OpName << "_output_gate = this->fVec_" << OpName << "_output_gate.data();\n";
out << SP << fType << " * " << OpName << "_cell_gate = this->fVec_" << OpName << "_cell_gate.data();\n";
if (fAttrInputForget == 0) {
out << SP << fType << " * " << OpName << "_forget_gate = fVec_" << OpName << "_forget_gate.data();\n";
out << SP << fType << " * " << OpName << "_forget_gate = this->fVec_" << OpName << "_forget_gate.data();\n";
}
} else {
out << SP << fType << " " << OpName << "_input_gate[" << hidden_state_size << "] = {0};\n";
Expand All @@ -398,8 +398,8 @@ auto ROperator_LSTM<T>::Generate(std::string OpName)
}
// Set the cell state and the new cell state = h(cell state)
if (fUseSession) {
out << SP << fType << " * " << OpName << "_cell_state = fVec_" << OpName << "_cell_state.data();\n";
out << SP << fType << " * " << OpName << "_new_cell_state = fVec_" << OpName << "_new_cell_state.data();\n";
out << SP << fType << " * " << OpName << "_cell_state = this->fVec_" << OpName << "_cell_state.data();\n";
out << SP << fType << " * " << OpName << "_new_cell_state = this->fVec_" << OpName << "_new_cell_state.data();\n";
} else {
out << SP << fType << " " << OpName << "_cell_state[" << hidden_state_size << "] = {0};\n";
out << SP << fType << " " << OpName << "_new_cell_state[" << hidden_state_size << "] = {0};\n";
Expand All @@ -410,7 +410,7 @@ auto ROperator_LSTM<T>::Generate(std::string OpName)
out << SP << fType << " *" << OpName << "_hidden_state = tensor_" << fNY << ";\n";
} else {
if (fUseSession) {
out << SP << fType << " * " << OpName << "_hidden_state = fVec_" << OpName << "_hidden_state.data();\n";
out << SP << fType << " * " << OpName << "_hidden_state = this->fVec_" << OpName << "_hidden_state.data();\n";
} else {
out << SP << fType << " " << OpName << "_hidden_state[" << hidden_state_size << "] = {0};\n";
}
Expand Down
8 changes: 4 additions & 4 deletions tmva/sofie/inc/TMVA/ROperator_RNN.icc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -235,7 +235,7 @@ auto ROperator_RNN<T>::Generate(std::string OpName)
}
} else {
if (fUseSession)
out << SP << fType << " * " << OpName << "_input = fVec_" << OpName << "_input.data();\n";
out << SP << fType << " * " << OpName << "_input = this->fVec_" << OpName << "_input.data();\n";
else
out << SP << fType << " " << OpName << "_input[" << seq_length * batch_size * input_size << "];\n";
out << SP << "for(size_t seq = 0; seq < " << seq_length << "; seq++) {\n";
Expand All @@ -256,7 +256,7 @@ auto ROperator_RNN<T>::Generate(std::string OpName)
<< fNInitial_h << ";\n";
} else {
if (fUseSession)
out << SP << fType << " * " << OpName << "_initial_hidden_state = fVec_" << OpName
out << SP << fType << " * " << OpName << "_initial_hidden_state = this->fVec_" << OpName
<< "_initial_hidden_state.data();\n";
else
out << fType << " " << OpName << "_initial_hidden_state[" << num_directions * batch_size *
Expand All @@ -276,7 +276,7 @@ auto ROperator_RNN<T>::Generate(std::string OpName)
}

if (fUseSession)
out << SP << fType << " * " << OpName << "_feedforward = fVec_" << OpName
out << SP << fType << " * " << OpName << "_feedforward = this->fVec_" << OpName
<< "_feedforward.data();\n";
else
out << SP << fType << " " << OpName << "_feedforward[" << seq_length * batch_size * fAttrHiddenSize << "] = {0};\n";
Expand All @@ -286,7 +286,7 @@ auto ROperator_RNN<T>::Generate(std::string OpName)
out << SP << fType << " *" << OpName << "_hidden_state = tensor_" << fNY << ";\n";
} else {
if (fUseSession)
out << SP << fType << " * " << OpName << "_hidden_state = fVec_" << OpName << "_hidden_state.data();\n";
out << SP << fType << " * " << OpName << "_hidden_state = this->fVec_" << OpName << "_hidden_state.data();\n";
else
out << SP << fType << " " << OpName << "_hidden_state[" << seq_length * num_directions *
batch_size * fAttrHiddenSize << "] = {0};\n";
Expand Down
4 changes: 2 additions & 2 deletions tmva/sofie/inc/TMVA/ROperator_Random.hxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,13 +125,13 @@ public:
throw std::runtime_error("TMVA SOFIE RandomNormal op : no mean or scale are defined");
float mean = fParams["mean"];
float scale = fParams["scale"];
out << SP << SP << "tensor_" << fNY << "[i] = fRndmEngine->Gaus(" << mean << "," << scale << ");\n";
out << SP << SP << "tensor_" << fNY << "[i] = this->fRndmEngine->Gaus(" << mean << "," << scale << ");\n";
} else if (fMode == kUniform) {
if (fParams.count("high") == 0 || fParams.count("low") == 0)
throw std::runtime_error("TMVA SOFIE RandomUniform op : no low or high are defined");
float high = fParams["high"];
float low = fParams["low"];
out << SP << SP << "tensor_" << fNY << "[i] = fRndmEngine->Uniform(" << low << "," << high << ");\n";
out << SP << SP << "tensor_" << fNY << "[i] = this->fRndmEngine->Uniform(" << low << "," << high << ");\n";
}
}
out << SP << "}\n";
Expand Down
Loading