Skip to content
This repository was archived by the owner on Mar 6, 2026. It is now read-only.

Commit 9d3bc1b

Browse files
committed
Refactor smatrix plugin
1 parent d4f1121 commit 9d3bc1b

14 files changed

Lines changed: 14 additions & 80 deletions

File tree

frontend/fastor/include/algebra/fastor.hpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
#pragma once
99

1010
// Project include(s).
11+
#include "algebra/boolean.hpp"
1112
#include "algebra/impl/fastor_getter.hpp"
1213
#include "algebra/impl/fastor_matrix.hpp"
1314
#include "algebra/impl/fastor_transform3.hpp"

frontend/smatrix/CMakeLists.txt

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,16 @@ message(STATUS "Building the SMatrix algebra plugin")
99
# Set up the library.
1010
algebra_add_library( algebra_smatrix smatrix
1111
"include/algebra/smatrix.hpp"
12+
"include/algebra/impl/*.hpp"
1213
)
1314

1415
target_link_libraries(
1516
algebra_smatrix
1617
INTERFACE
18+
ROOT::Core
19+
ROOT::MathCore
20+
ROOT::Smatrix
1721
algebra::common
18-
algebra::smatrix_storage
19-
algebra::smatrix_math
2022
algebra::generic_math
2123
)
2224

math/smatrix/include/algebra/math/impl/smatrix_errorcheck.hpp renamed to frontend/smatrix/include/algebra/impl/smatrix_errorcheck.hpp

File renamed without changes.

storage/smatrix/include/algebra/storage/impl/smatrix_getter.hpp renamed to frontend/smatrix/include/algebra/impl/smatrix_getter.hpp

File renamed without changes.

math/smatrix/include/algebra/math/impl/smatrix_matrix.hpp renamed to frontend/smatrix/include/algebra/impl/smatrix_matrix.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99

1010
// Project include(s).
1111
#include "algebra/concepts.hpp"
12+
#include "algebra/impl/smatrix_types.hpp"
1213
#include "algebra/qualifiers.hpp"
13-
#include "algebra/storage/smatrix.hpp"
1414

1515
// ROOT/Smatrix include(s).
1616
#include <Math/SMatrix.h>

math/smatrix/include/algebra/math/impl/smatrix_transform3.hpp renamed to frontend/smatrix/include/algebra/impl/smatrix_transform3.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
#pragma once
99

1010
// Project include(s).
11-
#include "algebra/math/impl/smatrix_errorcheck.hpp"
11+
#include "algebra/impl/smatrix_errorcheck.hpp"
1212
#include "algebra/qualifiers.hpp"
1313
#include "algebra/utils/approximately_equal.hpp"
1414

storage/smatrix/include/algebra/storage/smatrix.hpp renamed to frontend/smatrix/include/algebra/impl/smatrix_types.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
// Project include(s)
1111
#include "algebra/concepts.hpp"
12-
#include "algebra/storage/impl/smatrix_getter.hpp"
12+
#include "algebra/impl/smatrix_getter.hpp"
1313
#include "algebra/type_traits.hpp"
1414

1515
// ROOT/Smatrix include(s).

math/smatrix/include/algebra/math/impl/smatrix_vector.hpp renamed to frontend/smatrix/include/algebra/impl/smatrix_vector.hpp

File renamed without changes.

frontend/smatrix/include/algebra/smatrix.hpp

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,13 @@
88
#pragma once
99

1010
// Project include(s).
11+
#include "algebra/boolean.hpp"
12+
#include "algebra/impl/smatrix_getter.hpp"
13+
#include "algebra/impl/smatrix_matrix.hpp"
14+
#include "algebra/impl/smatrix_transform.hpp"
15+
#include "algebra/impl/smatrix_types.hpp"
16+
#include "algebra/impl/smatrix_vector.hpp"
1117
#include "algebra/math/generic.hpp"
12-
#include "algebra/math/smatrix.hpp"
1318
#include "algebra/storage/smatrix.hpp"
1419

1520
namespace algebra {

math/CMakeLists.txt

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,6 @@
88
add_subdirectory(cmath)
99
add_subdirectory(generic)
1010

11-
if(ALGEBRA_PLUGINS_INCLUDE_SMATRIX)
12-
add_subdirectory(smatrix)
13-
endif()
14-
1511
if(ALGEBRA_PLUGINS_INCLUDE_VC)
1612
add_subdirectory(vc_aos)
1713
add_subdirectory(vc_soa)

0 commit comments

Comments
 (0)