Skip to content

Update ParmParse #491

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
merged 1 commit into from
Oct 20, 2025
Merged

Update ParmParse #491

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
2 changes: 1 addition & 1 deletion dependencies.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@
"version_pyamrex": "25.10",
"version_amrex": "25.10",
"version_pybind11": "v3.0.1",
"commit_amrex": "26054b26bb653e594835a5a686893f6c20e7c5cd",
"commit_amrex": "42853742514953472f32b762e33eae3c31b1d68d",
"commit_pybind11": "v3.0.1"
}
48 changes: 24 additions & 24 deletions src/Base/ParmParse.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,30 +35,30 @@ void init_ParmParse(py::module &m)

.def_static("addfile", &ParmParse::addfile)

.def("add", py::overload_cast<char const*, bool const>(&ParmParse::add))
.def("add", py::overload_cast<char const*, int const>(&ParmParse::add))
.def("add", py::overload_cast<char const*, long const>(&ParmParse::add))
.def("add", py::overload_cast<char const*, long long const>(&ParmParse::add))
.def("add", py::overload_cast<char const*, float const>(&ParmParse::add))
.def("add", py::overload_cast<char const*, double const>(&ParmParse::add))
.def("add", py::overload_cast<char const*, std::string const &>(&ParmParse::add))
.def("add", py::overload_cast<char const*, amrex::IntVect const &>(&ParmParse::add))
.def("add", py::overload_cast<char const*, amrex::Box const &>(&ParmParse::add))

.def("addarr", py::overload_cast<char const*, std::vector<int> const &>(&ParmParse::addarr))
.def("addarr", py::overload_cast<char const*, std::vector<long> const &>(&ParmParse::addarr))
.def("addarr", py::overload_cast<char const*, std::vector<long long> const &>(&ParmParse::addarr))
.def("addarr", py::overload_cast<char const*, std::vector<float> const &>(&ParmParse::addarr))
.def("addarr", py::overload_cast<char const*, std::vector<double> const &>(&ParmParse::addarr))
.def("addarr", py::overload_cast<char const*, std::vector<std::string> const &>(&ParmParse::addarr))
.def("addarr", py::overload_cast<char const*, std::vector<amrex::IntVect> const &>(&ParmParse::addarr))
.def("addarr", py::overload_cast<char const*, std::vector<amrex::Box> const &>(&ParmParse::addarr))
.def("add", py::overload_cast<std::string_view, bool const>(&ParmParse::add))
.def("add", py::overload_cast<std::string_view, int const>(&ParmParse::add))
.def("add", py::overload_cast<std::string_view, long const>(&ParmParse::add))
.def("add", py::overload_cast<std::string_view, long long const>(&ParmParse::add))
.def("add", py::overload_cast<std::string_view, float const>(&ParmParse::add))
.def("add", py::overload_cast<std::string_view, double const>(&ParmParse::add))
.def("add", py::overload_cast<std::string_view, std::string const &>(&ParmParse::add))
.def("add", py::overload_cast<std::string_view, amrex::IntVect const &>(&ParmParse::add))
.def("add", py::overload_cast<std::string_view, amrex::Box const &>(&ParmParse::add))

.def("addarr", py::overload_cast<std::string_view, std::vector<int> const &>(&ParmParse::addarr))
.def("addarr", py::overload_cast<std::string_view, std::vector<long> const &>(&ParmParse::addarr))
.def("addarr", py::overload_cast<std::string_view, std::vector<long long> const &>(&ParmParse::addarr))
.def("addarr", py::overload_cast<std::string_view, std::vector<float> const &>(&ParmParse::addarr))
.def("addarr", py::overload_cast<std::string_view, std::vector<double> const &>(&ParmParse::addarr))
.def("addarr", py::overload_cast<std::string_view, std::vector<std::string> const &>(&ParmParse::addarr))
.def("addarr", py::overload_cast<std::string_view, std::vector<amrex::IntVect> const &>(&ParmParse::addarr))
.def("addarr", py::overload_cast<std::string_view, std::vector<amrex::Box> const &>(&ParmParse::addarr))

// TODO: getters and queries
.def("get_bool",
[](ParmParse &pp, std::string name, int ival) {
bool ref;
pp.get(name.c_str(), ref, ival);
pp.get(name, ref, ival);
return ref;
},
"parses input values", py::arg("name"), py::arg("ival")=0
Expand All @@ -67,7 +67,7 @@ void init_ParmParse(py::module &m)
.def("get_int",
[](ParmParse &pp, std::string name, int ival) {
int ref;
pp.get(name.c_str(), ref, ival);
pp.get(name, ref, ival);
return ref;
},
"parses input values", py::arg("name"), py::arg("ival")=0
Expand All @@ -76,7 +76,7 @@ void init_ParmParse(py::module &m)
.def("get_real",
[](ParmParse &pp, std::string name, int ival) {
amrex::Real ref;
pp.get(name.c_str(), ref, ival);
pp.get(name, ref, ival);
return ref;
},
"parses input values", py::arg("name"), py::arg("ival")=0
Expand All @@ -85,7 +85,7 @@ void init_ParmParse(py::module &m)
.def("query_int",
[](ParmParse &pp, std::string name, int ival) {
int ref;
bool exist = pp.query(name.c_str(), ref, ival);
bool exist = pp.query(name, ref, ival);
return std::make_tuple(exist,ref);
},
"queries input values", py::arg("name"), py::arg("ival")=0
Expand Down Expand Up @@ -155,7 +155,7 @@ void init_ParmParse(py::module &m)
[&](auto&& arg) {
using T = std::remove_pointer_t<std::decay_t<decltype(arg)>>;
T v;
pp.get(name.c_str(), v);
pp.get(name, v);
add_nested(v, name);
},
entry.m_typehint
Expand All @@ -166,7 +166,7 @@ void init_ParmParse(py::module &m)
using T = std::remove_pointer_t<std::decay_t<decltype(arg)>>;
if constexpr (!std::is_same_v<T, bool>) {
std::vector<T> valarr;
pp.getarr(name.c_str(), valarr);
pp.getarr(name, valarr);
add_nested(valarr, name);
}
},
Expand Down
Loading