Merge pull request #491 from STEllAR-GROUP/fix_header_order

Fix header order
STEllAR-GROUP · Apr 3, 2024 · bef65a2 · bef65a2
2 parents e843e9f + d7bb981
commit bef65a2
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 9 deletions.
diff --git a/octotiger-performance-tests b/octotiger-performance-tests
diff --git a/octotiger/monopole_interactions/kernel/kokkos_kernel.hpp b/octotiger/monopole_interactions/kernel/kokkos_kernel.hpp
@@ -4,7 +4,6 @@
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 //
 
-#include "octotiger/aggregation_util.hpp"
 #include "octotiger/common_kernel/interaction_constants.hpp"
 #include "octotiger/defs.hpp"
 #include "octotiger/monopole_interactions/kernel/monopole_kernel_templates.hpp"
@@ -19,6 +18,7 @@
 #ifdef HPX_HAVE_APEX
 #include <apex_api.hpp>
 #endif
+#include "octotiger/aggregation_util.hpp"
 static const char monopole_kokkos_kernel_identifier[] = "monopole_kernel_aggregator_kokkos";
 template <typename executor_t>
 using monopole_kokkos_agg_executor_pool =

diff --git a/src/monopole_interactions/monopole_kernel_interface.cpp b/src/monopole_interactions/monopole_kernel_interface.cpp
@@ -26,10 +26,8 @@
 #include <aligned_buffer_util.hpp>
 #include <buffer_manager.hpp>
 #include <stream_manager.hpp>
-#include <aggregation_manager.hpp>
 
 #include "octotiger/options.hpp"
-#include "octotiger/aggregation_util.hpp"
 
 #if defined(OCTOTIGER_HAVE_KOKKOS) && defined(KOKKOS_ENABLE_SYCL)
 #if defined(OCTOTIGER_HAVE_INTEL_GPU_WORKAROUND)
@@ -122,13 +120,8 @@ namespace fmm {
                     }
                     // TODO p2m kokkos bug - probably not enough threads for a wavefront
                     // TODO how to identify the intel sycl compile here?
-#if defined(KOKKOS_ENABLE_HIP) || defined(KOKKOS_ENABLE_SYCL)
                     if (contains_multipole_neighbor) // TODO Add device_only warning
                         avail = false;
-#elif (defined(KOKKOS_ENABLE_CUDA) && defined(__clang__) )
-                    /* if (contains_multipole_neighbor && opts().detected_intel_compiler) // TODO Add device_only warning */
-                    /*     avail = false; */
-#endif
                     if (avail) {
                         if (contains_multipole_neighbor) {
                             executor_interface_t executor{device_id};
+3 −3		rostam/aggregation-test/blast_aggregation_performance_cuda.sh
+3 −5		rostam/aggregation-test/blast_aggregation_performance_hip.sh
+0 −158		rostam/allocator_tests/test_allocator_performance.sh
+0 −167		rostam/multigpu-tests/test_multigpu_performance.sh