Skip to content

Commit

Permalink
Refactor OpenMPTarget backend (#5726)
Browse files Browse the repository at this point in the history
* OpenMPTarget: Refactored the current code into individual files that implement individual constructs.

* OpenMPTarget: Block unit tests that fail with llvm/16.

* OpenMPTarget: Adding the ParallelScan for hierarchical parallelism in a different file.

* OpenMPTarget: Add ParallelScan for TeamPolicy in a separate file.

* OpenMPTarget: Edits to include file names where needed.

* OpenMPTarget: Removed the diff_files file.

* OpenMPTarget: Rolled back the changes in the CMakeList for unit test.

* OpenMPTarget: diff_files reverted as of the develop branch. Moved Kokkos_OpenMPTargetSpace file into OpenMPTarget dir.

* OpenMPTarget: Fixing diff_files.

* OpenMPTarget: Delete empty lines at the top before license information.

* OpenMPTarget: Adding the OpenMPTargetSpace file which was removed from the dir above.

* OpenMPTarget: Moved the Kokkos_OpenMPTarget.hpp file inside OpenMPTarget dir.

---------

Co-authored-by: Rahulkumar Gayatri <rgayatri@lbl.gov>
Co-authored-by: Daniel Arndt <arndtd@ornl.gov>
  • Loading branch information
3 people committed Feb 1, 2023
1 parent dac21c7 commit a62aa40
Show file tree
Hide file tree
Showing 17 changed files with 3,293 additions and 3,105 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ static_assert(false,

#include <cstddef>
#include <iosfwd>
#include <Kokkos_OpenMPTargetSpace.hpp>
#include <OpenMPTarget/Kokkos_OpenMPTargetSpace.hpp>
#include <Kokkos_ScratchSpace.hpp>
#include <Kokkos_Parallel.hpp>
#include <Kokkos_TaskScheduler.hpp>
Expand Down Expand Up @@ -141,7 +141,6 @@ struct DeviceTypeTraits<::Kokkos::Experimental::OpenMPTarget> {
/*--------------------------------------------------------------------------*/
/*--------------------------------------------------------------------------*/

#include <OpenMPTarget/Kokkos_OpenMPTarget_Exec.hpp>
#include <OpenMPTarget/Kokkos_OpenMPTarget_Parallel.hpp>
#include <OpenMPTarget/Kokkos_OpenMPTarget_Parallel_MDRange.hpp>
#include <OpenMPTarget/Kokkos_OpenMPTarget_Task.hpp>
Expand Down
4 changes: 2 additions & 2 deletions core/src/OpenMPTarget/Kokkos_OpenMPTargetSpace.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@
#include <sstream>
#include <cstring>

#include <Kokkos_OpenMPTarget.hpp>
#include <Kokkos_OpenMPTargetSpace.hpp>
#include <OpenMPTarget/Kokkos_OpenMPTarget.hpp>
#include <OpenMPTarget/Kokkos_OpenMPTargetSpace.hpp>
#include <impl/Kokkos_Error.hpp>
#include <Kokkos_Atomic.hpp>
#include <impl/Kokkos_MemorySpace.hpp>
Expand Down
File renamed without changes.
Loading

0 comments on commit a62aa40

Please sign in to comment.