Merge branch 'master' into json_output

Author: arahlin

.github/workflows/cmake.yml

@@ -35,8 +35,8 @@ jobs:
         sudo apt update
         sudo apt install gcc-14 g++-14 -y
         sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-14 14 --slave /usr/bin/g++ g++ /usr/bin/g++-14
-        sudo apt-get install libz-dev libbz2-dev liblzma-dev libboost-python-dev libflac-dev libnetcdf-dev libpython3-dev
-        sudo pip install numpy scipy matplotlib astropy healpy sphinx --break-system-packages
+        sudo apt-get install libz-dev libbz2-dev liblzma-dev libflac-dev libnetcdf-dev libpython3-dev
+        sudo pip install numpy scipy matplotlib astropy healpy sphinx sphinx-rtd-theme --break-system-packages
 
     - name: Setup python on macOS
       if: runner.environment == 'github-hosted' && runner.os == 'macOS'
@@ -47,8 +47,8 @@ jobs:
     - name: Install macOS Dependencies
       if: runner.environment == 'github-hosted' && runner.os == 'macOS'
       run: |
-        brew install --overwrite bzip2 xz boost-python3 flac netcdf
-        python3.13 -m pip install numpy scipy matplotlib astropy healpy sphinx --break-system-packages
+        brew install --overwrite bzip2 xz flac netcdf
+        python3.13 -m pip install numpy scipy matplotlib astropy healpy sphinx sphinx-rtd-theme --break-system-packages
 
     - name: Create Build Environment
       # Some projects don't allow in-source building, so create a separate build directory

.github/workflows/wheels.yml

@@ -83,16 +83,16 @@ jobs:
           fetch-tags: true
 
       - name: Build wheels
-        uses: pypa/cibuildwheel@v2.23.2
+        uses: pypa/cibuildwheel@v2.23.3
         env:
           CIBW_BUILD: ${{ matrix.build }}
           CIBW_BEFORE_ALL_LINUX: yum install -y zlib-devel bzip2-devel xz-devel netcdf-devel
           CIBW_BEFORE_ALL_MACOS: brew install netcdf
           CIBW_BEFORE_BUILD_MACOS: >
             ln -s $(dirname $(readlink -f $(which python3)))/python3-config $(dirname $(which python3))/python3-config &&
-            pip install cmake && ./deps/install_flac.sh && ./deps/install_boost.sh
+            pip install cmake && ./deps/install_flac.sh
           CIBW_BEFORE_BUILD_LINUX: >
-            pip install cmake && ./deps/install_flac.sh && ./deps/install_boost.sh
+            pip install cmake && ./deps/install_flac.sh
           CIBW_REPAIR_WHEEL_COMMAND_LINUX: >
             LD_LIBRARY_PATH=$PWD/deps/lib auditwheel repair -w {dest_dir} {wheel}
           CIBW_REPAIR_WHEEL_COMMAND_MACOS: >

.gitignore

@@ -9,8 +9,6 @@ install_manifest.txt
 *.pyc
 __pycache__
 build
-doc/module-autodocs.rst
-doc/moddoc_*
 *.g3
 .DS_Store
-.idea/
+.idea/

CMakeLists.txt

@@ -1,8 +1,4 @@
 cmake_minimum_required(VERSION 3.12)
-# Don't warn about removal of FindBoost in cmake 3.30+
-if(POLICY CMP0167)
-	cmake_policy(SET CMP0167 NEW)
-endif()
 
 project(spt3g)
 enable_testing()
@@ -37,7 +33,7 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall")
 
 set(CMAKE_POSITION_INDEPENDENT_CODE ON)
 
-# Find all the Boost and Python libraries
+# Find all the Python libraries
 set(THREADS_PREFER_PTHREAD_FLAG ON)
 find_package(Threads REQUIRED)
 
@@ -48,11 +44,28 @@ else()
 	find_package(Python COMPONENTS Interpreter Development REQUIRED)
 endif()
 
