diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml index a2d71bf..aecc4a1 100644 --- a/.github/workflows/cmake.yml +++ b/.github/workflows/cmake.yml @@ -40,14 +40,14 @@ jobs: # The library must also configure, build and test on its own, with no engine # around it: that is what lets it move to its own repository. - - name: Configure sparse_linalg standalone + - name: Configure sparsediff_linalg standalone run: > - cmake -B build-standalone -S sparse_linalg + cmake -B build-standalone -S sparsediff_linalg -DCMAKE_BUILD_TYPE=${{ matrix.build_type }} ${{ runner.os == 'Windows' && '-DCMAKE_TOOLCHAIN_FILE=C:/vcpkg/scripts/buildsystems/vcpkg.cmake' || '' }} - - name: Build sparse_linalg standalone + - name: Build sparsediff_linalg standalone run: cmake --build build-standalone --config ${{ matrix.build_type }} - - name: Test sparse_linalg standalone + - name: Test sparsediff_linalg standalone run: ctest --test-dir build-standalone -C ${{ matrix.build_type }} --output-on-failure diff --git a/.github/workflows/conda-forge.yml b/.github/workflows/conda-forge.yml index 9fca358..155e6fd 100644 --- a/.github/workflows/conda-forge.yml +++ b/.github/workflows/conda-forge.yml @@ -73,8 +73,8 @@ jobs: run: | readelf -d build/all_tests | grep NEEDED readelf -d build/all_tests | grep -q 'libcblas\.so\.3' - readelf -d build/sparse_linalg/sparse_linalg_tests | grep NEEDED - readelf -d build/sparse_linalg/sparse_linalg_tests | grep -q 'libcblas\.so\.3' + readelf -d build/sparsediff_linalg/sparsediff_linalg_tests | grep NEEDED + readelf -d build/sparsediff_linalg/sparsediff_linalg_tests | grep -q 'libcblas\.so\.3' - name: Re-run tests after switching to OpenBLAS (Linux) if: runner.os == 'Linux' diff --git a/.github/workflows/guard-malloc.yml b/.github/workflows/guard-malloc.yml index 742cd6e..0ae8239 100644 --- a/.github/workflows/guard-malloc.yml +++ b/.github/workflows/guard-malloc.yml @@ -27,7 +27,7 @@ jobs: MallocScribble=1 MallocGuardEdges=1 leaks --atExit -- ./build/all_tests - - name: Run sparse_linalg tests under guard-malloc + leaks + - name: Run sparsediff_linalg tests under guard-malloc + leaks run: > MallocScribble=1 MallocGuardEdges=1 - leaks --atExit -- ./build/sparse_linalg/sparse_linalg_tests + leaks --atExit -- ./build/sparsediff_linalg/sparsediff_linalg_tests diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 53fc943..8b2ceeb 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -28,8 +28,8 @@ jobs: - name: Run tests run: ./build/all_tests - - name: Run sparse_linalg tests - run: ./build/sparse_linalg/sparse_linalg_tests + - name: Run sparsediff_linalg tests + run: ./build/sparsediff_linalg/sparsediff_linalg_tests # Create GitHub release after tests pass release: diff --git a/.github/workflows/sanitizer.yml b/.github/workflows/sanitizer.yml index f5a1a9c..34cc6f0 100644 --- a/.github/workflows/sanitizer.yml +++ b/.github/workflows/sanitizer.yml @@ -37,5 +37,5 @@ jobs: - name: Run tests under ASan+UBSan run: ./build/all_tests - - name: Run sparse_linalg tests under ASan+UBSan - run: ./build/sparse_linalg/sparse_linalg_tests + - name: Run sparsediff_linalg tests under ASan+UBSan + run: ./build/sparsediff_linalg/sparsediff_linalg_tests diff --git a/.github/workflows/valgrind.yml b/.github/workflows/valgrind.yml index c9587bc..b69e441 100644 --- a/.github/workflows/valgrind.yml +++ b/.github/workflows/valgrind.yml @@ -25,9 +25,9 @@ jobs: --track-origins=yes -s --show-reachable=yes \ --error-exitcode=1 build/all_tests - - name: Run sparse_linalg tests under Valgrind + - name: Run sparsediff_linalg tests under Valgrind run: | valgrind --leak-check=full --show-leak-kinds=all \ --track-origins=yes -s --show-reachable=yes \ - --error-exitcode=1 build/sparse_linalg/sparse_linalg_tests + --error-exitcode=1 build/sparsediff_linalg/sparsediff_linalg_tests diff --git a/CMakeLists.txt b/CMakeLists.txt index c8037de..c6bbe4d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -37,12 +37,12 @@ option(SDE_WARNINGS_AS_ERRORS "Treat MSVC warnings as errors (/WX)" # directory-scoped below this point (warnings, definitions) is engine-only: it # reaches only subdirectories added after it. if(SKBUILD) - set(SPARSE_LINALG_BUILD_TESTS OFF) + set(SPARSEDIFF_LINALG_BUILD_TESTS OFF) else() enable_testing() endif() -set(SPARSE_LINALG_WARNINGS_AS_ERRORS ${SDE_WARNINGS_AS_ERRORS}) -add_subdirectory(sparse_linalg) +set(SPARSEDIFF_LINALG_WARNINGS_AS_ERRORS ${SDE_WARNINGS_AS_ERRORS}) +add_subdirectory(sparsediff_linalg) add_compile_definitions(DIFF_ENGINE_VERSION="${DIFF_ENGINE_VERSION}") @@ -87,14 +87,14 @@ function(sde_set_config_options target) endfunction() # Source files - automatically gather all .c files from src/ (the library lives -# under sparse_linalg/, outside this tree). +# under sparsediff_linalg/, outside this tree). file(GLOB_RECURSE ENGINE_SOURCES "src/*.c") # Differentiation engine (expression DAG, atoms, problem). Built # position-independent so it can be linked into the Python extension module. add_library(dnlp_diff ${ENGINE_SOURCES}) target_include_directories(dnlp_diff PUBLIC ${PROJECT_SOURCE_DIR}/include) -target_link_libraries(dnlp_diff PUBLIC sparse_linalg::sparse_linalg) +target_link_libraries(dnlp_diff PUBLIC sparsediff_linalg::sparsediff_linalg) set_property(TARGET dnlp_diff PROPERTY POSITION_INDEPENDENT_CODE ON) sde_set_config_options(dnlp_diff) diff --git a/include/atoms/affine.h b/include/atoms/affine.h index 8c517a3..b207425 100644 --- a/include/atoms/affine.h +++ b/include/atoms/affine.h @@ -19,7 +19,7 @@ #define AFFINE_H #include "expr.h" -#include "sparse_linalg/CSR_matrix.h" +#include "sparsediff_linalg/CSR_matrix.h" expr *new_add(expr *left, expr *right); expr *new_neg(expr *child); diff --git a/include/atoms/non_elementwise_full_dom.h b/include/atoms/non_elementwise_full_dom.h index 1051beb..1c407b4 100644 --- a/include/atoms/non_elementwise_full_dom.h +++ b/include/atoms/non_elementwise_full_dom.h @@ -19,7 +19,7 @@ #define NON_ELEMENTWISE_FULL_DOM_H #include "expr.h" -#include "sparse_linalg/CSR_matrix.h" +#include "sparsediff_linalg/CSR_matrix.h" #include "subexpr.h" /* quad-form with sparse constant matrix Q */ diff --git a/include/expr.h b/include/expr.h index 2661348..0cceffd 100644 --- a/include/expr.h +++ b/include/expr.h @@ -18,9 +18,9 @@ #ifndef EXPR_H #define EXPR_H -#include "sparse_linalg/CSC_matrix.h" -#include "sparse_linalg/CSR_matrix.h" -#include "sparse_linalg/matrix.h" +#include "sparsediff_linalg/CSC_matrix.h" +#include "sparsediff_linalg/CSR_matrix.h" +#include "sparsediff_linalg/matrix.h" #include #include #include diff --git a/include/old-code/old_CSR.h b/include/old-code/old_CSR.h index d253545..bf2d064 100644 --- a/include/old-code/old_CSR.h +++ b/include/old-code/old_CSR.h @@ -18,7 +18,7 @@ #ifndef OLD_CSR_H #define OLD_CSR_H -#include "sparse_linalg/CSR_matrix.h" +#include "sparsediff_linalg/CSR_matrix.h" /* Build (I_p kron A) = blkdiag(A, A, ..., A) of size (p*A->m) x (p*A->n) */ CSR_matrix *block_diag_repeat_csr(const CSR_matrix *A, int p); diff --git a/include/old-code/old_CSR_sum.h b/include/old-code/old_CSR_sum.h index 300d0f3..ecd0ff0 100644 --- a/include/old-code/old_CSR_sum.h +++ b/include/old-code/old_CSR_sum.h @@ -18,7 +18,7 @@ #ifndef OLD_CSR_SUM_H #define OLD_CSR_SUM_H -#include "sparse_linalg/CSR_matrix.h" +#include "sparsediff_linalg/CSR_matrix.h" /* Compute C = A + B where A, B, C are CSR_matrix matrices * A and B must have same dimensions diff --git a/include/old-code/old_affine.h b/include/old-code/old_affine.h index 8889303..11dd517 100644 --- a/include/old-code/old_affine.h +++ b/include/old-code/old_affine.h @@ -19,7 +19,7 @@ #define OLD_AFFINE_H #include "expr.h" -#include "sparse_linalg/CSR_matrix.h" +#include "sparsediff_linalg/CSR_matrix.h" expr *new_linear(expr *u, const CSR_matrix *A, const double *b); diff --git a/include/old-code/old_permuted_dense.h b/include/old-code/old_permuted_dense.h index 19ce7bb..d297706 100644 --- a/include/old-code/old_permuted_dense.h +++ b/include/old-code/old_permuted_dense.h @@ -18,8 +18,8 @@ #ifndef OLD_PERMUTED_DENSE_H #define OLD_PERMUTED_DENSE_H -#include "sparse_linalg/CSR_matrix.h" -#include "sparse_linalg/permuted_dense.h" +#include "sparsediff_linalg/CSR_matrix.h" +#include "sparsediff_linalg/permuted_dense.h" /* Legacy CSR-based (PD, Sparse) BTA / BTDA kernels. diff --git a/include/problem.h b/include/problem.h index 6741526..27cf224 100644 --- a/include/problem.h +++ b/include/problem.h @@ -20,8 +20,8 @@ #include "Timer.h" #include "expr.h" -#include "sparse_linalg/COO_matrix.h" -#include "sparse_linalg/CSR_matrix.h" +#include "sparsediff_linalg/COO_matrix.h" +#include "sparsediff_linalg/CSR_matrix.h" #include typedef struct diff --git a/include/subexpr.h b/include/subexpr.h index 3276d39..c266268 100644 --- a/include/subexpr.h +++ b/include/subexpr.h @@ -19,9 +19,9 @@ #define SUBEXPR_H #include "expr.h" -#include "sparse_linalg/CSC_matrix.h" -#include "sparse_linalg/CSR_matrix.h" -#include "sparse_linalg/matrix.h" +#include "sparsediff_linalg/CSC_matrix.h" +#include "sparsediff_linalg/CSR_matrix.h" +#include "sparsediff_linalg/matrix.h" /* Parameter ID for fixed constants (not updatable) */ #define PARAM_FIXED -1 diff --git a/sparse_linalg/CMakeLists.txt b/sparsediff_linalg/CMakeLists.txt similarity index 54% rename from sparse_linalg/CMakeLists.txt rename to sparsediff_linalg/CMakeLists.txt index fd77a79..730e16b 100644 --- a/sparse_linalg/CMakeLists.txt +++ b/sparsediff_linalg/CMakeLists.txt @@ -1,25 +1,25 @@ cmake_minimum_required(VERSION 3.15) -project(sparse_linalg LANGUAGES C) +project(sparsediff_linalg LANGUAGES C) set(CMAKE_C_STANDARD 99) # Standalone (top-level) build vs. embedded via add_subdirectory(): a parent # project owns the build type and may override the options below with plain # set() before adding this directory (CMP0077). if(CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR) - set(SPARSE_LINALG_TOP_LEVEL ON) + set(SPARSEDIFF_LINALG_TOP_LEVEL ON) else() - set(SPARSE_LINALG_TOP_LEVEL OFF) + set(SPARSEDIFF_LINALG_TOP_LEVEL OFF) endif() -if(SPARSE_LINALG_TOP_LEVEL AND NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES) +if(SPARSEDIFF_LINALG_TOP_LEVEL AND NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES) message(STATUS "Setting build type to 'Release' as none was specified.") set(CMAKE_BUILD_TYPE Release CACHE STRING "Choose the type of build." FORCE) set_property(CACHE CMAKE_BUILD_TYPE PROPERTY STRINGS "Debug" "Release" "MinSizeRel" "RelWithDebInfo") endif() -option(SPARSE_LINALG_BUILD_TESTS "Build the sparse_linalg test suite" ON) -option(SPARSE_LINALG_WARNINGS_AS_ERRORS "Treat MSVC warnings as errors (/WX)" ON) +option(SPARSEDIFF_LINALG_BUILD_TESTS "Build the sparsediff_linalg test suite" ON) +option(SPARSEDIFF_LINALG_WARNINGS_AS_ERRORS "Treat MSVC warnings as errors (/WX)" ON) # Optional peak-memory tracking via the sp_malloc/sp_free counters. OFF by default # so the library carries no mutable global state. PUBLIC on the target so every # consumer of tracked_alloc.h sees the same definition. @@ -27,10 +27,10 @@ option(SP_TRACK_MEMORY "Track peak memory usage via sp_malloc/sp_free counters" # Warning flags, applied per target so they neither depend on nor leak into a # parent project. -function(sparse_linalg_warnings target) +function(sparsediff_linalg_warnings target) if(MSVC) target_compile_options(${target} PRIVATE /W4) - if(SPARSE_LINALG_WARNINGS_AS_ERRORS) + if(SPARSEDIFF_LINALG_WARNINGS_AS_ERRORS) target_compile_options(${target} PRIVATE /WX) endif() else() @@ -49,33 +49,33 @@ function(sparse_linalg_warnings target) endif() endfunction() -file(GLOB_RECURSE SPARSE_LINALG_SOURCES "src/*.c") -file(GLOB_RECURSE SPARSE_LINALG_HEADERS "include/sparse_linalg/*.h" "src/internal/*.h") +file(GLOB_RECURSE SPARSEDIFF_LINALG_SOURCES "src/*.c") +file(GLOB_RECURSE SPARSEDIFF_LINALG_HEADERS "include/sparsediff_linalg/*.h" "src/internal/*.h") -# Layering rule: sparse_linalg is a standalone sparse linear-algebra layer and +# Layering rule: sparsediff_linalg is a standalone sparse linear-algebra layer and # must not depend on whatever embeds it. Every quoted include in a library file -# must name a library header: a public one ("sparse_linalg/.h", under +# must name a library header: a public one ("sparsediff_linalg/.h", under # include/) or a private one ("internal/.h", under src/internal/, which # only the library and its own test suite can resolve). A public header must # never include a private one, or "public" would stop meaning anything. System # headers use <...>. Checked here so a violation fails every configure, locally # and in CI. -foreach(_sl_file IN LISTS SPARSE_LINALG_SOURCES SPARSE_LINALG_HEADERS) - file(STRINGS "${_sl_file}" _sl_includes REGEX "^[ \t]*#[ \t]*include[ \t]*\"") - foreach(_sl_line IN LISTS _sl_includes) - if(NOT _sl_line MATCHES "\"(sparse_linalg|internal)/[A-Za-z0-9_]+\\.h\"") +foreach(_sdl_file IN LISTS SPARSEDIFF_LINALG_SOURCES SPARSEDIFF_LINALG_HEADERS) + file(STRINGS "${_sdl_file}" _sdl_includes REGEX "^[ \t]*#[ \t]*include[ \t]*\"") + foreach(_sdl_line IN LISTS _sdl_includes) + if(NOT _sdl_line MATCHES "\"(sparsediff_linalg|internal)/[A-Za-z0-9_]+\\.h\"") message(FATAL_ERROR - "Layering violation in ${_sl_file}:\n" - " ${_sl_line}\n" - "sparse_linalg may include only its own headers " - "(#include \"sparse_linalg/.h\" or " + "Layering violation in ${_sdl_file}:\n" + " ${_sdl_line}\n" + "sparsediff_linalg may include only its own headers " + "(#include \"sparsediff_linalg/.h\" or " "\"internal/.h\") and system headers.") endif() - if(_sl_file MATCHES "/include/sparse_linalg/" AND _sl_line MATCHES "\"internal/") + if(_sdl_file MATCHES "/include/sparsediff_linalg/" AND _sdl_line MATCHES "\"internal/") message(FATAL_ERROR - "Public header ${_sl_file} includes a private one:\n" - " ${_sl_line}\n" - "Headers under include/sparse_linalg must not include " + "Public header ${_sdl_file} includes a private one:\n" + " ${_sdl_line}\n" + "Headers under include/sparsediff_linalg must not include " "internal/ headers.") endif() endforeach() @@ -83,111 +83,111 @@ endforeach() # Sparse linear-algebra library. Built position-independent so it can be linked # into shared objects such as a Python extension module. -add_library(sparse_linalg ${SPARSE_LINALG_SOURCES}) -add_library(sparse_linalg::sparse_linalg ALIAS sparse_linalg) -target_include_directories(sparse_linalg PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/include) +add_library(sparsediff_linalg ${SPARSEDIFF_LINALG_SOURCES}) +add_library(sparsediff_linalg::sparsediff_linalg ALIAS sparsediff_linalg) +target_include_directories(sparsediff_linalg PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/include) # src/ resolves the private headers ("internal/.h"); it is PRIVATE, so # consumers cannot include them at all. -target_include_directories(sparse_linalg PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/src) -set_property(TARGET sparse_linalg PROPERTY POSITION_INDEPENDENT_CODE ON) -sparse_linalg_warnings(sparse_linalg) +target_include_directories(sparsediff_linalg PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/src) +set_property(TARGET sparsediff_linalg PROPERTY POSITION_INDEPENDENT_CODE ON) +sparsediff_linalg_warnings(sparsediff_linalg) if(SP_TRACK_MEMORY) - target_compile_definitions(sparse_linalg PUBLIC SP_TRACK_MEMORY) + target_compile_definitions(sparsediff_linalg PUBLIC SP_TRACK_MEMORY) endif() # Link math library (Unix/Linux only) if(NOT MSVC) - target_link_libraries(sparse_linalg PUBLIC m) + target_link_libraries(sparsediff_linalg PUBLIC m) endif() # Find and link BLAS. Linked PUBLIC: the library's own kernels call CBLAS, and so # may consumers, which inherit it through the target. if(APPLE) find_library(ACCELERATE_FRAMEWORK Accelerate) - target_link_libraries(sparse_linalg PUBLIC ${ACCELERATE_FRAMEWORK}) + target_link_libraries(sparsediff_linalg PUBLIC ${ACCELERATE_FRAMEWORK}) elseif(MSVC) find_package(OpenBLAS CONFIG QUIET) if(TARGET OpenBLAS::OpenBLAS) # vcpkg - target_link_libraries(sparse_linalg PUBLIC OpenBLAS::OpenBLAS) + target_link_libraries(sparsediff_linalg PUBLIC OpenBLAS::OpenBLAS) else() # e.g. conda-forge's openblas ships openblas.lib and # include/openblas/cblas.h, but no imported target find_library(OPENBLAS_LIBRARY NAMES openblas libopenblas REQUIRED) - get_filename_component(_sl_openblas_libdir "${OPENBLAS_LIBRARY}" DIRECTORY) - get_filename_component(_sl_openblas_prefix "${_sl_openblas_libdir}" DIRECTORY) + get_filename_component(_sdl_openblas_libdir "${OPENBLAS_LIBRARY}" DIRECTORY) + get_filename_component(_sdl_openblas_prefix "${_sdl_openblas_libdir}" DIRECTORY) find_path(OPENBLAS_INCLUDE_DIR cblas.h - HINTS "${_sl_openblas_prefix}/include" + HINTS "${_sdl_openblas_prefix}/include" PATH_SUFFIXES openblas REQUIRED) - target_link_libraries(sparse_linalg PUBLIC ${OPENBLAS_LIBRARY}) - target_include_directories(sparse_linalg PUBLIC ${OPENBLAS_INCLUDE_DIR}) + target_link_libraries(sparsediff_linalg PUBLIC ${OPENBLAS_LIBRARY}) + target_include_directories(sparsediff_linalg PUBLIC ${OPENBLAS_INCLUDE_DIR}) endif() else() find_package(BLAS REQUIRED) # conda-forge splits the CBLAS interface into libcblas next to libblas. Link # it explicitly (and before BLAS) so the package keeps working when users # switch BLAS implementations, even if the build-time libblas exports cblas_*. - set(_sl_cblas_include_hints) + set(_sdl_cblas_include_hints) if(BLAS_LIBRARIES) - list(GET BLAS_LIBRARIES 0 _sl_blas_lib) - get_filename_component(_sl_blas_dir "${_sl_blas_lib}" DIRECTORY) + list(GET BLAS_LIBRARIES 0 _sdl_blas_lib) + get_filename_component(_sdl_blas_dir "${_sdl_blas_lib}" DIRECTORY) find_library(CBLAS_LIBRARY NAMES cblas - HINTS "${_sl_blas_dir}" NO_DEFAULT_PATH) - list(APPEND _sl_cblas_include_hints "${_sl_blas_dir}/../include") + HINTS "${_sdl_blas_dir}" NO_DEFAULT_PATH) + list(APPEND _sdl_cblas_include_hints "${_sdl_blas_dir}/../include") endif() if(CBLAS_LIBRARY) - target_link_libraries(sparse_linalg PUBLIC ${CBLAS_LIBRARY}) + target_link_libraries(sparsediff_linalg PUBLIC ${CBLAS_LIBRARY}) endif() - target_link_libraries(sparse_linalg PUBLIC ${BLAS_LIBRARIES}) + target_link_libraries(sparsediff_linalg PUBLIC ${BLAS_LIBRARIES}) # Some distributions ship cblas.h only under include/openblas. Export the # directory when it is found so library and consumer sources both compile; a # miss is not an error because cblas.h is normally on the default path. find_path(CBLAS_INCLUDE_DIR cblas.h - HINTS ${_sl_cblas_include_hints} + HINTS ${_sdl_cblas_include_hints} PATH_SUFFIXES openblas) if(CBLAS_INCLUDE_DIR) - target_include_directories(sparse_linalg PUBLIC ${CBLAS_INCLUDE_DIR}) + target_include_directories(sparsediff_linalg PUBLIC ${CBLAS_INCLUDE_DIR}) endif() endif() # ============================================================================= # Tests # ============================================================================= -if(SPARSE_LINALG_BUILD_TESTS) +if(SPARSEDIFF_LINALG_BUILD_TESTS) enable_testing() - # The suite links sparse_linalg alone, so a test that reaches outside the + # The suite links sparsediff_linalg alone, so a test that reaches outside the # library fails to link. include/ is public on the target, so the linker # would not catch a header-only reach; this check does. Quoted includes may # name a library header (public or private: the suite is white-box), # minunit/test_helpers, or a sibling test_.h. - file(GLOB_RECURSE _sl_test_files "tests/*.c" "tests/*.h") - foreach(_sl_file IN LISTS _sl_test_files) - file(STRINGS "${_sl_file}" _sl_includes REGEX "^[ \t]*#[ \t]*include[ \t]*\"") - foreach(_sl_line IN LISTS _sl_includes) - if(NOT _sl_line MATCHES - "\"((sparse_linalg|internal)/[A-Za-z0-9_]+|minunit|test_[A-Za-z0-9_]+)\\.h\"") + file(GLOB_RECURSE _sdl_test_files "tests/*.c" "tests/*.h") + foreach(_sdl_file IN LISTS _sdl_test_files) + file(STRINGS "${_sdl_file}" _sdl_includes REGEX "^[ \t]*#[ \t]*include[ \t]*\"") + foreach(_sdl_line IN LISTS _sdl_includes) + if(NOT _sdl_line MATCHES + "\"((sparsediff_linalg|internal)/[A-Za-z0-9_]+|minunit|test_[A-Za-z0-9_]+)\\.h\"") message(FATAL_ERROR - "Layering violation in ${_sl_file}:\n" - " ${_sl_line}\n" - "sparse_linalg tests may include only sparse_linalg/.h, " + "Layering violation in ${_sdl_file}:\n" + " ${_sdl_line}\n" + "sparsediff_linalg tests may include only sparsediff_linalg/.h, " "internal/.h, minunit.h, test_helpers.h and sibling " "test_.h files.") endif() endforeach() endforeach() - add_executable(sparse_linalg_tests - tests/sparse_linalg_tests.c + add_executable(sparsediff_linalg_tests + tests/sparsediff_linalg_tests.c tests/test_helpers.c ) - target_include_directories(sparse_linalg_tests PRIVATE + target_include_directories(sparsediff_linalg_tests PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/tests ${CMAKE_CURRENT_SOURCE_DIR}/src ) - target_link_libraries(sparse_linalg_tests sparse_linalg) - sparse_linalg_warnings(sparse_linalg_tests) + target_link_libraries(sparsediff_linalg_tests sparsediff_linalg) + sparsediff_linalg_warnings(sparsediff_linalg_tests) - add_test(NAME SparseLinalgTests COMMAND sparse_linalg_tests) + add_test(NAME SparseDiffLinalgTests COMMAND sparsediff_linalg_tests) endif() diff --git a/sparse_linalg/include/sparse_linalg/COO_matrix.h b/sparsediff_linalg/include/sparsediff_linalg/COO_matrix.h similarity index 97% rename from sparse_linalg/include/sparse_linalg/COO_matrix.h rename to sparsediff_linalg/include/sparsediff_linalg/COO_matrix.h index 979d558..f71a07b 100644 --- a/sparse_linalg/include/sparse_linalg/COO_matrix.h +++ b/sparsediff_linalg/include/sparsediff_linalg/COO_matrix.h @@ -18,7 +18,7 @@ #ifndef COO_matrix_H #define COO_matrix_H -#include "sparse_linalg/CSR_matrix.h" +#include "sparsediff_linalg/CSR_matrix.h" /* COO (Coordinate) Sparse matrix Format * diff --git a/sparse_linalg/include/sparse_linalg/CSC_matrix.h b/sparsediff_linalg/include/sparsediff_linalg/CSC_matrix.h similarity index 98% rename from sparse_linalg/include/sparse_linalg/CSC_matrix.h rename to sparsediff_linalg/include/sparsediff_linalg/CSC_matrix.h index 19aa55c..41d2679 100644 --- a/sparse_linalg/include/sparse_linalg/CSC_matrix.h +++ b/sparsediff_linalg/include/sparsediff_linalg/CSC_matrix.h @@ -18,7 +18,7 @@ #ifndef CSC_matrix_H #define CSC_matrix_H -#include "sparse_linalg/CSR_matrix.h" +#include "sparsediff_linalg/CSR_matrix.h" /* CSC_matrix (Compressed Sparse Column) matrix Format * diff --git a/sparse_linalg/include/sparse_linalg/CSR_matrix.h b/sparsediff_linalg/include/sparsediff_linalg/CSR_matrix.h similarity index 100% rename from sparse_linalg/include/sparse_linalg/CSR_matrix.h rename to sparsediff_linalg/include/sparsediff_linalg/CSR_matrix.h diff --git a/sparse_linalg/include/sparse_linalg/CSR_sum.h b/sparsediff_linalg/include/sparsediff_linalg/CSR_sum.h similarity index 98% rename from sparse_linalg/include/sparse_linalg/CSR_sum.h rename to sparsediff_linalg/include/sparsediff_linalg/CSR_sum.h index 830f5f6..2373811 100644 --- a/sparse_linalg/include/sparse_linalg/CSR_sum.h +++ b/sparsediff_linalg/include/sparsediff_linalg/CSR_sum.h @@ -18,7 +18,7 @@ #ifndef CSR_SUM_H #define CSR_SUM_H -#include "sparse_linalg/CSR_matrix.h" +#include "sparsediff_linalg/CSR_matrix.h" /* forward declaration */ struct int_double_pair; diff --git a/sparse_linalg/include/sparse_linalg/Vec_macros.h b/sparsediff_linalg/include/sparsediff_linalg/Vec_macros.h similarity index 99% rename from sparse_linalg/include/sparse_linalg/Vec_macros.h rename to sparsediff_linalg/include/sparsediff_linalg/Vec_macros.h index 4d6a028..b02ba82 100644 --- a/sparse_linalg/include/sparse_linalg/Vec_macros.h +++ b/sparsediff_linalg/include/sparsediff_linalg/Vec_macros.h @@ -36,7 +36,7 @@ #ifndef VEC_MACROS_H #define VEC_MACROS_H -#include "sparse_linalg/tracked_alloc.h" +#include "sparsediff_linalg/tracked_alloc.h" #include #include #include diff --git a/sparse_linalg/include/sparse_linalg/cblas_wrapper.h b/sparsediff_linalg/include/sparsediff_linalg/cblas_wrapper.h similarity index 100% rename from sparse_linalg/include/sparse_linalg/cblas_wrapper.h rename to sparsediff_linalg/include/sparsediff_linalg/cblas_wrapper.h diff --git a/sparse_linalg/include/sparse_linalg/iVec.h b/sparsediff_linalg/include/sparsediff_linalg/iVec.h similarity index 97% rename from sparse_linalg/include/sparse_linalg/iVec.h rename to sparsediff_linalg/include/sparsediff_linalg/iVec.h index 09d28a9..d49a5a6 100644 --- a/sparse_linalg/include/sparse_linalg/iVec.h +++ b/sparsediff_linalg/include/sparsediff_linalg/iVec.h @@ -38,7 +38,7 @@ #include -#include "sparse_linalg/Vec_macros.h" +#include "sparsediff_linalg/Vec_macros.h" // This macro defines a vector of integers. DEFINE_VECTOR(int, i) diff --git a/sparse_linalg/include/sparse_linalg/int_double_pair.h b/sparsediff_linalg/include/sparsediff_linalg/int_double_pair.h similarity index 100% rename from sparse_linalg/include/sparse_linalg/int_double_pair.h rename to sparsediff_linalg/include/sparsediff_linalg/int_double_pair.h diff --git a/sparse_linalg/include/sparse_linalg/linalg_dense_sparse_matmuls.h b/sparsediff_linalg/include/sparsediff_linalg/linalg_dense_sparse_matmuls.h similarity index 94% rename from sparse_linalg/include/sparse_linalg/linalg_dense_sparse_matmuls.h rename to sparsediff_linalg/include/sparsediff_linalg/linalg_dense_sparse_matmuls.h index 5aa938c..df026d2 100644 --- a/sparse_linalg/include/sparse_linalg/linalg_dense_sparse_matmuls.h +++ b/sparsediff_linalg/include/sparsediff_linalg/linalg_dense_sparse_matmuls.h @@ -18,9 +18,9 @@ #ifndef LINALG_DENSE_SPARSE_H #define LINALG_DENSE_SPARSE_H -#include "sparse_linalg/CSC_matrix.h" -#include "sparse_linalg/CSR_matrix.h" -#include "sparse_linalg/matrix.h" +#include "sparsediff_linalg/CSC_matrix.h" +#include "sparsediff_linalg/CSR_matrix.h" +#include "sparsediff_linalg/matrix.h" /* C = (I_p kron A) @ J via the polymorphic matrix interface. * A is dense m x n, J is (n*p) x k in CSC_matrix, C is (m*p) x k in CSC_matrix. diff --git a/sparse_linalg/include/sparse_linalg/linalg_sparse_matmuls.h b/sparsediff_linalg/include/sparsediff_linalg/linalg_sparse_matmuls.h similarity index 96% rename from sparse_linalg/include/sparse_linalg/linalg_sparse_matmuls.h rename to sparsediff_linalg/include/sparsediff_linalg/linalg_sparse_matmuls.h index 2f34368..6b4fef7 100644 --- a/sparse_linalg/include/sparse_linalg/linalg_sparse_matmuls.h +++ b/sparsediff_linalg/include/sparsediff_linalg/linalg_sparse_matmuls.h @@ -18,8 +18,8 @@ #ifndef LINALG_H #define LINALG_H -#include "sparse_linalg/CSC_matrix.h" -#include "sparse_linalg/CSR_matrix.h" +#include "sparsediff_linalg/CSC_matrix.h" +#include "sparsediff_linalg/CSR_matrix.h" /* Compute sparsity pattern and values for the matrix-matrix multiplication C = (I_p kron A) @ J where A is m x n, J is (n*p) x k, and C is (m*p) x k, diff --git a/sparse_linalg/include/sparse_linalg/matmul_dispatchers.h b/sparsediff_linalg/include/sparsediff_linalg/matmul_dispatchers.h similarity index 93% rename from sparse_linalg/include/sparse_linalg/matmul_dispatchers.h rename to sparsediff_linalg/include/sparsediff_linalg/matmul_dispatchers.h index 44e1a0e..84e2934 100644 --- a/sparse_linalg/include/sparse_linalg/matmul_dispatchers.h +++ b/sparsediff_linalg/include/sparsediff_linalg/matmul_dispatchers.h @@ -12,10 +12,10 @@ #ifndef MATMUL_DISPATCHERS_H #define MATMUL_DISPATCHERS_H -#include "sparse_linalg/matrix.h" -#include "sparse_linalg/permuted_dense.h" -#include "sparse_linalg/sparse_matrix.h" -#include "sparse_linalg/stacked_pd.h" +#include "sparsediff_linalg/matrix.h" +#include "sparsediff_linalg/permuted_dense.h" +#include "sparsediff_linalg/sparse_matrix.h" +#include "sparsediff_linalg/stacked_pd.h" /* Polymorphic dispatchers for C = BT @ A and C = BT @ diag(d) @ A, where A and B are any matrix type (permuted_dense, stacked_pd, or sparse_matrix). diff --git a/sparse_linalg/include/sparse_linalg/matrix.h b/sparsediff_linalg/include/sparsediff_linalg/matrix.h similarity index 98% rename from sparse_linalg/include/sparse_linalg/matrix.h rename to sparsediff_linalg/include/sparsediff_linalg/matrix.h index 6bb92b4..03b4dc0 100644 --- a/sparse_linalg/include/sparse_linalg/matrix.h +++ b/sparsediff_linalg/include/sparsediff_linalg/matrix.h @@ -18,8 +18,8 @@ #ifndef MATRIX_H #define MATRIX_H -#include "sparse_linalg/CSC_matrix.h" -#include "sparse_linalg/CSR_matrix.h" +#include "sparsediff_linalg/CSC_matrix.h" +#include "sparsediff_linalg/CSR_matrix.h" #include /* Polymorphic matrix base. Concrete types embed `matrix` as their first diff --git a/sparse_linalg/include/sparse_linalg/matrix_sum.h b/sparsediff_linalg/include/sparsediff_linalg/matrix_sum.h similarity index 97% rename from sparse_linalg/include/sparse_linalg/matrix_sum.h rename to sparsediff_linalg/include/sparsediff_linalg/matrix_sum.h index 29223d8..86cd7ef 100644 --- a/sparse_linalg/include/sparse_linalg/matrix_sum.h +++ b/sparsediff_linalg/include/sparsediff_linalg/matrix_sum.h @@ -18,7 +18,7 @@ #ifndef MATRIX_SUM_H #define MATRIX_SUM_H -#include "sparse_linalg/matrix.h" +#include "sparsediff_linalg/matrix.h" /* Polymorphic wrappers for allocating C = A + B. Right now we always convert to CSR matrices internally for the sum. */ diff --git a/sparse_linalg/include/sparse_linalg/mini_numpy.h b/sparsediff_linalg/include/sparsediff_linalg/mini_numpy.h similarity index 98% rename from sparse_linalg/include/sparse_linalg/mini_numpy.h rename to sparsediff_linalg/include/sparsediff_linalg/mini_numpy.h index cd2a3a4..6324a49 100644 --- a/sparse_linalg/include/sparse_linalg/mini_numpy.h +++ b/sparsediff_linalg/include/sparsediff_linalg/mini_numpy.h @@ -18,7 +18,7 @@ #ifndef MINI_NUMPY_H #define MINI_NUMPY_H -#include "sparse_linalg/CSR_matrix.h" +#include "sparsediff_linalg/CSR_matrix.h" /* Example: a = [1, 2], len = 2, repeats = 3, result = [1, 1, 1, 2, 2, 2] */ void repeat(double *result, const double *a, int len, int repeats); diff --git a/sparse_linalg/include/sparse_linalg/permuted_dense.h b/sparsediff_linalg/include/sparsediff_linalg/permuted_dense.h similarity index 99% rename from sparse_linalg/include/sparse_linalg/permuted_dense.h rename to sparsediff_linalg/include/sparsediff_linalg/permuted_dense.h index d4b4232..82e37c7 100644 --- a/sparse_linalg/include/sparse_linalg/permuted_dense.h +++ b/sparsediff_linalg/include/sparsediff_linalg/permuted_dense.h @@ -18,7 +18,7 @@ #ifndef PERMUTED_DENSE_H #define PERMUTED_DENSE_H -#include "sparse_linalg/matrix.h" +#include "sparsediff_linalg/matrix.h" #include #include diff --git a/sparse_linalg/include/sparse_linalg/sparse_matrix.h b/sparsediff_linalg/include/sparsediff_linalg/sparse_matrix.h similarity index 98% rename from sparse_linalg/include/sparse_linalg/sparse_matrix.h rename to sparsediff_linalg/include/sparsediff_linalg/sparse_matrix.h index 8d3b665..1ade9ca 100644 --- a/sparse_linalg/include/sparse_linalg/sparse_matrix.h +++ b/sparsediff_linalg/include/sparsediff_linalg/sparse_matrix.h @@ -18,7 +18,7 @@ #ifndef SPARSE_MATRIX_H #define SPARSE_MATRIX_H -#include "sparse_linalg/matrix.h" +#include "sparsediff_linalg/matrix.h" /* Sparse matrix wrapping CSR_matrix. csc_cache is a lazily-built CSC_matrix mirror used by the chain-rule ATA / ATDA paths; it's allocated on first need and refilled diff --git a/sparse_linalg/include/sparse_linalg/stacked_pd.h b/sparsediff_linalg/include/sparsediff_linalg/stacked_pd.h similarity index 97% rename from sparse_linalg/include/sparse_linalg/stacked_pd.h rename to sparsediff_linalg/include/sparsediff_linalg/stacked_pd.h index adb2fc3..bd61d06 100644 --- a/sparse_linalg/include/sparse_linalg/stacked_pd.h +++ b/sparsediff_linalg/include/sparsediff_linalg/stacked_pd.h @@ -18,9 +18,9 @@ #ifndef STACKED_PD_H #define STACKED_PD_H -#include "sparse_linalg/CSR_matrix.h" -#include "sparse_linalg/matrix.h" -#include "sparse_linalg/permuted_dense.h" +#include "sparsediff_linalg/CSR_matrix.h" +#include "sparsediff_linalg/matrix.h" +#include "sparsediff_linalg/permuted_dense.h" /* stacked_pd represents a matrix that is the (vertical) union of 'n_blocks' permuted_dense blocks. Two different blocks have disjoint row permutations, diff --git a/sparse_linalg/include/sparse_linalg/tracked_alloc.h b/sparsediff_linalg/include/sparsediff_linalg/tracked_alloc.h similarity index 100% rename from sparse_linalg/include/sparse_linalg/tracked_alloc.h rename to sparsediff_linalg/include/sparsediff_linalg/tracked_alloc.h diff --git a/sparse_linalg/include/sparse_linalg/utils.h b/sparsediff_linalg/include/sparsediff_linalg/utils.h similarity index 98% rename from sparse_linalg/include/sparse_linalg/utils.h rename to sparsediff_linalg/include/sparsediff_linalg/utils.h index 4f2ba8c..0058be2 100644 --- a/sparse_linalg/include/sparse_linalg/utils.h +++ b/sparsediff_linalg/include/sparsediff_linalg/utils.h @@ -18,7 +18,7 @@ #ifndef UTILS_H #define UTILS_H -#include "sparse_linalg/iVec.h" +#include "sparsediff_linalg/iVec.h" #include #include diff --git a/sparse_linalg/src/COO_matrix.c b/sparsediff_linalg/src/COO_matrix.c similarity index 97% rename from sparse_linalg/src/COO_matrix.c rename to sparsediff_linalg/src/COO_matrix.c index 07783f5..ef6940e 100644 --- a/sparse_linalg/src/COO_matrix.c +++ b/sparsediff_linalg/src/COO_matrix.c @@ -15,8 +15,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "sparse_linalg/COO_matrix.h" -#include "sparse_linalg/tracked_alloc.h" +#include "sparsediff_linalg/COO_matrix.h" +#include "sparsediff_linalg/tracked_alloc.h" #include #include diff --git a/sparse_linalg/src/CSC_matrix.c b/sparsediff_linalg/src/CSC_matrix.c similarity index 99% rename from sparse_linalg/src/CSC_matrix.c rename to sparsediff_linalg/src/CSC_matrix.c index 9593e74..c613f54 100644 --- a/sparse_linalg/src/CSC_matrix.c +++ b/sparsediff_linalg/src/CSC_matrix.c @@ -15,9 +15,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "sparse_linalg/CSC_matrix.h" -#include "sparse_linalg/iVec.h" -#include "sparse_linalg/tracked_alloc.h" +#include "sparsediff_linalg/CSC_matrix.h" +#include "sparsediff_linalg/iVec.h" +#include "sparsediff_linalg/tracked_alloc.h" #include #include #include diff --git a/sparse_linalg/src/CSR_matrix.c b/sparsediff_linalg/src/CSR_matrix.c similarity index 97% rename from sparse_linalg/src/CSR_matrix.c rename to sparsediff_linalg/src/CSR_matrix.c index fba3a45..933c013 100644 --- a/sparse_linalg/src/CSR_matrix.c +++ b/sparsediff_linalg/src/CSR_matrix.c @@ -15,10 +15,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "sparse_linalg/CSR_matrix.h" -#include "sparse_linalg/int_double_pair.h" -#include "sparse_linalg/tracked_alloc.h" -#include "sparse_linalg/utils.h" +#include "sparsediff_linalg/CSR_matrix.h" +#include "sparsediff_linalg/int_double_pair.h" +#include "sparsediff_linalg/tracked_alloc.h" +#include "sparsediff_linalg/utils.h" #include #include #include diff --git a/sparse_linalg/src/CSR_sum.c b/sparsediff_linalg/src/CSR_sum.c similarity index 97% rename from sparse_linalg/src/CSR_sum.c rename to sparsediff_linalg/src/CSR_sum.c index ea5e858..105835d 100644 --- a/sparse_linalg/src/CSR_sum.c +++ b/sparsediff_linalg/src/CSR_sum.c @@ -15,11 +15,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "sparse_linalg/CSR_sum.h" -#include "sparse_linalg/CSR_matrix.h" -#include "sparse_linalg/int_double_pair.h" -#include "sparse_linalg/tracked_alloc.h" -#include "sparse_linalg/utils.h" +#include "sparsediff_linalg/CSR_sum.h" +#include "sparsediff_linalg/CSR_matrix.h" +#include "sparsediff_linalg/int_double_pair.h" +#include "sparsediff_linalg/tracked_alloc.h" +#include "sparsediff_linalg/utils.h" #include #include #include diff --git a/sparse_linalg/src/int_double_pair.c b/sparsediff_linalg/src/int_double_pair.c similarity index 94% rename from sparse_linalg/src/int_double_pair.c rename to sparsediff_linalg/src/int_double_pair.c index f32f155..da05058 100644 --- a/sparse_linalg/src/int_double_pair.c +++ b/sparsediff_linalg/src/int_double_pair.c @@ -15,8 +15,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "sparse_linalg/int_double_pair.h" -#include "sparse_linalg/tracked_alloc.h" +#include "sparsediff_linalg/int_double_pair.h" +#include "sparsediff_linalg/tracked_alloc.h" #include static int compare_int_double_pair(const void *a, const void *b) diff --git a/sparse_linalg/src/internal/permuted_dense_linalg.h b/sparsediff_linalg/src/internal/permuted_dense_linalg.h similarity index 98% rename from sparse_linalg/src/internal/permuted_dense_linalg.h rename to sparsediff_linalg/src/internal/permuted_dense_linalg.h index 9b37c3f..235c4ed 100644 --- a/sparse_linalg/src/internal/permuted_dense_linalg.h +++ b/sparsediff_linalg/src/internal/permuted_dense_linalg.h @@ -18,8 +18,8 @@ #ifndef PERMUTED_DENSE_LINALG_H #define PERMUTED_DENSE_LINALG_H -#include "sparse_linalg/CSC_matrix.h" -#include "sparse_linalg/permuted_dense.h" +#include "sparsediff_linalg/CSC_matrix.h" +#include "sparsediff_linalg/permuted_dense.h" /* Fill values of C = diag(d) @ A where len(d) = number of (global) rows of A */ void DA_pd_fill_values(const double *d, const permuted_dense *A, permuted_dense *C); diff --git a/sparse_linalg/src/internal/stacked_pd_kron_linalg.h b/sparsediff_linalg/src/internal/stacked_pd_kron_linalg.h similarity index 93% rename from sparse_linalg/src/internal/stacked_pd_kron_linalg.h rename to sparsediff_linalg/src/internal/stacked_pd_kron_linalg.h index 0e1509c..c593869 100644 --- a/sparse_linalg/src/internal/stacked_pd_kron_linalg.h +++ b/sparsediff_linalg/src/internal/stacked_pd_kron_linalg.h @@ -18,10 +18,10 @@ #ifndef STACKED_PD_KRON_LINALG_H #define STACKED_PD_KRON_LINALG_H -#include "sparse_linalg/CSC_matrix.h" -#include "sparse_linalg/matrix.h" -#include "sparse_linalg/permuted_dense.h" -#include "sparse_linalg/stacked_pd.h" +#include "sparsediff_linalg/CSC_matrix.h" +#include "sparsediff_linalg/matrix.h" +#include "sparsediff_linalg/permuted_dense.h" +#include "sparsediff_linalg/stacked_pd.h" /* All three families compute C = kron(I_p, A) @ J as a stacked_pd, without materializing kron(I_p, A). diff --git a/sparse_linalg/src/internal/stacked_pd_linalg.h b/sparsediff_linalg/src/internal/stacked_pd_linalg.h similarity index 98% rename from sparse_linalg/src/internal/stacked_pd_linalg.h rename to sparsediff_linalg/src/internal/stacked_pd_linalg.h index 5e1a943..9d74794 100644 --- a/sparse_linalg/src/internal/stacked_pd_linalg.h +++ b/sparsediff_linalg/src/internal/stacked_pd_linalg.h @@ -18,8 +18,8 @@ #ifndef STACKED_PD_LINALG_H #define STACKED_PD_LINALG_H -#include "sparse_linalg/permuted_dense.h" -#include "sparse_linalg/stacked_pd.h" +#include "sparsediff_linalg/permuted_dense.h" +#include "sparsediff_linalg/stacked_pd.h" /* Allocate a new spd C with the same sparsity as A. */ matrix *copy_sparsity_spd_alloc(const stacked_pd *A); diff --git a/sparse_linalg/src/linalg_dense_sparse_matmuls.c b/sparsediff_linalg/src/linalg_dense_sparse_matmuls.c similarity index 97% rename from sparse_linalg/src/linalg_dense_sparse_matmuls.c rename to sparsediff_linalg/src/linalg_dense_sparse_matmuls.c index 389aa2c..9578bcc 100644 --- a/sparse_linalg/src/linalg_dense_sparse_matmuls.c +++ b/sparsediff_linalg/src/linalg_dense_sparse_matmuls.c @@ -15,12 +15,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "sparse_linalg/linalg_dense_sparse_matmuls.h" -#include "sparse_linalg/CSC_matrix.h" -#include "sparse_linalg/CSR_matrix.h" -#include "sparse_linalg/cblas_wrapper.h" -#include "sparse_linalg/iVec.h" -#include "sparse_linalg/tracked_alloc.h" +#include "sparsediff_linalg/linalg_dense_sparse_matmuls.h" +#include "sparsediff_linalg/CSC_matrix.h" +#include "sparsediff_linalg/CSR_matrix.h" +#include "sparsediff_linalg/cblas_wrapper.h" +#include "sparsediff_linalg/iVec.h" +#include "sparsediff_linalg/tracked_alloc.h" #include #include #include diff --git a/sparse_linalg/src/linalg_sparse_matmuls.c b/sparsediff_linalg/src/linalg_sparse_matmuls.c similarity index 98% rename from sparse_linalg/src/linalg_sparse_matmuls.c rename to sparsediff_linalg/src/linalg_sparse_matmuls.c index e186786..c460a35 100644 --- a/sparse_linalg/src/linalg_sparse_matmuls.c +++ b/sparsediff_linalg/src/linalg_sparse_matmuls.c @@ -15,11 +15,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "sparse_linalg/CSC_matrix.h" -#include "sparse_linalg/CSR_matrix.h" -#include "sparse_linalg/iVec.h" -#include "sparse_linalg/tracked_alloc.h" -#include "sparse_linalg/utils.h" +#include "sparsediff_linalg/CSC_matrix.h" +#include "sparsediff_linalg/CSR_matrix.h" +#include "sparsediff_linalg/iVec.h" +#include "sparsediff_linalg/tracked_alloc.h" +#include "sparsediff_linalg/utils.h" #include #include #include diff --git a/sparse_linalg/src/matmul_dispatchers.c b/sparsediff_linalg/src/matmul_dispatchers.c similarity index 97% rename from sparse_linalg/src/matmul_dispatchers.c rename to sparsediff_linalg/src/matmul_dispatchers.c index 87e31e4..2f66ab0 100644 --- a/sparse_linalg/src/matmul_dispatchers.c +++ b/sparsediff_linalg/src/matmul_dispatchers.c @@ -9,16 +9,16 @@ * * http://www.apache.org/licenses/LICENSE-2.0 */ -#include "sparse_linalg/matmul_dispatchers.h" +#include "sparsediff_linalg/matmul_dispatchers.h" #include "internal/permuted_dense_linalg.h" #include "internal/stacked_pd_kron_linalg.h" #include "internal/stacked_pd_linalg.h" -#include "sparse_linalg/CSC_matrix.h" -#include "sparse_linalg/CSR_matrix.h" -#include "sparse_linalg/permuted_dense.h" -#include "sparse_linalg/sparse_matrix.h" -#include "sparse_linalg/stacked_pd.h" +#include "sparsediff_linalg/CSC_matrix.h" +#include "sparsediff_linalg/CSR_matrix.h" +#include "sparsediff_linalg/permuted_dense.h" +#include "sparsediff_linalg/sparse_matrix.h" +#include "sparsediff_linalg/stacked_pd.h" #include /* Forward declarations of the fixed-B dispatchers used internally by diff --git a/sparse_linalg/src/matrix_sum.c b/sparsediff_linalg/src/matrix_sum.c similarity index 90% rename from sparse_linalg/src/matrix_sum.c rename to sparsediff_linalg/src/matrix_sum.c index 0289ec6..c0e21fe 100644 --- a/sparse_linalg/src/matrix_sum.c +++ b/sparsediff_linalg/src/matrix_sum.c @@ -15,9 +15,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "sparse_linalg/matrix_sum.h" -#include "sparse_linalg/CSR_sum.h" -#include "sparse_linalg/sparse_matrix.h" +#include "sparsediff_linalg/matrix_sum.h" +#include "sparsediff_linalg/CSR_sum.h" +#include "sparsediff_linalg/sparse_matrix.h" void sum_matrices_alloc(matrix *A, matrix *B, matrix *C) { diff --git a/sparse_linalg/src/mini_numpy.c b/sparsediff_linalg/src/mini_numpy.c similarity index 98% rename from sparse_linalg/src/mini_numpy.c rename to sparsediff_linalg/src/mini_numpy.c index fe157d7..8b57daa 100644 --- a/sparse_linalg/src/mini_numpy.c +++ b/sparsediff_linalg/src/mini_numpy.c @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "sparse_linalg/mini_numpy.h" +#include "sparsediff_linalg/mini_numpy.h" #include void repeat(double *result, const double *a, int len, int repeats) diff --git a/sparse_linalg/src/permuted_dense.c b/sparsediff_linalg/src/permuted_dense.c similarity index 98% rename from sparse_linalg/src/permuted_dense.c rename to sparsediff_linalg/src/permuted_dense.c index 5c47544..17d4232 100644 --- a/sparse_linalg/src/permuted_dense.c +++ b/sparsediff_linalg/src/permuted_dense.c @@ -15,13 +15,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "sparse_linalg/permuted_dense.h" +#include "sparsediff_linalg/permuted_dense.h" #include "internal/permuted_dense_linalg.h" -#include "sparse_linalg/cblas_wrapper.h" -#include "sparse_linalg/linalg_dense_sparse_matmuls.h" -#include "sparse_linalg/tracked_alloc.h" -#include "sparse_linalg/utils.h" +#include "sparsediff_linalg/cblas_wrapper.h" +#include "sparsediff_linalg/linalg_dense_sparse_matmuls.h" +#include "sparsediff_linalg/tracked_alloc.h" +#include "sparsediff_linalg/utils.h" #include #include #include diff --git a/sparse_linalg/src/permuted_dense_linalg.c b/sparsediff_linalg/src/permuted_dense_linalg.c similarity index 98% rename from sparse_linalg/src/permuted_dense_linalg.c rename to sparsediff_linalg/src/permuted_dense_linalg.c index bf577cc..e475fb3 100644 --- a/sparse_linalg/src/permuted_dense_linalg.c +++ b/sparsediff_linalg/src/permuted_dense_linalg.c @@ -17,12 +17,12 @@ */ #include "internal/permuted_dense_linalg.h" -#include "sparse_linalg/cblas_wrapper.h" -#include "sparse_linalg/iVec.h" -#include "sparse_linalg/mini_numpy.h" -#include "sparse_linalg/permuted_dense.h" -#include "sparse_linalg/tracked_alloc.h" -#include "sparse_linalg/utils.h" +#include "sparsediff_linalg/cblas_wrapper.h" +#include "sparsediff_linalg/iVec.h" +#include "sparsediff_linalg/mini_numpy.h" +#include "sparsediff_linalg/permuted_dense.h" +#include "sparsediff_linalg/tracked_alloc.h" +#include "sparsediff_linalg/utils.h" #include #include #include diff --git a/sparse_linalg/src/sparse_matrix.c b/sparsediff_linalg/src/sparse_matrix.c similarity index 97% rename from sparse_linalg/src/sparse_matrix.c rename to sparsediff_linalg/src/sparse_matrix.c index b9de4fb..a87e881 100644 --- a/sparse_linalg/src/sparse_matrix.c +++ b/sparsediff_linalg/src/sparse_matrix.c @@ -15,15 +15,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "sparse_linalg/sparse_matrix.h" - -#include "sparse_linalg/CSC_matrix.h" -#include "sparse_linalg/CSR_sum.h" -#include "sparse_linalg/linalg_sparse_matmuls.h" -#include "sparse_linalg/matrix.h" -#include "sparse_linalg/mini_numpy.h" -#include "sparse_linalg/tracked_alloc.h" -#include "sparse_linalg/utils.h" +#include "sparsediff_linalg/sparse_matrix.h" + +#include "sparsediff_linalg/CSC_matrix.h" +#include "sparsediff_linalg/CSR_sum.h" +#include "sparsediff_linalg/linalg_sparse_matmuls.h" +#include "sparsediff_linalg/matrix.h" +#include "sparsediff_linalg/mini_numpy.h" +#include "sparsediff_linalg/tracked_alloc.h" +#include "sparsediff_linalg/utils.h" #include #include #include diff --git a/sparse_linalg/src/stacked_pd.c b/sparsediff_linalg/src/stacked_pd.c similarity index 98% rename from sparse_linalg/src/stacked_pd.c rename to sparsediff_linalg/src/stacked_pd.c index abca836..ea462a2 100644 --- a/sparse_linalg/src/stacked_pd.c +++ b/sparsediff_linalg/src/stacked_pd.c @@ -15,14 +15,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "sparse_linalg/stacked_pd.h" +#include "sparsediff_linalg/stacked_pd.h" #include "internal/stacked_pd_linalg.h" -#include "sparse_linalg/matrix.h" -#include "sparse_linalg/permuted_dense.h" -#include "sparse_linalg/sparse_matrix.h" -#include "sparse_linalg/tracked_alloc.h" -#include "sparse_linalg/utils.h" +#include "sparsediff_linalg/matrix.h" +#include "sparsediff_linalg/permuted_dense.h" +#include "sparsediff_linalg/sparse_matrix.h" +#include "sparsediff_linalg/tracked_alloc.h" +#include "sparsediff_linalg/utils.h" #include #include #include diff --git a/sparse_linalg/src/stacked_pd_coalesce.c b/sparsediff_linalg/src/stacked_pd_coalesce.c similarity index 98% rename from sparse_linalg/src/stacked_pd_coalesce.c rename to sparsediff_linalg/src/stacked_pd_coalesce.c index 601e1f5..b6ea049 100644 --- a/sparse_linalg/src/stacked_pd_coalesce.c +++ b/sparsediff_linalg/src/stacked_pd_coalesce.c @@ -15,12 +15,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "sparse_linalg/stacked_pd.h" +#include "sparsediff_linalg/stacked_pd.h" -#include "sparse_linalg/iVec.h" -#include "sparse_linalg/permuted_dense.h" -#include "sparse_linalg/tracked_alloc.h" -#include "sparse_linalg/utils.h" +#include "sparsediff_linalg/iVec.h" +#include "sparsediff_linalg/permuted_dense.h" +#include "sparsediff_linalg/tracked_alloc.h" +#include "sparsediff_linalg/utils.h" #include #include #include diff --git a/sparse_linalg/src/stacked_pd_kron_linalg.c b/sparsediff_linalg/src/stacked_pd_kron_linalg.c similarity index 98% rename from sparse_linalg/src/stacked_pd_kron_linalg.c rename to sparsediff_linalg/src/stacked_pd_kron_linalg.c index c11034c..086e926 100644 --- a/sparse_linalg/src/stacked_pd_kron_linalg.c +++ b/sparsediff_linalg/src/stacked_pd_kron_linalg.c @@ -19,9 +19,9 @@ #include "internal/permuted_dense_linalg.h" #include "internal/stacked_pd_linalg.h" -#include "sparse_linalg/permuted_dense.h" -#include "sparse_linalg/stacked_pd.h" -#include "sparse_linalg/tracked_alloc.h" +#include "sparsediff_linalg/permuted_dense.h" +#include "sparsediff_linalg/stacked_pd.h" +#include "sparsediff_linalg/tracked_alloc.h" #include // ==================================================================================== diff --git a/sparse_linalg/src/stacked_pd_linalg.c b/sparsediff_linalg/src/stacked_pd_linalg.c similarity index 99% rename from sparse_linalg/src/stacked_pd_linalg.c rename to sparsediff_linalg/src/stacked_pd_linalg.c index 8d5a342..dfbde8d 100644 --- a/sparse_linalg/src/stacked_pd_linalg.c +++ b/sparsediff_linalg/src/stacked_pd_linalg.c @@ -18,12 +18,12 @@ #include "internal/stacked_pd_linalg.h" #include "internal/permuted_dense_linalg.h" -#include "sparse_linalg/cblas_wrapper.h" -#include "sparse_linalg/iVec.h" -#include "sparse_linalg/permuted_dense.h" -#include "sparse_linalg/stacked_pd.h" -#include "sparse_linalg/tracked_alloc.h" -#include "sparse_linalg/utils.h" +#include "sparsediff_linalg/cblas_wrapper.h" +#include "sparsediff_linalg/iVec.h" +#include "sparsediff_linalg/permuted_dense.h" +#include "sparsediff_linalg/stacked_pd.h" +#include "sparsediff_linalg/tracked_alloc.h" +#include "sparsediff_linalg/utils.h" #include #include #include diff --git a/sparse_linalg/src/tracked_alloc.c b/sparsediff_linalg/src/tracked_alloc.c similarity index 94% rename from sparse_linalg/src/tracked_alloc.c rename to sparsediff_linalg/src/tracked_alloc.c index c4fb500..6c7be04 100644 --- a/sparse_linalg/src/tracked_alloc.c +++ b/sparsediff_linalg/src/tracked_alloc.c @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "sparse_linalg/tracked_alloc.h" +#include "sparsediff_linalg/tracked_alloc.h" #ifdef SP_TRACK_MEMORY size_t g_allocated_bytes = 0; diff --git a/sparse_linalg/src/utils.c b/sparsediff_linalg/src/utils.c similarity index 96% rename from sparse_linalg/src/utils.c rename to sparsediff_linalg/src/utils.c index db2d1ef..554e59f 100644 --- a/sparse_linalg/src/utils.c +++ b/sparsediff_linalg/src/utils.c @@ -15,10 +15,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "sparse_linalg/utils.h" +#include "sparsediff_linalg/utils.h" -#include "sparse_linalg/iVec.h" -#include "sparse_linalg/tracked_alloc.h" +#include "sparsediff_linalg/iVec.h" +#include "sparsediff_linalg/tracked_alloc.h" #include /* Helper function to compare integers for qsort */ diff --git a/sparse_linalg/tests/minunit.h b/sparsediff_linalg/tests/minunit.h similarity index 100% rename from sparse_linalg/tests/minunit.h rename to sparsediff_linalg/tests/minunit.h diff --git a/sparse_linalg/tests/sparse_linalg_tests.c b/sparsediff_linalg/tests/sparsediff_linalg_tests.c similarity index 96% rename from sparse_linalg/tests/sparse_linalg_tests.c rename to sparsediff_linalg/tests/sparsediff_linalg_tests.c index 85844c6..4f46ac7 100644 --- a/sparse_linalg/tests/sparse_linalg_tests.c +++ b/sparsediff_linalg/tests/sparsediff_linalg_tests.c @@ -2,8 +2,8 @@ #include "minunit.h" -/* Library-only suite: this executable links sparse_linalg alone, so every - header below may include only sparse_linalg/.h, internal/.h, +/* Library-only suite: this executable links sparsediff_linalg alone, so every + header below may include only sparsediff_linalg/.h, internal/.h, minunit.h, test_helpers.h and sibling test_.h files (checked at configure time in ../CMakeLists.txt). Tests that need old-code or engine kernels live in the engine's tests/old-code and run from all_tests. */ @@ -24,11 +24,11 @@ int main(void) { - printf("=== Running sparse_linalg Tests ===\n\n"); + printf("=== Running sparsediff_linalg Tests ===\n\n"); int tests_run = 0; - printf("--- sparse_linalg Tests ---\n"); + printf("--- sparsediff_linalg Tests ---\n"); mu_run_test(test_sat_mul_int_clamps_on_overflow, tests_run); mu_run_test(test_row_gather_alloc_no_int_overflow, tests_run); mu_run_test(test_cblas_ddot, tests_run); @@ -198,6 +198,6 @@ int main(void) mu_run_test(test_I_kron_X, tests_run); mu_run_test(test_I_kron_X_larger, tests_run); - printf("\n=== All %d sparse_linalg tests passed ===\n", tests_run); + printf("\n=== All %d sparsediff_linalg tests passed ===\n", tests_run); return 0; } diff --git a/sparse_linalg/tests/test_COO_matrix.h b/sparsediff_linalg/tests/test_COO_matrix.h similarity index 98% rename from sparse_linalg/tests/test_COO_matrix.h rename to sparsediff_linalg/tests/test_COO_matrix.h index 0ac87b6..58d3ce1 100644 --- a/sparse_linalg/tests/test_COO_matrix.h +++ b/sparsediff_linalg/tests/test_COO_matrix.h @@ -3,7 +3,7 @@ #include #include "minunit.h" -#include "sparse_linalg/COO_matrix.h" +#include "sparsediff_linalg/COO_matrix.h" #include "test_helpers.h" const char *test_csr_to_coo(void) diff --git a/sparse_linalg/tests/test_alloc_overflow.h b/sparsediff_linalg/tests/test_alloc_overflow.h similarity index 94% rename from sparse_linalg/tests/test_alloc_overflow.h rename to sparsediff_linalg/tests/test_alloc_overflow.h index 67831d3..f256760 100644 --- a/sparse_linalg/tests/test_alloc_overflow.h +++ b/sparsediff_linalg/tests/test_alloc_overflow.h @@ -19,10 +19,10 @@ #define TEST_ALLOC_OVERFLOW_H #include "minunit.h" -#include "sparse_linalg/CSR_matrix.h" -#include "sparse_linalg/matrix.h" -#include "sparse_linalg/sparse_matrix.h" -#include "sparse_linalg/utils.h" +#include "sparsediff_linalg/CSR_matrix.h" +#include "sparsediff_linalg/matrix.h" +#include "sparsediff_linalg/sparse_matrix.h" +#include "sparsediff_linalg/utils.h" #include #include #include diff --git a/sparse_linalg/tests/test_cblas.h b/sparsediff_linalg/tests/test_cblas.h similarity index 90% rename from sparse_linalg/tests/test_cblas.h rename to sparsediff_linalg/tests/test_cblas.h index 52feb4d..e7cac20 100644 --- a/sparse_linalg/tests/test_cblas.h +++ b/sparsediff_linalg/tests/test_cblas.h @@ -2,7 +2,7 @@ #define TEST_CBLAS_H #include "minunit.h" -#include "sparse_linalg/cblas_wrapper.h" +#include "sparsediff_linalg/cblas_wrapper.h" #include static char *test_cblas_ddot(void) diff --git a/sparse_linalg/tests/test_csc_matrix.h b/sparsediff_linalg/tests/test_csc_matrix.h similarity index 99% rename from sparse_linalg/tests/test_csc_matrix.h rename to sparsediff_linalg/tests/test_csc_matrix.h index d252445..6a59e59 100644 --- a/sparse_linalg/tests/test_csc_matrix.h +++ b/sparsediff_linalg/tests/test_csc_matrix.h @@ -4,7 +4,7 @@ #include #include "minunit.h" -#include "sparse_linalg/CSC_matrix.h" +#include "sparsediff_linalg/CSC_matrix.h" #include "test_helpers.h" /* Test ATA_alloc with a simple 3x3 example diff --git a/sparse_linalg/tests/test_csr_csc_conversion.h b/sparsediff_linalg/tests/test_csr_csc_conversion.h similarity index 98% rename from sparse_linalg/tests/test_csr_csc_conversion.h rename to sparsediff_linalg/tests/test_csr_csc_conversion.h index 78fbf22..66b14d4 100644 --- a/sparse_linalg/tests/test_csr_csc_conversion.h +++ b/sparsediff_linalg/tests/test_csr_csc_conversion.h @@ -4,8 +4,8 @@ #include #include "minunit.h" -#include "sparse_linalg/CSC_matrix.h" -#include "sparse_linalg/CSR_matrix.h" +#include "sparsediff_linalg/CSC_matrix.h" +#include "sparsediff_linalg/CSR_matrix.h" #include "test_helpers.h" /* Test CSR_matrix to CSC_matrix conversion with fill_sparsity and fill_values */ diff --git a/sparse_linalg/tests/test_csr_matrix.h b/sparsediff_linalg/tests/test_csr_matrix.h similarity index 98% rename from sparse_linalg/tests/test_csr_matrix.h rename to sparsediff_linalg/tests/test_csr_matrix.h index 17b1beb..4dbdd3c 100644 --- a/sparse_linalg/tests/test_csr_matrix.h +++ b/sparsediff_linalg/tests/test_csr_matrix.h @@ -2,7 +2,7 @@ #include #include "minunit.h" -#include "sparse_linalg/CSR_matrix.h" +#include "sparsediff_linalg/CSR_matrix.h" #include "test_helpers.h" const char *test_transpose(void) diff --git a/sparse_linalg/tests/test_helpers.c b/sparsediff_linalg/tests/test_helpers.c similarity index 98% rename from sparse_linalg/tests/test_helpers.c rename to sparsediff_linalg/tests/test_helpers.c index 26a549c..01c55bd 100644 --- a/sparse_linalg/tests/test_helpers.c +++ b/sparsediff_linalg/tests/test_helpers.c @@ -3,8 +3,8 @@ #include #include -#include "sparse_linalg/CSR_matrix.h" -#include "sparse_linalg/matrix.h" +#include "sparsediff_linalg/CSR_matrix.h" +#include "sparsediff_linalg/matrix.h" #define EPSILON 1e-7 diff --git a/sparse_linalg/tests/test_helpers.h b/sparsediff_linalg/tests/test_helpers.h similarity index 94% rename from sparse_linalg/tests/test_helpers.h rename to sparsediff_linalg/tests/test_helpers.h index 2e1d4d5..01bcba6 100644 --- a/sparse_linalg/tests/test_helpers.h +++ b/sparsediff_linalg/tests/test_helpers.h @@ -1,8 +1,8 @@ #ifndef TEST_HELPERS_H #define TEST_HELPERS_H -#include "sparse_linalg/CSR_matrix.h" -#include "sparse_linalg/matrix.h" +#include "sparsediff_linalg/CSR_matrix.h" +#include "sparsediff_linalg/matrix.h" /* Compare two double arrays directly * Returns 1 if all values match, 0 otherwise */ @@ -33,7 +33,7 @@ CSR_matrix *new_csr_random(int m, int n, double density); /* Only available with -DSP_TRACK_MEMORY=ON: reads the tracked allocator * counters, which do not exist in a default build. */ #ifdef SP_TRACK_MEMORY -#include "sparse_linalg/tracked_alloc.h" +#include "sparsediff_linalg/tracked_alloc.h" /* No-alloc-in-fill contract: after alloc and one warm-up fill, a second fill * must not touch the tracked allocator at all. Any transient sp_malloc inside diff --git a/sparse_linalg/tests/test_linalg_sparse_matmuls.h b/sparsediff_linalg/tests/test_linalg_sparse_matmuls.h similarity index 98% rename from sparse_linalg/tests/test_linalg_sparse_matmuls.h rename to sparsediff_linalg/tests/test_linalg_sparse_matmuls.h index 1e382c4..527c51f 100644 --- a/sparse_linalg/tests/test_linalg_sparse_matmuls.h +++ b/sparsediff_linalg/tests/test_linalg_sparse_matmuls.h @@ -4,12 +4,12 @@ #include #include "minunit.h" -#include "sparse_linalg/CSC_matrix.h" -#include "sparse_linalg/CSR_matrix.h" -#include "sparse_linalg/iVec.h" -#include "sparse_linalg/linalg_sparse_matmuls.h" -#include "sparse_linalg/tracked_alloc.h" -#include "sparse_linalg/utils.h" +#include "sparsediff_linalg/CSC_matrix.h" +#include "sparsediff_linalg/CSR_matrix.h" +#include "sparsediff_linalg/iVec.h" +#include "sparsediff_linalg/linalg_sparse_matmuls.h" +#include "sparsediff_linalg/tracked_alloc.h" +#include "sparsediff_linalg/utils.h" #include "test_helpers.h" /* Test block_left_multiply_fill_sparsity with simple case: single block */ diff --git a/sparse_linalg/tests/test_linalg_utils_matmul_chain_rule.h b/sparsediff_linalg/tests/test_linalg_utils_matmul_chain_rule.h similarity index 97% rename from sparse_linalg/tests/test_linalg_utils_matmul_chain_rule.h rename to sparsediff_linalg/tests/test_linalg_utils_matmul_chain_rule.h index ed4e0db..cdeb2d5 100644 --- a/sparse_linalg/tests/test_linalg_utils_matmul_chain_rule.h +++ b/sparsediff_linalg/tests/test_linalg_utils_matmul_chain_rule.h @@ -3,9 +3,9 @@ #include #include "minunit.h" -#include "sparse_linalg/CSC_matrix.h" -#include "sparse_linalg/CSR_matrix.h" -#include "sparse_linalg/linalg_dense_sparse_matmuls.h" +#include "sparsediff_linalg/CSC_matrix.h" +#include "sparsediff_linalg/CSR_matrix.h" +#include "sparsediff_linalg/linalg_dense_sparse_matmuls.h" #include "test_helpers.h" /* Test YT_kron_I_alloc and YT_kron_I_fill_values diff --git a/sparse_linalg/tests/test_matmul_dispatchers.h b/sparsediff_linalg/tests/test_matmul_dispatchers.h similarity index 99% rename from sparse_linalg/tests/test_matmul_dispatchers.h rename to sparsediff_linalg/tests/test_matmul_dispatchers.h index 24d3d8d..23ac8d1 100644 --- a/sparse_linalg/tests/test_matmul_dispatchers.h +++ b/sparsediff_linalg/tests/test_matmul_dispatchers.h @@ -4,14 +4,14 @@ #include "internal/permuted_dense_linalg.h" #include "internal/stacked_pd_linalg.h" #include "minunit.h" -#include "sparse_linalg/CSC_matrix.h" -#include "sparse_linalg/CSR_matrix.h" -#include "sparse_linalg/matmul_dispatchers.h" -#include "sparse_linalg/permuted_dense.h" -#include "sparse_linalg/sparse_matrix.h" -#include "sparse_linalg/stacked_pd.h" -#include "sparse_linalg/tracked_alloc.h" -#include "sparse_linalg/utils.h" +#include "sparsediff_linalg/CSC_matrix.h" +#include "sparsediff_linalg/CSR_matrix.h" +#include "sparsediff_linalg/matmul_dispatchers.h" +#include "sparsediff_linalg/permuted_dense.h" +#include "sparsediff_linalg/sparse_matrix.h" +#include "sparsediff_linalg/stacked_pd.h" +#include "sparsediff_linalg/tracked_alloc.h" +#include "sparsediff_linalg/utils.h" #include "test_helpers.h" #include #include diff --git a/sparse_linalg/tests/test_matrix.h b/sparsediff_linalg/tests/test_matrix.h similarity index 97% rename from sparse_linalg/tests/test_matrix.h rename to sparsediff_linalg/tests/test_matrix.h index 75a541a..0227e5e 100644 --- a/sparse_linalg/tests/test_matrix.h +++ b/sparsediff_linalg/tests/test_matrix.h @@ -2,8 +2,8 @@ #define TEST_MATRIX_H #include "minunit.h" -#include "sparse_linalg/permuted_dense.h" -#include "sparse_linalg/sparse_matrix.h" +#include "sparsediff_linalg/permuted_dense.h" +#include "sparsediff_linalg/sparse_matrix.h" #include "test_helpers.h" #include #include diff --git a/sparse_linalg/tests/test_permuted_dense.h b/sparsediff_linalg/tests/test_permuted_dense.h similarity index 99% rename from sparse_linalg/tests/test_permuted_dense.h rename to sparsediff_linalg/tests/test_permuted_dense.h index 9833d40..4fea0fe 100644 --- a/sparse_linalg/tests/test_permuted_dense.h +++ b/sparsediff_linalg/tests/test_permuted_dense.h @@ -3,12 +3,12 @@ #include "internal/permuted_dense_linalg.h" #include "minunit.h" -#include "sparse_linalg/CSC_matrix.h" -#include "sparse_linalg/matmul_dispatchers.h" -#include "sparse_linalg/permuted_dense.h" -#include "sparse_linalg/sparse_matrix.h" -#include "sparse_linalg/stacked_pd.h" -#include "sparse_linalg/utils.h" +#include "sparsediff_linalg/CSC_matrix.h" +#include "sparsediff_linalg/matmul_dispatchers.h" +#include "sparsediff_linalg/permuted_dense.h" +#include "sparsediff_linalg/sparse_matrix.h" +#include "sparsediff_linalg/stacked_pd.h" +#include "sparsediff_linalg/utils.h" #include "test_helpers.h" #include #include diff --git a/sparse_linalg/tests/test_row_gather.h b/sparsediff_linalg/tests/test_row_gather.h similarity index 97% rename from sparse_linalg/tests/test_row_gather.h rename to sparsediff_linalg/tests/test_row_gather.h index 1f7787d..2e33e8a 100644 --- a/sparse_linalg/tests/test_row_gather.h +++ b/sparsediff_linalg/tests/test_row_gather.h @@ -2,10 +2,10 @@ #define TEST_ROW_GATHER_H #include "minunit.h" -#include "sparse_linalg/CSR_matrix.h" -#include "sparse_linalg/permuted_dense.h" -#include "sparse_linalg/sparse_matrix.h" -#include "sparse_linalg/stacked_pd.h" +#include "sparsediff_linalg/CSR_matrix.h" +#include "sparsediff_linalg/permuted_dense.h" +#include "sparsediff_linalg/sparse_matrix.h" +#include "sparsediff_linalg/stacked_pd.h" #include "test_helpers.h" #include #include diff --git a/sparse_linalg/tests/test_row_reduce.h b/sparsediff_linalg/tests/test_row_reduce.h similarity index 98% rename from sparse_linalg/tests/test_row_reduce.h rename to sparsediff_linalg/tests/test_row_reduce.h index 1f68ae2..49d1c68 100644 --- a/sparse_linalg/tests/test_row_reduce.h +++ b/sparsediff_linalg/tests/test_row_reduce.h @@ -2,10 +2,10 @@ #define TEST_ROW_REDUCE_H #include "minunit.h" -#include "sparse_linalg/CSR_matrix.h" -#include "sparse_linalg/permuted_dense.h" -#include "sparse_linalg/sparse_matrix.h" -#include "sparse_linalg/stacked_pd.h" +#include "sparsediff_linalg/CSR_matrix.h" +#include "sparsediff_linalg/permuted_dense.h" +#include "sparsediff_linalg/sparse_matrix.h" +#include "sparsediff_linalg/stacked_pd.h" #include "test_helpers.h" #include #include diff --git a/sparse_linalg/tests/test_stacked_pd.h b/sparsediff_linalg/tests/test_stacked_pd.h similarity index 99% rename from sparse_linalg/tests/test_stacked_pd.h rename to sparsediff_linalg/tests/test_stacked_pd.h index 6ab2f3f..bd83a04 100644 --- a/sparse_linalg/tests/test_stacked_pd.h +++ b/sparsediff_linalg/tests/test_stacked_pd.h @@ -3,9 +3,9 @@ #include "internal/stacked_pd_linalg.h" #include "minunit.h" -#include "sparse_linalg/CSC_matrix.h" -#include "sparse_linalg/permuted_dense.h" -#include "sparse_linalg/stacked_pd.h" +#include "sparsediff_linalg/CSC_matrix.h" +#include "sparsediff_linalg/permuted_dense.h" +#include "sparsediff_linalg/stacked_pd.h" #include "test_helpers.h" #include #include diff --git a/src/atoms/affine/add.c b/src/atoms/affine/add.c index c5c371d..0a6c9c1 100644 --- a/src/atoms/affine/add.c +++ b/src/atoms/affine/add.c @@ -16,9 +16,9 @@ * limitations under the License. */ #include "atoms/affine.h" -#include "sparse_linalg/matrix_sum.h" -#include "sparse_linalg/sparse_matrix.h" -#include "sparse_linalg/tracked_alloc.h" +#include "sparsediff_linalg/matrix_sum.h" +#include "sparsediff_linalg/sparse_matrix.h" +#include "sparsediff_linalg/tracked_alloc.h" #include #include #include diff --git a/src/atoms/affine/broadcast.c b/src/atoms/affine/broadcast.c index 2639aa2..ced7101 100644 --- a/src/atoms/affine/broadcast.c +++ b/src/atoms/affine/broadcast.c @@ -16,7 +16,7 @@ * limitations under the License. */ #include "atoms/affine.h" -#include "sparse_linalg/tracked_alloc.h" +#include "sparsediff_linalg/tracked_alloc.h" #include "subexpr.h" #include #include diff --git a/src/atoms/affine/convolve.c b/src/atoms/affine/convolve.c index 2826ee6..f114d2d 100644 --- a/src/atoms/affine/convolve.c +++ b/src/atoms/affine/convolve.c @@ -16,11 +16,11 @@ * limitations under the License. */ #include "atoms/affine.h" -#include "sparse_linalg/CSR_matrix.h" -#include "sparse_linalg/linalg_sparse_matmuls.h" -#include "sparse_linalg/mini_numpy.h" -#include "sparse_linalg/sparse_matrix.h" -#include "sparse_linalg/tracked_alloc.h" +#include "sparsediff_linalg/CSR_matrix.h" +#include "sparsediff_linalg/linalg_sparse_matmuls.h" +#include "sparsediff_linalg/mini_numpy.h" +#include "sparsediff_linalg/sparse_matrix.h" +#include "sparsediff_linalg/tracked_alloc.h" #include "subexpr.h" #include #include diff --git a/src/atoms/affine/diag_mat.c b/src/atoms/affine/diag_mat.c index 3df6935..65c0992 100644 --- a/src/atoms/affine/diag_mat.c +++ b/src/atoms/affine/diag_mat.c @@ -16,7 +16,7 @@ * limitations under the License. */ #include "atoms/affine.h" -#include "sparse_linalg/tracked_alloc.h" +#include "sparsediff_linalg/tracked_alloc.h" #include #include diff --git a/src/atoms/affine/diag_vec.c b/src/atoms/affine/diag_vec.c index b43b3dc..4b48b24 100644 --- a/src/atoms/affine/diag_vec.c +++ b/src/atoms/affine/diag_vec.c @@ -18,7 +18,7 @@ // SPDX-License-Identifier: Apache-2.0 #include "atoms/affine.h" -#include "sparse_linalg/tracked_alloc.h" +#include "sparsediff_linalg/tracked_alloc.h" #include #include #include diff --git a/src/atoms/affine/hstack.c b/src/atoms/affine/hstack.c index cd4d9ed..7bf2ef5 100644 --- a/src/atoms/affine/hstack.c +++ b/src/atoms/affine/hstack.c @@ -16,10 +16,10 @@ * limitations under the License. */ #include "atoms/affine.h" -#include "sparse_linalg/CSR_sum.h" -#include "sparse_linalg/sparse_matrix.h" -#include "sparse_linalg/tracked_alloc.h" -#include "sparse_linalg/utils.h" +#include "sparsediff_linalg/CSR_sum.h" +#include "sparsediff_linalg/sparse_matrix.h" +#include "sparsediff_linalg/tracked_alloc.h" +#include "sparsediff_linalg/utils.h" #include "subexpr.h" #include #include diff --git a/src/atoms/affine/index.c b/src/atoms/affine/index.c index 2eedecf..0aac588 100644 --- a/src/atoms/affine/index.c +++ b/src/atoms/affine/index.c @@ -16,7 +16,7 @@ * limitations under the License. */ #include "atoms/affine.h" -#include "sparse_linalg/tracked_alloc.h" +#include "sparsediff_linalg/tracked_alloc.h" #include "subexpr.h" #include #include diff --git a/src/atoms/affine/kron.c b/src/atoms/affine/kron.c index 3350b63..134658a 100644 --- a/src/atoms/affine/kron.c +++ b/src/atoms/affine/kron.c @@ -16,9 +16,9 @@ * limitations under the License. */ #include "atoms/affine.h" -#include "sparse_linalg/CSR_matrix.h" -#include "sparse_linalg/sparse_matrix.h" -#include "sparse_linalg/tracked_alloc.h" +#include "sparsediff_linalg/CSR_matrix.h" +#include "sparsediff_linalg/sparse_matrix.h" +#include "sparsediff_linalg/tracked_alloc.h" #include "subexpr.h" #include #include diff --git a/src/atoms/affine/left_matmul.c b/src/atoms/affine/left_matmul.c index a7c9baf..cb7cd17 100644 --- a/src/atoms/affine/left_matmul.c +++ b/src/atoms/affine/left_matmul.c @@ -16,12 +16,12 @@ * limitations under the License. */ #include "atoms/affine.h" -#include "sparse_linalg/matmul_dispatchers.h" -#include "sparse_linalg/mini_numpy.h" -#include "sparse_linalg/permuted_dense.h" -#include "sparse_linalg/sparse_matrix.h" -#include "sparse_linalg/stacked_pd.h" -#include "sparse_linalg/tracked_alloc.h" +#include "sparsediff_linalg/matmul_dispatchers.h" +#include "sparsediff_linalg/mini_numpy.h" +#include "sparsediff_linalg/permuted_dense.h" +#include "sparsediff_linalg/sparse_matrix.h" +#include "sparsediff_linalg/stacked_pd.h" +#include "sparsediff_linalg/tracked_alloc.h" #include "subexpr.h" #include #include diff --git a/src/atoms/affine/neg.c b/src/atoms/affine/neg.c index 2aa2bd3..6367566 100644 --- a/src/atoms/affine/neg.c +++ b/src/atoms/affine/neg.c @@ -16,7 +16,7 @@ * limitations under the License. */ #include "atoms/affine.h" -#include "sparse_linalg/tracked_alloc.h" +#include "sparsediff_linalg/tracked_alloc.h" #include #include #include diff --git a/src/atoms/affine/parameter.c b/src/atoms/affine/parameter.c index 38bcfbe..c407df7 100644 --- a/src/atoms/affine/parameter.c +++ b/src/atoms/affine/parameter.c @@ -16,8 +16,8 @@ * limitations under the License. */ #include "atoms/affine.h" -#include "sparse_linalg/sparse_matrix.h" -#include "sparse_linalg/tracked_alloc.h" +#include "sparsediff_linalg/sparse_matrix.h" +#include "sparsediff_linalg/tracked_alloc.h" #include "subexpr.h" #include #include diff --git a/src/atoms/affine/promote.c b/src/atoms/affine/promote.c index 4c772c8..103c1bd 100644 --- a/src/atoms/affine/promote.c +++ b/src/atoms/affine/promote.c @@ -16,7 +16,7 @@ * limitations under the License. */ #include "atoms/affine.h" -#include "sparse_linalg/tracked_alloc.h" +#include "sparsediff_linalg/tracked_alloc.h" #include #include #include diff --git a/src/atoms/affine/reshape.c b/src/atoms/affine/reshape.c index f0856ee..3e5719a 100644 --- a/src/atoms/affine/reshape.c +++ b/src/atoms/affine/reshape.c @@ -16,7 +16,7 @@ * limitations under the License. */ #include "atoms/affine.h" -#include "sparse_linalg/tracked_alloc.h" +#include "sparsediff_linalg/tracked_alloc.h" #include #include #include diff --git a/src/atoms/affine/right_matmul.c b/src/atoms/affine/right_matmul.c index 3d750ed..f6f4c7f 100644 --- a/src/atoms/affine/right_matmul.c +++ b/src/atoms/affine/right_matmul.c @@ -16,9 +16,9 @@ * limitations under the License. */ #include "atoms/affine.h" -#include "sparse_linalg/CSR_matrix.h" -#include "sparse_linalg/mini_numpy.h" -#include "sparse_linalg/tracked_alloc.h" +#include "sparsediff_linalg/CSR_matrix.h" +#include "sparsediff_linalg/mini_numpy.h" +#include "sparsediff_linalg/tracked_alloc.h" #include "subexpr.h" #include #include diff --git a/src/atoms/affine/scalar_mult.c b/src/atoms/affine/scalar_mult.c index 2497914..bb48eb1 100644 --- a/src/atoms/affine/scalar_mult.c +++ b/src/atoms/affine/scalar_mult.c @@ -16,7 +16,7 @@ * limitations under the License. */ #include "atoms/affine.h" -#include "sparse_linalg/tracked_alloc.h" +#include "sparsediff_linalg/tracked_alloc.h" #include "subexpr.h" #include #include diff --git a/src/atoms/affine/sum.c b/src/atoms/affine/sum.c index 4e2cf8d..603fa02 100644 --- a/src/atoms/affine/sum.c +++ b/src/atoms/affine/sum.c @@ -16,8 +16,8 @@ * limitations under the License. */ #include "atoms/affine.h" -#include "sparse_linalg/mini_numpy.h" -#include "sparse_linalg/tracked_alloc.h" +#include "sparsediff_linalg/mini_numpy.h" +#include "sparsediff_linalg/tracked_alloc.h" #include "subexpr.h" #include #include diff --git a/src/atoms/affine/trace.c b/src/atoms/affine/trace.c index a51fd01..ad6ebec 100644 --- a/src/atoms/affine/trace.c +++ b/src/atoms/affine/trace.c @@ -16,10 +16,10 @@ * limitations under the License. */ #include "atoms/affine.h" -#include "sparse_linalg/CSR_sum.h" -#include "sparse_linalg/sparse_matrix.h" -#include "sparse_linalg/tracked_alloc.h" -#include "sparse_linalg/utils.h" +#include "sparsediff_linalg/CSR_sum.h" +#include "sparsediff_linalg/sparse_matrix.h" +#include "sparsediff_linalg/tracked_alloc.h" +#include "sparsediff_linalg/utils.h" #include "subexpr.h" #include #include diff --git a/src/atoms/affine/transpose.c b/src/atoms/affine/transpose.c index 77446ca..01a2672 100644 --- a/src/atoms/affine/transpose.c +++ b/src/atoms/affine/transpose.c @@ -16,8 +16,8 @@ * limitations under the License. */ #include "atoms/affine.h" -#include "sparse_linalg/mini_numpy.h" -#include "sparse_linalg/tracked_alloc.h" +#include "sparsediff_linalg/mini_numpy.h" +#include "sparsediff_linalg/tracked_alloc.h" #include #include diff --git a/src/atoms/affine/upper_tri.c b/src/atoms/affine/upper_tri.c index 37f04f4..a80103e 100644 --- a/src/atoms/affine/upper_tri.c +++ b/src/atoms/affine/upper_tri.c @@ -16,7 +16,7 @@ * limitations under the License. */ #include "atoms/affine.h" -#include "sparse_linalg/tracked_alloc.h" +#include "sparsediff_linalg/tracked_alloc.h" #include #include diff --git a/src/atoms/affine/variable.c b/src/atoms/affine/variable.c index cd50a78..ba88c0b 100644 --- a/src/atoms/affine/variable.c +++ b/src/atoms/affine/variable.c @@ -16,8 +16,8 @@ * limitations under the License. */ #include "atoms/affine.h" -#include "sparse_linalg/sparse_matrix.h" -#include "sparse_linalg/tracked_alloc.h" +#include "sparsediff_linalg/sparse_matrix.h" +#include "sparsediff_linalg/tracked_alloc.h" #include #include diff --git a/src/atoms/affine/vector_mult.c b/src/atoms/affine/vector_mult.c index 5ae782f..c56cc42 100644 --- a/src/atoms/affine/vector_mult.c +++ b/src/atoms/affine/vector_mult.c @@ -16,7 +16,7 @@ * limitations under the License. */ #include "atoms/affine.h" -#include "sparse_linalg/tracked_alloc.h" +#include "sparsediff_linalg/tracked_alloc.h" #include "subexpr.h" #include #include diff --git a/src/atoms/affine/vstack.c b/src/atoms/affine/vstack.c index 6beadc4..ac460e3 100644 --- a/src/atoms/affine/vstack.c +++ b/src/atoms/affine/vstack.c @@ -16,7 +16,7 @@ * limitations under the License. */ #include "atoms/affine.h" -#include "sparse_linalg/tracked_alloc.h" +#include "sparsediff_linalg/tracked_alloc.h" #include #include diff --git a/src/atoms/bivariate_full_dom/matmul.c b/src/atoms/bivariate_full_dom/matmul.c index 0f4b0d3..4a61a2e 100644 --- a/src/atoms/bivariate_full_dom/matmul.c +++ b/src/atoms/bivariate_full_dom/matmul.c @@ -16,17 +16,17 @@ * limitations under the License. */ #include "atoms/bivariate_full_dom.h" -#include "sparse_linalg/CSC_matrix.h" -#include "sparse_linalg/CSR_matrix.h" -#include "sparse_linalg/CSR_sum.h" -#include "sparse_linalg/cblas_wrapper.h" -#include "sparse_linalg/linalg_dense_sparse_matmuls.h" -#include "sparse_linalg/linalg_sparse_matmuls.h" -#include "sparse_linalg/mini_numpy.h" -#include "sparse_linalg/sparse_matrix.h" -#include "sparse_linalg/stacked_pd.h" -#include "sparse_linalg/tracked_alloc.h" -#include "sparse_linalg/utils.h" +#include "sparsediff_linalg/CSC_matrix.h" +#include "sparsediff_linalg/CSR_matrix.h" +#include "sparsediff_linalg/CSR_sum.h" +#include "sparsediff_linalg/cblas_wrapper.h" +#include "sparsediff_linalg/linalg_dense_sparse_matmuls.h" +#include "sparsediff_linalg/linalg_sparse_matmuls.h" +#include "sparsediff_linalg/mini_numpy.h" +#include "sparsediff_linalg/sparse_matrix.h" +#include "sparsediff_linalg/stacked_pd.h" +#include "sparsediff_linalg/tracked_alloc.h" +#include "sparsediff_linalg/utils.h" #include "subexpr.h" #include #include diff --git a/src/atoms/bivariate_full_dom/multiply.c b/src/atoms/bivariate_full_dom/multiply.c index b898e9e..96bad23 100644 --- a/src/atoms/bivariate_full_dom/multiply.c +++ b/src/atoms/bivariate_full_dom/multiply.c @@ -16,13 +16,13 @@ * limitations under the License. */ #include "atoms/bivariate_full_dom.h" -#include "sparse_linalg/CSR_matrix.h" -#include "sparse_linalg/CSR_sum.h" -#include "sparse_linalg/matmul_dispatchers.h" -#include "sparse_linalg/matrix_sum.h" -#include "sparse_linalg/sparse_matrix.h" -#include "sparse_linalg/stacked_pd.h" -#include "sparse_linalg/tracked_alloc.h" +#include "sparsediff_linalg/CSR_matrix.h" +#include "sparsediff_linalg/CSR_sum.h" +#include "sparsediff_linalg/matmul_dispatchers.h" +#include "sparsediff_linalg/matrix_sum.h" +#include "sparsediff_linalg/sparse_matrix.h" +#include "sparsediff_linalg/stacked_pd.h" +#include "sparsediff_linalg/tracked_alloc.h" #include "subexpr.h" #include #include diff --git a/src/atoms/bivariate_restricted_dom/atan2.c b/src/atoms/bivariate_restricted_dom/atan2.c index 88e0582..1aa6a70 100644 --- a/src/atoms/bivariate_restricted_dom/atan2.c +++ b/src/atoms/bivariate_restricted_dom/atan2.c @@ -16,8 +16,8 @@ * limitations under the License. */ #include "atoms/bivariate_restricted_dom.h" -#include "sparse_linalg/sparse_matrix.h" -#include "sparse_linalg/tracked_alloc.h" +#include "sparsediff_linalg/sparse_matrix.h" +#include "sparsediff_linalg/tracked_alloc.h" #include #include #include diff --git a/src/atoms/bivariate_restricted_dom/quad_over_lin.c b/src/atoms/bivariate_restricted_dom/quad_over_lin.c index 60871db..ee7930d 100644 --- a/src/atoms/bivariate_restricted_dom/quad_over_lin.c +++ b/src/atoms/bivariate_restricted_dom/quad_over_lin.c @@ -16,9 +16,9 @@ * limitations under the License. */ #include "atoms/bivariate_restricted_dom.h" -#include "sparse_linalg/CSC_matrix.h" -#include "sparse_linalg/sparse_matrix.h" -#include "sparse_linalg/tracked_alloc.h" +#include "sparsediff_linalg/CSC_matrix.h" +#include "sparsediff_linalg/sparse_matrix.h" +#include "sparsediff_linalg/tracked_alloc.h" #include "subexpr.h" #include #include diff --git a/src/atoms/bivariate_restricted_dom/rel_entr.c b/src/atoms/bivariate_restricted_dom/rel_entr.c index 117b170..a9d1b31 100644 --- a/src/atoms/bivariate_restricted_dom/rel_entr.c +++ b/src/atoms/bivariate_restricted_dom/rel_entr.c @@ -16,8 +16,8 @@ * limitations under the License. */ #include "atoms/bivariate_restricted_dom.h" -#include "sparse_linalg/sparse_matrix.h" -#include "sparse_linalg/tracked_alloc.h" +#include "sparsediff_linalg/sparse_matrix.h" +#include "sparsediff_linalg/tracked_alloc.h" #include #include #include diff --git a/src/atoms/bivariate_restricted_dom/rel_entr_scalar_vector.c b/src/atoms/bivariate_restricted_dom/rel_entr_scalar_vector.c index 3960015..6bff498 100644 --- a/src/atoms/bivariate_restricted_dom/rel_entr_scalar_vector.c +++ b/src/atoms/bivariate_restricted_dom/rel_entr_scalar_vector.c @@ -16,8 +16,8 @@ * limitations under the License. */ #include "atoms/bivariate_restricted_dom.h" -#include "sparse_linalg/sparse_matrix.h" -#include "sparse_linalg/tracked_alloc.h" +#include "sparsediff_linalg/sparse_matrix.h" +#include "sparsediff_linalg/tracked_alloc.h" #include #include #include diff --git a/src/atoms/bivariate_restricted_dom/rel_entr_vector_scalar.c b/src/atoms/bivariate_restricted_dom/rel_entr_vector_scalar.c index d264130..9910f24 100644 --- a/src/atoms/bivariate_restricted_dom/rel_entr_vector_scalar.c +++ b/src/atoms/bivariate_restricted_dom/rel_entr_vector_scalar.c @@ -16,8 +16,8 @@ * limitations under the License. */ #include "atoms/bivariate_restricted_dom.h" -#include "sparse_linalg/sparse_matrix.h" -#include "sparse_linalg/tracked_alloc.h" +#include "sparsediff_linalg/sparse_matrix.h" +#include "sparsediff_linalg/tracked_alloc.h" #include #include #include diff --git a/src/atoms/elementwise_full_dom/common.c b/src/atoms/elementwise_full_dom/common.c index 753635d..f62e314 100644 --- a/src/atoms/elementwise_full_dom/common.c +++ b/src/atoms/elementwise_full_dom/common.c @@ -16,11 +16,11 @@ * limitations under the License. */ #include "atoms/elementwise_full_dom.h" -#include "sparse_linalg/CSC_matrix.h" -#include "sparse_linalg/CSR_matrix.h" -#include "sparse_linalg/matrix_sum.h" -#include "sparse_linalg/sparse_matrix.h" -#include "sparse_linalg/tracked_alloc.h" +#include "sparsediff_linalg/CSC_matrix.h" +#include "sparsediff_linalg/CSR_matrix.h" +#include "sparsediff_linalg/matrix_sum.h" +#include "sparsediff_linalg/sparse_matrix.h" +#include "sparsediff_linalg/tracked_alloc.h" #include "subexpr.h" #include #include diff --git a/src/atoms/elementwise_full_dom/power.c b/src/atoms/elementwise_full_dom/power.c index 41fb7c3..a2cfb56 100644 --- a/src/atoms/elementwise_full_dom/power.c +++ b/src/atoms/elementwise_full_dom/power.c @@ -16,7 +16,7 @@ * limitations under the License. */ #include "atoms/elementwise_full_dom.h" -#include "sparse_linalg/tracked_alloc.h" +#include "sparsediff_linalg/tracked_alloc.h" #include "subexpr.h" #include #include diff --git a/src/atoms/elementwise_restricted_dom/common.c b/src/atoms/elementwise_restricted_dom/common.c index f2eb010..982085e 100644 --- a/src/atoms/elementwise_restricted_dom/common.c +++ b/src/atoms/elementwise_restricted_dom/common.c @@ -16,8 +16,8 @@ * limitations under the License. */ #include "atoms/elementwise_restricted_dom.h" -#include "sparse_linalg/sparse_matrix.h" -#include "sparse_linalg/tracked_alloc.h" +#include "sparsediff_linalg/sparse_matrix.h" +#include "sparsediff_linalg/tracked_alloc.h" #include #include diff --git a/src/atoms/other/prod.c b/src/atoms/other/prod.c index 8952ea5..c78c80f 100644 --- a/src/atoms/other/prod.c +++ b/src/atoms/other/prod.c @@ -16,8 +16,8 @@ * limitations under the License. */ #include "atoms/non_elementwise_full_dom.h" -#include "sparse_linalg/sparse_matrix.h" -#include "sparse_linalg/tracked_alloc.h" +#include "sparsediff_linalg/sparse_matrix.h" +#include "sparsediff_linalg/tracked_alloc.h" #include #include #include diff --git a/src/atoms/other/prod_axis_one.c b/src/atoms/other/prod_axis_one.c index 3924330..d7abe24 100644 --- a/src/atoms/other/prod_axis_one.c +++ b/src/atoms/other/prod_axis_one.c @@ -16,8 +16,8 @@ * limitations under the License. */ #include "atoms/non_elementwise_full_dom.h" -#include "sparse_linalg/sparse_matrix.h" -#include "sparse_linalg/tracked_alloc.h" +#include "sparsediff_linalg/sparse_matrix.h" +#include "sparsediff_linalg/tracked_alloc.h" #include #include #include diff --git a/src/atoms/other/prod_axis_zero.c b/src/atoms/other/prod_axis_zero.c index f596dc6..19004ff 100644 --- a/src/atoms/other/prod_axis_zero.c +++ b/src/atoms/other/prod_axis_zero.c @@ -16,8 +16,8 @@ * limitations under the License. */ #include "atoms/non_elementwise_full_dom.h" -#include "sparse_linalg/sparse_matrix.h" -#include "sparse_linalg/tracked_alloc.h" +#include "sparsediff_linalg/sparse_matrix.h" +#include "sparsediff_linalg/tracked_alloc.h" #include #include #include diff --git a/src/atoms/other/quad_form.c b/src/atoms/other/quad_form.c index df36171..e1d428d 100644 --- a/src/atoms/other/quad_form.c +++ b/src/atoms/other/quad_form.c @@ -16,13 +16,13 @@ * limitations under the License. */ #include "atoms/non_elementwise_full_dom.h" -#include "sparse_linalg/CSC_matrix.h" -#include "sparse_linalg/cblas_wrapper.h" -#include "sparse_linalg/matmul_dispatchers.h" -#include "sparse_linalg/matrix_sum.h" -#include "sparse_linalg/permuted_dense.h" -#include "sparse_linalg/sparse_matrix.h" -#include "sparse_linalg/tracked_alloc.h" +#include "sparsediff_linalg/CSC_matrix.h" +#include "sparsediff_linalg/cblas_wrapper.h" +#include "sparsediff_linalg/matmul_dispatchers.h" +#include "sparsediff_linalg/matrix_sum.h" +#include "sparsediff_linalg/permuted_dense.h" +#include "sparsediff_linalg/sparse_matrix.h" +#include "sparsediff_linalg/tracked_alloc.h" #include "subexpr.h" #include #include diff --git a/src/expr.c b/src/expr.c index 4c87305..91febc2 100644 --- a/src/expr.c +++ b/src/expr.c @@ -16,8 +16,8 @@ * limitations under the License. */ #include "expr.h" -#include "sparse_linalg/CSC_matrix.h" -#include "sparse_linalg/tracked_alloc.h" +#include "sparsediff_linalg/CSC_matrix.h" +#include "sparsediff_linalg/tracked_alloc.h" #include #include diff --git a/src/old-code/linear_op.c b/src/old-code/linear_op.c index 684a7b6..7264466 100644 --- a/src/old-code/linear_op.c +++ b/src/old-code/linear_op.c @@ -16,9 +16,9 @@ * limitations under the License. */ #include "old-code/old_affine.h" -#include "sparse_linalg/CSR_matrix.h" -#include "sparse_linalg/sparse_matrix.h" -#include "sparse_linalg/tracked_alloc.h" +#include "sparsediff_linalg/CSR_matrix.h" +#include "sparsediff_linalg/sparse_matrix.h" +#include "sparsediff_linalg/tracked_alloc.h" #include "subexpr.h" #include #include diff --git a/src/old-code/old_CSR.c b/src/old-code/old_CSR.c index a1226c6..59be693 100644 --- a/src/old-code/old_CSR.c +++ b/src/old-code/old_CSR.c @@ -16,7 +16,7 @@ * limitations under the License. */ #include "old-code/old_CSR.h" -#include "sparse_linalg/CSR_matrix.h" +#include "sparsediff_linalg/CSR_matrix.h" #include #include diff --git a/src/old-code/old_CSR_sum.c b/src/old-code/old_CSR_sum.c index be60050..ab54057 100644 --- a/src/old-code/old_CSR_sum.c +++ b/src/old-code/old_CSR_sum.c @@ -16,9 +16,9 @@ * limitations under the License. */ #include "old-code/old_CSR_sum.h" -#include "sparse_linalg/CSR_matrix.h" -#include "sparse_linalg/int_double_pair.h" -#include "sparse_linalg/utils.h" +#include "sparsediff_linalg/CSR_matrix.h" +#include "sparsediff_linalg/int_double_pair.h" +#include "sparsediff_linalg/utils.h" #include #include #include diff --git a/src/old-code/old_permuted_dense.c b/src/old-code/old_permuted_dense.c index 6fe1123..60b6edb 100644 --- a/src/old-code/old_permuted_dense.c +++ b/src/old-code/old_permuted_dense.c @@ -17,8 +17,8 @@ */ #include "old-code/old_permuted_dense.h" -#include "sparse_linalg/cblas_wrapper.h" -#include "sparse_linalg/tracked_alloc.h" +#include "sparsediff_linalg/cblas_wrapper.h" +#include "sparsediff_linalg/tracked_alloc.h" #include #include diff --git a/src/problem.c b/src/problem.c index b013fd3..3a487d2 100644 --- a/src/problem.c +++ b/src/problem.c @@ -16,10 +16,10 @@ * limitations under the License. */ #include "problem.h" -#include "sparse_linalg/CSR_sum.h" -#include "sparse_linalg/stacked_pd.h" -#include "sparse_linalg/tracked_alloc.h" -#include "sparse_linalg/utils.h" +#include "sparsediff_linalg/CSR_sum.h" +#include "sparsediff_linalg/stacked_pd.h" +#include "sparsediff_linalg/tracked_alloc.h" +#include "sparsediff_linalg/utils.h" #include "subexpr.h" #include #include diff --git a/tests/jacobian_tests/affine/test_broadcast.h b/tests/jacobian_tests/affine/test_broadcast.h index 58e342a..317b7a0 100644 --- a/tests/jacobian_tests/affine/test_broadcast.h +++ b/tests/jacobian_tests/affine/test_broadcast.h @@ -5,7 +5,7 @@ #include "atoms/affine.h" #include "expr.h" #include "minunit.h" -#include "sparse_linalg/permuted_dense.h" +#include "sparsediff_linalg/permuted_dense.h" #include "test_helpers.h" const char *test_broadcast_row_jacobian(void) diff --git a/tests/jacobian_tests/affine/test_left_matmul.h b/tests/jacobian_tests/affine/test_left_matmul.h index 3053c1a..5f8806b 100644 --- a/tests/jacobian_tests/affine/test_left_matmul.h +++ b/tests/jacobian_tests/affine/test_left_matmul.h @@ -7,7 +7,7 @@ #include "expr.h" #include "minunit.h" #include "numerical_diff.h" -#include "sparse_linalg/permuted_dense.h" +#include "sparsediff_linalg/permuted_dense.h" #include "test_helpers.h" const char *test_jacobian_left_matmul_log(void) diff --git a/tests/jacobian_tests/affine/test_promote.h b/tests/jacobian_tests/affine/test_promote.h index f08e927..b4beb78 100644 --- a/tests/jacobian_tests/affine/test_promote.h +++ b/tests/jacobian_tests/affine/test_promote.h @@ -5,7 +5,7 @@ #include "atoms/affine.h" #include "expr.h" #include "minunit.h" -#include "sparse_linalg/permuted_dense.h" +#include "sparsediff_linalg/permuted_dense.h" #include "test_helpers.h" const char *test_promote_scalar_jacobian(void) diff --git a/tests/jacobian_tests/affine/test_sum.h b/tests/jacobian_tests/affine/test_sum.h index 38b80fc..5bcbe63 100644 --- a/tests/jacobian_tests/affine/test_sum.h +++ b/tests/jacobian_tests/affine/test_sum.h @@ -7,7 +7,7 @@ #include "expr.h" #include "minunit.h" #include "numerical_diff.h" -#include "sparse_linalg/stacked_pd.h" +#include "sparsediff_linalg/stacked_pd.h" #include "test_helpers.h" const char *test_jacobian_sum_log(void) diff --git a/tests/jacobian_tests/affine/test_transpose.h b/tests/jacobian_tests/affine/test_transpose.h index cb46a27..d479453 100644 --- a/tests/jacobian_tests/affine/test_transpose.h +++ b/tests/jacobian_tests/affine/test_transpose.h @@ -4,7 +4,7 @@ #include "atoms/affine.h" #include "minunit.h" -#include "sparse_linalg/permuted_dense.h" +#include "sparsediff_linalg/permuted_dense.h" #include "test_helpers.h" #include #include diff --git a/tests/jacobian_tests/composite/test_chain_rule_jacobian.h b/tests/jacobian_tests/composite/test_chain_rule_jacobian.h index 30ba655..bfdcc4d 100644 --- a/tests/jacobian_tests/composite/test_chain_rule_jacobian.h +++ b/tests/jacobian_tests/composite/test_chain_rule_jacobian.h @@ -5,7 +5,7 @@ #include "expr.h" #include "minunit.h" #include "numerical_diff.h" -#include "sparse_linalg/CSR_matrix.h" +#include "sparsediff_linalg/CSR_matrix.h" #include "subexpr.h" #include "test_helpers.h" diff --git a/tests/jacobian_tests/test_values_version.h b/tests/jacobian_tests/test_values_version.h index b019632..4660ea6 100644 --- a/tests/jacobian_tests/test_values_version.h +++ b/tests/jacobian_tests/test_values_version.h @@ -8,7 +8,7 @@ #include "expr.h" #include "minunit.h" #include "numerical_diff.h" -#include "sparse_linalg/sparse_matrix.h" +#include "sparsediff_linalg/sparse_matrix.h" #include "test_helpers.h" /* Non-affine node: every eval_jacobian call bumps the jacobian's diff --git a/tests/old-code/test_old_CSR.h b/tests/old-code/test_old_CSR.h index dccb30c..ef9cbfc 100644 --- a/tests/old-code/test_old_CSR.h +++ b/tests/old-code/test_old_CSR.h @@ -7,15 +7,15 @@ #include "minunit.h" #include "old-code/old_CSR.h" #include "old-code/old_CSR_sum.h" -#include "sparse_linalg/CSR_matrix.h" -#include "sparse_linalg/int_double_pair.h" +#include "sparsediff_linalg/CSR_matrix.h" +#include "sparsediff_linalg/int_double_pair.h" #include "test_helpers.h" /* Direct unit tests for the legacy CSR kernels in old-code (diag_csr_mult, sum_csr_matrices, Ax_csr_fill_values, the sum_*_rows_csr family and kron_identity_csr). None of them sits on a production path; the tests keep the reference implementations honest. Run by all_tests only, since the - kernels are compiled into the engine, not into sparse_linalg. */ + kernels are compiled into the engine, not into sparsediff_linalg. */ const char *test_diag_csr_mult(void) { diff --git a/tests/old-code/test_old_permuted_dense.h b/tests/old-code/test_old_permuted_dense.h index 5f7cf87..dcd3954 100644 --- a/tests/old-code/test_old_permuted_dense.h +++ b/tests/old-code/test_old_permuted_dense.h @@ -3,10 +3,10 @@ #include "minunit.h" #include "old-code/old_permuted_dense.h" -#include "sparse_linalg/CSR_matrix.h" -#include "sparse_linalg/matmul_dispatchers.h" -#include "sparse_linalg/permuted_dense.h" -#include "sparse_linalg/sparse_matrix.h" +#include "sparsediff_linalg/CSR_matrix.h" +#include "sparsediff_linalg/matmul_dispatchers.h" +#include "sparsediff_linalg/permuted_dense.h" +#include "sparsediff_linalg/sparse_matrix.h" #include "test_helpers.h" #include #include diff --git a/tests/profiling/profile_BTA_pd_csr_vs_csc.h b/tests/profiling/profile_BTA_pd_csr_vs_csc.h index 04a0754..605df57 100644 --- a/tests/profiling/profile_BTA_pd_csr_vs_csc.h +++ b/tests/profiling/profile_BTA_pd_csr_vs_csc.h @@ -9,10 +9,10 @@ #include "Timer.h" #include "minunit.h" #include "old-code/old_permuted_dense.h" -#include "sparse_linalg/CSR_matrix.h" -#include "sparse_linalg/matmul_dispatchers.h" -#include "sparse_linalg/permuted_dense.h" -#include "sparse_linalg/sparse_matrix.h" +#include "sparsediff_linalg/CSR_matrix.h" +#include "sparsediff_linalg/matmul_dispatchers.h" +#include "sparsediff_linalg/permuted_dense.h" +#include "sparsediff_linalg/sparse_matrix.h" #include "test_helpers.h" /* Microbenchmark: compare the legacy CSR-pd BTA kernel (old-code) against the diff --git a/tests/profiling/profile_hessian_exp_AX.h b/tests/profiling/profile_hessian_exp_AX.h index 2759ad2..249a652 100644 --- a/tests/profiling/profile_hessian_exp_AX.h +++ b/tests/profiling/profile_hessian_exp_AX.h @@ -11,10 +11,10 @@ #include "atoms/elementwise_full_dom.h" #include "expr.h" #include "minunit.h" -#include "sparse_linalg/CSR_matrix.h" -#include "sparse_linalg/permuted_dense.h" -#include "sparse_linalg/stacked_pd.h" -#include "sparse_linalg/tracked_alloc.h" +#include "sparsediff_linalg/CSR_matrix.h" +#include "sparsediff_linalg/permuted_dense.h" +#include "sparsediff_linalg/stacked_pd.h" +#include "sparsediff_linalg/tracked_alloc.h" /* Profile and validate two ways to compute the Hessian of w^T exp(A @ X) for n x n matrices A, X with n = 50. diff --git a/tests/profiling/profile_log_reg.h b/tests/profiling/profile_log_reg.h index 80c6297..adf5bce 100644 --- a/tests/profiling/profile_log_reg.h +++ b/tests/profiling/profile_log_reg.h @@ -11,7 +11,7 @@ #include "atoms/elementwise_full_dom.h" #include "expr.h" #include "minunit.h" -#include "sparse_linalg/permuted_dense.h" +#include "sparsediff_linalg/permuted_dense.h" /* Profile and validate Jacobian + Hessian of obj = sum(logistic(A x)). diff --git a/tests/test_helpers.c b/tests/test_helpers.c index 26a549c..01c55bd 100644 --- a/tests/test_helpers.c +++ b/tests/test_helpers.c @@ -3,8 +3,8 @@ #include #include -#include "sparse_linalg/CSR_matrix.h" -#include "sparse_linalg/matrix.h" +#include "sparsediff_linalg/CSR_matrix.h" +#include "sparsediff_linalg/matrix.h" #define EPSILON 1e-7 diff --git a/tests/test_helpers.h b/tests/test_helpers.h index 2e1d4d5..01bcba6 100644 --- a/tests/test_helpers.h +++ b/tests/test_helpers.h @@ -1,8 +1,8 @@ #ifndef TEST_HELPERS_H #define TEST_HELPERS_H -#include "sparse_linalg/CSR_matrix.h" -#include "sparse_linalg/matrix.h" +#include "sparsediff_linalg/CSR_matrix.h" +#include "sparsediff_linalg/matrix.h" /* Compare two double arrays directly * Returns 1 if all values match, 0 otherwise */ @@ -33,7 +33,7 @@ CSR_matrix *new_csr_random(int m, int n, double density); /* Only available with -DSP_TRACK_MEMORY=ON: reads the tracked allocator * counters, which do not exist in a default build. */ #ifdef SP_TRACK_MEMORY -#include "sparse_linalg/tracked_alloc.h" +#include "sparsediff_linalg/tracked_alloc.h" /* No-alloc-in-fill contract: after alloc and one warm-up fill, a second fill * must not touch the tracked allocator at all. Any transient sp_malloc inside