Relintai/pmlpp
1
0
Fork 0
mirror of https://github.com/Relintai/pmlpp.git synced 2024-12-22 15:06:47 +01:00
Code Issues Packages Projects Releases Wiki Activity

Start reworking vector's math api. Alno some notes.

Browse Source
This commit is contained in:
Relintai 2023-04-24 12:24:09 +02:00
parent 5793dc32e3
commit f8f3edf6ef
2 changed files with 68 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

71
mlpp/lin_alg/mlpp_vector.cpp
View File

@ -3,7 +3,33 @@
#include "mlpp_matrix.h" #include "mlpp_matrix.h"
Ref<MLPPVector> MLPPVector::flattenmnv(const Vector<Ref<MLPPVector>> &A) {
void MLPPVector::flatten_vectors(const Vector<Ref<MLPPVector>> &A) {
int vsize = 0;
for (int i = 0; i < A.size(); ++i) {
vsize += A[i]->size();
}
resize(vsize);
int a_index = 0;
real_t *a_ptr = ptrw();
for (int i = 0; i < A.size(); ++i) {
const Ref<MLPPVector> &r = A[i];
int r_size = r->size();
const real_t *r_ptr = r->ptr();
for (int j = 0; j < r_size; ++j) {
a_ptr[a_index] = r_ptr[j];
++a_index;
}
}
}
Ref<MLPPVector> MLPPVector::flatten_vectorsn(const Vector<Ref<MLPPVector>> &A) {
Ref<MLPPVector> a; Ref<MLPPVector> a;
a.instance(); a.instance();
@ -32,44 +58,55 @@ Ref<MLPPVector> MLPPVector::flattenmnv(const Vector<Ref<MLPPVector>> &A) {
return a; return a;
} }
Ref<MLPPVector> MLPPVector::hadamard_productnv(const Ref<MLPPVector> &a, const Ref<MLPPVector> &b) { void MLPPVector::hadamard_product(const Ref<MLPPVector> &b) {
ERR_FAIL_COND_V(!a.is_valid() || !b.is_valid(), Ref<MLPPVector>()); ERR_FAIL_COND(!b.is_valid());
ERR_FAIL_COND(_size != b->size());
const real_t *a_ptr = ptr();
const real_t *b_ptr = b->ptr();
real_t *out_ptr = ptrw();
for (int i = 0; i < _size; ++i) {
out_ptr[i] = a_ptr[i] * b_ptr[i];
}
}
Ref<MLPPVector> MLPPVector::hadamard_productn(const Ref<MLPPVector> &b) {
ERR_FAIL_COND_V(!b.is_valid(), Ref<MLPPVector>());
Ref<MLPPVector> out; Ref<MLPPVector> out;
out.instance(); out.instance();
int size = a->size(); ERR_FAIL_COND_V(_size != b->size(), Ref<MLPPVector>());
ERR_FAIL_COND_V(size != b->size(), Ref<MLPPVector>()); out->resize(_size);
out->resize(size); const real_t *a_ptr = ptr();
const real_t *a_ptr = a->ptr();
const real_t *b_ptr = b->ptr(); const real_t *b_ptr = b->ptr();
real_t *out_ptr = out->ptrw(); real_t *out_ptr = out->ptrw();
for (int i = 0; i < size; ++i) { for (int i = 0; i < _size; ++i) {
out_ptr[i] = a_ptr[i] * b_ptr[i]; out_ptr[i] = a_ptr[i] * b_ptr[i];
} }
return out; return out;
} }
void MLPPVector::hadamard_productv(const Ref<MLPPVector> &a, const Ref<MLPPVector> &b, Ref<MLPPVector> out) { void MLPPVector::hadamard_productb(const Ref<MLPPVector> &a, const Ref<MLPPVector> &b) {
ERR_FAIL_COND(!a.is_valid() || !b.is_valid() || !out.is_valid()); ERR_FAIL_COND(!a.is_valid() || !b.is_valid());
int size = a->size(); int s = a->size();
ERR_FAIL_COND(size != b->size()); ERR_FAIL_COND(s != b->size());
if (unlikely(out->size() != size)) { if (unlikely(size() != s)) {
out->resize(size); resize(s);
} }
const real_t *a_ptr = a->ptr(); const real_t *a_ptr = a->ptr();
const real_t *b_ptr = b->ptr(); const real_t *b_ptr = b->ptr();
real_t *out_ptr = out->ptrw(); real_t *out_ptr = ptrw();
for (int i = 0; i < size; ++i) { for (int i = 0; i < s; ++i) {
out_ptr[i] = a_ptr[i] * b_ptr[i]; out_ptr[i] = a_ptr[i] * b_ptr[i];
} }
} }

20
mlpp/lin_alg/mlpp_vector.h
View File

@ -330,14 +330,22 @@ public:
} }
// New apis should look like this: // New apis should look like this:
//Ref<MLPPVector> substract(const Ref<MLPPVector> &b); //void substract(const Ref<MLPPVector> &b); <- this should be the simplest / most obvious method
//void substracted(const Ref<MLPPVector> &b); //Ref<MLPPVector> substractn(const Ref<MLPPVector> &b);
//void subtraction(const Ref<MLPPVector> &a, const Ref<MLPPVector> &b); -> result is in this (subtractionv like) //void substractb(const Ref<MLPPVector> &a, const Ref<MLPPVector> &b); -> result is in this (subtractionv like)
Ref<MLPPVector> flattenmnv(const Vector<Ref<MLPPVector>> &A); // Or:
//void hadamard_product(const Ref<MLPPVector> &b); <- this should be the simplest / most obvious method
//Ref<MLPPVector> hadamard_productn(const Ref<MLPPVector> &b); <- n -> new
//void hadamard_productb(const Ref<MLPPVector> &a, const Ref<MLPPVector> &b); <- b -> between, result is stored in *this
Ref<MLPPVector> hadamard_productnv(const Ref<MLPPVector> &a, const Ref<MLPPVector> &b);
void hadamard_productv(const Ref<MLPPVector> &a, const Ref<MLPPVector> &b, Ref<MLPPVector> out); void flatten_vectors(const Vector<Ref<MLPPVector>> &A);
Ref<MLPPVector> flatten_vectorsn(const Vector<Ref<MLPPVector>> &A);
void hadamard_product(const Ref<MLPPVector> &b);
Ref<MLPPVector> hadamard_productn(const Ref<MLPPVector> &b);
void hadamard_productb(const Ref<MLPPVector> &a, const Ref<MLPPVector> &b);
Ref<MLPPVector> element_wise_divisionnv(const Ref<MLPPVector> &a, const Ref<MLPPVector> &b); Ref<MLPPVector> element_wise_divisionnv(const Ref<MLPPVector> &a, const Ref<MLPPVector> &b);