Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,13 @@ cmake_minimum_required(VERSION 3.25 FATAL_ERROR)

project(linalglib LANGUAGES CXX)

if(MSVC)
# Keep the project and all fetched dependencies on the DLL-based MSVC runtime
# so that targets like yaml-cpp do not end up linked against /MTd while the
# executable is built against /MDd.
set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>DLL")
endif()

set(CMAKE_CXX_STANDARD 17)

option(ENABLE_COVERAGE "Build with code coverage support" OFF)
Expand Down
5 changes: 1 addition & 4 deletions clients/testing/test_arguments.h
Original file line number Diff line number Diff line change
Expand Up @@ -61,10 +61,7 @@ namespace testing
std::string generate_test_name() const
{
std::string name = group;
if(this->backend != backend::CPU)
{
name += "_" + backend_to_string(this->backend);
}
name += "_" + backend_to_string(this->backend);
if(this->uplo != uplo::lower)
{
name += "_" + uplo_to_string(this->uplo);
Expand Down
2 changes: 1 addition & 1 deletion clients/testing/tests/test_symmetric_ruiz_scaling.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ Tests:
"matrices/SPD/nos7/nos7.mtx"]
max_iters: [30]
tol: [1e-6]
backend: [GPU]
backend: [CPU]

small:
matrix_file: ["matrices/SPD/bcsstm02/bcsstm02.mtx",
Expand Down
14 changes: 14 additions & 0 deletions library/include/csr_matrix.h
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,14 @@

#include "vector.h"

#include "linalg_types.h"

// struct csrmv_descr;
// struct csrgemm_descr;
// struct csrsv_descr;
// struct csric0_descr;
// struct csrilu0_descr;

/*! \file
* \brief csr_matrx.h provides class for CSR sparse matrices
*/
Expand Down Expand Up @@ -95,6 +103,12 @@ namespace linalg
/*! \brief Flag indicating if the matrix data is currently on the host (CPU) or device (GPU). */
bool on_host;

csrmv_descr* descr_mv;
csrgemm_descr* descr_gemm;
csrtrsv_descr* descr_sv;
csric0_descr* descr_ic;
csrilu0_descr* descr_ilu;

public:
/*! \brief Default constructor.
* Initializes an empty CSR matrix with zero dimensions and no non-zero elements.
Expand Down
3 changes: 2 additions & 1 deletion library/include/linalg_enums.h
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,8 @@ namespace linalg
default_algorithm, /*!< Default algorithm */
merge_path,
rowsplit,
nnzsplit
nnzsplit,
lrb
};

/*! \brief Enumeration for CSR matrix-matrix addition algorithms.
Expand Down
Loading
Loading