From d0279d2738548b8e25aca2b9a39c172b99a561a6 Mon Sep 17 00:00:00 2001
From: Varun Agrawal <varagrawal@gmail.com>
Date: Mon, 31 Jan 2022 11:57:31 -0500
Subject: [PATCH] Add pybind11/stl.h and get it compiling

---
 gtsam/base/base.i                   | 36 -----------------------------
 python/gtsam/gtsam.tpl              |  1 +
 python/gtsam/specializations/base.h |  3 ---
 3 files changed, 1 insertion(+), 39 deletions(-)

diff --git a/gtsam/base/base.i b/gtsam/base/base.i
index 9838f97d3..f4184fa12 100644
--- a/gtsam/base/base.i
+++ b/gtsam/base/base.i
@@ -41,45 +41,9 @@ class DSFMap {
   std::map<KEY, This::Set> sets();
 };
 
-class IndexPairSet {
-  IndexPairSet();
-  // common STL methods
-  size_t size() const;
-  bool empty() const;
-  void clear();
-
-  // structure specific methods
-  void insert(gtsam::IndexPair key);
-  bool erase(gtsam::IndexPair key);        // returns true if value was removed
-  bool count(gtsam::IndexPair key) const;  // returns true if value exists
-};
-
-class IndexPairVector {
-  IndexPairVector();
-  IndexPairVector(const gtsam::IndexPairVector& other);
-
-  // common STL methods
-  size_t size() const;
-  bool empty() const;
-  void clear();
-
-  // structure specific methods
-  gtsam::IndexPair at(size_t i) const;
-  void push_back(gtsam::IndexPair key) const;
-};
 
 gtsam::IndexPairVector IndexPairSetAsArray(gtsam::IndexPairSet& set);
 
-class IndexPairSetMap {
-  IndexPairSetMap();
-  // common STL methods
-  size_t size() const;
-  bool empty() const;
-  void clear();
-
-  // structure specific methods
-  gtsam::IndexPairSet at(gtsam::IndexPair& key);
-};
 
 #include <gtsam/base/Matrix.h>
 bool linear_independent(Matrix A, Matrix B, double tol);
diff --git a/python/gtsam/gtsam.tpl b/python/gtsam/gtsam.tpl
index b760e4eb5..bdeb2bccc 100644
--- a/python/gtsam/gtsam.tpl
+++ b/python/gtsam/gtsam.tpl
@@ -11,6 +11,7 @@
 {include_boost}
 
 #include <pybind11/eigen.h>
+#include <pybind11/stl.h>
 #include <pybind11/stl_bind.h>
 #include <pybind11/pybind11.h>
 #include <pybind11/operators.h>
diff --git a/python/gtsam/specializations/base.h b/python/gtsam/specializations/base.h
index 9eefdeca8..995753da1 100644
--- a/python/gtsam/specializations/base.h
+++ b/python/gtsam/specializations/base.h
@@ -11,7 +11,4 @@
  * and saves one copy operation.
  */
 
-py::bind_map<gtsam::IndexPairSetMap>(m_, "IndexPairSetMap");
-py::bind_vector<gtsam::IndexPairVector>(m_, "IndexPairVector");
-
 py::bind_vector<std::vector<gtsam::Matrix> >(m_, "JacobianVector");