Skip to content
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

Jocs hopefully final #57

Open
wants to merge 17 commits into
base: JOCS
Choose a base branch
from
Open

Jocs hopefully final #57

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
cafe11f
Refactor dummy kernels, change active condition, use naive kernel in …
Oct 22, 2021
9b2376b
Refactor dummy kernels and its utils
Oct 22, 2021
725cd36
Refactor active cells kernels
Oct 22, 2021
616be7b
Add util function for switch read/write and calc grid dim
Oct 22, 2021
2ec2a3e
Create utils for ac
Oct 22, 2021
461cb91
Remove unused statistics
Oct 22, 2021
89ee725
Extract function for saving simulation output
Oct 23, 2021
e5e0b68
Extract adaptation logic to function
Oct 23, 2021
6cb384c
Extract function for saving simulation output
Oct 23, 2021
15b2038
Merge
pectom Oct 24, 2021
7b92846
Rework adaptive
pectom Oct 24, 2021
1c06547
Rework global sc and adaptive impl
pectom Oct 24, 2021
f6f1748
Rework global naive
pectom Oct 24, 2021
62de092
Rework project structure for active cells
Oct 24, 2021
69fe87b
Rework basic implementations
Oct 24, 2021
2deb542
Fix wrong pow usage in dummy kernel
Oct 25, 2021
fd66a8a
Remove obsolete tests
Oct 25, 2021
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
6 changes: 3 additions & 3 deletions notebooks/ca_size_comparison_charts.ipynb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -795,9 +795,9 @@
"evalue": "list index out of range",
"output_type": "error",
"traceback": [
"\u001B[0;31m---------------------------------------------------------------------------\u001B[0m",
"\u001B[0;31mIndexError\u001B[0m Traceback (most recent call last)",
"\u001B[0;32m<ipython-input-42-812c6b018c8c>\u001B[0m in \u001B[0;36m<module>\u001B[0;34m\u001B[0m\n\u001B[0;32m----> 1\u001B[0;31m \u001B[0mdf\u001B[0m\u001B[0;34m=\u001B[0m\u001B[0mread_ca_size_data\u001B[0m\u001B[0;34m(\u001B[0m\u001B[0mdir_path\u001B[0m \u001B[0;34m=\u001B[0m \u001B[0;34m\"results/mount/conway/ca_size\"\u001B[0m\u001B[0;34m,\u001B[0m \u001B[0mtest_name\u001B[0m\u001B[0;34m=\u001B[0m\u001B[0;34m\"active_cells_stress\"\u001B[0m\u001B[0;34m)\u001B[0m\u001B[0;34m\u001B[0m\u001B[0;34m\u001B[0m\u001B[0m\n\u001B[0m\u001B[1;32m 2\u001B[0m \u001B[0mprint\u001B[0m\u001B[0;34m(\u001B[0m\u001B[0mdf\u001B[0m\u001B[0;34m)\u001B[0m\u001B[0;34m\u001B[0m\u001B[0;34m\u001B[0m\u001B[0m\n\u001B[1;32m 3\u001B[0m df = df.rename(columns={\n\u001B[1;32m 4\u001B[0m \u001B[0;34m\"ac_u_naive_stress_\"\u001B[0m\u001B[0;34m:\u001B[0m \u001B[0;34m\"AC FK stress impl.\"\u001B[0m\u001B[0;34m,\u001B[0m\u001B[0;34m\u001B[0m\u001B[0;34m\u001B[0m\u001B[0m\n\u001B[1;32m 5\u001B[0m \u001B[0;34m\"ac_u_sc_one_kernel_adaptive_stress_\"\u001B[0m\u001B[0;34m:\u001B[0m \u001B[0;34m\"AC SC adaptive stress impl.\"\u001B[0m\u001B[0;34m,\u001B[0m\u001B[0;34m\u001B[0m\u001B[0;34m\u001B[0m\u001B[0m\n",
"\u001B[031m---------------------------------------------------------------------------\u001B[0m",
"\u001B[031mIndexError\u001B[0m Traceback (most recent call last)",
"\u001B[032m<ipython-input-42-812c6b018c8c>\u001B[0m in \u001B[0;36m<module>\u001B[0;34m\u001B[0m\n\u001B[0;32m----> 1\u001B[0;31m \u001B[0mdf\u001B[0m\u001B[0;34m=\u001B[0m\u001B[0mread_ca_size_data\u001B[0m\u001B[0;34m(\u001B[0m\u001B[0mdir_path\u001B[0m \u001B[0;34m=\u001B[0m \u001B[0;34m\"results/mount/conway/ca_size\"\u001B[0m\u001B[0;34m,\u001B[0m \u001B[0mtest_name\u001B[0m\u001B[0;34m=\u001B[0m\u001B[0;34m\"active_cells_stress\"\u001B[0m\u001B[0;34m)\u001B[0m\u001B[0;34m\u001B[0m\u001B[0;34m\u001B[0m\u001B[0m\n\u001B[0m\u001B[1;32m 2\u001B[0m \u001B[0mprint\u001B[0m\u001B[0;34m(\u001B[0m\u001B[0mdf\u001B[0m\u001B[0;34m)\u001B[0m\u001B[0;34m\u001B[0m\u001B[0;34m\u001B[0m\u001B[0m\n\u001B[1;32m 3\u001B[0m df = df.rename(columns={\n\u001B[1;32m 4\u001B[0m \u001B[0;34m\"ac_u_naive_stress_\"\u001B[0m\u001B[0;34m:\u001B[0m \u001B[0;34m\"AC FK stress impl.\"\u001B[0m\u001B[0;34m,\u001B[0m\u001B[0;34m\u001B[0m\u001B[0;34m\u001B[0m\u001B[0m\n\u001B[1;32m 5\u001B[0m \u001B[0;34m\"ac_u_sc_one_kernel_adaptive_stress_\"\u001B[0m\u001B[0;34m:\u001B[0m \u001B[0;34m\"AC SC adaptive stress impl.\"\u001B[0m\u001B[0;34m,\u001B[0m\u001B[0;34m\u001B[0m\u001B[0;34m\u001B[0m\u001B[0m\n",
"\u001B[0;32m<ipython-input-26-87c2292ce297>\u001B[0m in \u001B[0;36mread_ca_size_data\u001B[0;34m(dir_path, test_name)\u001B[0m\n\u001B[1;32m 11\u001B[0m \u001B[0;32mfor\u001B[0m \u001B[0mi\u001B[0m\u001B[0;34m,\u001B[0m \u001B[0mca_size\u001B[0m \u001B[0;32min\u001B[0m \u001B[0menumerate\u001B[0m\u001B[0;34m(\u001B[0m\u001B[0mdf\u001B[0m\u001B[0;34m.\u001B[0m\u001B[0mca_size\u001B[0m\u001B[0;34m)\u001B[0m\u001B[0;34m:\u001B[0m\u001B[0;34m\u001B[0m\u001B[0;34m\u001B[0m\u001B[0m\n\u001B[1;32m 12\u001B[0m \u001B[0mfiles\u001B[0m \u001B[0;34m=\u001B[0m \u001B[0mglob\u001B[0m\u001B[0;34m(\u001B[0m\u001B[0;34mf\"{dir_path}/{test_name}/*{file_name}*{ca_size}*\"\u001B[0m\u001B[0;34m)\u001B[0m\u001B[0;34m\u001B[0m\u001B[0;34m\u001B[0m\u001B[0m\n\u001B[0;32m---> 13\u001B[0;31m \u001B[0mfile_df\u001B[0m \u001B[0;34m=\u001B[0m \u001B[0mpd\u001B[0m\u001B[0;34m.\u001B[0m\u001B[0mread_csv\u001B[0m\u001B[0;34m(\u001B[0m\u001B[0mfiles\u001B[0m\u001B[0;34m[\u001B[0m\u001B[0;36m0\u001B[0m\u001B[0;34m]\u001B[0m\u001B[0;34m,\u001B[0m \u001B[0mskiprows\u001B[0m\u001B[0;34m=\u001B[0m\u001B[0;36m2\u001B[0m\u001B[0;34m,\u001B[0m \u001B[0mnames\u001B[0m\u001B[0;34m=\u001B[0m\u001B[0;34m[\u001B[0m\u001B[0;34m\"ac_coverage\"\u001B[0m\u001B[0;34m,\u001B[0m\u001B[0;34m'iter_time'\u001B[0m\u001B[0;34m,\u001B[0m \u001B[0;34m'z'\u001B[0m\u001B[0;34m,\u001B[0m \u001B[0;34m'x'\u001B[0m\u001B[0;34m,\u001B[0m \u001B[0;34m'y'\u001B[0m\u001B[0;34m]\u001B[0m\u001B[0;34m)\u001B[0m\u001B[0;34m\u001B[0m\u001B[0;34m\u001B[0m\u001B[0m\n\u001B[0m\u001B[1;32m 14\u001B[0m \u001B[0mfile_data\u001B[0m\u001B[0;34m.\u001B[0m\u001B[0mappend\u001B[0m\u001B[0;34m(\u001B[0m\u001B[0mfile_df\u001B[0m\u001B[0;34m[\u001B[0m\u001B[0;34m\"iter_time\"\u001B[0m\u001B[0;34m]\u001B[0m\u001B[0;34m.\u001B[0m\u001B[0mcumsum\u001B[0m\u001B[0;34m(\u001B[0m\u001B[0;34m)\u001B[0m\u001B[0;34m.\u001B[0m\u001B[0miloc\u001B[0m\u001B[0;34m[\u001B[0m\u001B[0;34m-\u001B[0m\u001B[0;36m1\u001B[0m\u001B[0;34m]\u001B[0m \u001B[0;34m/\u001B[0m \u001B[0;36m10\u001B[0m\u001B[0;34m**\u001B[0m\u001B[0;36m9\u001B[0m\u001B[0;34m)\u001B[0m\u001B[0;34m\u001B[0m\u001B[0;34m\u001B[0m\u001B[0m\n\u001B[1;32m 15\u001B[0m \u001B[0mdf\u001B[0m\u001B[0;34m[\u001B[0m\u001B[0mfile_name\u001B[0m\u001B[0;34m]\u001B[0m\u001B[0;34m=\u001B[0m\u001B[0mfile_data\u001B[0m\u001B[0;34m\u001B[0m\u001B[0;34m\u001B[0m\u001B[0m\n",
"\u001B[0;31mIndexError\u001B[0m: list index out of range"
]
Expand Down
84 changes: 38 additions & 46 deletions src/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,45 +12,49 @@ set(CMAKE_CUDA_STANDARD 14)

