Decouple from Blaze - part 2 (#38)

- RegisterMatrixTest.testPotrf works - Added reference gemm() implementation - Cleaned-up few other tests in RegisterMatrixTest - Added DynamicMatrix class - Functions trans(), submatrix(), randomize(), makePositiveDefinite() implemented for BLAST matrices - Randomize.hpp moved to blast/math/algorithm.
mkatliar · Sep 29, 2024 · 85721d3 · 85721d3
1 parent 81192ce
commit 85721d3
Show file tree

Hide file tree

Showing 63 changed files with 1,281 additions and 364 deletions.
diff --git a/bench/blas/Gemm.cpp b/bench/blas/Gemm.cpp
@@ -4,7 +4,7 @@
 
 #include <bench/Gemm.hpp>
 
-#include <test/Randomize.hpp>
+#include <blast/math/algorithm/Randomize.hpp>
 
 #include <blaze/Math.h>
 

diff --git a/bench/blas/Iamax.cpp b/bench/blas/Iamax.cpp
@@ -19,7 +19,7 @@
 #include <bench/Benchmark.hpp>
 #include <bench/Iamax.hpp>
 
-#include <test/Randomize.hpp>
+#include <blast/math/algorithm/Randomize.hpp>
 
 
 namespace blast :: benchmark

diff --git a/bench/blast/math/dense/DynamicGemm.cpp b/bench/blast/math/dense/DynamicGemm.cpp
@@ -8,7 +8,7 @@
 
 #include <bench/Gemm.hpp>
 
-#include <test/Randomize.hpp>
+#include <blast/math/algorithm/Randomize.hpp>
 
 
 namespace blast :: benchmark

diff --git a/bench/blast/math/dense/DynamicSyrk.cpp b/bench/blast/math/dense/DynamicSyrk.cpp
@@ -9,7 +9,7 @@
 #include <bench/Benchmark.hpp>
 #include <bench/Syrk.hpp>
 
-#include <test/Randomize.hpp>
+#include <blast/math/algorithm/Randomize.hpp>
 
 
 namespace blast :: benchmark

diff --git a/bench/blast/math/dense/StaticGemm.cpp b/bench/blast/math/dense/StaticGemm.cpp
@@ -8,7 +8,7 @@
 
 #include <bench/Gemm.hpp>
 
-#include <test/Randomize.hpp>
+#include <blast/math/algorithm/Randomize.hpp>
 
 
 namespace blast :: benchmark

diff --git a/bench/blast/math/dense/StaticGetrf.cpp b/bench/blast/math/dense/StaticGetrf.cpp
@@ -9,7 +9,7 @@
 #include <bench/Complexity.hpp>
 #include <bench/Getrf.hpp>
 
-#include <test/Randomize.hpp>
+#include <blast/math/algorithm/Randomize.hpp>
 
 #include <vector>
 

diff --git a/bench/blast/math/dense/StaticPotrf.cpp b/bench/blast/math/dense/StaticPotrf.cpp
@@ -8,7 +8,7 @@
 #include <bench/Benchmark.hpp>
 #include <bench/Complexity.hpp>
 
-#include <test/Randomize.hpp>
+#include <blast/math/algorithm/Randomize.hpp>
 
 #include <random>
 #include <memory>

diff --git a/bench/blast/math/dense/StaticSyrk.cpp b/bench/blast/math/dense/StaticSyrk.cpp
@@ -9,7 +9,7 @@
 #include <bench/Benchmark.hpp>
 #include <bench/Syrk.hpp>
 
-#include <test/Randomize.hpp>
+#include <blast/math/algorithm/Randomize.hpp>
 
 
 namespace blast :: benchmark

diff --git a/bench/blast/math/dense/StaticTrmm.cpp b/bench/blast/math/dense/StaticTrmm.cpp
@@ -7,7 +7,7 @@
 #include <blast/blaze/Math.hpp>
 
 #include <bench/Gemm.hpp>
-#include <test/Randomize.hpp>
+#include <blast/math/algorithm/Randomize.hpp>
 
 
 namespace blast :: benchmark

diff --git a/bench/blast/math/panel/DynamicGemm.cpp b/bench/blast/math/panel/DynamicGemm.cpp
@@ -7,7 +7,7 @@
 
 #include <bench/Gemm.hpp>
 
-#include <test/Randomize.hpp>
+#include <blast/math/algorithm/Randomize.hpp>
 
 
 namespace blast :: benchmark

diff --git a/bench/blast/math/panel/DynamicPotrf.cpp b/bench/blast/math/panel/DynamicPotrf.cpp
@@ -8,7 +8,7 @@
 #include <bench/Benchmark.hpp>
 #include <bench/Complexity.hpp>
 
-#include <test/Randomize.hpp>
+#include <blast/math/algorithm/Randomize.hpp>
 
 #include <random>
 #include <memory>

diff --git a/bench/blast/math/panel/StaticGemm.cpp b/bench/blast/math/panel/StaticGemm.cpp
@@ -9,7 +9,7 @@
 
 #include <bench/Gemm.hpp>
 
-#include <test/Randomize.hpp>
+#include <blast/math/algorithm/Randomize.hpp>
 
 
 namespace blast :: benchmark

diff --git a/bench/blast/math/panel/StaticPotrf.cpp b/bench/blast/math/panel/StaticPotrf.cpp
@@ -8,7 +8,7 @@
 #include <bench/Benchmark.hpp>
 #include <bench/Complexity.hpp>
 
-#include <test/Randomize.hpp>
+#include <blast/math/algorithm/Randomize.hpp>
 
 #include <random>
 #include <memory>

diff --git a/bench/blast/math/simd/Ger.cpp b/bench/blast/math/simd/Ger.cpp
@@ -7,7 +7,7 @@
 
 #include <bench/Benchmark.hpp>
 
-#include <test/Randomize.hpp>
+#include <blast/math/algorithm/Randomize.hpp>
 
 
 namespace blast :: benchmark
@@ -53,4 +53,4 @@ namespace blast :: benchmark
     BENCHMARK_TEMPLATE(BM_RegisterMatrix_ger_nt, float, 24, 4, columnMajor);
     BENCHMARK_TEMPLATE(BM_RegisterMatrix_ger_nt, float, 16, 5, columnMajor);
     BENCHMARK_TEMPLATE(BM_RegisterMatrix_ger_nt, float, 16, 6, columnMajor);
-}
+}
diff --git a/bench/blast/math/simd/Load.cpp b/bench/blast/math/simd/Load.cpp
@@ -9,7 +9,7 @@
 
 #include <bench/Benchmark.hpp>
 
