Skip to content

Commit

Permalink
fix python parameter handling when building with SST-Core
Browse files Browse the repository at this point in the history
  • Loading branch information
jpkenny authored and gvoskuilen committed Dec 16, 2022
1 parent 499f292 commit 3219a68
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 18 deletions.
9 changes: 0 additions & 9 deletions sstmac/sst_core/integrated_core.cc
Original file line number Diff line number Diff line change
Expand Up @@ -162,15 +162,6 @@ py_add_sub_params(PyObject* dict, sprockit::SimParameters::ptr params)
}
}

PyObject*
py_dict_from_params(SST::Params& params)
{
PyObject* dict = PyDict_New();
sstmac::py_add_params(dict, params);
sstmac::py_add_sub_params(dict, params);
return dict;
}

}

static PyObject*
Expand Down
10 changes: 1 addition & 9 deletions sstmac/sst_core/integrated_core.h
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ inline PyObject* py_tuple_from_int_vector(const std::vector<int>& vec){
* @param dict [out]
* @param params [in]
*/
void py_add_params(PyObject* dict, SST::Params& params);
void py_add_params(PyObject* dict, sprockit::SimParameters::ptr params);

/**
* @brief py_add_sub_params Take all the key-value parameters in a sprockit params object
Expand All @@ -124,14 +124,6 @@ void py_add_params(PyObject* dict, SST::Params& params);
*/
void py_add_sub_params(PyObject* dict, SST::Params& params);

/**
* @brief py_dict_from_params Wrapper to py_add_params that creates a new Python dictionary
* and stores all the key-value pairs in params
* @param params
* @return A python dictionary (recursive for namespaces)
*/
PyObject* py_dict_from_params(SST::Params& params);

} // end namespace sstmac

#endif /* SSTMAC_MICRO_INTEGRATED_SST_CORE_H_ */

0 comments on commit 3219a68

Please sign in to comment.