Merge branch 'develop' into Kokkos

Author: breyerml

cmake/presets/all.json

@@ -7,7 +7,6 @@
       "displayName": "All available backends",
       "inherits": "build",
       "cacheVariables": {
-        "CMAKE_CXX_COMPILER": "clang++",
         "PLSSVM_ENABLE_OPENMP_BACKEND": "AUTO",
         "PLSSVM_ENABLE_HPX_BACKEND": "AUTO",
         "PLSSVM_ENABLE_STDPAR_BACKEND": "OFF",
@@ -23,7 +22,6 @@
       "displayName": "All available backends + Python bindings",
       "inherits": "build",
       "cacheVariables": {
-        "CMAKE_CXX_COMPILER": "clang++",
         "PLSSVM_ENABLE_OPENMP_BACKEND": "AUTO",
         "PLSSVM_ENABLE_HPX_BACKEND": "AUTO",
         "PLSSVM_ENABLE_STDPAR_BACKEND": "OFF",
@@ -41,7 +39,6 @@
       "displayName": "All available backends tests",
       "inherits": "test",
       "cacheVariables": {
-        "CMAKE_CXX_COMPILER": "clang++",
         "PLSSVM_ENABLE_OPENMP_BACKEND": "AUTO",
         "PLSSVM_ENABLE_HPX_BACKEND": "AUTO",
         "PLSSVM_ENABLE_STDPAR_BACKEND": "OFF",

include/plssvm/matrix.hpp

@@ -496,6 +496,9 @@ matrix<T, layout_>::matrix(const plssvm::shape shape, const std::vector<value_ty
 template <typename T, layout_type layout_>
 matrix<T, layout_>::matrix(const plssvm::shape shape, const_pointer data) :
     matrix{ shape } {
+    if (data == nullptr && this->size() > 0) {
+        throw matrix_exception{ "The provided data pointer may not be a nullptr if the matrix size is greater than 0!" };
+    }
     if (this->size() > 0) {
         // memcpy data to matrix
         std::memcpy(this->data(), data, this->size() * sizeof(value_type));
@@ -505,6 +508,9 @@ matrix<T, layout_>::matrix(const plssvm::shape shape, const_pointer data) :
 template <typename T, layout_type layout_>
 matrix<T, layout_>::matrix(const plssvm::shape shape, const_pointer data, const plssvm::shape padding) :
     matrix{ shape, padding } {
+    if (data == nullptr && this->size() > 0) {
+        throw matrix_exception{ "The provided data pointer may not be a nullptr if the matrix size is greater than 0!" };
+    }
     if (this->size() > 0) {
         // memcpy data row- or column-wise depending on the layout type to the matrix
         this->opt_mismatched_padding_copy(this->data(), this->shape_padded(), data, this->shape());

tests/matrix.cpp

@@ -533,6 +533,16 @@ TYPED_TEST(Matrix, construct_with_size_and_ptr_empty) {
     EXPECT_EQ(matr.shape_padded(), (plssvm::shape{ 0, 0 }));
 }
 
+TYPED_TEST(Matrix, construct_with_size_and_nullptr_ptr) {
+    using real_type = typename TestFixture::fixture_real_type;
+    constexpr plssvm::layout_type layout = TestFixture::fixture_layout;
+
+    // construct a matrix with a specific size and a nullptr
+    EXPECT_THROW_WHAT((plssvm::matrix<real_type, layout>{ plssvm::shape{ 2, 3 }, nullptr }),
+                      plssvm::matrix_exception,
+                      "The provided data pointer may not be a nullptr if the matrix size is greater than 0!");
+}
+
 TYPED_TEST(Matrix, construct_with_size_and_ptr_value_zero_num_rows) {
     using real_type = typename TestFixture::fixture_real_type;
     constexpr plssvm::layout_type layout = TestFixture::fixture_layout;
@@ -603,6 +613,16 @@ TYPED_TEST(Matrix, construct_with_size_and_ptr_empty_and_padding) {
     EXPECT_TRUE(std::all_of(matr.data(), matr.data() + matr.size_padded(), [](const real_type val) { return val == real_type{ 0.0 }; }));
 }
 
+TYPED_TEST(Matrix, construct_with_size_and_nullptr_empty_and_padding) {
+    using real_type = typename TestFixture::fixture_real_type;
+    constexpr plssvm::layout_type layout = TestFixture::fixture_layout;
+
+    // construct a matrix with a specific size, padding and a nullptr
+    EXPECT_THROW_WHAT((plssvm::matrix<real_type, layout>{ plssvm::shape{ 2, 3 }, nullptr, plssvm::shape{ 4, 5 } }),
+                      plssvm::matrix_exception,
+                      "The provided data pointer may not be a nullptr if the matrix size is greater than 0!");
+}
+
 TYPED_TEST(Matrix, construct_with_size_and_ptr_empty_and_zero_padding) {
     using real_type = typename TestFixture::fixture_real_type;
     constexpr plssvm::layout_type layout = TestFixture::fixture_layout;