Skip to content

More code cleanup #61

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rhornung67 merged 1 commit into from
Jul 21, 2025
Merged

More code cleanup #61

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
0 ...solution/03_umpire_allocator_solution.cpp → ...llocator/03_umpire_allocator_solution.cpp
View file
Open in desktop
File renamed without changes.
5 changes: 5 additions & 0 deletions Intro_Tutorial/lessons/03_umpire_allocator/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,8 @@ blt_add_executable(
NAME 03_umpire_allocator
SOURCES 03_umpire_allocator.cpp
DEPENDS_ON RAJA umpire cuda)

blt_add_executable(
NAME 03_umpire_allocator_solution
SOURCES 03_umpire_allocator_solution.cpp
DEPENDS_ON RAJA umpire cuda)
0 ...rall/solution/04_raja_forall_solution.cpp → ...4_raja_forall/04_raja_forall_solution.cpp
View file
Open in desktop
File renamed without changes.
7 changes: 6 additions & 1 deletion Intro_Tutorial/lessons/04_raja_forall/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,9 @@
blt_add_executable(
NAME 04_raja_forall
SOURCES 04_raja_forall.cpp
DEPENDS_ON RAJA umpire cuda)
DEPENDS_ON RAJA umpire)

blt_add_executable(
NAME 04_raja_forall_solution
SOURCES 04_raja_forall_solution.cpp
DEPENDS_ON RAJA umpire)
2 changes: 1 addition & 1 deletion ...duce/solution/05_raja_reduce_solution.cpp → ...5_raja_reduce/05_raja_reduce_solution.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
#include "RAJA/RAJA.hpp"

//TODO: uncomment this out in order to build!
//#define COMPILE
#define COMPILE

int main()
{
Expand Down
5 changes: 5 additions & 0 deletions Intro_Tutorial/lessons/05_raja_reduce/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,8 @@ blt_add_executable(
NAME 05_raja_reduce
SOURCES 05_raja_reduce.cpp
DEPENDS_ON RAJA umpire)

blt_add_executable(
NAME 05_raja_reduce_solution
SOURCES 05_raja_reduce_solution.cpp
DEPENDS_ON RAJA umpire)
6 changes: 6 additions & 0 deletions ...n/06_raja_umpire_host_device_solution.cpp → ...e/06_raja_umpire_host_device_solution.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,13 @@
#include "RAJA/RAJA.hpp"
#include "umpire/Umpire.hpp"

//TODO: uncomment this out in order to build!
#define COMPILE

int main()
{
#if defined(COMPILE)

constexpr int N{10000};
//TODO: Set up a block size value
constexpr std::size_t CUDA_BLOCK_SIZE{256};
Expand Down Expand Up @@ -55,5 +60,6 @@ int main()
host_allocator.deallocate(a_h);
host_allocator.deallocate(b_h);

#endif
return 0;
}
5 changes: 5 additions & 0 deletions Intro_Tutorial/lessons/06_raja_umpire_host_device/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,9 @@ if (ENABLE_CUDA)
NAME 06_raja_umpire_host_device
SOURCES 06_raja_umpire_host_device.cpp
DEPENDS_ON RAJA umpire cuda)

blt_add_executable(
NAME 06_raja_umpire_host_device_solution
SOURCES 06_raja_umpire_host_device_solution.cpp
DEPENDS_ON RAJA umpire cuda)
endif()
2 changes: 1 addition & 1 deletion ...algs/solution/07_raja_atomic_solution.cpp → .../07_raja_algs/07_raja_atomic_solution.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
#include "umpire/Umpire.hpp"

//TODO: uncomment this out in order to build!
//#define COMPILE
#define COMPILE

int main()
{
Expand Down
2 changes: 1 addition & 1 deletion ...a_algs/solution/07_raja_scan_solution.cpp → ...ns/07_raja_algs/07_raja_scan_solution.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
#include "umpire/Umpire.hpp"

//TODO: uncomment this out in order to build!
//#define COMPILE
#define COMPILE

int main()
{
Expand Down
12 changes: 12 additions & 0 deletions Intro_Tutorial/lessons/07_raja_algs/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,21 @@
if (ENABLE_CUDA)
blt_add_executable(
NAME 07_raja_atomic
SOURCES 07_raja_atomic.cpp
DEPENDS_ON RAJA umpire cuda)

blt_add_executable(
NAME 07_raja_atomic_solution
SOURCES 07_raja_atomic_solution.cpp
DEPENDS_ON RAJA umpire cuda)

blt_add_executable(
NAME 07_raja_scan
SOURCES 07_raja_scan.cpp
DEPENDS_ON RAJA umpire cuda)

blt_add_executable(
NAME 07_raja_scan_solution
SOURCES 07_raja_scan_solution.cpp
DEPENDS_ON RAJA umpire cuda)
endif()
7 changes: 7 additions & 0 deletions ...on/08_raja_umpire_quick_pool_solution.cpp → ...ol/08_raja_umpire_quick_pool_solution.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,13 @@
// use it in the code below
#include "umpire/strategy/QuickPool.hpp"

//Uncomment to compile
//#define COMPILE

int main()
{
#if defined(COMPILE)

constexpr int N{10000};
constexpr std::size_t CUDA_BLOCK_SIZE{256};
double* a{nullptr};
Expand Down Expand Up @@ -54,5 +59,7 @@ int main()
host_allocator.deallocate(a_h);
host_allocator.deallocate(b_h);

#endif

return 0;
}
5 changes: 5 additions & 0 deletions Intro_Tutorial/lessons/08_raja_umpire_quick_pool/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,9 @@ if (ENABLE_CUDA)
NAME 08_raja_umpire_quick_pool
SOURCES 08_raja_umpire_quick_pool.cpp
DEPENDS_ON RAJA umpire cuda)

blt_add_executable(
NAME 08_raja_umpire_quick_pool_solution
SOURCES 08_raja_umpire_quick_pool_solution.cpp
DEPENDS_ON RAJA umpire cuda)
endif()
2 changes: 1 addition & 1 deletion Intro_Tutorial/lessons/09_raja_view/09_raja_view.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ int main()

// TODO: Create a standard MxN RAJA::View called "A", initialized with the
// "a" array.
RAJA::View<double, ???>> A(???, ???, ???);
RAJA::View<double, ??? >> A( ???, ???, ??? );

// A left-oriented layout view initialized with the "result_left" array
auto L = RAJA::make_permuted_view<RAJA::layout_left>(result_left, M, N);
Expand Down
1 change: 1 addition & 0 deletions Intro_Tutorial/lessons/09_raja_view/09_raja_view_solution.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
#include "umpire/Umpire.hpp"
#include "umpire/strategy/QuickPool.hpp"

// TODO: Uncomment this in order to build!
#define COMPILE

// Method to print arrays associated with the Views in the lesson
Expand Down
12 changes: 7 additions & 5 deletions Profile_Demo/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
if (ENABLE_CUDA)
blt_add_executable(
NAME profile_raja
SOURCES profile_raja.cpp
DEPENDS_ON RAJA umpire cuda)
if (ENABLE_CUDA)
if (RAJA_ENABLE_CALIPER)
blt_add_executable(
NAME profile_raja
SOURCES profile_raja.cpp
DEPENDS_ON RAJA umpire cuda)
endif()
endif()