Fittet new functions to everying in neural networks. Still need to optimise for uint64_t vs int64_t and vec vs mat in some places.

This commit is contained in:
2026-05-16 20:37:05 +02:00
parent 412a854c65
commit d2fe8aa65c
50 changed files with 489 additions and 1482 deletions
+2 -2
View File
@@ -3,8 +3,8 @@
#include <cstdint> //uint64_t
#include <cmath> // std::abs
#include "../utils/vector.h"
#include "../utils/matrix.h"
#include "utils/vector.h"
#include "utils/matrix.h"
namespace numerics::detail{
+2 -2
View File
@@ -3,8 +3,8 @@
#include <cstdint> //uint64_t
#include <stdexcept> // std::runtime_error
#include "../utils/vector.h"
#include "../utils/matrix.h"
#include "utils/vector.h"
#include "utils/matrix.h"
namespace numerics::detail{
+2 -2
View File
@@ -3,8 +3,8 @@
#include <cstdint> //uint64_t
//#include <stdexcept> // std::runtime_error
#include "../utils/vector.h"
#include "../utils/matrix.h"
#include "utils/vector.h"
#include "utils/matrix.h"
namespace numerics::detail{
+2 -2
View File
@@ -3,8 +3,8 @@
#include <cstdint> //uint64_t
//#include <stdexcept> // std::runtime_error
#include "../utils/vector.h"
#include "../utils/matrix.h"
#include "utils/vector.h"
#include "utils/matrix.h"
namespace numerics::detail{
+2 -2
View File
@@ -3,8 +3,8 @@
#include <cstdint> //uint64_t
#include <stdexcept> // std::runtime_error
#include "../utils/vector.h"
#include "../utils/matrix.h"
#include "utils/vector.h"
#include "utils/matrix.h"
namespace numerics::detail{
+2 -2
View File
@@ -3,8 +3,8 @@
#include <cstdint> //uint64_t
#include <stdexcept> // std::runtime_error
#include "../utils/vector.h"
#include "../utils/matrix.h"
#include "utils/vector.h"
#include "utils/matrix.h"
namespace numerics::detail{
+2 -2
View File
@@ -3,8 +3,8 @@
#include <cstdint> //uint64_t
#include <stdexcept> // std::runtime_error
#include "../utils/vector.h"
#include "../utils/matrix.h"
#include "utils/vector.h"
#include "utils/matrix.h"
namespace numerics::detail{
+46 -4
View File
@@ -3,14 +3,14 @@
#include <cstdint> //uint64_t
//#include <stdexcept> // std::runtime_error
#include "../utils/vector.h"
#include "../utils/matrix.h"
#include "utils/vector.h"
#include "utils/matrix.h"
namespace numerics::detail{
// ---------------- Matrix ----------------
template <typename T>
inline bool equal_serial(const utils::Matrix<T>& A, const utils::Matrix<T> & B) {
inline bool equal_all_serial(const utils::Matrix<T>& A, const utils::Matrix<T> & B) {
const uint64_t rows = A.rows();
const uint64_t cols = A.cols();
@@ -30,7 +30,7 @@ namespace numerics::detail{
// ---------------- Vector ----------------
template <typename T>
inline bool equal_serial(const utils::Vector<T>& v, const utils::Vector<T>& p) {
inline bool equal_all_serial(const utils::Vector<T>& v, const utils::Vector<T>& p) {
const uint64_t N = v.size();
if (N != p.size()){
return false;
@@ -43,5 +43,47 @@ namespace numerics::detail{
return true;
}
// ---------------- Matrix ----------------
template <typename T>
inline utils::Matrix<T> equal_elementwise_serial(const utils::Matrix<T>& A, const utils::Matrix<T> & B) {
const uint64_t rows = A.rows();
const uint64_t cols = A.cols();
if ((rows != B.rows()) || (cols != B.cols())){
throw std::runtime_error("equal_elementwise_serial: Dimention misfit");
}
utils::Matrix<T> C(rows, cols, T{0});
for (uint64_t i = 0; i < rows; ++i){
for (uint64_t j = 0; j < cols; ++j){
if (A(i,j) == B(i,j)){
C(i,j) = T{1};
}
}
}
return C;
}
// ---------------- Vector ----------------
template <typename T>
inline utils::Vector<T> equal_elementwise_serial(const utils::Vector<T>& v, const utils::Vector<T>& p) {
const uint64_t N = v.size();
if (N != p.size()){
throw std::runtime_error("equal_elementwise_serial: Dimention misfit");
}
utils::Vector<T> y(N, T{0});
for (uint64_t i = 0; i < N; ++i){
if ((v[i] == p[i])){
y[i] = T{1};
}
}
return y;
}
} // namespace numerics
+2 -2
View File
@@ -3,8 +3,8 @@
#include <cstdint> //uint64_t
#include <cmath> // std::exp
#include "../utils/vector.h"
#include "../utils/matrix.h"
#include "utils/vector.h"
#include "utils/matrix.h"
namespace numerics::detail{
+2 -2
View File
@@ -3,8 +3,8 @@
#include <cstdint> //uint64_t
//#include <stdexcept> // std::runtime_error
#include "../utils/vector.h"
#include "../utils/matrix.h"
#include "utils/vector.h"
#include "utils/matrix.h"
#include <cmath> // std::abs
+2 -2
View File
@@ -3,8 +3,8 @@
#include <cstdint> //uint64_t
#include <cmath> // std::log
#include "../utils/vector.h"
#include "../utils/matrix.h"
#include "utils/vector.h"
#include "utils/matrix.h"
namespace numerics::detail{
+8 -3
View File
@@ -3,8 +3,8 @@
#include <cstdint> //uint64_t
#include <stdexcept> // std::runtime_error
#include "../utils/vector.h"
#include "../utils/matrix.h"
#include "utils/vector.h"
#include "utils/matrix.h"
namespace numerics::detail{
@@ -15,7 +15,12 @@ namespace numerics::detail{
const uint64_t n = A.cols(); // also B.rows()
const uint64_t p = B.cols();
if(n != B.rows()){
throw std::runtime_error("matmul: dimension mismatch");
throw std::runtime_error(
"matmul: dimension mismatch: A is " +
std::to_string(A.rows()) + "x" + std::to_string(A.cols()) +
", B is " +
std::to_string(B.rows()) + "x" + std::to_string(B.cols())
);
}
T tmp;
utils::Matrix<T> C(m, p, T{0});
+12 -2
View File
@@ -3,10 +3,19 @@
#include <cstdint> //uint64_t
//#include <stdexcept> // std::runtime_error
#include "../utils/vector.h"
#include "../utils/matrix.h"
#include "utils/vector.h"
#include "utils/matrix.h"
namespace numerics::detail{
// ---------------- (Scalar, Scalar) -> Scalar ----------------
template <typename T>
T max_serial(const T a, const T b) {
if (a >= b){
return a;
}
return b;
}
// ---------------- Matrix -> Scalar ----------------
template <typename T>
@@ -37,6 +46,7 @@ namespace numerics::detail{
return max;
}
// ---------------- Matrix -> Vector ----------------
template <typename T>
utils::Vector<T> max_rowwise_serial(const utils::Matrix<T>& A) {
+2 -2
View File
@@ -3,8 +3,8 @@
#include <cstdint> //uint64_t
//#include <stdexcept> // std::runtime_error
#include "../utils/vector.h"
#include "../utils/matrix.h"
#include "utils/vector.h"
#include "utils/matrix.h"
#include "sum_serial.h"
+11 -2
View File
@@ -3,11 +3,20 @@
#include <cstdint> //uint64_t
//#include <stdexcept> // std::runtime_error
#include "../utils/vector.h"
#include "../utils/matrix.h"
#include "utils/vector.h"
#include "utils/matrix.h"
namespace numerics::detail{
// ---------------- (Scalar, Scalar) -> Scalar ----------------
template <typename T>
T min_serial(const T a, const T b) {
if (a >= b){
return a;
}
return b;
}
// ---------------- Matrix -> Scalar ----------------
template <typename T>
T min_serial(const utils::Matrix<T>& A) {
+2 -2
View File
@@ -3,8 +3,8 @@
#include <cstdint> //uint64_t
#include <stdexcept> // std::runtime_error
#include "../utils/vector.h"
#include "../utils/matrix.h"
#include "utils/vector.h"
#include "utils/matrix.h"
namespace numerics::detail{
+2 -2
View File
@@ -2,8 +2,8 @@
#include <cstdint> //uint64_t
#include "../utils/vector.h"
#include "../utils/matrix.h"
#include "utils/vector.h"
#include "utils/matrix.h"
namespace numerics::detail{
+2 -2
View File
@@ -4,8 +4,8 @@
#include <stdexcept> // std::runtime_error
#include <cmath> // std::pow
#include "../utils/vector.h"
#include "../utils/matrix.h"
#include "utils/vector.h"
#include "utils/matrix.h"
namespace numerics::detail{
+2 -2
View File
@@ -6,8 +6,8 @@
#include <type_traits>
#include "../utils/vector.h"
#include "../utils/matrix.h"
#include "utils/vector.h"
#include "utils/matrix.h"
namespace numerics::detail{
+2 -2
View File
@@ -3,8 +3,8 @@
#include <cstdint> //uint64_t
#include <cmath> // std::sqrt
#include "../utils/vector.h"
#include "../utils/matrix.h"
#include "utils/vector.h"
#include "utils/matrix.h"
namespace numerics::detail{
+3 -3
View File
@@ -3,8 +3,8 @@
#include <cstdint> //uint64_t
#include <stdexcept> // std::runtime_error
#include "../utils/vector.h"
#include "../utils/matrix.h"
#include "utils/vector.h"
#include "utils/matrix.h"
namespace numerics::detail{
@@ -21,7 +21,7 @@ namespace numerics::detail{
}
template <typename T>
void inplace_add_scalar_serial(utils::Vector<T>& v, const T c) {
void inplace_sub_scalar_serial(utils::Vector<T>& v, const T c) {
for (uint64_t i = 0; i < v.size(); ++i){
v[i] -= c;
}
+2 -2
View File
@@ -3,8 +3,8 @@
#include <cstdint> //uint64_t
//#include <stdexcept> // std::runtime_error
#include "../utils/vector.h"
#include "../utils/matrix.h"
#include "utils/vector.h"
#include "utils/matrix.h"
namespace numerics::detail{