simonsobs · tskisner · May 13, 2025 · May 16, 2025 · Nov 4, 2025 · Nov 4, 2025
diff --git a/.gitignore b/.gitignore
@@ -58,3 +58,6 @@ docs/_build
 
 # vim
 *.swp
+
+# vscode
+.vscode
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,21 +1,33 @@
-cmake_minimum_required(VERSION 3.17)
-project (so3g)
+cmake_minimum_required(VERSION 3.20)
+project(${SKBUILD_PROJECT_NAME} LANGUAGES CXX C)
 
 include(local.cmake OPTIONAL)
 
-# cmake policies -- best to keep these in sync with spt3g!
-# Don't warn about removal of FindBoost in cmake 3.30+
-if(POLICY CMP0167)
-	cmake_policy(SET CMP0167 NEW)
+# Warn if the user invokes CMake directly
+if (NOT SKBUILD)
+    message(WARNING "\
+    This CMake file is meant to be executed using 'scikit-build-core'.
+    Running it directly will almost certainly not produce the desired
+    result. If you are a user trying to install this package, use the
+    command below, which will install all necessary build dependencies,
+    compile the package in an isolated environment, and then install it.
+    =====================================================================
+    $ pip install .
+    =====================================================================
+    If you are a software developer, and this is your own package, then
+    it is usually much more efficient to install the build dependencies
+    in your environment once and use the following command that avoids
+    a costly creation of a new virtual environment at every compilation:
+    =====================================================================
+    $ pip install pybind11 scikit-build-core[pyproject]
+    $ pip install --no-build-isolation -ve .
+    =====================================================================
+    You may optionally add -Ceditable.rebuild=true to auto-rebuild when
+    the package is imported. Otherwise, you need to rerun the above
+    after editing C++ files.")
 endif()
 
-# Default to Release because we want that -O3.  This is what spt3g_software does too.
-if(NOT CMAKE_BUILD_TYPE)
-  set(CMAKE_BUILD_TYPE "Release" CACHE STRING
-    "Choose the type of build, options are: None(CMAKE_CXX_FLAGS or CMAKE_C_FLAGS used) Debug Release RelWithDebInfo MinSizeRel" FORCE)
-endif(NOT CMAKE_BUILD_TYPE)
-
-# Require C++ 17 (aligned with spt3g)
+# Require C++17
 set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 set(CMAKE_CXX_EXTENSIONS OFF)
@@ -24,146 +36,102 @@ set(CMAKE_CXX_EXTENSIONS OFF)
 # modules.  All code should be built with PIC.
 set(CMAKE_POSITION_INDEPENDENT_CODE ON)
 
-# For this to be found, make sure the spt3g build directory can be
-# searched; i.e. -DCMAKE_PREFIX_PATH=/path/to/spt3g_software/build
-find_package(Spt3g REQUIRED)
+find_package(
+    Python 3.9
+    REQUIRED COMPONENTS Interpreter Development.Module
+    OPTIONAL_COMPONENTS Development.SABIModule
+)
 
-find_package(Python COMPONENTS Interpreter Development.Module REQUIRED)
+find_package(OpenMP)
 find_package(FLAC)
 find_package(GSL)
 find_package(Ceres)
+find_package(pybind11 CONFIG REQUIRED)
+
+set(libso3g_SOURCES
+    src/main.cxx
+    src/hkagg.cxx
+    src/Intervals.cxx
+    src/Butterworth.cxx
+    src/Ranges.cxx
+    src/Projection.cxx
+    src/so_linterp.cxx
+    src/exceptions.cxx
+    src/array_ops.cxx
+    src/fitting_ops.cxx
+)
 
-find_package(OpenMP)
-if(OPENMP_FOUND)
-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${OpenMP_CXX_FLAGS}")
-  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${OpenMP_C_FLAGS}")
-else()
-  message(WARNING "OpenMP not being linked -- this may affect performance.")
-endif()
+# Documentation for the options here:
+# https://pybind11.readthedocs.io/en/stable/compiling.html#modules-with-cmake
+pybind11_add_module(libso3g ${libso3g_SOURCES})
 
-# Determine the location of site-packages.
-execute_process(COMMAND ${Python_EXECUTABLE} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())" OUTPUT_VARIABLE PYTHON_SITE_PACKAGES OUTPUT_STRIP_TRAILING_WHITESPACE)
+# Install directive for scikit-build-core
+install(TARGETS libso3g LIBRARY DESTINATION so3g)
 
 # Numpy include directory
 execute_process(COMMAND ${Python_EXECUTABLE} -c
-  "import numpy; print(numpy.get_include())"
-  OUTPUT_VARIABLE NUMPY_INCLUDE_DIR
-  OUTPUT_STRIP_TRAILING_WHITESPACE
+    "import numpy; print(numpy.get_include())"
+    OUTPUT_VARIABLE NUMPY_INCLUDE_DIR
+    OUTPUT_STRIP_TRAILING_WHITESPACE
 )
 
 include_directories(${CMAKE_SOURCE_DIR}/include ${CMAKE_BINARY_DIR} )
 include_directories(${NUMPY_INCLUDE_DIR})
 
-#
-# Define the so3g build target.  This is a shared library.
-#
-set(CMAKE_LIBRARY_OUTPUT_DIRECTORY so3g)
-add_library(so3g SHARED
-  src/main.cxx
-  src/hkagg.cxx
-  src/Intervals.cxx
-  src/Butterworth.cxx
-  src/Ranges.cxx
-  src/Projection.cxx
-  src/G3SuperTimestream.cxx
-  src/so_linterp.cxx
-  src/exceptions.cxx
-  src/array_ops.cxx
-  src/fitting_ops.cxx
-)
-
-# We could disable the lib prefix on the output library... but let's not.
-#set_target_properties(so3g PROPERTIES PREFIX "")
+# Add external dependencies to our include / link commands
 
-# Disable boost python auto_ptr warnings
-target_compile_definitions(so3g PUBLIC BOOST_NO_AUTO_PTR)
+if(OPENMP_FOUND)
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${OpenMP_CXX_FLAGS}")
+    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${OpenMP_C_FLAGS}")
+else()
+    message(WARNING "OpenMP not being linked -- this may affect performance.")
+endif()
 
-# Link to the core spt3g library.  This brings in boost dependencies
-# as well.
-target_link_libraries(so3g PUBLIC spt3g::core)
+target_link_libraries(libso3g PUBLIC Ceres::ceres Eigen3::Eigen)
 
-# Link to GSL
-target_include_directories(so3g PRIVATE ${GSL_INCLUDE_DIR})
-target_link_libraries(so3g PUBLIC ${GSL_LIBRARIES})
-# Link Ceres
-target_link_libraries(so3g PUBLIC Ceres::ceres Eigen3::Eigen)
+target_include_directories(libso3g PRIVATE ${FLAC_INCLUDE_DIR})
 
-# FLAC- library already comes from spt3g dependencies, but
-# we need to have the headers.
-target_include_directories(so3g PRIVATE ${FLAC_INCLUDE_DIR})
+target_include_directories(libso3g PRIVATE ${GSL_INCLUDE_DIR})
+target_link_libraries(libso3g PUBLIC ${GSL_LIBRARIES})
 
 # You probably want to select openblas, so pass -DBLA_VENDOR=OpenBLAS
 find_package(BLAS REQUIRED)
 if(BLAS_FOUND)
-  message("-- BLAS found: ${BLAS_LIBRARIES}")
-  target_link_libraries(so3g PUBLIC ${BLAS_LIBRARIES})
-
-  # The BLAS library may or may not include the cblas_* bindings.
-  # This variable set is needed by check_function_exists; starting in
-  # cmake v3.18 you can say BLAS::BLAS instead of the lib path...
-  set(CMAKE_REQUIRED_LIBRARIES ${BLAS_LIBRARIES})
-  check_function_exists(cblas_sgemm CBLAS_OK)
-  if(${CBLAS_OK})
-    message("-- cblas bindings are included in the BLAS library")
-  else()
-    message("-- cblas bindings not found in BLAS; adding cblas.")
-    target_link_libraries(so3g PUBLIC cblas)
-  endif()
-
-  # On MacOS with clang linking to the Accelerate framework, the cblas
-  # headers are not always found.  Handle this case.  Also note that the
-  # Accelerate framework has documented numerical problems- consider using
-  # a better BLAS/LAPACK implementation.
-  if(BLAS_Accelerate_LIBRARY)
-    target_include_directories(so3g PRIVATE ${BLAS_Accelerate_LIBRARY}/Versions/A/Frameworks/vecLib.framework/Headers)
-  endif()
+    message("-- BLAS found: ${BLAS_LIBRARIES}")
+    target_link_libraries(libso3g PUBLIC ${BLAS_LIBRARIES})
+
+    # The BLAS library may or may not include the cblas_* bindings.
+    # This variable set is needed by check_function_exists; starting in
+    # cmake v3.18 you can say BLAS::BLAS instead of the lib path...
+    set(CMAKE_REQUIRED_LIBRARIES ${BLAS_LIBRARIES})
+    check_function_exists(cblas_sgemm CBLAS_OK)
+    if(${CBLAS_OK})
+        message("-- cblas bindings are included in the BLAS library")
+    else()
+        message("-- cblas bindings not found in BLAS; adding cblas.")
+        target_link_libraries(libso3g PUBLIC cblas)
+    endif()
+
+    # On MacOS with clang linking to the Accelerate framework, the cblas
+    # headers are not always found.  Handle this case.  Also note that the
+    # Accelerate framework has documented numerical problems- consider using
+    # a better BLAS/LAPACK implementation.
+    if(BLAS_Accelerate_LIBRARY)
+        target_include_directories(libso3g PRIVATE
+            ${BLAS_Accelerate_LIBRARY}/Versions/A/Frameworks/vecLib.framework/Headers
+        )
+    endif()
 endif(BLAS_FOUND)
 
 # This custom target generates _version.h, in the build tree.  That is all.
 add_custom_target(so3g-version
-  COMMAND python ${CMAKE_CURRENT_SOURCE_DIR}/version_h.py
-  SO3G_VERSION_STRING ${CMAKE_CURRENT_BINARY_DIR}/_version.h
-  SOURCES version_h.py
+    COMMAND python ${CMAKE_CURRENT_SOURCE_DIR}/version_h.py
+    SO3G_VERSION_STRING ${CMAKE_CURRENT_BINARY_DIR}/_version.h
+    SOURCES version_h.py
 )
-
-add_dependencies(so3g so3g-version)
-
-# Make a list of .py files for the library.
-file(GLOB MY_PYTHONS
-  "${CMAKE_CURRENT_SOURCE_DIR}/python/*.py")
-file(GLOB MY_PYTHONS_HK
-  "${CMAKE_CURRENT_SOURCE_DIR}/python/hk/*.py")
-file(GLOB MY_PYTHONS_PROJ
-  "${CMAKE_CURRENT_SOURCE_DIR}/python/proj/*.py")
-file(GLOB MY_PYTHONS_SMURF
-  "${CMAKE_CURRENT_SOURCE_DIR}/python/smurf/*.py")
-
-# Define the install rules.
-
-if(DEFINED PYTHON_INSTALL_DEST)
-  get_filename_component(INSTALL_DEST ${PYTHON_INSTALL_DEST}/so3g
-                         ABSOLUTE BASE_DIR ${CMAKE_BINARY_DIR})
-  message("local.cmake has specified the install dir: ${INSTALL_DEST}")
-else()
-  set(INSTALL_DEST ${PYTHON_SITE_PACKAGES}/so3g)
-endif()
-
-install(TARGETS so3g
-        DESTINATION ${INSTALL_DEST})
-
-install(FILES ${MY_PYTHONS}
-        DESTINATION ${INSTALL_DEST})
-install(FILES ${MY_PYTHONS_HK}
-        DESTINATION ${INSTALL_DEST}/hk)
-install(FILES ${MY_PYTHONS_PROJ}
-        DESTINATION ${INSTALL_DEST}/proj)
-install(FILES ${MY_PYTHONS_SMURF}
-        DESTINATION ${INSTALL_DEST}/smurf)
-
-# To add a prefix, pass CMAKE_INSTALL_PREFIX.
-install(PROGRAMS scripts/so-hk-tool DESTINATION bin)
+add_dependencies(libso3g so3g-version)
 
 add_custom_target(prep-readthedocs
-  COMMAND python ${CMAKE_CURRENT_SOURCE_DIR}/docs/extract_docstrings.py
-          --prep-rtd --source-branch=master
-  )
+    COMMAND python ${CMAKE_CURRENT_SOURCE_DIR}/docs/extract_docstrings.py
+            --prep-rtd --source-branch=master
+)
diff --git a/Dockerfile b/Dockerfile
diff --git a/docker-compose.yml b/docker-compose.yml
diff --git a/docker/qpoint-setup.sh b/docker/qpoint-setup.sh
diff --git a/docker/so3g-setup.sh b/docker/so3g-setup.sh
diff --git a/include/Butterworth.h b/include/Butterworth.h
@@ -1,10 +1,14 @@
 #include <vector>
 #include <cstdint>
+#include <array>
 
-#include <boost/python.hpp>
+#include <pybind11/pybind11.h>
 
 #include "numpy_assist.h"
 
+namespace py = pybind11;
+
+
 class BFilterParams {
 public:
     BFilterParams(int32_t b0, int32_t b1, int b_bits, int p_bits, int shift)
@@ -25,11 +29,12 @@ class BFilterBank {
     void apply(int32_t* input, int32_t* output, int n_samp);
     void apply_to_float(float *input, float *output, float unit, int n_samp);
 
-    void apply_buffer(boost::python::object input,
-                      boost::python::object output);
+    void apply_buffer(py::object input,
+                      py::object output);
 
     std::vector<std::vector<std::array<std::int64_t,2>>> w;  // (n_bank,n_chan,2)
     std::vector<BFilterParams> par;
 };
 
-void butterworth_test();
+
+void register_butterworth(py::module_ & m);
-Original file line number
+Diff line change
@@ Expand Up / @@ -58,3 +58,6 @@ docs/_build @@
     # vim
     *.swp
+    # vscode
+    .vscode