-#include <test/Randomize.hpp>
+#include <blast/math/algorithm/Randomize.hpp>
 
 #include <blaze/Math.h>
 

diff --git a/bench/blast/math/simd/PartialGemm.cpp b/bench/blast/math/simd/PartialGemm.cpp
@@ -8,7 +8,7 @@
 
 #include <bench/Benchmark.hpp>
 
-#include <test/Randomize.hpp>
+#include <blast/math/algorithm/Randomize.hpp>
 
 #include <blaze/math/StaticMatrix.h>
 
@@ -47,4 +47,4 @@ namespace blast :: benchmark
     BENCHMARK_TEMPLATE(BM_RegisterMatrix_partialGemm_static, double, 4, 4, columnMajor, 3, 4);
     BENCHMARK_TEMPLATE(BM_RegisterMatrix_partialGemm_static, double, 4, 4, columnMajor, 4, 4);
     BENCHMARK_TEMPLATE(BM_RegisterMatrix_partialGemm_static, double, 4, 4, columnMajor, 1, 1);
-}
+}
diff --git a/bench/blast/math/simd/PartialLoad.cpp b/bench/blast/math/simd/PartialLoad.cpp
@@ -8,7 +8,7 @@
 
 #include <bench/Benchmark.hpp>
 
-#include <test/Randomize.hpp>
+#include <blast/math/algorithm/Randomize.hpp>
 
 #include <blaze/Math.h>
 
@@ -121,4 +121,4 @@ namespace blast :: benchmark
 
     // BENCHMARK_TEMPLATE(BM_RegisterMatrix_partialStore_static, double, 4, 4, columnMajor, 1, 4);
     // BENCHMARK_TEMPLATE(BM_RegisterMatrix_partialStore_static, double, 4, 4, columnMajor, 2, 4);
-}
+}
diff --git a/bench/blast/math/simd/PartialStore.cpp b/bench/blast/math/simd/PartialStore.cpp
@@ -8,7 +8,7 @@
 
 #include <bench/Benchmark.hpp>
 
-#include <test/Randomize.hpp>
+#include <blast/math/algorithm/Randomize.hpp>
 
 #include <blaze/math/StaticMatrix.h>
 
@@ -171,4 +171,4 @@ namespace blast :: benchmark
 
     BENCHMARK_TEMPLATE(BM_RegisterMatrix_partialStore_static, double, 4, 4, columnMajor, 1, 4);
     BENCHMARK_TEMPLATE(BM_RegisterMatrix_partialStore_static, double, 4, 4, columnMajor, 2, 4);
-}
+}
diff --git a/bench/blast/math/simd/Potrf.cpp b/bench/blast/math/simd/Potrf.cpp
@@ -9,7 +9,7 @@
 #include <bench/Benchmark.hpp>
 #include <bench/Complexity.hpp>
 
-#include <test/Randomize.hpp>
+#include <blast/math/algorithm/Randomize.hpp>
 
 
 namespace blast :: benchmark
@@ -46,4 +46,4 @@ namespace blast :: benchmark
     BENCHMARK_TEMPLATE(BM_RegisterMatrix_potrf, float, 8, 4, columnMajor);
     BENCHMARK_TEMPLATE(BM_RegisterMatrix_potrf, float, 16, 4, columnMajor);
     BENCHMARK_TEMPLATE(BM_RegisterMatrix_potrf, float, 24, 4, columnMajor);
-}
+}
diff --git a/bench/blast/math/simd/Store.cpp b/bench/blast/math/simd/Store.cpp
@@ -9,7 +9,7 @@
 
 #include <bench/Benchmark.hpp>
 