-set(Boost_USE_STATIC_LIBS OFF)
-set(Boost_USE_MULTITHREADED ON)
-set(Boost_USE_STATIC_RUNTIME OFF)
-set(Boost_PYTHON_VERSION ${Python_VERSION})
-find_package(Boost COMPONENTS python REQUIRED)
+# Find pybind11
+set(PYBIND11_FINDPYTHON ON)
+find_package(pybind11 2.13 QUIET)
+if (pybind11_FOUND)
+	message(STATUS "Found pybind11: ${pybind11_INCLUDE_DIR} (found version \"${pybind11_VERSION}\")")
+else()
+	if (NOT pybind11_DIR)
+		# download if necessary
+		include(FetchContent)
+		FetchContent_Declare(
+			pybind11
+			GIT_REPOSITORY https://github.com/pybind/pybind11.git
+			GIT_TAG v2.13.6
+		)
+		FetchContent_MakeAvailable(pybind11)
+	else()
+		find_package(pybind11 2.13 CONFIG REQUIRED)
+	endif()
+endif()
+if ("${CMAKE_BUILD_TYPE}" STREQUAL "Debug" OR "${CMAKE_BUILD_TYPE}" STREQUAL "RelWithDebInfo")
+	add_compile_definitions(PYBIND11_DETAILED_ERROR_MESSAGES)
+endif()
 
 # Interface library for flags and library dependencies
 add_library(spt3g INTERFACE)
@@ -65,27 +78,11 @@ if (SPT3G_VERSION)
 endif()
 
 target_compile_features(spt3g INTERFACE cxx_std_17)
-target_include_directories(spt3g INTERFACE ${Boost_INCLUDE_DIR})
-target_link_libraries(spt3g INTERFACE Threads::Threads Boost::python)
+target_link_libraries(spt3g INTERFACE Threads::Threads)
 target_include_directories(spt3g INTERFACE $<INSTALL_INTERFACE:${SPT3G_INCLUDE_INSTALL_DIR}>)
 
 # Python bindings
-if(TARGET Python::Module)
-	target_link_libraries(spt3g INTERFACE Python::Module)
-else()
-	target_include_directories(spt3g INTERFACE ${Python_INCLUDE_DIRS})
-	if(APPLE)
-		target_link_options(spt3g INTERFACE "LINKER:-undefined,dynamic_lookup")
-	endif()
-endif()
-
-# Work around yet more bugs in GCC 4.4, this time with C++ 11 support
-# Also increase maximum number of arguments in python bindings
-target_compile_definitions(spt3g INTERFACE -DBOOST_PYTHON_MAX_ARITY=20
-	-DBOOST_ALLOW_DEPRECATED_HEADERS)
-if(Boost_VERSION VERSION_LESS 1.77)
-	target_compile_definitions(spt3g INTERFACE -DBOOST_BIND_GLOBAL_PLACEHOLDERS)
-endif()
+target_link_libraries(spt3g INTERFACE pybind11::module)
 
 # Shell script to set environment variables
 configure_file(${CMAKE_SOURCE_DIR}/cmake/env-shell.sh.in ${CMAKE_BINARY_DIR}/env-shell.sh @ONLY)
