Clean up some unnecessary things from scipy#99

Author: steppi

CMakeLists.txt

@@ -6,31 +6,8 @@ project(xsf)
 set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
-# Help find packages in conda/pixi environment
-if(DEFINED ENV{CONDA_PREFIX})
-    message(STATUS "Using conda prefix: $ENV{CONDA_PREFIX}")
-    list(APPEND CMAKE_PREFIX_PATH "$ENV{CONDA_PREFIX}")
-    set(ENV{PKG_CONFIG_PATH} "$ENV{CONDA_PREFIX}/lib/pkgconfig:$ENV{PKG_CONFIG_PATH}")
-endif()
-
-#============================================
-# SDB says: Use pkg-config to find blas & lapack
-# which are requred to run the Mathieu tests.
-# Find pkg-config
-find_package(PkgConfig REQUIRED)
-
-# Use pkg-config to find a library
-#pkg_check_modules(BLAS REQUIRED blas)
-#pkg_check_modules(LAPACK REQUIRED lapack)
-
-#pkg_search_module(BLAS IMPORTED_TARGET REQUIRED openblas blas)
-#pkg_search_module(LAPACK IMPORTED_TARGET REQUIRED openblas lapack)
-
-#============================================
-
 # Tests
-# Turned on by SDB
-option(BUILD_TESTS "Build the tests" ON) 
+option(BUILD_TESTS "Build the tests" OFF)
 
 if(BUILD_TESTS)
   enable_testing()

include/xsf/numpy.h