add_library(common STATIC
params.h
parallel/common/cuda_error_check.cuh
parallel/common/file_helper.h
parallel/common/file_helper.cpp
parallel/common/timer.h
parallel/common/timer.cpp
parallel/common/statistics.h
parallel/common/statistics.cpp
parallel/common/memory_management.cuh
parallel/common/memory_management.cu
parallel/kernels/iteration_step.cu
parallel/utils/cuda_error_check.cuh
parallel/utils/file_helper.h
parallel/utils/file_helper.cpp
parallel/utils/timer.h
parallel/utils/timer.cpp
parallel/utils/statistics.h
parallel/utils/statistics.cpp
parallel/utils/memory_management.cuh
parallel/utils/memory_management.cu
parallel/kernels/transition_kernels.cu
parallel/active_cells_impl/utils.cu
parallel/kernels/dummy_kernels.cu
parallel/kernels/ac_kernels.cu
parallel/active_cells_impl/sc/utils.cu
)
set_target_properties(common PROPERTIES LINKER_LANGUAGE CUDA)

# global memory target
add_executable(g_standard parallel/global_memory/g_standard.cu)
add_executable(g_standard parallel/memory_impl/variants/g_standard.cu)
target_link_libraries(g_standard common)
add_executable(g_standard_stress parallel/global_memory/g_standard_stress.cu)
add_executable(g_standard_stress parallel/memory_impl/variants/g_standard_stress.cu)
target_link_libraries(g_standard_stress common)
add_executable(g_shared parallel/global_memory/g_shared.cu)
add_executable(g_shared parallel/memory_impl/variants/g_shared.cu)
target_link_libraries(g_shared common)
add_executable(g_shared_stress parallel/global_memory/g_shared_stress.cu)
add_executable(g_shared_stress parallel/memory_impl/variants/g_shared_stress.cu)
target_link_libraries(g_shared_stress common)
add_executable(g_hybrid parallel/global_memory/g_hybrid.cu)
add_executable(g_hybrid parallel/memory_impl/variants/g_hybrid.cu)
target_link_libraries(g_hybrid common)
add_executable(g_hybrid_stress parallel/global_memory/g_hybrid_stress.cu)
add_executable(g_hybrid_stress parallel/memory_impl/variants/g_hybrid_stress.cu)
target_link_libraries(g_hybrid_stress common)

