Skip to content

neuralnetworkoptimizer: wrap _tfModel in std::unique_ptr #54

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

Open
wants to merge 4 commits into
base: develop
Choose a base branch
from
Open

neuralnetworkoptimizer: wrap _tfModel in std::unique_ptr #54

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
bcf4d1b
Release 2025 (#44)
ScSteffen May 28, 2025
7e4df92
neuralnetworkoptimizer.hpp: _tfModel as unique_ptr
freifrauvonbleifrei Jul 1, 2025
d0555fc
neuralnetworkoptimizer.cpp: make _tfModel unique
freifrauvonbleifrei Jul 1, 2025
086e202
Merge branch 'develop' into freifrauvonbleifrei-tfmodel
freifrauvonbleifrei Jul 1, 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
3 changes: 2 additions & 1 deletion include/optimizers/neuralnetworkoptimizer.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
#ifndef MLOPTIMIZER_H
#define MLOPTIMIZER_H

#include <memory>
#include "optimizerbase.hpp"

#ifdef BUILD_ML
Expand Down Expand Up @@ -31,7 +32,7 @@ class NeuralNetworkOptimizer : public OptimizerBase
Vector _weights; /*!< @brief quadrature weights, dim(_weights) = (_nq) */

std::string _tfModelInputName; /*!< @brief Name of the tf model input */
cppflow::model* _tfModel; /*!< @brief wrapper object for the compiled tensorflow model*/
std::unique_ptr<cppflow::model> _tfModel; /*!< @brief wrapper object for the compiled tensorflow model*/
cppflow::tensor _modelInput; /*!< @brief model input tensor. dims: _nCellsx_nSys*/
std::vector<float> _modelServingVectorU; /*!< @brief model input as a 1D vector. dims: _nCells*(_nSys-1) */
std::vector<float> _modelServingVectorAlpha; /*!< @brief model output as a 1D vector. dims: _nCells*_nSys */
Expand Down
2 changes: 1 addition & 1 deletion src/optimizers/neuralnetworkoptimizer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ NeuralNetworkOptimizer::NeuralNetworkOptimizer( Config* settings ) : OptimizerBa
log->info( "| Load Tensorflow model from:\n| " + tfModelPath + "\n Tensorflow internal outputs activated below:\n" );

// Load model
_tfModel = new cppflow::model( tfModelPath ); // load model
_tfModel = std::make_unique<cppflow::model>( tfModelPath ); // load model
unsigned servingSize = _settings->GetNCells();
if( _settings->GetEnforceNeuralRotationalSymmetry() ) {
if( _settings->GetMaxMomentDegree() > 3 ) {
Expand Down
Loading