Skip to content

Refactor arithmetic ops to use std::variant + std::visit #723

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

Open
jysh1214 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Refactor arithmetic ops to use std::variant + std::visit #723

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
3,042 changes: 0 additions & 3,042 deletions src/backend/linalg_internal_cpu/Arithmetic_internal.cpp
View file
Open in desktop

This file was deleted.

805 changes: 0 additions & 805 deletions src/backend/linalg_internal_cpu/Arithmetic_internal.hpp
View file
Open in desktop

This file was deleted.

2 changes: 0 additions & 2 deletions src/backend/linalg_internal_cpu/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ target_sources_local(cytnx
Norm_internal.hpp
Add_internal.hpp
iAdd_internal.hpp
Arithmetic_internal.hpp
iArithmetic_internal.hpp
Conj_inplace_internal.hpp
Cpr_internal.hpp
Expand Down Expand Up @@ -46,7 +45,6 @@ target_sources_local(cytnx
memcpyTruncation.hpp

iAdd_internal.cpp
Arithmetic_internal.cpp
iArithmetic_internal.cpp
Conj_inplace_internal.cpp
Diag_internal.cpp
Expand Down
134 changes: 0 additions & 134 deletions src/backend/linalg_internal_interface.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,140 +13,6 @@ namespace cytnx {

linalg_internal_interface::~linalg_internal_interface() {}
linalg_internal_interface::linalg_internal_interface() {
Ari_ii = vector<vector<Arithmeticfunc_oii>>(N_Type, vector<Arithmeticfunc_oii>(N_Type, NULL));

Ari_ii[Type.ComplexDouble][Type.ComplexDouble] = Arithmetic_internal_cdtcd;
Ari_ii[Type.ComplexDouble][Type.ComplexFloat] = Arithmetic_internal_cdtcf;
Ari_ii[Type.ComplexDouble][Type.Double] = Arithmetic_internal_cdtd;
Ari_ii[Type.ComplexDouble][Type.Float] = Arithmetic_internal_cdtf;
Ari_ii[Type.ComplexDouble][Type.Int64] = Arithmetic_internal_cdti64;
Ari_ii[Type.ComplexDouble][Type.Uint64] = Arithmetic_internal_cdtu64;
Ari_ii[Type.ComplexDouble][Type.Int32] = Arithmetic_internal_cdti32;
Ari_ii[Type.ComplexDouble][Type.Uint32] = Arithmetic_internal_cdtu32;
Ari_ii[Type.ComplexDouble][Type.Uint16] = Arithmetic_internal_cdtu16;
Ari_ii[Type.ComplexDouble][Type.Int16] = Arithmetic_internal_cdti16;
Ari_ii[Type.ComplexDouble][Type.Bool] = Arithmetic_internal_cdtb;

Ari_ii[Type.ComplexFloat][Type.ComplexDouble] = Arithmetic_internal_cftcd;
Ari_ii[Type.ComplexFloat][Type.ComplexFloat] = Arithmetic_internal_cftcf;
Ari_ii[Type.ComplexFloat][Type.Double] = Arithmetic_internal_cftd;
Ari_ii[Type.ComplexFloat][Type.Float] = Arithmetic_internal_cftf;
Ari_ii[Type.ComplexFloat][Type.Int64] = Arithmetic_internal_cfti64;
Ari_ii[Type.ComplexFloat][Type.Uint64] = Arithmetic_internal_cftu64;
Ari_ii[Type.ComplexFloat][Type.Int32] = Arithmetic_internal_cfti32;
Ari_ii[Type.ComplexFloat][Type.Uint32] = Arithmetic_internal_cftu32;
Ari_ii[Type.ComplexFloat][Type.Uint16] = Arithmetic_internal_cftu16;
Ari_ii[Type.ComplexFloat][Type.Int16] = Arithmetic_internal_cfti16;
Ari_ii[Type.ComplexFloat][Type.Bool] = Arithmetic_internal_cftb;

Ari_ii[Type.Double][Type.ComplexDouble] = Arithmetic_internal_dtcd;
Ari_ii[Type.Double][Type.ComplexFloat] = Arithmetic_internal_dtcf;
Ari_ii[Type.Double][Type.Double] = Arithmetic_internal_dtd;
Ari_ii[Type.Double][Type.Float] = Arithmetic_internal_dtf;
Ari_ii[Type.Double][Type.Int64] = Arithmetic_internal_dti64;
Ari_ii[Type.Double][Type.Uint64] = Arithmetic_internal_dtu64;
Ari_ii[Type.Double][Type.Int32] = Arithmetic_internal_dti32;
Ari_ii[Type.Double][Type.Uint32] = Arithmetic_internal_dtu32;
Ari_ii[Type.Double][Type.Uint16] = Arithmetic_internal_dtu16;
Ari_ii[Type.Double][Type.Int16] = Arithmetic_internal_dti16;
Ari_ii[Type.Double][Type.Bool] = Arithmetic_internal_dtb;

Ari_ii[Type.Float][Type.ComplexDouble] = Arithmetic_internal_ftcd;
Ari_ii[Type.Float][Type.ComplexFloat] = Arithmetic_internal_ftcf;
Ari_ii[Type.Float][Type.Double] = Arithmetic_internal_ftd;
Ari_ii[Type.Float][Type.Float] = Arithmetic_internal_ftf;
Ari_ii[Type.Float][Type.Int64] = Arithmetic_internal_fti64;
Ari_ii[Type.Float][Type.Uint64] = Arithmetic_internal_ftu64;
Ari_ii[Type.Float][Type.Int32] = Arithmetic_internal_fti32;
Ari_ii[Type.Float][Type.Uint32] = Arithmetic_internal_ftu32;
Ari_ii[Type.Float][Type.Uint16] = Arithmetic_internal_ftu16;
Ari_ii[Type.Float][Type.Int16] = Arithmetic_internal_fti16;
Ari_ii[Type.Float][Type.Bool] = Arithmetic_internal_ftb;

Ari_ii[Type.Int64][Type.ComplexDouble] = Arithmetic_internal_i64tcd;
Ari_ii[Type.Int64][Type.ComplexFloat] = Arithmetic_internal_i64tcf;
Ari_ii[Type.Int64][Type.Double] = Arithmetic_internal_i64td;
Ari_ii[Type.Int64][Type.Float] = Arithmetic_internal_i64tf;
Ari_ii[Type.Int64][Type.Int64] = Arithmetic_internal_i64ti64;
Ari_ii[Type.Int64][Type.Uint64] = Arithmetic_internal_i64tu64;
Ari_ii[Type.Int64][Type.Int32] = Arithmetic_internal_i64ti32;
Ari_ii[Type.Int64][Type.Uint32] = Arithmetic_internal_i64tu32;
Ari_ii[Type.Int64][Type.Uint16] = Arithmetic_internal_i64tu16;
Ari_ii[Type.Int64][Type.Int16] = Arithmetic_internal_i64ti16;
Ari_ii[Type.Int64][Type.Bool] = Arithmetic_internal_i64tb;

Ari_ii[Type.Uint64][Type.ComplexDouble] = Arithmetic_internal_u64tcd;
Ari_ii[Type.Uint64][Type.ComplexFloat] = Arithmetic_internal_u64tcf;
Ari_ii[Type.Uint64][Type.Double] = Arithmetic_internal_u64td;
Ari_ii[Type.Uint64][Type.Float] = Arithmetic_internal_u64tf;
Ari_ii[Type.Uint64][Type.Int64] = Arithmetic_internal_u64ti64;
Ari_ii[Type.Uint64][Type.Uint64] = Arithmetic_internal_u64tu64;
Ari_ii[Type.Uint64][Type.Int32] = Arithmetic_internal_u64ti32;
Ari_ii[Type.Uint64][Type.Uint32] = Arithmetic_internal_u64tu32;
Ari_ii[Type.Uint64][Type.Uint16] = Arithmetic_internal_u64tu16;
Ari_ii[Type.Uint64][Type.Int16] = Arithmetic_internal_u64ti16;
Ari_ii[Type.Uint64][Type.Bool] = Arithmetic_internal_u64tb;

Ari_ii[Type.Int32][Type.ComplexDouble] = Arithmetic_internal_i32tcd;
Ari_ii[Type.Int32][Type.ComplexFloat] = Arithmetic_internal_i32tcf;
Ari_ii[Type.Int32][Type.Double] = Arithmetic_internal_i32td;
Ari_ii[Type.Int32][Type.Float] = Arithmetic_internal_i32tf;
Ari_ii[Type.Int32][Type.Int64] = Arithmetic_internal_i32ti64;
Ari_ii[Type.Int32][Type.Uint64] = Arithmetic_internal_i32tu64;
Ari_ii[Type.Int32][Type.Int32] = Arithmetic_internal_i32ti32;
Ari_ii[Type.Int32][Type.Uint32] = Arithmetic_internal_i32tu32;
Ari_ii[Type.Int32][Type.Uint16] = Arithmetic_internal_i32tu16;
Ari_ii[Type.Int32][Type.Int16] = Arithmetic_internal_i32ti16;
Ari_ii[Type.Int32][Type.Bool] = Arithmetic_internal_i32tb;

Ari_ii[Type.Uint32][Type.ComplexDouble] = Arithmetic_internal_u32tcd;
Ari_ii[Type.Uint32][Type.ComplexFloat] = Arithmetic_internal_u32tcf;
Ari_ii[Type.Uint32][Type.Double] = Arithmetic_internal_u32td;
Ari_ii[Type.Uint32][Type.Float] = Arithmetic_internal_u32tf;
Ari_ii[Type.Uint32][Type.Int64] = Arithmetic_internal_u32ti64;
Ari_ii[Type.Uint32][Type.Uint64] = Arithmetic_internal_u32tu64;
Ari_ii[Type.Uint32][Type.Int32] = Arithmetic_internal_u32ti32;
Ari_ii[Type.Uint32][Type.Uint32] = Arithmetic_internal_u32tu32;
Ari_ii[Type.Uint32][Type.Uint16] = Arithmetic_internal_u32tu16;
Ari_ii[Type.Uint32][Type.Int16] = Arithmetic_internal_u32ti16;
Ari_ii[Type.Uint32][Type.Bool] = Arithmetic_internal_u32tb;

Ari_ii[Type.Int16][Type.ComplexDouble] = Arithmetic_internal_i16tcd;
Ari_ii[Type.Int16][Type.ComplexFloat] = Arithmetic_internal_i16tcf;
Ari_ii[Type.Int16][Type.Double] = Arithmetic_internal_i16td;
Ari_ii[Type.Int16][Type.Float] = Arithmetic_internal_i16tf;
Ari_ii[Type.Int16][Type.Int64] = Arithmetic_internal_i16ti64;
Ari_ii[Type.Int16][Type.Uint64] = Arithmetic_internal_i16tu64;
Ari_ii[Type.Int16][Type.Int32] = Arithmetic_internal_i16ti32;
Ari_ii[Type.Int16][Type.Uint32] = Arithmetic_internal_i16tu32;
Ari_ii[Type.Int16][Type.Uint16] = Arithmetic_internal_i16tu16;
Ari_ii[Type.Int16][Type.Int16] = Arithmetic_internal_i16ti16;
Ari_ii[Type.Int16][Type.Bool] = Arithmetic_internal_i16tb;

Ari_ii[Type.Uint16][Type.ComplexDouble] = Arithmetic_internal_u16tcd;
Ari_ii[Type.Uint16][Type.ComplexFloat] = Arithmetic_internal_u16tcf;
Ari_ii[Type.Uint16][Type.Double] = Arithmetic_internal_u16td;
Ari_ii[Type.Uint16][Type.Float] = Arithmetic_internal_u16tf;
Ari_ii[Type.Uint16][Type.Int64] = Arithmetic_internal_u16ti64;
Ari_ii[Type.Uint16][Type.Uint64] = Arithmetic_internal_u16tu64;
Ari_ii[Type.Uint16][Type.Int32] = Arithmetic_internal_u16ti32;
Ari_ii[Type.Uint16][Type.Uint32] = Arithmetic_internal_u16tu32;
Ari_ii[Type.Uint16][Type.Uint16] = Arithmetic_internal_u16tu16;
Ari_ii[Type.Uint16][Type.Int16] = Arithmetic_internal_u16ti16;
Ari_ii[Type.Uint16][Type.Bool] = Arithmetic_internal_u16tb;

Ari_ii[Type.Bool][Type.ComplexDouble] = Arithmetic_internal_btcd;
Ari_ii[Type.Bool][Type.ComplexFloat] = Arithmetic_internal_btcf;
Ari_ii[Type.Bool][Type.Double] = Arithmetic_internal_btd;
Ari_ii[Type.Bool][Type.Float] = Arithmetic_internal_btf;
Ari_ii[Type.Bool][Type.Int64] = Arithmetic_internal_bti64;
Ari_ii[Type.Bool][Type.Uint64] = Arithmetic_internal_btu64;
Ari_ii[Type.Bool][Type.Int32] = Arithmetic_internal_bti32;
Ari_ii[Type.Bool][Type.Uint32] = Arithmetic_internal_btu32;
Ari_ii[Type.Bool][Type.Uint16] = Arithmetic_internal_btu16;
Ari_ii[Type.Bool][Type.Int16] = Arithmetic_internal_bti16;
Ari_ii[Type.Bool][Type.Bool] = Arithmetic_internal_btb;

iAri_ii =
vector<vector<Arithmeticfunc_oii>>(N_Type, vector<Arithmeticfunc_oii>(N_Type, NULL));

Expand Down
8 changes: 6 additions & 2 deletions src/backend/linalg_internal_interface.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,13 @@
#include "backend/Scalar.hpp"
#include "backend/Storage.hpp"
#include "linalg_internal_cpu/Abs_internal.hpp"
#include "linalg_internal_cpu/Arithmetic_internal.hpp"
#include "linalg_internal_cpu/Add_internal.hpp"
#include "linalg_internal_cpu/Axpy_internal.hpp"
#include "linalg_internal_cpu/Conj_inplace_internal.hpp"
#include "linalg_internal_cpu/Cpr_internal.hpp"
#include "linalg_internal_cpu/Det_internal.hpp"
#include "linalg_internal_cpu/Diag_internal.hpp"
#include "linalg_internal_cpu/Div_internal.hpp"
#include "linalg_internal_cpu/Eig_internal.hpp"
#include "linalg_internal_cpu/Eigh_internal.hpp"
#include "linalg_internal_cpu/Exp_internal.hpp"
Expand All @@ -27,11 +29,14 @@
#include "linalg_internal_cpu/Matmul_internal.hpp"
#include "linalg_internal_cpu/Matvec_internal.hpp"
#include "linalg_internal_cpu/MaxMin_internal.hpp"
#include "linalg_internal_cpu/Mod_internal.hpp"
#include "linalg_internal_cpu/Mul_internal.hpp"
#include "linalg_internal_cpu/Norm_internal.hpp"
#include "linalg_internal_cpu/Outer_internal.hpp"
#include "linalg_internal_cpu/Pow_internal.hpp"
#include "linalg_internal_cpu/QR_internal.hpp"
#include "linalg_internal_cpu/Sdd_internal.hpp"
#include "linalg_internal_cpu/Sub_internal.hpp"
#include "linalg_internal_cpu/Sum_internal.hpp"
#include "linalg_internal_cpu/Trace_internal.hpp"
#include "linalg_internal_cpu/Tridiag_internal.hpp"
Expand Down Expand Up @@ -212,7 +217,6 @@ namespace cytnx {
#endif
class linalg_internal_interface {
public:
std::vector<std::vector<Arithmeticfunc_oii>> Ari_ii;
std::vector<std::vector<Arithmeticfunc_oii>> iAri_ii;
std::vector<Svdfunc_oii> Sdd_ii;
std::vector<Svdfunc_oii> Gesvd_ii;
Expand Down
Loading
Loading