Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove support for ellsort format #724

Merged
merged 1 commit into from
Aug 11, 2023
Merged

Remove support for ellsort format #724

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 0 additions & 1 deletion src/C-interface/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,6 @@ endif()
add_subdirectory(dense)
add_subdirectory(ellpack)
add_subdirectory(ellblock)
add_subdirectory(ellsort)
add_subdirectory(csr)
if(BML_MPI)
add_subdirectory(distributed2d)
Expand Down
1 change: 0 additions & 1 deletion src/C-interface/bml.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
* - ellpack (sparse)
* - csr (sparse)
* - ellblock (sparse)
* - ellsort (sparse)
*
* \section usage_examples Usage Examples
*
Expand Down
13 changes: 0 additions & 13 deletions src/C-interface/bml_add.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
#include "bml_logger.h"
#include "dense/bml_add_dense.h"
#include "ellpack/bml_add_ellpack.h"
#include "ellsort/bml_add_ellsort.h"
#include "ellblock/bml_add_ellblock.h"
#include "csr/bml_add_csr.h"
#ifdef BML_USE_MPI
Expand Down Expand Up @@ -40,9 +39,6 @@ bml_add(
case ellpack:
bml_add_ellpack(A, B, alpha, beta, threshold);
break;
case ellsort:
bml_add_ellsort(A, B, alpha, beta, threshold);
break;
case ellblock:
bml_add_ellblock(A, B, alpha, beta, threshold);
break;
Expand Down Expand Up @@ -93,9 +89,6 @@ bml_add_norm(
case ellblock:
return bml_add_norm_ellblock(A, B, alpha, beta, threshold);
break;
case ellsort:
return bml_add_norm_ellsort(A, B, alpha, beta, threshold);
break;
case csr:
return bml_add_norm_csr(A, B, alpha, beta, threshold);
break;
Expand Down Expand Up @@ -138,9 +131,6 @@ bml_add_identity(
case ellblock:
bml_add_identity_ellblock(A, beta, threshold);
break;
case ellsort:
bml_add_identity_ellsort(A, beta, threshold);
break;
case csr:
bml_add_identity_csr(A, beta, threshold);
break;
Expand Down Expand Up @@ -184,9 +174,6 @@ bml_scale_add_identity(
case ellblock:
bml_scale_add_identity_ellblock(A, alpha, beta, threshold);
break;
case ellsort:
bml_scale_add_identity_ellsort(A, alpha, beta, threshold);
break;
case csr:
bml_scale_add_identity_csr(A, alpha, beta, threshold);
break;
Expand Down
32 changes: 0 additions & 32 deletions src/C-interface/bml_allocate.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
#include "dense/bml_allocate_dense.h"
#include "ellpack/bml_allocate_ellpack.h"
#include "ellblock/bml_allocate_ellblock.h"
#include "ellsort/bml_allocate_ellsort.h"
#include "csr/bml_allocate_csr.h"
#ifdef BML_USE_MPI
#include "distributed2d/bml_allocate_distributed2d.h"
Expand Down Expand Up @@ -181,9 +180,6 @@ bml_deallocate(
case ellpack:
bml_deallocate_ellpack(*A);
break;
case ellsort:
bml_deallocate_ellsort(*A);
break;
case ellblock:
bml_deallocate_ellblock(*A);
break;
Expand Down Expand Up @@ -239,9 +235,6 @@ bml_clear(
case ellpack:
bml_clear_ellpack(A);
break;
case ellsort:
bml_clear_ellsort(A);
break;
case ellblock:
bml_clear_ellblock(A);
break;
Expand Down Expand Up @@ -299,11 +292,6 @@ bml_noinit_rectangular_matrix(
matrix_dimension,
distrib_mode);
break;
case ellsort:
return bml_noinit_matrix_ellsort(matrix_precision,
matrix_dimension,
distrib_mode);
break;
case ellblock:
return bml_noinit_matrix_ellblock(matrix_precision,
matrix_dimension,
Expand Down Expand Up @@ -427,10 +415,6 @@ bml_zero_matrix(
return bml_zero_matrix_ellpack(matrix_precision, N, M,
distrib_mode);
break;
case ellsort:
return bml_zero_matrix_ellsort(matrix_precision, N, M,
distrib_mode);
break;
case ellblock:
return bml_zero_matrix_ellblock(matrix_precision, N, M,
distrib_mode);
Expand Down Expand Up @@ -485,10 +469,6 @@ bml_random_matrix(
return bml_random_matrix_ellpack(matrix_precision, N, M,
distrib_mode);
break;
case ellsort:
return bml_random_matrix_ellsort(matrix_precision, N, M,
distrib_mode);
break;
case ellblock:
return bml_random_matrix_ellblock(matrix_precision, N, M,
distrib_mode);
Expand Down Expand Up @@ -537,10 +517,6 @@ bml_banded_matrix(
return bml_banded_matrix_ellpack(matrix_precision, N, M,
distrib_mode);
break;
case ellsort:
return bml_banded_matrix_ellsort(matrix_precision, N, M,
distrib_mode);
break;
case ellblock:
return bml_banded_matrix_ellblock(matrix_precision, N, M,
distrib_mode);
Expand Down Expand Up @@ -595,10 +571,6 @@ bml_identity_matrix(
return bml_identity_matrix_ellpack(matrix_precision, N, M,
distrib_mode);
break;
case ellsort:
return bml_identity_matrix_ellsort(matrix_precision, N, M,
distrib_mode);
break;
case ellblock:
return bml_identity_matrix_ellblock(matrix_precision, N, M,
distrib_mode);
Expand Down Expand Up @@ -759,10 +731,6 @@ bml_update_domain(
bml_update_domain_ellpack(A, localPartMin, localPartMax,
nnodesInPart);
break;
case ellsort:
bml_update_domain_ellsort(A, localPartMin, localPartMax,
nnodesInPart);
break;
default:
LOG_ERROR("unknown matrix type (%d)\n", bml_get_type(A));
break;
Expand Down
5 changes: 0 additions & 5 deletions src/C-interface/bml_convert.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
#include "bml_logger.h"
#include "dense/bml_convert_dense.h"
#include "ellpack/bml_convert_ellpack.h"
#include "ellsort/bml_convert_ellsort.h"
#include "ellblock/bml_convert_ellblock.h"
#include "csr/bml_convert_csr.h"
#ifdef BML_USE_MPI
Expand Down Expand Up @@ -40,10 +39,6 @@ bml_convert(
return bml_convert_ellpack(A, matrix_precision, M,
distrib_mode);
break;
case ellsort:
return bml_convert_ellsort(A, matrix_precision, M,
distrib_mode);
break;
case ellblock:
return bml_convert_ellblock(A, matrix_precision, M,
distrib_mode);
Expand Down
16 changes: 0 additions & 16 deletions src/C-interface/bml_copy.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
#include "bml_logger.h"
#include "dense/bml_copy_dense.h"
#include "ellpack/bml_copy_ellpack.h"
#include "ellsort/bml_copy_ellsort.h"
#include "ellblock/bml_copy_ellblock.h"
#include "csr/bml_copy_csr.h"
#ifdef BML_USE_MPI
Expand Down Expand Up @@ -38,9 +37,6 @@ bml_copy_new(
case ellpack:
B = bml_copy_ellpack_new(A);
break;
case ellsort:
B = bml_copy_ellsort_new(A);
break;
case ellblock:
B = bml_copy_ellblock_new(A);
break;
Expand Down Expand Up @@ -97,9 +93,6 @@ bml_copy(
case ellpack:
bml_copy_ellpack(A, B);
break;
case ellsort:
bml_copy_ellsort(A, B);
break;
case ellblock:
bml_copy_ellblock(A, B);
break;
Expand Down Expand Up @@ -137,9 +130,6 @@ bml_reorder(
case ellpack:
bml_reorder_ellpack(A, perm);
break;
case ellsort:
bml_reorder_ellsort(A, perm);
break;
case ellblock:
bml_reorder_ellblock(A, perm);
break;
Expand Down Expand Up @@ -188,9 +178,6 @@ bml_save_domain(
case ellpack:
bml_save_domain_ellpack(A);
break;
case ellsort:
bml_save_domain_ellsort(A);
break;
case csr:
bml_save_domain_csr(A);
break;
Expand All @@ -216,9 +203,6 @@ bml_restore_domain(
case ellpack:
bml_restore_domain_ellpack(A);
break;
case ellsort:
bml_restore_domain_ellsort(A);
break;
case csr:
bml_restore_domain_csr(A);
break;
Expand Down
3 changes: 0 additions & 3 deletions src/C-interface/bml_diagonalize.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,6 @@ bml_diagonalize(
case ellpack:
bml_diagonalize_ellpack(A, eigenvalues, eigenvectors);
break;
case ellsort:
LOG_ERROR("diagonalize routine is not implemented for ellsort\n");
break;
case ellblock:
bml_diagonalize_ellblock(A, eigenvalues, eigenvectors);
break;
Expand Down
4 changes: 0 additions & 4 deletions src/C-interface/bml_element_multiply.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
#include "bml_logger.h"
#include "dense/bml_element_multiply_dense.h"
#include "ellpack/bml_element_multiply_ellpack.h"
#include "ellsort/bml_element_multiply_ellsort.h"
#include "csr/bml_element_multiply_csr.h"
#ifdef BML_USE_MPI
#include "distributed2d/bml_multiply_distributed2d.h"
Expand Down Expand Up @@ -37,9 +36,6 @@ bml_element_multiply_AB(
case ellpack:
bml_element_multiply_AB_ellpack(A, B, C, threshold);
break;
case ellsort:
bml_element_multiply_AB_ellsort(A, B, C, threshold);
break;
case csr:
bml_element_multiply_AB_csr(A, B, C, threshold);
break;
Expand Down
13 changes: 0 additions & 13 deletions src/C-interface/bml_elemental.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
#include "bml_logger.h"
#include "dense/bml_elemental_dense.h"
#include "ellpack/bml_elemental_ellpack.h"
#include "ellsort/bml_elemental_ellsort.h"

#ifdef BML_COMPLEX
#include <complex.h>
Expand All @@ -30,9 +29,6 @@ bml_get_element_single_real(
case ellpack:
return bml_get_element_ellpack_single_real(A, i, j);
break;
case ellsort:
return bml_get_element_ellsort_single_real(A, i, j);
break;
default:
LOG_ERROR("unknown matrix type\n");
break;
Expand Down Expand Up @@ -61,9 +57,6 @@ bml_get_element_double_real(
case ellpack:
return bml_get_element_ellpack_double_real(A, i, j);
break;
case ellsort:
return bml_get_element_ellsort_double_real(A, i, j);
break;
default:
LOG_ERROR("unknown matrix type\n");
break;
Expand Down Expand Up @@ -93,9 +86,6 @@ bml_get_element_single_complex(
case ellpack:
return bml_get_element_ellpack_single_complex(A, i, j);
break;
case ellsort:
return bml_get_element_ellsort_single_complex(A, i, j);
break;
default:
LOG_ERROR("unknown matrix type\n");
break;
Expand Down Expand Up @@ -124,9 +114,6 @@ bml_get_element_double_complex(
case ellpack:
return bml_get_element_ellpack_double_complex(A, i, j);
break;
case ellsort:
return bml_get_element_ellsort_double_complex(A, i, j);
break;

default:
LOG_ERROR("unknown matrix type\n");
Expand Down
3 changes: 0 additions & 3 deletions src/C-interface/bml_export.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
#include "bml_logger.h"
#include "dense/bml_export_dense.h"
#include "ellpack/bml_export_ellpack.h"
#include "ellsort/bml_export_ellsort.h"
#include "ellblock/bml_export_ellblock.h"
#include "csr/bml_export_csr.h"
#ifdef BML_USE_MPI
Expand Down Expand Up @@ -45,8 +44,6 @@ bml_export_to_dense(
return bml_export_to_dense_dense(A, order);
case ellpack:
return bml_export_to_dense_ellpack(A, order);
case ellsort:
return bml_export_to_dense_ellsort(A, order);
case ellblock:
return bml_export_to_dense_ellblock(A, order);
case csr:
Expand Down
10 changes: 0 additions & 10 deletions src/C-interface/bml_getters.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
#include "bml_getters.h"
#include "dense/bml_getters_dense.h"
#include "ellpack/bml_getters_ellpack.h"
#include "ellsort/bml_getters_ellsort.h"
#include "ellblock/bml_getters_ellblock.h"
#include "csr/bml_getters_csr.h"
#ifdef BML_USE_MPI
Expand Down Expand Up @@ -33,9 +32,6 @@ bml_get_element(
case ellpack:
return bml_get_element_ellpack(A, i, j);
break;
case ellsort:
return bml_get_element_ellsort(A, i, j);
break;
case ellblock:
return bml_get_element_ellblock(A, i, j);
break;
Expand Down Expand Up @@ -68,9 +64,6 @@ bml_get_row(
case ellpack:
return bml_get_row_ellpack(A, i);
break;
case ellsort:
return bml_get_row_ellsort(A, i);
break;
case ellblock:
return bml_get_row_ellblock(A, i);
break;
Expand Down Expand Up @@ -106,9 +99,6 @@ bml_get_diagonal(
case ellpack:
return bml_get_diagonal_ellpack(A);
break;
case ellsort:
return bml_get_diagonal_ellsort(A);
break;
case ellblock:
return bml_get_diagonal_ellblock(A);
break;
Expand Down
5 changes: 0 additions & 5 deletions src/C-interface/bml_import.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
#include "bml_logger.h"
#include "dense/bml_import_dense.h"
#include "ellpack/bml_import_ellpack.h"
#include "ellsort/bml_import_ellsort.h"
#include "ellblock/bml_import_ellblock.h"
#include "csr/bml_import_csr.h"
#ifdef BML_USE_MPI
Expand Down Expand Up @@ -54,10 +53,6 @@ bml_import_from_dense(
return bml_import_from_dense_ellpack(matrix_precision, order,
N, A, threshold, M,
distrib_mode);
case ellsort:
return bml_import_from_dense_ellsort(matrix_precision, order,
N, A, threshold, M,
distrib_mode);
case ellblock:
return bml_import_from_dense_ellblock(matrix_precision, order,
N, A, threshold, M,
Expand Down
Loading