From 13bf84c3c07775a255f16826e36bf5db66d7a363 Mon Sep 17 00:00:00 2001 From: Dorival Pedroso Date: Wed, 20 Sep 2023 12:01:42 +1000 Subject: [PATCH] Rename solve matrix market tool --- .vscode/launch.json | 12 +++--- russell_sparse/README.md | 8 ++-- .../solve-matrix-market-umfpack-bfwb62.json | 42 +++++++++++++++++++ ..._build.rs => solve_matrix_market_build.rs} | 0 russell_sparse/zscripts/memcheck.bash | 4 +- .../zscripts/run-solve-matrix-markert.bash | 2 +- 6 files changed, 55 insertions(+), 13 deletions(-) create mode 100644 russell_sparse/data/results/solve-matrix-market-umfpack-bfwb62.json rename russell_sparse/src/bin/{solve_mm_build.rs => solve_matrix_market_build.rs} (100%) diff --git a/.vscode/launch.json b/.vscode/launch.json index fb7b4828..4c36f330 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -159,15 +159,15 @@ { "type": "lldb", "request": "launch", - "name": "Debug executable 'solve_mm_build'", + "name": "Debug executable 'solve_matrix_market_build'", "cargo": { "args": [ "build", - "--bin=solve_mm_build", + "--bin=solve_matrix_market_build", "--package=russell_sparse" ], "filter": { - "name": "solve_mm_build", + "name": "solve_matrix_market_build", "kind": "bin" } }, @@ -177,16 +177,16 @@ { "type": "lldb", "request": "launch", - "name": "Debug unit tests in executable 'solve_mm_build'", + "name": "Debug unit tests in executable 'solve_matrix_market_build'", "cargo": { "args": [ "test", "--no-run", - "--bin=solve_mm_build", + "--bin=solve_matrix_market_build", "--package=russell_sparse" ], "filter": { - "name": "solve_mm_build", + "name": "solve_matrix_market_build", "kind": "bin" } }, diff --git a/russell_sparse/README.md b/russell_sparse/README.md index 44d575d7..976896b5 100644 --- a/russell_sparse/README.md +++ b/russell_sparse/README.md @@ -123,9 +123,9 @@ We wrap two direct sparse solvers: UMFPACK (aka **UMF**) and MUMPS (aka **MMP**) ## Tools -This crate includes a tool named `solve_mm_build` to study the performance of the available sparse solvers (currently MMP and UMF). The `_build` suffix is to disable the coverage tool. +This crate includes a tool named `solve_matrix_market_build` to study the performance of the available sparse solvers (currently MMP and UMF). The `_build` suffix is to disable the coverage tool. -`solve_mm_build` reads a [Matrix Market file](https://math.nist.gov/MatrixMarket/formats.html) and solves the linear system: +`solve_matrix_market_build` reads a [Matrix Market file](https://math.nist.gov/MatrixMarket/formats.html) and solves the linear system: ```text a ⋅ x = rhs @@ -138,13 +138,13 @@ The data directory contains an example of Matrix Market file named `bfwb62.mtx` Run the command: ```bash -cargo run --release --bin solve_mm_build -- ~/Downloads/matrix-market/bfwb62.mtx +cargo run --release --bin solve_matrix_market_build -- ~/Downloads/matrix-market/bfwb62.mtx ``` Or ```bash -cargo run --release --bin solve_mm_build -- --help +cargo run --release --bin solve_matrix_market_build -- --help ``` for more options. diff --git a/russell_sparse/data/results/solve-matrix-market-umfpack-bfwb62.json b/russell_sparse/data/results/solve-matrix-market-umfpack-bfwb62.json new file mode 100644 index 00000000..79335a66 --- /dev/null +++ b/russell_sparse/data/results/solve-matrix-market-umfpack-bfwb62.json @@ -0,0 +1,42 @@ +{ + "platform": "russell", + "blasLib": "OpenBLAS", + "matrixName": "bfwb62", + "read": { + "timeReadNs": 37275, + "timeReadStr": "37.275µs" + }, + "triplet": { + "neq": 62, + "nnz_current": 342, + "nnz_maximum": 404, + + }, + "symmetry": "Some(General)" + "solver": { + "name": "UMF", + "ordering": "Auto", + "scaling": "Auto", + "pctIncWorkspace": 100, + "maxWorkMemory": 0, + "openmpNumThreads": 1 + "usedOrdering": "Amd", + "usedScaling": "Sum", + "doneFactorize": true, + "nrow": 62, + "timeFactNs": 176349, + "timeSolveNs": 7712, + "timeTotalNs": 184061, + "timeFactStr": "176.349µs", + "timeSolveStr": "7.712µs", + "timeTotalStr": "184.061µs" + }, + "verify": { + "maxAbsA": 0.0001, + "maxAbsAx": 1.0000000000000004, + "maxAbsDiff": 4.440892098500626e-16, + "relativeError": 4.4404480536952566e-16, + "timeCheckNs": 1322, + "timeCheckStr": "1.322µs" + } +} diff --git a/russell_sparse/src/bin/solve_mm_build.rs b/russell_sparse/src/bin/solve_matrix_market_build.rs similarity index 100% rename from russell_sparse/src/bin/solve_mm_build.rs rename to russell_sparse/src/bin/solve_matrix_market_build.rs diff --git a/russell_sparse/zscripts/memcheck.bash b/russell_sparse/zscripts/memcheck.bash index f446fc57..dd58b04e 100755 --- a/russell_sparse/zscripts/memcheck.bash +++ b/russell_sparse/zscripts/memcheck.bash @@ -1,5 +1,5 @@ #!/bin/bash cargo valgrind run --bin mem_check_build -cargo valgrind run --bin solve_mm_build -- data/matrix_market/bfwb62.mtx -cargo valgrind run --bin solve_mm_build -- data/matrix_market/bfwb62.mtx --mmp +cargo valgrind run --bin solve_matrix_market_build -- data/matrix_market/bfwb62.mtx +cargo valgrind run --bin solve_matrix_market_build -- data/matrix_market/bfwb62.mtx --mmp diff --git a/russell_sparse/zscripts/run-solve-matrix-markert.bash b/russell_sparse/zscripts/run-solve-matrix-markert.bash index ac6f3187..b4d5e611 100755 --- a/russell_sparse/zscripts/run-solve-matrix-markert.bash +++ b/russell_sparse/zscripts/run-solve-matrix-markert.bash @@ -1,4 +1,4 @@ #!/bin/bash -cargo run --release --bin solve_mm_build -- data/matrix_market/bfwb62.mtx +cargo run --release --bin solve_matrix_market_build -- data/matrix_market/bfwb62.mtx