From e36fa332f2752ae14f825831721d7037fd49f7bc Mon Sep 17 00:00:00 2001
From: Varun Agrawal <varagrawal@gmail.com>
Date: Thu, 26 Sep 2024 11:51:41 -0400
Subject: [PATCH] Revert "Revert "Fix compile error on Clang 18, tweak for
 better type generation""

This reverts commit 6190e3d13ffec5b7435fd9e3d62a2a94a9d6fb9f.
---
 python/CMakeLists.txt  | 4 ++--
 python/gtsam/gtsam.tpl | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/python/CMakeLists.txt b/python/CMakeLists.txt
index 404f5ecc0..674f17d3f 100644
--- a/python/CMakeLists.txt
+++ b/python/CMakeLists.txt
@@ -257,7 +257,7 @@ if(GTSAM_UNSTABLE_BUILD_PYTHON)
         COMMAND
         ${CMAKE_COMMAND} -E env
         "PYTHONPATH=${GTSAM_PYTHON_BUILD_DIRECTORY}/$ENV{PYTHONPATH}"
-        pybind11-stubgen -o . --enum-class-locations \"KernelFunctionType|NoiseFormat:gtsam.gtsam\" --enum-class-locations \"OrderingType:gtsam.gtsam.Ordering\" gtsam_unstable
+        pybind11-stubgen -o . --enum-class-locations \"KernelFunctionType|NoiseFormat:gtsam.gtsam\" --enum-class-locations \"OrderingType:gtsam.gtsam.Ordering\" --numpy-array-use-type-var gtsam_unstable
         DEPENDS ${GTSAM_PYTHON_DEPENDENCIES} ${GTSAM_PYTHON_TEST_FILES} ${GTSAM_PYTHON_UNSTABLE_TARGET}
         WORKING_DIRECTORY "${GTSAM_PYTHON_BUILD_DIRECTORY}/"
     )
@@ -284,7 +284,7 @@ add_custom_target(
         COMMAND
         ${CMAKE_COMMAND} -E env
         "PYTHONPATH=${GTSAM_PYTHON_BUILD_DIRECTORY}/$ENV{PYTHONPATH}"
-        pybind11-stubgen -o . --enum-class-locations \"KernelFunctionType|NoiseFormat:gtsam.gtsam\" --enum-class-locations \"OrderingType:gtsam.gtsam.Ordering\" gtsam
+        pybind11-stubgen -o . --enum-class-locations \"KernelFunctionType|NoiseFormat:gtsam.gtsam\" --enum-class-locations \"OrderingType:gtsam.gtsam.Ordering\" --numpy-array-use-type-var gtsam
         DEPENDS ${GTSAM_PYTHON_DEPENDENCIES} ${GTSAM_PYTHON_TEST_FILES} ${GTSAM_PYTHON_TARGET}
         WORKING_DIRECTORY "${GTSAM_PYTHON_BUILD_DIRECTORY}/"
 )
diff --git a/python/gtsam/gtsam.tpl b/python/gtsam/gtsam.tpl
index c72a216a2..6876b4ab4 100644
--- a/python/gtsam/gtsam.tpl
+++ b/python/gtsam/gtsam.tpl
@@ -39,12 +39,12 @@ namespace py = pybind11;
 {module_def} {{
     m_.doc() = "pybind11 wrapper of {module_name}";
 
+// Specializations for STL classes
+#include "python/gtsam/specializations/{module_name}.h"
+
 {submodules_init}
 
 {wrapped_namespace}
 
-// Specializations for STL classes
-#include "python/gtsam/specializations/{module_name}.h"
-
 }}