# unified_sc memory target
add_executable(u_standard parallel/unified_memory/u_standard.cu)
add_executable(u_standard parallel/memory_impl/variants/u_standard.cu)
target_link_libraries(u_standard common)
add_executable(u_standard_stress parallel/unified_memory/u_standard_stress.cu)
add_executable(u_standard_stress parallel/memory_impl/variants/u_standard_stress.cu)
target_link_libraries(u_standard_stress common)
add_executable(u_shared parallel/unified_memory/u_shared.cu)
add_executable(u_shared parallel/memory_impl/variants/u_shared.cu)
target_link_libraries(u_shared common)
add_executable(u_shared_stress parallel/unified_memory/u_shared_stress.cu)
add_executable(u_shared_stress parallel/memory_impl/variants/u_shared_stress.cu)
target_link_libraries(u_shared_stress common)
add_executable(u_hybrid parallel/unified_memory/u_hybrid.cu)
add_executable(u_hybrid parallel/memory_impl/variants/u_hybrid.cu)
target_link_libraries(u_hybrid common)
add_executable(u_hybrid_stress parallel/unified_memory/u_hybrid_stress.cu)
add_executable(u_hybrid_stress parallel/memory_impl/variants/u_hybrid_stress.cu)
target_link_libraries(u_hybrid_stress common)

