building armadillo

Author: brdav

.github/workflows/build.yml

@@ -1,23 +1,35 @@
-name: Build Wheels
+name: Wheel builder
+
 on: [push, pull_request]
+
 jobs:
   build_wheels:
     runs-on: ${{ matrix.os }}
+
     strategy:
       fail-fast: false
       matrix:
         os: [ubuntu-latest, macos-latest]  # skip Windows
+
     steps:
-      - uses: actions/checkout@v4
+      - name: Checkout code
+        uses: actions/checkout@v4
         with:
           submodules: recursive  # for CARMA submodule
-      - uses: actions/setup-python@v4
-      - name: Install system BLAS/LAPACK
-        if: matrix.os == 'ubuntu-latest'
-        run: sudo apt-get update && sudo apt-get install -y libopenblas-dev liblapack-dev
-      - run: pip install cibuildwheel
-      - run: cibuildwheel --output-dir wheelhouse
-      - uses: actions/upload-artifact@v4
+
+      - name: Setup Python
+        uses: actions/setup-python@v5
+        with:
+          python-version: "3.11"
+
+      - name: Install cibuildwheel
+        run: pip install cibuildwheel
+
+      - name: Build wheels
+        run: cibuildwheel --output-dir wheelhouse
+
+      - name: Upload wheels
+        uses: actions/upload-artifact@v4
         with:
           name: wheels-${{ matrix.os }}
           path: wheelhouse/

src/cpp/CMakeLists.txt

@@ -7,28 +7,19 @@ set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 set(CMAKE_CXX_EXTENSIONS OFF)
 
-# Find and link BLAS/LAPACK (required by Armadillo)
-find_package(BLAS REQUIRED)
-find_package(LAPACK REQUIRED)
-
 include(FetchContent)
 
-## # --- Armadillo vendoring using FetchContent ------------------------------
+# --- Armadillo vendoring using FetchContent ------------------------------
 set(ARMADILLO_VERSION "15.0.2")
+set(HEADER_ONLY ON CACHE BOOL "Build Armadillo header-only")
 
-# By setting SOURCE_SUBDIR to a non-existing path, we prevent automatic
-# add_subdirectory in FetchContent_MakeAvailable.
-# https://gitlab.kitware.com/cmake/cmake/-/issues/26220
 FetchContent_Declare(
   armadillo_vendored
   URL "https://sourceforge.net/projects/arma/files/armadillo-${ARMADILLO_VERSION}.tar.xz/download"
   URL_HASH SHA256=990ab4ccb7eff1b6d70409e9aa7fa4119877ac5f5d10ba219e98460ab3e4d6eb
   DOWNLOAD_EXTRACT_TIMESTAMP true
-  SOURCE_SUBDIR "PATH_THAT_DOES_NOT_EXIST" # Prevents automatic add_subdirectory
 )
 FetchContent_MakeAvailable(armadillo_vendored)
-add_library(armadillo INTERFACE)
-target_include_directories(armadillo INTERFACE "${armadillo_vendored_SOURCE_DIR}/include")
 
 # --- Core library --------------------------------------------------------
 add_library(ppca STATIC
@@ -42,5 +33,5 @@ target_include_directories(ppca PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
 # Ensure the static library is built as PIC so it can be linked into a shared module
 set_target_properties(ppca PROPERTIES POSITION_INDEPENDENT_CODE ON)
 
-# Link to Armadillo target and system BLAS/LAPACK
-target_link_libraries(ppca PUBLIC armadillo ${BLAS_LIBRARIES} ${LAPACK_LIBRARIES})
+# Link to Armadillo target
+target_link_libraries(ppca PUBLIC armadillo)