AST-1495 Remove GSL dependency

.readthedocs.yaml

@@ -21,7 +21,6 @@ build:
     - libboost-all-dev
     - libcfitsio-dev
     - libfftw3-dev
-    - libgsl-dev
     - libgtkmm-3.0-dev
     - libhdf5-dev
     - liblapack-dev

CHANGELOG.md

+# EveryBeam Changelog
+
+## Next release
+
+### Improvements
+- EveryBeam no longer indirectly depends on the GSL library, via schaapcommon.

CMake/EveryBeamConfig.cmake.in

@@ -39,7 +39,7 @@ message(STATUS "  EveryBeam lib: ${EVERYBEAM_LIB}")
 set(EVERYBEAM_VERSION "@EVERYBEAM_VERSION@")
 set(EVERYBEAM_VERSION_MAJOR @EVERYBEAM_VERSION_MAJOR@)
 set(EVERYBEAM_VERSION_MINOR @EVERYBEAM_VERSION_MINOR@)
-set(EVERYBEAM_VERSION_PATCH @EVERYBEAM_VERSION_MINOR@)
+set(EVERYBEAM_VERSION_PATCH @EVERYBEAM_VERSION_PATCH@)
 set(EVERYBEAM_FOUND 1)
 
 unset(_EVERYBEAM_ROOT_DIR)

CMakeLists.txt

@@ -7,7 +7,7 @@ cmake_minimum_required(VERSION 3.15)
 
 #------------------------------------------------------------------------------
 # Set version name and project number
-set(EVERYBEAM_VERSION 0.5.5) # Keep in sync with `pyproject.toml` file
+set(EVERYBEAM_VERSION 0.5.6) # Keep in sync with `pyproject.toml` file
 if(EVERYBEAM_VERSION MATCHES "^([0-9]+)\\.([0-9]+)\\.([0-9]+)")
   set(EVERYBEAM_VERSION_MAJOR "${CMAKE_MATCH_1}")
   set(EVERYBEAM_VERSION_MINOR "${CMAKE_MATCH_2}")
@@ -165,6 +165,7 @@ add_subdirectory("${CMAKE_SOURCE_DIR}/external/pybind11")
 include_directories(SYSTEM ${pybind11_INCLUDE_DIRS})
 
 # Include schaapcommon
+set(SCHAAPCOMMON_MODULES h5parm)
 add_subdirectory("${CMAKE_SOURCE_DIR}/external/schaapcommon")
 include_directories("${CMAKE_SOURCE_DIR}/external/schaapcommon/include")
 

cibuildwheel/before_all.sh

@@ -8,9 +8,7 @@ nproc=$(python -c 'import multiprocessing as mp; print(mp.cpu_count())')
 function install_packages
 {
   /bin/echo -e "\n==> Installing packages using the package manager ...\n"
-  yum install -y \
-    gsl-devel \
-    wget
+  yum install -y wget
 }
 
 

cpp/CMakeLists.txt