############################
Expand All @@ -59,53 +63,41 @@ target_link_libraries(u_hybrid_stress common)

## UNIFIED MEMORY ##

# atomic
add_executable(ac_u_atomic parallel/active_cells/unified_memory/atomic/ac_standard.cu)
target_link_libraries(ac_u_atomic common)
add_executable(ac_u_atomic_stress parallel/active_cells/unified_memory/atomic/ac_standard_stress.cu)
target_link_libraries(ac_u_atomic_stress common)

# naive
add_executable(ac_u_naive parallel/active_cells/unified_memory/naive/ac_standard.cu)
add_executable(ac_u_naive parallel/active_cells_impl/naive/variants/u_ac_standard.cu)
target_link_libraries(ac_u_naive common)
add_executable(ac_u_naive_stress parallel/active_cells/unified_memory/naive/ac_standard_stress.cu)
add_executable(ac_u_naive_stress parallel/active_cells_impl/naive/variants/u_standard_stress.cu)
target_link_libraries(ac_u_naive_stress common)

# stream compaction
add_executable(ac_u_sc parallel/active_cells/unified_memory/sc/ac_standard.cu)
add_executable(ac_u_sc parallel/active_cells_impl/sc/variants/u_ac_standard.cu)
target_link_libraries(ac_u_sc common)
add_executable(ac_u_sc_stress parallel/active_cells/unified_memory/sc/ac_standard_stress.cu)
add_executable(ac_u_sc_stress parallel/active_cells_impl/sc/variants/u_ac_standard_stress.cu)
target_link_libraries(ac_u_sc_stress common)