@@ -175,7 +172,7 @@ add_custom_target(tarball
 add_custom_target(docs
 	COMMAND ${CMAKE_COMMAND} -P ${CMAKE_SOURCE_DIR}/cmake/gen_per_module_docs.cmake ${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} ${Python_EXECUTABLE}
 	COMMAND mkdir -p ${CMAKE_BINARY_DIR}/docs
-	COMMAND which sphinx-build && sphinx-build -b html ${CMAKE_SOURCE_DIR}/doc ${CMAKE_BINARY_DIR}/docs || echo "Error: sphinx-build not found. Could not generate HTML docs."
+	COMMAND ${CMAKE_COMMAND} -E env PYTHONPATH=${CMAKE_BINARY_DIR}:$ENV{PYTHONPATH} LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/lib:$ENV{LD_LIBRARY_PATH} sphinx-build -b html ${CMAKE_SOURCE_DIR}/doc ${CMAKE_BINARY_DIR}/docs
 	COMMENT "Generate HTML documentation")
 
 # Set up installation

README.rst

@@ -24,32 +24,31 @@ The main documentation for the software is in the docs folder. After building th
 Dependencies
 ------------
 
-This depends on Boost and cmake, as well as the usual Python packages. Some additional packages (NetCDF, in particular) will activate optional components of the code if installed. You also need a C++11 compiler. This software is designed to run and work on a variety of operating systems (all Linuxes, Mac OS X, and FreeBSD) and architectures (at least 64-bit x86 and POWER).
+This depends on pybind11 and cmake, as well as the usual Python packages. Some additional packages (NetCDF, in particular) will activate optional components of the code if installed. You also need a C++11 compiler. This software is designed to run and work on a variety of operating systems (all Linuxes, Mac OS X, and FreeBSD) and architectures (at least 64-bit x86 and POWER).
 
 Minimum versions:
 
 - GCC >= 5.0 or clang >= 3.4
-- Boost >= 1.63
+- pybind11 >= 2.13
 - cmake >= 3.12
-- Python >= 2.7 (although pre-Python-3 support is best-effort)
+- Python >= 3.7 (although pre-Python-3.8 support is best-effort)
 
 On Ubuntu/Debian, you can install the non-Python dependencies, including the optional ones, by doing:
 
 .. code-block:: shell
 
-	apt-get install cmake libboost-python-dev libflac-dev libnetcdf-dev
+	apt-get install cmake libz-dev libbz2-dev liblzma-dev libflac-dev libnetcdf-dev
 
 On RHEL-type systems (SL, CentOS, etc.), do this:
 
 .. code-block:: shell
 
-	yum install cmake netcdf-devel boost-devel flac-devel
+	yum install cmake netcdf-devel zlib-devel bz2-devel xz-devel flac-devel
 	
 If your system defaults to Python 2, but you wish to use Python 3, please do the following:
 
 1. Install Python 3 *from the system package manager*
-2. Make sure the python-3 version of the Boost library is installed (on Ubuntu, this is part of the standard boost-python package referenced above)
-3. When you run cmake below, pass ``-DPython_EXECUTABLE=`which python3```
+2. When you run cmake below, pass ``-DPython_EXECUTABLE=`which python3```
 
 On any system, this software requires numpy and scipy (hard requirements), plus astropy and healpy (optional).
 
@@ -124,7 +123,7 @@ For pre-built wheels hosted on `PyPI`_, available for most Linux x86_64, macOS x
 
 	pip install spt3g
 
-The hosted wheels will include the necessary libraries (Boost, etc) bundled with the package.  Otherwise, ensure that the dependency libraries are installed as explained above, and processed to one of the following steps.
+The hosted wheels will include the necessary libraries (flac, etc) bundled with the package.  Otherwise, ensure that the dependency libraries are installed as explained above, and processed to one of the following steps.
 
 To install the package from the github repo, run ``pip`` as usual (this may take a while, so consider setting the ``CMAKE_BUILD_PARALLEL_LEVEL`` environment variable):
 
@@ -174,10 +173,7 @@ Use the ``git archive`` command or the Python ``build`` package to export the so
 Version Control Hygiene
 -----------------------
 
-You can use two mechanisms to access the repository: git and SVN. The following is a brief overview of how to use these in a way that your collaborators will appreciate.
-
-Git
-===
+The following is a brief overview of how to use git in a way that your collaborators will appreciate.
 
 To initially check out the repository:
 
@@ -199,26 +195,3 @@ To send your changes back:
 	git commit files_to_commit
 	git push
 
-
-SVN
-===
-
-To initially check out the repository:
-
-.. code-block:: shell
-
-	svn co https://user@github.com/CMB-S4/spt3g_software/trunk spt3g_software
-
-To update your checkout:
-
-.. code-block:: shell
-
-	svn up
-
-To send your changes back:
-
-.. code-block:: shell
-
-	svn diff files_to_commit <- Examine this
-	svn ci files_to_commit
-

calibration/python/build_cal_frames.py

@@ -268,7 +268,7 @@ def ExplodeBolometerProperties(frame, bpmname='NominalBolometerProperties'):
     yoff = core.G3MapDouble()
     coupling = core.G3MapInt()
 
-    for bolo, p in bpm.iteritems():
+    for bolo, p in bpm.items():
         polangle[bolo] = p.pol_angle
         poleff[bolo] = p.pol_efficiency
         bands[bolo] = p.band

calibration/src/BoloProperties.cxx

@@ -58,6 +58,17 @@ G3_SERIALIZABLE_CODE(BolometerProperties);
 G3_SERIALIZABLE_CODE(BolometerPropertiesMap);
 
 PYBINDINGS("calibration", scope) {
+	register_enum<BolometerProperties::CouplingType>(scope, "BolometerCouplingType",
+	  "Coupling type for BolometerProperties objects.")
+	    .value("Unknown", BolometerProperties::Unknown)
+	    .value("Optical", BolometerProperties::Optical)
+	    .value("DarkTermination", BolometerProperties::DarkTermination)
+	    .value("DarkCrossover", BolometerProperties::DarkCrossover)
+	    .value("Resistor", BolometerProperties::Resistor)
+	    .value("Loopback", BolometerProperties::Loopback)
+	    .value("OffResonance", BolometerProperties::OffResonance)
+	;
+
 	register_frameobject<BolometerProperties>(scope, "BolometerProperties",
             "Physical bolometer properties, such as detector angular offsets. "
 	    "Does not include tuning-dependent properties of the detectors.")
@@ -90,17 +101,6 @@ PYBINDINGS("calibration", scope) {
 	       "Name of the pixel type of which this detector is a part")
 	;
 
-	register_enum<BolometerProperties::CouplingType>(scope, "BolometerCouplingType",
-	  "Coupling type for BolometerProperties objects.")
-	    .value("Unknown", BolometerProperties::Unknown)
-	    .value("Optical", BolometerProperties::Optical)
-	    .value("DarkTermination", BolometerProperties::DarkTermination)
-	    .value("DarkCrossover", BolometerProperties::DarkCrossover)
-	    .value("Resistor", BolometerProperties::Resistor)
-	    .value("Loopback", BolometerProperties::Loopback)
-	    .value("OffResonance", BolometerProperties::OffResonance)
-	;
-
 	register_g3map<BolometerPropertiesMap>(scope, "BolometerPropertiesMap",
 	    "Container for bolometer properties for focal plane, mapping "
 	    "logical bolometer IDs to their physical properties.");

cmake/FindFFTW.cmake

@@ -1,14 +1,14 @@
 # - Find FFTW
 # Find the native FFTW includes and library
 #
-# FFTW_INCLUDES - where to find fftw3.h
+# FFTW_INCLUDE_DIRS - where to find fftw3.h
 # FFTW_LIBRARIES - List of libraries when using FFTW.
 # FFTW_FOUND - True if FFTW found.
-if (FFTW_INCLUDES)
+if (FFTW_INCLUDE_DIRS)
 # Already in cache, be silent
 set (FFTW_FIND_QUIETLY TRUE)
-endif (FFTW_INCLUDES)
-find_path (FFTW_INCLUDES fftw3.h HINTS ENV FFTW_INC)
+endif (FFTW_INCLUDE_DIRS)
+find_path (FFTW_INCLUDE_DIRS fftw3.h HINTS ENV FFTW_INC)
 find_library (FFTW_LIBRARIES NAMES fftw3 HINTS ENV FFTW_DIR)
 
 
@@ -22,5 +22,5 @@ mark_as_advanced(FFTW_THREADS_LIBRARY)
 
 # handle the QUIETLY and REQUIRED arguments and set FFTW_FOUND to TRUE if
 # all listed variables are TRUE
-find_package_handle_standard_args (FFTW DEFAULT_MSG FFTW_LIBRARIES FFTW_INCLUDES)
-mark_as_advanced (FFTW_LIBRARIES FFTW_INCLUDES)
+find_package_handle_standard_args (FFTW DEFAULT_MSG FFTW_LIBRARIES FFTW_INCLUDE_DIRS)
+mark_as_advanced (FFTW_LIBRARIES FFTW_INCLUDE_DIRS)

cmake/FindGSL.cmake

@@ -38,11 +38,7 @@ else()
 	find_dependency(Python COMPONENTS Interpreter Development REQUIRED)
 endif()
 
-set(Boost_USE_STATIC_LIBS @Boost_USE_STATIC_LIBS@)
-set(Boost_USE_MULTITHREADED @Boost_USE_MULTITHREADED@)
-set(Boost_USE_STATIC_RUNTIME @Boost_USE_STATIC_RUNTIME@)
-set(Boost_PYTHON_VERSION @Boost_PYTHON_VERSION@)
-find_dependency(Boost COMPONENTS python REQUIRED)
+find_dependency(pybind11 CONFIG REQUIRED)
 
 include(FindPackageHandleStandardArgs)
 find_package_handle_standard_args(Spt3g