Permalink
Browse files

Kill old macro-based pipelining framework (scan.h). Move tests that d…

…epend on scan.h (ami_arith, ami_gp, ami_merge, ami_pmerge, ami_sort) along with tests that were already commented out of CMakeLists.txt (ami_bp, ami_btree) into new folder test/deadcode/, move scan.h and scan_utils.h into tpie/deadcode. Comment out matrix app from apps/CMakeLists.txt.
  • Loading branch information...
1 parent c0ad731 commit 0d628359a67c59ce1265beb8f919d33599a38796 @Mortal Mortal committed Jan 24, 2012
View
@@ -1,3 +1,3 @@
-add_subdirectory(matrix)
+#add_subdirectory(matrix)
#add_subdirectory(rtree)
#add_subdirectory(bkdtree)
View
@@ -7,43 +7,19 @@ set (COMMON_DEPS
parse_args.h
)
-set (SCAN_DEPS
- scan_count.cpp
- scan_count.h
- scan_diff.h
- scan_random.cpp
- scan_random.h
- scan_square.h
- # scan_uniform_sm.cpp
-# scan_uniform_sm.h
- scan_universal.h
- )
add_library(test_common ${COMMON_DEPS})
-add_library(test_scan_common ${SCAN_DEPS})
set_target_properties(test_common PROPERTIES FOLDER tpie/test)
-set_target_properties(test_scan_common PROPERTIES FOLDER tpie/test)
macro(add_tpie_test NAME)
add_executable(${NAME} ${NAME}.cpp)
set_target_properties(${NAME} PROPERTIES FOLDER tpie/test)
- target_link_libraries(${NAME} tpie test_common test_scan_common )
+ target_link_libraries(${NAME} tpie test_common )
endmacro(add_tpie_test)
-add_tpie_test(test_ami_arith)
-add_tpie_test(test_ami_gp)
-add_tpie_test(test_ami_merge)
-#add_tpie_test(test_ami_sm)
add_tpie_test(test_ami_stack)
add_tpie_test(test_sort)
-#add_tpie_test(test_ami_bp)
-#add_tpie_test(test_ami_matrix)
-add_tpie_test(test_ami_pmerge)
add_tpie_test(test_big_scan)
-#add_tpie_test(test_ami_btree)
-#add_tpie_test(test_ami_matrix_pad)
add_tpie_test(test_ami_queue)
-add_tpie_test(test_ami_sort)
-#add_tpie_test(test_correctness)
add_subdirectory(speed_regression)
View
@@ -0,0 +1 @@
+See tpie/deadcode/README.md.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
@@ -38,6 +38,8 @@
// Get some memory.
#include <tpie/memory.h>
+#include <tpie/tpie.h>
+
using namespace tpie;
static char def_crf[] = "osc.txt";
@@ -81,6 +83,8 @@ void parse_app_opts(int idx, char *opt_arg)
int main(int argc, char **argv)
{
+ tpie_init();
+
parse_args(argc, argv, app_opts, parse_app_opts);
if (verbose) {
@@ -91,7 +95,7 @@ int main(int argc, char **argv)
else {
std::cout << test_size << ' ' << static_cast<TPIE_OS_OUTPUT_SIZE_T>(test_mm_size) << ' ' << random_seed;
}
-
+
// Set the amount of main memory:
get_memory_manager().set_limit (test_mm_size);
@@ -157,6 +161,6 @@ int main(int argc, char **argv)
if (report_results_final) {
ami::scan(&amis2, rptf);
}
-
+
return 0;
}
File renamed without changes.
File renamed without changes.
@@ -36,6 +36,8 @@
// Get AMI_general_permute().
#include <tpie/gen_perm.h>
+#include <tpie/tpie.h>
+
#include "parse_args.h"
#include "scan_count.h"
@@ -92,6 +94,7 @@ class reverse_order : public ami::gen_perm_object {
int main(int argc, char **argv) {
+ tpie_init();
parse_args(argc, argv, app_opts, parse_app_opts);
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
View
@@ -11,8 +11,6 @@ set (AMI_HEADERS
priority_queue.h
priority_queue.inl
queue.h
- scan.h
- #scan_utils.h
serialization.h
sort.h
stack.h
File renamed without changes.
File renamed without changes.

0 comments on commit 0d62835

Please sign in to comment.