@@ -43,12 +43,6 @@ add_library(
   mwabeam/tilebeam2016.cc
   mwabeam/beam2016implementation.cc
   options.cc
-  # aterms
-  # From CMake 3.12 onwards, the line below can be replaced by
-  # target_link_libraries(everybeam aterms)
-  # That way the dependencies of the aterms object library
-  # will be automatically linked as well
-  $<TARGET_OBJECTS:aterms>
   phasedarrayresponse.cc
   pointresponse/phasedarraypoint.cc
   pointresponse/dishpoint.cc
@@ -96,12 +90,12 @@ target_include_directories(everybeam PRIVATE "${CMAKE_BINARY_DIR}")
 
 target_include_directories(everybeam PUBLIC ${CASACORE_INCLUDE_DIR})
 
+target_link_libraries(everybeam PRIVATE aterms)
 target_link_libraries(everybeam PUBLIC hamaker oskar skamidbeam)
 target_link_libraries(
   everybeam PUBLIC ${CASACORE_LIBRARIES} ${HDF5_CXX_LIBRARIES}
                    ${FFTW3F_LIBRARY} ${CFITSIO_LIBRARY})
-target_link_libraries(everybeam PRIVATE schaapcommon Threads::Threads xtensor
-                                        ${BLAS_LIBRARIES} ${LAPACK_LIBRARIES})
+target_link_libraries(everybeam PRIVATE schaapcommon Threads::Threads xtensor)
 
 if(SKBUILD)
   set_target_properties(everybeam PROPERTIES INSTALL_RPATH "$ORIGIN")
@@ -130,10 +124,11 @@ install(
         phasedarrayresponse.h
   DESTINATION "include/${CMAKE_PROJECT_NAME}")
 
-# TODO: not sure whether this is needed at all
+# Install EveryBeamTargets.cmake, which contains the EveryBeam cmake targets.
+# Other install() calls generate the contents for EveryBeamTargets.cmake.
+# EveryBeamConfig.cmake includes the generated EveryBeamTargets.cmake.
 install(
   EXPORT EveryBeamTargets
-  FILE EveryBeamTargets.cmake
   NAMESPACE EveryBeam::
   DESTINATION "lib/${projectname}")
 

cpp/aterms/CMakeLists.txt

@@ -23,7 +23,15 @@ add_library(
 set_property(TARGET aterms PROPERTY POSITION_INDEPENDENT_CODE ON)
 
 # Link to XTensor libraries, which are loaded using FetchXTensor.cmake.
-target_link_libraries(aterms xtensor xtl xtensor-blas xtensor-fftw)
+# BLAS and LAPACK are needed for xtensor-blas.
+target_link_libraries(
+  aterms
+  xtensor
+  xtl
+  xtensor-blas
+  xtensor-fftw
+  ${BLAS_LIBRARIES}
+  ${LAPACK_LIBRARIES})
 
 install(
   FILES atermconfig.h

doc/build-instructions.rst

@@ -14,7 +14,7 @@ General packages:
 
     apt-get -y install wget git make cmake g++ doxygen \
     libboost-all-dev libhdf5-dev libfftw3-dev \
-    libblas-dev liblapack-dev libgsl-dev libxml2-dev \
+    libblas-dev liblapack-dev libxml2-dev \
     libgtkmm-3.0-dev libpython3-dev python3-distutils
 
 Astronomy-specific packages:

docker/ubuntu_20_04_base

@@ -16,7 +16,6 @@ RUN export DEBIAN_FRONTEND="noninteractive" && \
 		libboost-all-dev \
 		libcfitsio-dev \
 		libfftw3-dev \
-		libgsl-dev \
 		libgtkmm-3.0-dev \
 		libhdf5-dev \
 		liblapack-dev \

docker/ubuntu_22_04_base

@@ -18,7 +18,6 @@ RUN export DEBIAN_FRONTEND="noninteractive" && \
 		libboost-all-dev \
 		libcfitsio-dev \
 		libfftw3-dev \
-		libgsl-dev \
 		libgtkmm-3.0-dev \
 		libhdf5-dev \
 		liblapack-dev \

docker/ubuntu_22_04_gcc12_base

@@ -14,7 +14,6 @@ RUN export DEBIAN_FRONTEND="noninteractive" && \
       libboost-all-dev \
       libcfitsio-dev \
       libfftw3-dev \
-      libgsl-dev \
       libgtkmm-3.0-dev \
       libhdf5-dev \
       liblapack-dev \

schaapcommon @ 3cc5c03c

-Subproject commit 1e402bb87ab3806c23696087ed294dc6c078ae6c
+Subproject commit 3cc5c03cbc25f146be511518003d49a321d4d720

pyproject.toml

@@ -15,7 +15,7 @@ build-backend = "scikit_build_core.build"
 
 [project]
 name = "everybeam"
-version = "0.5.5"  # Keep in sync with top-level `CMakeLists.txt` file
+version = "0.5.6"  # Keep in sync with top-level `CMakeLists.txt` file
 description = "EveryBeam"
 readme = {file = "README.md", content-type = "text/markdown"}
 requires-python = ">=3.7"