From 3219a6879e3574ac0225e137899d2200ee5c39ff Mon Sep 17 00:00:00 2001 From: Joseph Kenny Date: Thu, 15 Dec 2022 19:49:12 -0800 Subject: [PATCH] fix python parameter handling when building with SST-Core --- sstmac/sst_core/integrated_core.cc | 9 --------- sstmac/sst_core/integrated_core.h | 10 +--------- 2 files changed, 1 insertion(+), 18 deletions(-) diff --git a/sstmac/sst_core/integrated_core.cc b/sstmac/sst_core/integrated_core.cc index 0ac5ba568..ea9c9196d 100644 --- a/sstmac/sst_core/integrated_core.cc +++ b/sstmac/sst_core/integrated_core.cc @@ -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* diff --git a/sstmac/sst_core/integrated_core.h b/sstmac/sst_core/integrated_core.h index 070b05ede..d0aeffde6 100644 --- a/sstmac/sst_core/integrated_core.h +++ b/sstmac/sst_core/integrated_core.h @@ -113,7 +113,7 @@ inline PyObject* py_tuple_from_int_vector(const std::vector& 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 @@ -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_ */