diff options
| -rw-r--r-- | CMakeLists.txt | 18 | ||||
| -rw-r--r-- | expt_0528.cu | 2 | ||||
| -rw-r--r-- | expt_0604.cpp | 1 | ||||
| -rw-r--r-- | expt_220702.cpp (renamed from expt_0702.cpp) | 0 | ||||
| -rwxr-xr-x | expt_220702.py (renamed from expt_0702.py) | 0 | ||||
| -rw-r--r-- | expt_220722.cpp (renamed from expt_0722.cpp) | 0 | ||||
| -rw-r--r-- | expt_220726.cpp (renamed from expt_0726.cpp) | 0 | ||||
| -rw-r--r-- | expt_220729.cu (renamed from expt_0729.cu) | 0 | ||||
| -rw-r--r-- | expt_220802.cpp (renamed from expt_0802.cpp) | 0 | ||||
| -rw-r--r-- | expt_220804.cu (renamed from expt_0804.cu) | 0 | ||||
| -rw-r--r-- | expt_220809.cu (renamed from expt_0809.cu) | 0 | ||||
| -rw-r--r-- | expt_220821.cpp (renamed from expt_0821.cpp) | 0 | ||||
| -rw-r--r-- | expt_220830.cu (renamed from expt_0830.cu) | 0 |
13 files changed, 11 insertions, 10 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 56323ee..d0292ff 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -84,30 +84,30 @@ set_target_properties(normal_distribution PROPERTIES LINKER_LANGUAGE CXX) add_executable(normal_distribution_expt3 expt_3.cpp) set_target_properties(normal_distribution_expt3 PROPERTIES LINKER_LANGUAGE CXX) -add_executable(normal_distribution_expt0702 expt_0702.cpp) +add_executable(normal_distribution_expt0702 expt_220702.cpp) set_target_properties(normal_distribution_expt0702 PROPERTIES LINKER_LANGUAGE CXX) add_executable(work_0719 work_0719.cu) set_cuda_target_base(work_0719) -add_executable(expt_0722 expt_0722.cpp) +add_executable(expt_0722 expt_220722.cpp) set_target_properties(expt_0722 PROPERTIES LINKER_LANGUAGE CXX) -add_executable(expt_0726 expt_0726.cpp) +add_executable(expt_0726 expt_220726.cpp) set_target_properties(expt_0726 PROPERTIES LINKER_LANGUAGE CXX) -add_executable(expt_0729 expt_0729.cu) +add_executable(expt_0729 expt_220729.cu) set_cuda_target_base(expt_0729) -add_executable(expt_0802 expt_0802.cpp) +add_executable(expt_0802 expt_220802.cpp) target_link_libraries(expt_0802 m stdc++) -add_executable(expt_0804 expt_0804.cu) +add_executable(expt_0804 expt_220804.cu) set_cuda_target_base(expt_0804) -add_executable(expt_0809 expt_0809.cu) +add_executable(expt_0809 expt_220809.cu) set_cuda_target_base(expt_0809) @@ -117,10 +117,10 @@ target_link_libraries(valid_sort_new m stdc++) add_executable(valid_sort valid_sort.cpp) target_link_libraries(valid_sort m stdc++) -add_executable(expt_0821 expt_0821.cpp sortlib.h) +add_executable(expt_0821 expt_220821.cpp sortlib.h) target_link_libraries(expt_0821 m stdc++) -add_executable(expt_0830 expt_0830.cu sortlib.cuh) +add_executable(expt_0830 expt_220830.cu sortlib.cuh) set_cuda_target_base(expt_0830) add_executable(normal_skiplist normal_skiplist.cpp) diff --git a/expt_0528.cu b/expt_0528.cu index d74c93a..fadf3b8 100644 --- a/expt_0528.cu +++ b/expt_0528.cu @@ -729,12 +729,12 @@ int main(int argc, char **argv) { // Launch main kernel + blocks = calcBlocks(search_length); cudaEvent_t start, stop; cudaEventCreate(&start); cudaEventCreate(&stop); cudaEventRecord(start, nullptr); - blocks = calcBlocks(search_length); kernel<<<blocks, NUM_THREADS>>>(cudaOperatorItems, search_length, cudaResult); CudaCheckError(); cudaDeviceSynchronize(); diff --git a/expt_0604.cpp b/expt_0604.cpp index a1dbf26..1109bcb 100644 --- a/expt_0604.cpp +++ b/expt_0604.cpp @@ -52,6 +52,7 @@ int main(int argc, char const *argv[]) { if (limit <= 0) { limit = max_limit; } + auto s = measure("stdio", stdio); auto f = measure("fstream", fstream); std::cout << (s < f ? "stdio" : "fstream") << " win\n"; diff --git a/expt_0702.cpp b/expt_220702.cpp index f7023f7..f7023f7 100644 --- a/expt_0702.cpp +++ b/expt_220702.cpp diff --git a/expt_0702.py b/expt_220702.py index 5ac42b0..5ac42b0 100755 --- a/expt_0702.py +++ b/expt_220702.py diff --git a/expt_0722.cpp b/expt_220722.cpp index db4b833..db4b833 100644 --- a/expt_0722.cpp +++ b/expt_220722.cpp diff --git a/expt_0726.cpp b/expt_220726.cpp index 397bc90..397bc90 100644 --- a/expt_0726.cpp +++ b/expt_220726.cpp diff --git a/expt_0729.cu b/expt_220729.cu index 5660c6c..5660c6c 100644 --- a/expt_0729.cu +++ b/expt_220729.cu diff --git a/expt_0802.cpp b/expt_220802.cpp index 094da65..094da65 100644 --- a/expt_0802.cpp +++ b/expt_220802.cpp diff --git a/expt_0804.cu b/expt_220804.cu index 66f66ec..66f66ec 100644 --- a/expt_0804.cu +++ b/expt_220804.cu diff --git a/expt_0809.cu b/expt_220809.cu index 44d9992..44d9992 100644 --- a/expt_0809.cu +++ b/expt_220809.cu diff --git a/expt_0821.cpp b/expt_220821.cpp index 6bbcef0..6bbcef0 100644 --- a/expt_0821.cpp +++ b/expt_220821.cpp diff --git a/expt_0830.cu b/expt_220830.cu index fc05092..fc05092 100644 --- a/expt_0830.cu +++ b/expt_220830.cu |