@@ -803,9 +803,11 @@ namespace numpy {
 
             Func func = static_cast<ufunc_data<Func> *>(data)->func;
             for (npy_intp i = 0; i < dims[0]; ++i) {
-                Res res = func(npy_traits<Args>::get(
-                    args[I], new_dims.data() + ranks_scan[I], steps + ranks_scan[I] + sizeof...(Args) + 1
-                )...);
+                Res res = func(
+                    npy_traits<Args>::get(
+                        args[I], new_dims.data() + ranks_scan[I], steps + ranks_scan[I] + sizeof...(Args) + 1
+                    )...
+                );
                 npy_traits<Res>::set(args[sizeof...(Args)], res); // assign to the output pointer
 
                 for (npy_uintp j = 0; j <= sizeof...(Args); ++j) {
@@ -837,9 +839,11 @@ namespace numpy {
 
             Func func = static_cast<ufunc_data<Func> *>(data)->func;
             for (npy_intp i = 0; i < dims[0]; ++i) {
-                func(npy_traits<Args>::get(
-                    args[I], new_dims.data() + ranks_scan[I], steps + ranks_scan[I] + sizeof...(Args)
-                )...);
+                func(
+                    npy_traits<Args>::get(
+                        args[I], new_dims.data() + ranks_scan[I], steps + ranks_scan[I] + sizeof...(Args)
+                    )...
+                );
 
                 for (npy_uintp j = 0; j < sizeof...(Args); ++j) {
                     args[j] += steps[j];

meson.build

@@ -4,126 +4,7 @@ project(
   version : '0.2.2',
   license : 'BSD-3-Clause AND MIT AND BSD-3-Clause-LBNL AND Apache-2.0 WITH LLVM-exception',
   license_files : ['LICENSE', 'LICENSES_bundled.txt'],
-  meson_version : '>=1.5.0',
-  default_options : ['cpp_std=c++17']
+  meson_version : '>=1.5.0'
 )
 
-# Get compiler
-cpp = meson.get_compiler('cpp')
-
-# ========================================
-# BLAS/LAPACK Dependencies -- needed for Mathieu fcns.
-# ========================================
-blas_name = get_option('blas')
-lapack_name = get_option('lapack')
-
-if blas_name == ''
-  # Auto-detect BLAS
-  blas = dependency('blas', required: false)
-  if not blas.found()
-    blas = cpp.find_library('blas', required: false)
-  endif
-  if not blas.found()
-    blas = dependency('openblas', required: false)
-  endif
-  if not blas.found()
-    blas = cpp.find_library('openblas', required: true)
-  endif
-else
-  # Use specified BLAS
-  blas = dependency(blas_name, required: true)
-endif
-
-if lapack_name == ''
-  # Auto-detect LAPACK
-  lapack = dependency('lapack', required: false)
-  if not lapack.found()
-    lapack = cpp.find_library('lapack', required: false)
-  endif
-  if not lapack.found()
-    lapack = dependency('openblas', required: false)
-  endif
-  if not lapack.found()
-    lapack = cpp.find_library('openblas', required: true)
-  endif
-else
-  # Use specified LAPACK
-  lapack = dependency(lapack_name, required: true)
-endif
-
-message('xsf: BLAS library: ' + blas.type_name())
-message('xsf: LAPACK library: ' + lapack.type_name())
-
-# Combined dependency
-blas_lapack_dep = declare_dependency(
-  dependencies: [blas, lapack]
-)
-
-# ========================================
-# Float128 Configuration
-# ========================================
-
-# Check for _Float128 support
-float128_code = '''
-int main() {
-  _Float128 x = 1.0;
-  return 0;
-}
-'''
-
-has_float128 = cpp.compiles(float128_code, name: '_Float128 support')
-
-# Configuration data
-conf_data = configuration_data()
-conf_data.set('HAVE_FLOAT128', has_float128)
-configure_file(
-  output: 'xsf_config.h',
-  configuration: conf_data
-)
-
-# ========================================
-# Includes
-# ========================================
-xsf_inc = include_directories('include')
-
-
-# ========================================
-# Declare Dependency
-# ========================================
-
-xsf_dep = declare_dependency(
-  include_directories: xsf_inc,
-  dependencies: blas_lapack_dep,
-)
-
-# Make it discoverable
-meson.override_dependency('xsf', xsf_dep)
-
-# ========================================
-# Installation
-# ========================================
-
-if not meson.is_subproject()
-  # Install headers
-  install_headers(
-    'include/xsf/mathieu/mathieu_fcns.h',
-    subdir: 'xsf/mathieu'
-  )
-  
-  # Install pkg-config file
-  pkg = import('pkgconfig')
-  pkg.generate(
-    xsf_lib,
-    name: 'xsf',
-    description: 'XSF Special Functions Library',
-    version: meson.project_version(),
-  )
-endif
-
-# ========================================
-# Tests (optional)
-# ========================================
-
-if get_option('build_tests')
-  subdir('tests')
-endif
+xsf_dep = declare_dependency(include_directories : 'include')

meson_options.txt

@@ -15,9 +15,6 @@ version = "0.2.2"
 cmake = ">=3.30.5,<4"
 cxx-compiler = ">=1.8.0,<2"
 make = ">=4.4.1,<5"
-openblas = "*"
-pkg-config = "*"
-
 
 [feature.build.tasks.configure]
 cmd = [
@@ -26,7 +23,6 @@ cmd = [
   "-S .",
   # We want to build in the build directory
   "-B build",
-  "-DCMAKE_PREFIX_PATH=$CONDA_PREFIX",
 ]
 cwd = "."
 
@@ -216,8 +212,4 @@ test-cupy.depends-on = ["install-xsref-test-cupy"]
 default = { features = ["build", "tests", "tests-debug"], solve-group = "default" }
 tests-ci = { features = ["build", "tests", "tests-ci", "tests-debug", "tests-debug-ci", "coverage"], solve-group = "default"}
 lint = { features = ["clang-format"], solve-group = "default" }
-cupy-tests = { features = ["cupy-tests"], solve-group = "cupy" }
-
-[dependencies]
-pkg-config = ">=0.29.2,<0.30"
-openblas = ">=0.3.30,<0.4"
+cupy-tests = { features = ["cupy-tests"], solve-group = "default" }

pixi.toml

@@ -3,16 +3,6 @@ find_package(Catch2 3 REQUIRED)
 find_package(Arrow REQUIRED)
 find_package(Parquet REQUIRED)
 
-#============================================
-# SDB says: Use pkg-config to find blas & lapack
-# which are requred to run the Mathieu tests.
-# Find pkg-config
-find_package(PkgConfig REQUIRED)
-
-# Use pkg-config to find a library
-pkg_search_module(BLAS REQUIRED IMPORTED_TARGET openblas blas)
-pkg_search_module(LAPACK REQUIRED IMPORTED_TARGET openblas lapack)
-#============================================
 
 if(CMAKE_BUILD_TYPE STREQUAL "Debug")
   # Enable debug assertions to make sure they won't get triggered in debug builds of
@@ -30,14 +20,10 @@ add_library(xsf INTERFACE)
 target_include_directories(xsf INTERFACE ${CMAKE_SOURCE_DIR}/include)
 
 set(TEST_BASE_DIR "${CMAKE_SOURCE_DIR}/tests")
-include(${CMAKE_SOURCE_DIR}/tests/Coverage.cmake)
 
-# Include CTest once at the top level
-include(CTest)
-enable_testing()
+include(${CMAKE_SOURCE_DIR}/tests/Coverage.cmake)
 
 file(GLOB TEST_SOURCES "*/test_*.cpp")
-
 foreach(test_file ${TEST_SOURCES})
   # Families of tests go in subfolders of xsf/tests. Test files in different
   # folders can have the same name. Try to generate a unique target name based
@@ -50,34 +36,10 @@ foreach(test_file ${TEST_SOURCES})
 
   add_executable(${target_name} ${test_file})
 
-  #===========================================
-  # SDB added blas and lapack to link libs
-  target_link_libraries(${target_name} PRIVATE
-  Catch2::Catch2WithMain
-  Arrow::arrow_shared
-  Parquet::parquet_shared
-  PkgConfig::BLAS
-  PkgConfig::LAPACK
-  xsf)
+  target_link_libraries(${target_name} PRIVATE Catch2::Catch2WithMain Arrow::arrow_shared Parquet::parquet_shared xsf)
 
   target_compile_definitions(${target_name} PRIVATE XSREF_TABLES_PATH="${XSREF_TABLES_PATH}")
   include(CTest)
-
-  target_compile_definitions(${target_name} PRIVATE 
-    XSREF_TABLES_PATH="${XSREF_TABLES_PATH}"
-  )
-  
-  # Manual test registration instead of catch_discover_tests
-  add_test(
-    NAME ${target_name}
-    COMMAND ${target_name}
-    WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
-  )
-
-  # Set test properties
-  set_tests_properties(${target_name} PROPERTIES
-    TIMEOUT 300
-    ENVIRONMENT "XSREF_TABLES_PATH=${XSREF_TABLES_PATH}"
-  )
-
+  include(Catch)
+  catch_discover_tests(${target_name})
 endforeach()