Skip to content

Multi slice cab factory #5

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
HazelCullom merged 10 commits into from
Oct 20, 2022
Merged

Multi slice cab factory #5

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
b8b2a15
removed unnecessary functions
HazelCullom Oct 13, 2022
997669e
added more tests
HazelCullom Oct 13, 2022
fa268d5
added new test cases for array types
HazelCullom Oct 14, 2022
e9ac9d3
added support for array types
HazelCullom Oct 14, 2022
7165bb1
now supports multi-dimensional arrays, new test cases
HazelCullom Oct 14, 2022
2e0f712
issue arises with many types when num_tuples goes above 32
HazelCullom Oct 17, 2022
1c35d7c
descending size ordered many type test works
HazelCullom Oct 18, 2022
79e90db
removed broken test case
HazelCullom Oct 18, 2022
39702a2
removed no type test as Cabana::MemberTypes does not support zero types
HazelCullom Oct 18, 2022
d476e54
removed unnecessary test build instructions
HazelCullom Oct 20, 2022
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
11 changes: 10 additions & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,17 @@ target_link_libraries(SliceWrapper Omega_h::omega_h)
target_link_libraries(SliceWrapper Cabana::cabanacore)
target_compile_definitions(SliceWrapper PUBLIC ENABLE_CABANA)

#add_executable(AoSoA_Ordering test/aosoa_ordering_issue.cpp)
#target_link_libraries(AoSoA_Ordering Omega_h::omega_h)
#target_link_libraries(AoSoA_Ordering Cabana::cabanacore)
#target_compile_definitions(AoSoA_Ordering PUBLIC ENABLE_CABANA)

add_test(sliceWrapper10 ./SliceWrapper 10)
add_test(sliceWrapper32 ./SliceWrapper 32)
add_test(sliceWrapper33 ./SliceWrapper 33)
add_test(sliceWrapper50 ./SliceWrapper 50)
add_test(sliceWrapper100 ./SliceWrapper 100)

#add_test(AoSoAOrderingTest10 ./AoSoA_Ordering 10)
#add_test(AoSoAOrderingTest32 ./AoSoA_Ordering 32)
#add_test(AoSoAOrderingTest33 ./AoSoA_Ordering 33)
#add_test(AoSoAOrderingTest50 ./AoSoA_Ordering 50)
17 changes: 0 additions & 17 deletions test/SliceWrapper.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,22 +145,6 @@ int mix_arrays_test(int num_tuples) {
return 0;
}

int no_type_test(int num_tuples) {
/*
using ExecutionSpace = Kokkos::DefaultExecutionSpace;
using MemorySpace = ExecutionSpace::memory_space;
bool exception = false;
try {
CabSliceFactory<ExecutionSpace, MemorySpace> cabSliceFactory(num_tuples);
}
catch (std::invalid_argument &e) {
exception = true;
}
assert(exception);
*/
return 0;
}

int single_type_test(int num_tuples) {
using ExecutionSpace = Kokkos::DefaultExecutionSpace;
using MemorySpace = ExecutionSpace::memory_space;
Expand Down Expand Up @@ -286,7 +270,6 @@ int main(int argc, char* argv[]) {
Kokkos::ScopeGuard scope_guard(argc, argv);

many_type_test(num_tuples);
no_type_test(num_tuples);
single_type_test(num_tuples);
multi_type_test(num_tuples);

Expand Down