# stream compaction adaptive
add_executable(ac_u_sc_adaptive parallel/active_cells/unified_memory/sc_adaptive/ac_standard.cu)
add_executable(ac_u_sc_adaptive parallel/active_cells_impl/sc/variants/u_ac_adaptive.cu)
target_link_libraries(ac_u_sc_adaptive common)
add_executable(ac_u_sc_adaptive_stress parallel/active_cells/unified_memory/sc_adaptive/ac_standard_stress.cu)
add_executable(ac_u_sc_adaptive_stress parallel/active_cells_impl/sc/variants/u_ac_adaptive_stress.cu)
target_link_libraries(ac_u_sc_adaptive_stress common)


## GLOBAL MEMORY ##

# atomic (deprecated)
add_executable(ac_g_atomic parallel/active_cells/global_memory/atomic/ac_standard.cu)
target_link_libraries(ac_g_atomic common)
add_executable(ac_g_atomic_stress parallel/active_cells/global_memory/atomic/ac_standard_stress.cu)
target_link_libraries(ac_g_atomic_stress common)

# naive
add_executable(ac_g_naive parallel/active_cells/global_memory/naive/ac_standard.cu)
add_executable(ac_g_naive parallel/active_cells_impl/naive/variants/g_ac_standard.cu)
target_link_libraries(ac_g_naive common)
add_executable(ac_g_naive_stress parallel/active_cells/global_memory/naive/ac_standard_stress.cu)
add_executable(ac_g_naive_stress parallel/active_cells_impl/naive/variants/g_ac_standard_stress.cu)
target_link_libraries(ac_g_naive_stress common)

# stream compaction
add_executable(ac_g_sc parallel/active_cells/global_memory/sc/ac_standard.cu)
add_executable(ac_g_sc parallel/active_cells_impl/sc/variants/g_ac_standard.cu)
target_link_libraries(ac_g_sc common)
add_executable(ac_g_sc_stress parallel/active_cells/global_memory/sc/ac_standard_stress.cu)
add_executable(ac_g_sc_stress parallel/active_cells_impl/sc/variants/g_ac_standard_stress.cu)
target_link_libraries(ac_g_sc_stress common)

# stream compaction adaptive
add_executable(ac_g_sc_adaptive parallel/active_cells/global_memory/sc_adaptive/ac_standard.cu)
add_executable(ac_g_sc_adaptive parallel/active_cells_impl/sc/variants/g_ac_adaptive.cu)
target_link_libraries(ac_g_sc_adaptive common)
add_executable(ac_g_sc_adaptive_stress parallel/active_cells/global_memory/sc_adaptive/ac_standard_stress.cu)
add_executable(ac_g_sc_adaptive_stress parallel/active_cells_impl/sc/variants/g_ac_adaptive_stress.cu)
target_link_libraries(ac_g_sc_adaptive_stress common)
3 changes: 0 additions & 3 deletions src/parallel/active_cells/global_memory/atomic/ac_standard.cu
View file
Open in desktop

This file was deleted.

11 changes: 0 additions & 11 deletions src/parallel/active_cells/global_memory/atomic/ac_standard_stress.cu
View file
Open in desktop

This file was deleted.

204 changes: 0 additions & 204 deletions src/parallel/active_cells/global_memory/atomic/common.cu
View file
Open in desktop

This file was deleted.

3 changes: 0 additions & 3 deletions src/parallel/active_cells/global_memory/naive/ac_standard.cu
View file
Open in desktop

This file was deleted.

11 changes: 0 additions & 11 deletions src/parallel/active_cells/global_memory/naive/ac_standard_stress.cu
View file
Open in desktop

This file was deleted.

Loading