Skip to content

DM-38772: Use pybind11 v3 holder classes #69

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
mwittgen merged 2 commits into from
Aug 7, 2025
Merged

DM-38772: Use pybind11 v3 holder classes #69

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4c1a2fc
Switch to pybind11 version 3 and use smart holders.
Aug 1, 2025
919e5fb
Avoid signed/unsigned comparison warning.
Aug 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
2 changes: 1 addition & 1 deletion python/astshim/channel.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ using namespace pybind11::literals;
namespace ast {

void wrapChannel(lsst::cpputils::python::WrapperCollection &wrappers) {
using PyChannel = py::class_<Channel, std::shared_ptr<Channel>, Object>;
using PyChannel = py::classh<Channel, Object>;
wrappers.wrapType(PyChannel(wrappers.module, "Channel"), [](auto &mod, auto &cls) {

cls.def(py::init<Stream &, std::string const &>(), "stream"_a, "options"_a = "");
Expand Down
4 changes: 2 additions & 2 deletions python/astshim/chebyMap.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,15 +36,15 @@ using namespace pybind11::literals;
namespace ast {

void wrapChebyMap(lsst::cpputils::python::WrapperCollection &wrappers) {
using PyChebyDomain = py::class_<ChebyDomain, std::shared_ptr<ChebyDomain>>;
using PyChebyDomain = py::classh<ChebyDomain>;
wrappers.wrapType(PyChebyDomain(wrappers.module, "ChebyDomain"), [](auto &mod, auto &cls) {

cls.def(py::init<std::vector<double> const &, std::vector<double> const &>(), "lbnd"_a, "ubnd"_a);
cls.def_readonly("lbnd", &ChebyDomain::lbnd);
cls.def_readonly("ubnd", &ChebyDomain::ubnd);
});

using PyChebyMap = py::class_<ChebyMap, std::shared_ptr<ChebyMap>, Mapping>;
using PyChebyMap = py::classh<ChebyMap, Mapping>;
wrappers.wrapType(PyChebyMap(wrappers.module, "ChebyMap"), [](auto &mod, auto &cls) {

cls.def(py::init<ConstArray2D const &, ConstArray2D const &, std::vector<double> const &,
Expand Down
2 changes: 1 addition & 1 deletion python/astshim/cmpFrame.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ using namespace pybind11::literals;
namespace ast {

void wrapCmpFrame(lsst::cpputils::python::WrapperCollection &wrappers) {
using PyCmpFrame = py::class_<CmpFrame, std::shared_ptr<CmpFrame>, Frame>;
using PyCmpFrame = py::classh<CmpFrame, Frame>;
wrappers.wrapType(PyCmpFrame(wrappers.module, "CmpFrame"), [](auto &mod, auto &cls) {
cls.def(py::init<Frame const &, Frame const &, std::string const &>(), "frame1"_a, "frame2"_a,
"options"_a = "");
Expand Down
2 changes: 1 addition & 1 deletion python/astshim/cmpMap.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ using namespace pybind11::literals;
namespace ast {

void wrapCmpMap(lsst::cpputils::python::WrapperCollection &wrappers) {
using PrCmpMap = py::class_<CmpMap, std::shared_ptr<CmpMap>, Mapping>;
using PrCmpMap = py::classh<CmpMap, Mapping>;
wrappers.wrapType(PrCmpMap(wrappers.module, "CmpMap"), [](auto &mod, auto &cls) {
cls.def(py::init<Mapping const &, Mapping const &, bool, std::string const &>(), "map1"_a, "map2"_a,
"series"_a, "options"_a = "");
Expand Down
4 changes: 2 additions & 2 deletions python/astshim/fitsChan.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ namespace {

template<typename T>
void wrapFoundValue(lsst::cpputils::python::WrapperCollection &wrappers, std::string const &suffix) {
using PyFoundValue = py::class_<FoundValue<T>>;
using PyFoundValue = py::classh<FoundValue<T>>;
std::string name = "FoundValue" + suffix;
wrappers.wrapType(PyFoundValue(wrappers.module, name.c_str()), [](auto &mod, auto &cls) {
cls.def(py::init<bool, T const &>(), "found"_a, "value"_a);
Expand Down Expand Up @@ -78,7 +78,7 @@ void wrapFitsChan(lsst::cpputils::python::WrapperCollection &wrappers) {
wrapFoundValue<bool>(wrappers, "L");

// Wrap FitsChan
using PyFitsChan = py::class_<FitsChan, std::shared_ptr<FitsChan>, Channel>;
using PyFitsChan = py::classh<FitsChan, Channel>;
wrappers.wrapType(PyFitsChan(wrappers.module, "FitsChan"), [](auto &mod, auto &cls) {
cls.def(py::init<Stream &, std::string const &>(), "stream"_a, "options"_a = "");

Expand Down
2 changes: 1 addition & 1 deletion python/astshim/fitsTable.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ using namespace pybind11::literals;
namespace ast {

void wrapFitsTable(lsst::cpputils::python::WrapperCollection &wrappers) {
using PyFitsTable = py::class_<FitsTable, std::shared_ptr<FitsTable>, Table>;
using PyFitsTable = py::classh<FitsTable, Table>;
wrappers.wrapType(PyFitsTable(wrappers.module, "FitsTable"), [](auto &mod, auto &cls) {
cls.def(py::init<std::string const &>(), "options"_a = "");
cls.def(py::init<FitsChan const &, std::string const &>(), "header"_a, "options"_a = "");
Expand Down
10 changes: 5 additions & 5 deletions python/astshim/frame.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,23 +34,23 @@ using namespace pybind11::literals;
namespace ast {

void wrapDirectionPoint(lsst::cpputils::python::WrapperCollection &wrappers) {
wrappers.wrapType(py::class_<DirectionPoint>(wrappers.module, "DirectionPoint"), [](auto &mod, auto &cls) {
wrappers.wrapType(py::classh<DirectionPoint>(wrappers.module, "DirectionPoint"), [](auto &mod, auto &cls) {
cls.def(py::init<double, PointD>(), "direction"_a, "point"_a);
cls.def_readwrite("direction", &DirectionPoint::direction);
cls.def_readwrite("point", &DirectionPoint::point);
});
}

void wrapNReadValue(lsst::cpputils::python::WrapperCollection &wrappers) {
wrappers.wrapType(py::class_<NReadValue>(wrappers.module, "NReadValue"), [](auto &mod, auto &cls) {
wrappers.wrapType(py::classh<NReadValue>(wrappers.module, "NReadValue"), [](auto &mod, auto &cls) {
cls.def(py::init<int, double>(), "nread"_a, "value"_a);
cls.def_readwrite("nread", &NReadValue::nread);
cls.def_readwrite("value", &NReadValue::value);
});
}

void wrapResolvedPoint(lsst::cpputils::python::WrapperCollection &wrappers) {
wrappers.wrapType(py::class_<ResolvedPoint> (wrappers.module, "ResolvedPoint"), [](auto &mod, auto &cls) {
wrappers.wrapType(py::classh<ResolvedPoint> (wrappers.module, "ResolvedPoint"), [](auto &mod, auto &cls) {
cls.def(py::init<int>(), "naxes"_a);
cls.def_readwrite("point", &ResolvedPoint::point);
cls.def_readwrite("d1", &ResolvedPoint::d1);
Expand All @@ -59,7 +59,7 @@ void wrapResolvedPoint(lsst::cpputils::python::WrapperCollection &wrappers) {
}

void wrapFrameMapping(lsst::cpputils::python::WrapperCollection &wrappers) {
wrappers.wrapType(py::class_<FrameMapping>(wrappers.module, "FrameMapping"), [](auto &mod, auto &cls) {
wrappers.wrapType(py::classh<FrameMapping>(wrappers.module, "FrameMapping"), [](auto &mod, auto &cls) {
cls.def(py::init<std::shared_ptr<Frame>, std::shared_ptr<Mapping>>(), "frame"_a, "mapping"_a);
cls.def_readwrite("frame", &FrameMapping::frame);
cls.def_readwrite("mapping", &FrameMapping::mapping);
Expand All @@ -72,7 +72,7 @@ void wrapFrame(lsst::cpputils::python::WrapperCollection &wrappers) {
wrapResolvedPoint(wrappers);
wrapFrameMapping(wrappers);

using PyFrame = py::class_<Frame, std::shared_ptr<Frame>, Mapping>;
using PyFrame = py::classh<Frame, Mapping>;
wrappers.wrapType(PyFrame(wrappers.module, "Frame"), [](auto &mod, auto &cls) {
cls.def(py::init<int, std::string const &>(), "naxes"_a, "options"_a = "");
cls.def(py::init<Frame const &>());
Expand Down
4 changes: 2 additions & 2 deletions python/astshim/frameDict.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,15 +64,15 @@ class FrameDictMaker {
}

void wrapFrameDict(lsst::cpputils::python::WrapperCollection &wrappers) {
using PyFrameDictMaker = py::class_<FrameDictMaker, std::shared_ptr<FrameDictMaker>>;
using PyFrameDictMaker = py::classh<FrameDictMaker>;
static auto clsMaker = wrappers.wrapType(PyFrameDictMaker(wrappers.module, "FrameDictMaker"), [](auto &mod, auto &cls) {
cls.def(py::init<>());
cls.def("__call__", &FrameDictMaker::operator());
cls.def("__reduce__",
[cls](FrameDictMaker const &self) { return py::make_tuple(cls, py::tuple()); });
});

using PyFrameDict = py::class_<FrameDict, std::shared_ptr<FrameDict>, FrameSet>;
using PyFrameDict = py::classh<FrameDict, FrameSet>;
wrappers.wrapType(PyFrameDict(wrappers.module, "FrameDict"), [](auto &mod, auto &cls) {

cls.def(py::init<Frame const &, std::string const &>(), "frame"_a, "options"_a = "");
Expand Down
2 changes: 1 addition & 1 deletion python/astshim/frameSet.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ using namespace pybind11::literals;
namespace ast {

void wrapFrameSet(lsst::cpputils::python::WrapperCollection &wrappers) {
using PyFrameSet = py::class_<FrameSet, std::shared_ptr<FrameSet>, Frame>;
using PyFrameSet = py::classh<FrameSet, Frame>;
wrappers.wrapType(PyFrameSet(wrappers.module, "FrameSet"), [](auto &mod, auto &cls) {
cls.def(py::init<Frame const &, std::string const &>(), "frame"_a, "options"_a = "");
cls.def(py::init<Frame const &, Mapping const &, Frame const &, std::string const &>(), "baseFrame"_a,
Expand Down
2 changes: 1 addition & 1 deletion python/astshim/keyMap/keyMap.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ using namespace pybind11::literals;

namespace ast {
void wrapKeyMap(lsst::cpputils::python::WrapperCollection &wrappers){
using PyKeyMap = py::class_<KeyMap, std::shared_ptr<KeyMap>, Object> ;
using PyKeyMap = py::classh<KeyMap, Object> ;
wrappers.wrapType(PyKeyMap (wrappers.module, "KeyMap"), [](auto &mod, auto &cls) {


Expand Down
2 changes: 1 addition & 1 deletion python/astshim/lutMap.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ using namespace pybind11::literals;
namespace ast {

void wrapLutMap(lsst::cpputils::python::WrapperCollection &wrappers) {
using PyLutMap = py::class_<LutMap, std::shared_ptr<LutMap>, Mapping>;
using PyLutMap = py::classh<LutMap, Mapping>;
wrappers.wrapType(PyLutMap(wrappers.module, "LutMap"), [](auto &mod, auto &cls) {
cls.def(py::init<std::vector<double> const &, double, double, std::string const &>(), "lut"_a, "start"_a,
"inc"_a, "options"_a = "");
Expand Down
2 changes: 1 addition & 1 deletion python/astshim/mapBox.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ using namespace pybind11::literals;
namespace ast {

void wrapMapBox(lsst::cpputils::python::WrapperCollection &wrappers) {
using PyMapBox = py::class_<MapBox>;
using PyMapBox = py::classh<MapBox>;
wrappers.wrapType(PyMapBox(wrappers.module, "MapBox"), [](auto &mod, auto &cls) {
cls.def(py::init<Mapping const &, std::vector<double> const &, std::vector<double> const &, int, int>(),
"map"_a, "lbnd"_a, "ubnd"_a, "minOutCoord"_a = 1, "maxOutCoord"_a = 0);
Expand Down
2 changes: 1 addition & 1 deletion python/astshim/mapSplit.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ using namespace pybind11::literals;
namespace ast {

void wrapMapSplit(lsst::cpputils::python::WrapperCollection &wrappers) {
using PyMapSplit = py::class_<MapSplit>;
using PyMapSplit = py::classh<MapSplit>;
wrappers.wrapType(PyMapSplit(wrappers.module, "MapSplit"), [](auto &mod, auto &cls) {
cls.def(py::init<Mapping const &, std::vector<int> const &>(), "map"_a, "in"_a);
cls.def_readonly("splitMap", &MapSplit::splitMap);
Expand Down
2 changes: 1 addition & 1 deletion python/astshim/mapping.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ using namespace pybind11::literals;
namespace ast {

void wrapMapping(lsst::cpputils::python::WrapperCollection &wrappers) {
using PyMapping = py::class_<Mapping, std::shared_ptr<Mapping>, Object>;
using PyMapping = py::classh<Mapping, Object>;
wrappers.wrapType(PyMapping(wrappers.module, "Mapping"), [](auto &mod, auto &cls) {
cls.def_property_readonly("nIn", &Mapping::getNIn);
cls.def_property_readonly("nOut", &Mapping::getNOut);
Expand Down
2 changes: 1 addition & 1 deletion python/astshim/mathMap.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ using namespace pybind11::literals;
namespace ast {

void wrapMathMap(lsst::cpputils::python::WrapperCollection &wrappers) {
using PyMathMap = py::class_<MathMap, std::shared_ptr<MathMap>, Mapping>;
using PyMathMap = py::classh<MathMap, Mapping>;
wrappers.wrapType(PyMathMap(wrappers.module, "MathMap"), [](auto &mod, auto &cls) {
cls.def(py::init<int, int, std::vector<std::string> const &, std::vector<std::string> const &,
std::string const &>(),
Expand Down
2 changes: 1 addition & 1 deletion python/astshim/matrixMap.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ using namespace pybind11::literals;
namespace ast {

void wrapMatrixMap(lsst::cpputils::python::WrapperCollection &wrappers) {
using PyMatrixMap = py::class_<MatrixMap, std::shared_ptr<MatrixMap>, Mapping>;
using PyMatrixMap = py::classh<MatrixMap, Mapping>;
wrappers.wrapType(PyMatrixMap(wrappers.module, "MatrixMap"), [](auto &mod, auto &cls) {
cls.def(py::init<ConstArray2D const &, std::string const &>(), "matrix"_a, "options"_a = "");
cls.def(py::init<std::vector<double> const &, std::string const &>(), "diag"_a, "options"_a = "");
Expand Down
2 changes: 1 addition & 1 deletion python/astshim/normMap.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ using namespace pybind11::literals;
namespace ast {

void wrapNormMap(lsst::cpputils::python::WrapperCollection &wrappers) {
using PyNormMap = py::class_<NormMap, std::shared_ptr<NormMap>, Mapping>;
using PyNormMap = py::classh<NormMap, Mapping>;
wrappers.wrapType(PyNormMap(wrappers.module, "NormMap"), [](auto &mod, auto &cls) {
cls.def(py::init<Frame const &, std::string const &>(), "frame"_a, "options"_a = "");
cls.def(py::init<NormMap const &>());
Expand Down
4 changes: 2 additions & 2 deletions python/astshim/object.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,15 +55,15 @@ class ObjectMaker {
}

void wrapObject(lsst::cpputils::python::WrapperCollection &wrappers) {
using PyObjectMaker = py::class_<ObjectMaker, std::shared_ptr<ObjectMaker>>;
using PyObjectMaker = py::classh<ObjectMaker>;
static auto makerCls = wrappers.wrapType(PyObjectMaker(wrappers.module, "ObjectMaker"), [](auto &mod, auto &cls) {
cls.def(py::init<>());
cls.def("__call__", &ObjectMaker::operator());
cls.def("__reduce__",
[cls](ObjectMaker const &self) { return py::make_tuple(cls, py::tuple()); });
});

using PyObject = py::class_<Object, std::shared_ptr<Object>>;
using PyObject = py::classh<Object>;
wrappers.wrapType(PyObject(wrappers.module, "Object"), [](auto &mod, auto &cls) {
cls.def_static("fromString", &Object::fromString);
// do not wrap fromAstObject because it uses a bare AST pointer
Expand Down
2 changes: 1 addition & 1 deletion python/astshim/parallelMap.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ using namespace pybind11::literals;
namespace ast {

void wrapParallelMap(lsst::cpputils::python::WrapperCollection &wrappers) {
using PyParallelMap = py::class_<ParallelMap, std::shared_ptr<ParallelMap>, CmpMap>;
using PyParallelMap = py::classh<ParallelMap, CmpMap>;
wrappers.wrapType(PyParallelMap(wrappers.module, "ParallelMap"), [](auto &mod, auto &cls) {
cls.def(py::init<Mapping const &, Mapping const &, std::string const &>(), "map1"_a, "map2"_a,
"options"_a = "");
Expand Down
2 changes: 1 addition & 1 deletion python/astshim/pcdMap.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ using namespace pybind11::literals;
namespace ast {

void wrapPcdMap(lsst::cpputils::python::WrapperCollection &wrappers) {
using PyPcdMap = py::class_<PcdMap, std::shared_ptr<PcdMap>, Mapping>;
using PyPcdMap = py::classh<PcdMap, Mapping>;
wrappers.wrapType(PyPcdMap(wrappers.module, "PcdMap"), [](auto &mod, auto &cls) {
cls.def(py::init<double, std::vector<double> const &, std::string const &>(), "disco"_a, "pcdcen"_a,
"options"_a = "");
Expand Down
2 changes: 1 addition & 1 deletion python/astshim/permMap.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ using namespace pybind11::literals;
namespace ast {

void wrapPermMap(lsst::cpputils::python::WrapperCollection &wrappers) {
using PyPermMap = py::class_<PermMap, std::shared_ptr<PermMap>, Mapping>;
using PyPermMap = py::classh<PermMap, Mapping>;
wrappers.wrapType(PyPermMap (wrappers.module, "PermMap"), [](auto &mod, auto &cls) {
cls.def(py::init<std::vector<int> const &, std::vector<int> const &, std::vector<double> const &,
std::string const &>(),
Expand Down
2 changes: 1 addition & 1 deletion python/astshim/polyMap.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ using namespace pybind11::literals;
namespace ast {

void wrapPolyMap(lsst::cpputils::python::WrapperCollection &wrappers){
using PyPolyMap = py::class_<PolyMap, std::shared_ptr<PolyMap>, Mapping>;
using PyPolyMap = py::classh<PolyMap, Mapping>;
wrappers.wrapType(PyPolyMap (wrappers.module, "PolyMap"), [](auto &mod, auto &cls) {
cls.def(py::init<ConstArray2D const &, ConstArray2D const &, std::string const &>(), "coeff_f"_a,
"coeff_i"_a, "options"_a = "IterInverse=0");
Expand Down
2 changes: 1 addition & 1 deletion python/astshim/quadApprox.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ using namespace pybind11::literals;
namespace ast {

void wrapQuadApprox(lsst::cpputils::python::WrapperCollection &wrappers) {
using PyQuadApprox = py::class_<QuadApprox>;
using PyQuadApprox = py::classh<QuadApprox>;
wrappers.wrapType(PyQuadApprox(wrappers.module, "QuadApprox"), [](auto &mod, auto &cls) {
cls.def(py::init<Mapping const &, std::vector<double> const &, std::vector<double> const &, int, int>(),
"map"_a, "lbnd"_a, "ubnd"_a, "nx"_a = 3, "ny"_a = 3);
Expand Down
2 changes: 1 addition & 1 deletion python/astshim/rateMap.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ using namespace pybind11::literals;
namespace ast {

void wrapRateMap(lsst::cpputils::python::WrapperCollection &wrappers) {
using PyRateMap = py::class_<RateMap, std::shared_ptr<RateMap>, Mapping> ;
using PyRateMap = py::classh<RateMap, Mapping> ;
wrappers.wrapType(PyRateMap(wrappers.module, "RateMap"), [](auto &mod, auto &cls) {
cls.def(py::init<Mapping const &, int, int, std::string const &>(), "map"_a, "ax1"_a, "ax2"_a,
"options"_a = "");
Expand Down
2 changes: 1 addition & 1 deletion python/astshim/seriesMap.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ using namespace pybind11::literals;
namespace ast {

void wrapSeriesMap(lsst::cpputils::python::WrapperCollection &wrappers){
using PySeriesMap = py::class_<SeriesMap, std::shared_ptr<SeriesMap>, CmpMap>;
using PySeriesMap = py::classh<SeriesMap, CmpMap>;
wrappers.wrapType(PySeriesMap(wrappers.module, "SeriesMap"), [](auto &mod, auto &cls) {
cls.def(py::init<Mapping const &, Mapping const &, std::string const &>(), "map1"_a, "map2"_a,
"options"_a = "");
Expand Down
2 changes: 1 addition & 1 deletion python/astshim/shiftMap.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ using namespace pybind11::literals;
namespace ast {

void wrapShiftMap(lsst::cpputils::python::WrapperCollection &wrappers) {
using PyShiftMap = py::class_<ShiftMap, std::shared_ptr<ShiftMap>, Mapping>;
using PyShiftMap = py::classh<ShiftMap, Mapping>;
wrappers.wrapType(PyShiftMap(wrappers.module, "ShiftMap"), [](auto &mod, auto &cls) {
cls.def(py::init<std::vector<double> const &, std::string const &>(), "shift"_a, "options"_a = "");
cls.def(py::init<ShiftMap const &>());
Expand Down
2 changes: 1 addition & 1 deletion python/astshim/skyFrame.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ using namespace pybind11::literals;
namespace ast {

void wrapSkyFrame(lsst::cpputils::python::WrapperCollection &wrappers) {
using PySkyFrame = py::class_<SkyFrame, std::shared_ptr<SkyFrame>, Frame>;
using PySkyFrame = py::classh<SkyFrame, Frame>;
wrappers.wrapType(PySkyFrame(wrappers.module, "SkyFrame"), [](auto &mod, auto &cls) {

cls.def(py::init<std::string const &>(), "options"_a = "");
Expand Down
2 changes: 1 addition & 1 deletion python/astshim/slaMap.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ using namespace pybind11::literals;
namespace ast {

void wrapSlaMap(lsst::cpputils::python::WrapperCollection &wrappers) {
using PySlaMap = py::class_<SlaMap, std::shared_ptr<SlaMap>, Mapping>;
using PySlaMap = py::classh<SlaMap, Mapping>;
wrappers.wrapType(PySlaMap(wrappers.module, "SlaMap"), [](auto &mod, auto &cls) {
cls.def(py::init<std::string const &>(), "options"_a = "");
cls.def(py::init<SlaMap const &>());
Expand Down
2 changes: 1 addition & 1 deletion python/astshim/specFrame.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ using namespace pybind11::literals;
namespace ast {

void wrapSpecFrame(lsst::cpputils::python::WrapperCollection &wrappers) {
using PySpecFrame= py::class_<SpecFrame, std::shared_ptr<SpecFrame>, Frame>;
using PySpecFrame= py::classh<SpecFrame, Frame>;
wrappers.wrapType(PySpecFrame(wrappers.module, "SpecFrame"), [](auto &mod, auto &cls) {
cls.def(py::init<std::string const &>(), "options"_a = "");
cls.def(py::init<SpecFrame const &>());
Expand Down
2 changes: 1 addition & 1 deletion python/astshim/sphMap.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ using namespace pybind11::literals;

namespace ast {
void wrapSphMap(lsst::cpputils::python::WrapperCollection &wrappers) {
using PySphMap=py::class_<SphMap, std::shared_ptr<SphMap>, Mapping>;
using PySphMap=py::classh<SphMap, Mapping>;
wrappers.wrapType(PySphMap(wrappers.module, "SphMap"), [](auto &mod, auto &cls) {

cls.def(py::init<std::string const &>(), "options"_a = "");
Expand Down
Loading