Skip to content

Commit 6091976

Browse files
Merge pull request #1632 from PrincetonUniversity/issue-1330-deprecate-kokkos-abstractions
Issue 1330 - Deprecate Kokkos abstractions
2 parents 5fad497 + ffece6e commit 6091976

File tree

133 files changed

+485
-1782
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

133 files changed

+485
-1782
lines changed

core/specfem/algorithms/gradient.hpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
#pragma once
22

3-
#include "kokkos_abstractions.h"
43
#include "specfem/assembly.hpp"
54
#include "specfem/data_access.hpp"
65
#include "specfem/execution.hpp"

core/specfem/algorithms/interpolate.hpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
#pragma once
22

3-
#include "kokkos_abstractions.h"
43
#include "specfem/datatype.hpp"
54
#include "specfem/execution.hpp"
65
#include "specfem_setup.hpp"

core/specfem/assembly/compute_source_array.hpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
#pragma once
22

3-
#include "kokkos_abstractions.h"
43
#include "specfem/assembly/element_types.hpp"
54
#include "specfem/assembly/jacobian_matrix.hpp"
65
#include "specfem/assembly/mesh.hpp"

core/specfem/assembly/compute_source_array/dim2/compute_source_array.tpp

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,14 @@
44
#include "specfem/element.hpp"
55
#include "impl/compute_source_array_from_tensor.hpp"
66
#include "impl/compute_source_array_from_vector.hpp"
7-
#include "kokkos_abstractions.h"
7+
#include "specfem/assembly/compute_source_array.hpp"
8+
89
#include "specfem/assembly/element_types.hpp"
910
#include "specfem/source.hpp"
1011
#include "specfem_setup.hpp"
1112
#include <Kokkos_Core.hpp>
1213

13-
template<typename SourceArrayViewType>
14+
template <typename SourceArrayViewType>
1415
void specfem::assembly::compute_source_array(
1516
const std::shared_ptr<
1617
specfem::sources::source<specfem::element::dimension_tag::dim2> > &source,
@@ -20,7 +21,8 @@ void specfem::assembly::compute_source_array(
2021
SourceArrayViewType &source_array) {
2122

2223
// Ensure source_array is a 3D view
23-
static_assert(SourceArrayViewType::rank() == 3, "Source array must be in rank 3.");
24+
static_assert(SourceArrayViewType::rank() == 3,
25+
"Source array must be in rank 3.");
2426

2527
switch (source->get_source_type()) {
2628
case specfem::sources::source_type::vector_source: {

core/specfem/assembly/compute_source_array/dim2/impl/compute_source_array_from_tensor.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#include "compute_source_array_from_tensor.hpp"
2-
#include "kokkos_abstractions.h"
2+
33
#include "specfem/algorithms.hpp"
44
#include "specfem/assembly/element_types.hpp"
55
#include "specfem/assembly/jacobian_matrix.hpp"

core/specfem/assembly/compute_source_array/dim2/impl/compute_source_array_from_tensor.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#pragma once
2-
#include "kokkos_abstractions.h"
2+
33
#include "specfem/assembly/jacobian_matrix.hpp"
44
#include "specfem/assembly/mesh.hpp"
55
#include "specfem/source.hpp"

core/specfem/assembly/compute_source_array/dim2/impl/compute_source_array_from_vector.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#include "compute_source_array_from_vector.hpp"
2-
#include "kokkos_abstractions.h"
2+
33
#include "specfem/algorithms.hpp"
44
#include "specfem/assembly/element_types.hpp"
55
#include "specfem/assembly/jacobian_matrix.hpp"

core/specfem/assembly/compute_source_array/dim2/impl/compute_source_array_from_vector.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#pragma once
2-
#include "kokkos_abstractions.h"
2+
33
#include "specfem/assembly/mesh.hpp"
44
#include "specfem/source.hpp"
55
#include <Kokkos_Core.hpp>

core/specfem/assembly/compute_source_array/dim3/compute_source_array.tpp

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,14 @@
44
#include "specfem/element.hpp"
55
#include "impl/compute_source_array_from_tensor.hpp"
66
#include "impl/compute_source_array_from_vector.hpp"
7-
#include "kokkos_abstractions.h"
7+
#include "specfem/assembly/compute_source_array.hpp"
8+
89
#include "specfem/assembly/element_types.hpp"
910
#include "specfem/source.hpp"
1011
#include "specfem_setup.hpp"
1112
#include <Kokkos_Core.hpp>
1213

13-
template<typename SourceArrayViewType>
14+
template <typename SourceArrayViewType>
1415
void specfem::assembly::compute_source_array(
1516
const std::shared_ptr<
1617
specfem::sources::source<specfem::element::dimension_tag::dim3> > &source,
@@ -20,8 +21,8 @@ void specfem::assembly::compute_source_array(
2021
SourceArrayViewType &source_array) {
2122

2223
// Ensure source_array is a 4D view
23-
static_assert(SourceArrayViewType::rank() == 4, "Source array must be in rank 4.");
24-
24+
static_assert(SourceArrayViewType::rank() == 4,
25+
"Source array must be in rank 4.");
2526

2627
switch (source->get_source_type()) {
2728
case specfem::sources::source_type::vector_source: {

core/specfem/assembly/compute_source_array/dim3/impl/compute_source_array_from_tensor.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#include "compute_source_array_from_tensor.hpp"
2-
#include "kokkos_abstractions.h"
2+
33
#include "specfem/algorithms.hpp"
44
#include "specfem/assembly/element_types.hpp"
55
#include "specfem/assembly/jacobian_matrix.hpp"

0 commit comments

Comments
 (0)