-#include <test/Randomize.hpp>
+#include <blast/math/algorithm/Randomize.hpp>
 
 #include <blaze/Math.h>
 

diff --git a/bench/blast/math/simd/Trmm.cpp b/bench/blast/math/simd/Trmm.cpp
@@ -7,7 +7,7 @@
 
 #include <bench/Benchmark.hpp>
 
-#include <test/Randomize.hpp>
+#include <blast/math/algorithm/Randomize.hpp>
 
 #include <blast/blaze/Math.hpp>
 

diff --git a/bench/blast/math/simd/Trsm.cpp b/bench/blast/math/simd/Trsm.cpp
@@ -8,7 +8,7 @@
 #include <bench/Benchmark.hpp>
 #include <bench/Trsm.hpp>
 
-#include <test/Randomize.hpp>
+#include <blast/math/algorithm/Randomize.hpp>
 
 
 namespace blast :: benchmark
@@ -44,4 +44,4 @@ namespace blast :: benchmark
     BENCHMARK_TEMPLATE(BM_RegisterMatrix_trsm, double, 8, 4, columnMajor);
     BENCHMARK_TEMPLATE(BM_RegisterMatrix_trsm, double, 12, 4, columnMajor);
     BENCHMARK_TEMPLATE(BM_RegisterMatrix_trsm, double, 8, 8, columnMajor);
-}
+}
diff --git a/bench/blaze/Gemm.cpp b/bench/blaze/Gemm.cpp
@@ -3,7 +3,7 @@
 // license that can be found in the LICENSE file.
 
 #include <bench/Gemm.hpp>
-#include <test/Randomize.hpp>
+#include <blast/math/algorithm/Randomize.hpp>
 
 #include <blaze/Math.h>
 

diff --git a/bench/blaze/StaticTrmm.cpp b/bench/blaze/StaticTrmm.cpp
@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.
 
 #include <bench/Gemm.hpp>
-#include <test/Randomize.hpp>
 
 #include <blaze/Math.h>
 

diff --git a/bench/eigen/Gemm.cpp b/bench/eigen/Gemm.cpp
@@ -10,7 +10,7 @@
 
 #include <Eigen/Dense>
 
-#include <test/Randomize.hpp>
+#include <blast/math/algorithm/Randomize.hpp>
 
 #include <bench/Gemm.hpp>
 

diff --git a/bench/libxsmm/Gemm.cpp b/bench/libxsmm/Gemm.cpp
@@ -4,7 +4,7 @@
 
 #include <bench/Gemm.hpp>
 
-#include <test/Randomize.hpp>
+#include <blast/math/algorithm/Randomize.hpp>
 
 #include <libxsmm.h>
 

diff --git a/include/blast/math/Matrix.hpp b/include/blast/math/Matrix.hpp
@@ -14,7 +14,6 @@
 
 #include <iosfwd>
 #include <stdexcept>
-#include <random>
 
 
 namespace blast
@@ -49,18 +48,6 @@ namespace blast
     {
         return ptr<IsAligned_v<MT>>(m, 0, 0);
     }
-
-
-    template <Matrix M>
-    inline void randomize(M& m) noexcept
-    {
-        std::mt19937 rng;
-        std::uniform_real_distribution<ElementType_t<M>> dist;
-
-        for (size_t i = 0; i < rows(m); ++i)
-            for (size_t j = 0; j < columns(m); ++j)
-                m(i, j) = dist(rng);
-    }
 
 
     template <Matrix MA, Matrix MB>

diff --git a/include/blast/math/TransposeFlag.hpp b/include/blast/math/TransposeFlag.hpp
@@ -1,33 +1,26 @@
-// Copyright 2023 Mikhail Katliar
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Copyright 2023-2024 Mikhail Katliar. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
 
 #pragma once
 
-#include <blaze/math/TransposeFlag.h>
-
 
 namespace blast
 {
+    /**
+     * @brief Defines whether a vector is a row or a column
+     *
+     * The bool values match those of @a blaze::TransposeFlag
+     */
     enum TransposeFlag : bool
     {
-        rowVector = blaze::rowVector,
-        columnVector = blaze::columnVector
+        rowVector = true,
+        columnVector = false
     };
 
 
     inline TransposeFlag constexpr operator!(TransposeFlag tf)
     {
         return tf == TransposeFlag::rowVector ? TransposeFlag::columnVector : TransposeFlag::rowVector;
     }
-}
+}
diff --git a/include/blast/math/TypeTraits.hpp b/include/blast/math/TypeTraits.hpp
@@ -9,6 +9,7 @@
 #include <blast/math/typetraits/IsPadded.hpp>
 #include <blast/math/typetraits/IsContiguous.hpp>
 #include <blast/math/typetraits/IsStaticallySpaced.hpp>
+#include <blast/math/typetraits/IsView.hpp>
 #include <blast/math/typetraits/ElementType.hpp>
 #include <blast/math/typetraits/StorageOrder.hpp>
 #include <blast/math/typetraits/Spacing.hpp>