Skip to content

Use built in method numpy.set_printoptions in addObject/addChild methods to enable numpy 2 #518

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
hugtalbot merged 4 commits into from
Jul 16, 2025
Merged

Use built in method numpy.set_printoptions in addObject/addChild methods to enable numpy 2 #518

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
10d5db9
Use set_printoptions(legacy=True) in node binfing to force usage of l…
bakpaul Jul 15, 2025
a7c339d
Patch addChild
bakpaul Jul 15, 2025
ef5a313
Add RAII mechanism to make sure numpy is put back its initial state
bakpaul Jul 15, 2025
807820d
Add [[maybe_unused]]
hugtalbot Jul 16, 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
44 changes: 44 additions & 0 deletions bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_Node.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -235,9 +235,47 @@ void setFieldsFromPythonValues(Base* self, const py::kwargs& dict)
}
}

class NumpyReprFixerRAII
{
public:
NumpyReprFixerRAII()
{
using namespace pybind11::literals;

m_numpy = py::module_::import("numpy");
const std::string version = py::cast<std::string>(m_numpy.attr("__version__"));
m_majorVersion = std::stoi(version.substr(0,1));
if ( m_majorVersion > 1)
{
m_setPO = m_numpy.attr("set_printoptions");
m_initialState = m_numpy.attr("get_printoptions")();
m_setPO("legacy"_a = true);
}
}

~NumpyReprFixerRAII()
{
if ( m_majorVersion > 1)
{
m_setPO(**m_initialState);
}
}

private:
py::module_ m_numpy;
int m_majorVersion;
py::object m_setPO;
py::dict m_initialState;

};


/// Implement the addObject function.
py::object addObjectKwargs(Node* self, const std::string& type, const py::kwargs& kwargs)
{
//Instantiating this object will make sure the numpy representation is fixed during the call of this function, and comes back to its previous state after
[[maybe_unused]] const NumpyReprFixerRAII numpyReprFixer;

std::string name {};
if (kwargs.contains("name"))
{
Expand Down Expand Up @@ -292,6 +330,8 @@ py::object addObjectKwargs(Node* self, const std::string& type, const py::kwargs
if(d)
d->setPersistent(true);
}


return PythonFactory::toPython(object.get());
}

Expand Down Expand Up @@ -361,6 +401,9 @@ py::object createObject(Node* self, const std::string& type, const py::kwargs& k

py::object addChildKwargs(Node* self, const std::string& name, const py::kwargs& kwargs)
{
//Instantiating this object will make sure the numpy representation is fixed during the call of this function, and comes back to its previous state after
[[maybe_unused]] const NumpyReprFixerRAII numpyReprFixer;

if (sofapython3::isProtectedKeyword(name))
throw py::value_error("addChild: Cannot call addChild with name " + name + ": Protected keyword");
BaseObjectDescription desc (name.c_str());
Expand All @@ -379,6 +422,7 @@ py::object addChildKwargs(Node* self, const std::string& name, const py::kwargs&
d->setPersistent(true);
}


return py::cast(node);
}

Expand Down
Loading