diff --git a/source/tests/aligned_allocator_tests.cpp b/source/tests/aligned_allocator_tests.cpp index ecbeb40f6..d9a53c38b 100644 --- a/source/tests/aligned_allocator_tests.cpp +++ b/source/tests/aligned_allocator_tests.cpp @@ -195,14 +195,14 @@ TEST_F(aligned_allocator_tests, m128) }); // print the solution and initial factors for record-keeping - std::cout << "\nsizeof(__m128) = " << sizeof(__m128) << std::endl; - details::print(std::cout, "initial factors", factors); - details::print(std::cout, "solution", solution); + // std::cout << "\nsizeof(__m128) = " << sizeof(__m128) << std::endl; + // details::print(std::cout, "initial factors", factors); + // details::print(std::cout, "solution", solution); for(std::size_t i = 0; i < niter; ++i) { // print current iteration - std::cout << "\niteration " << i << ":\n"; + // std::cout << "\niteration " << i << ":\n"; // create two __m128 packed vectors to add together lhs.push_back(_mm_set_ps(factors[3], factors[2], factors[1], factors[0])); @@ -234,7 +234,7 @@ TEST_F(aligned_allocator_tests, m128) lhs.erase(lhs.begin()); rhs.erase(rhs.begin()); } - std::cout << std::endl; + // std::cout << std::endl; } //--------------------------------------------------------------------------------------// @@ -264,14 +264,14 @@ TEST_F(aligned_allocator_tests, m128d) }); // print the solution and initial factors for record-keeping - std::cout << "\nsizeof(__m128d) = " << sizeof(__m128d) << std::endl; - details::print(std::cout, "initial factors", factors); - details::print(std::cout, "solution", solution); + // std::cout << "\nsizeof(__m128d) = " << sizeof(__m128d) << std::endl; + // details::print(std::cout, "initial factors", factors); + // details::print(std::cout, "solution", solution); for(std::size_t i = 0; i < niter; ++i) { // print current iteration - std::cout << "\niteration " << i << ":\n"; + // std::cout << "\niteration " << i << ":\n"; // create two __m128 packed vectors to add together lhs.push_back(_mm_set_pd(factors[1], factors[0])); @@ -303,7 +303,7 @@ TEST_F(aligned_allocator_tests, m128d) lhs.erase(lhs.begin()); rhs.erase(rhs.begin()); } - std::cout << std::endl; + // std::cout << std::endl; } //--------------------------------------------------------------------------------------// diff --git a/source/tests/archive_storage_tests.cpp b/source/tests/archive_storage_tests.cpp index 94c7e272c..31f6e264f 100644 --- a/source/tests/archive_storage_tests.cpp +++ b/source/tests/archive_storage_tests.cpp @@ -148,8 +148,8 @@ class archive_storage_tests : public ::testing::Test tim::settings::cout_output() = false; tim::settings::text_output() = true; tim::settings::flamegraph_output() = false; - tim::dmp::initialize(_argc, _argv); - tim::timemory_init(_argc, _argv); + tim::dmp::initialize(test_argc, test_argv); + tim::timemory_init(test_argc, test_argv); tim::settings::dart_output() = true; tim::settings::dart_count() = 1; tim::settings::banner() = false; @@ -159,14 +159,14 @@ class archive_storage_tests : public ::testing::Test threads.emplace_back(std::thread(details::generate_history, 5, 2)); for(auto& itr : threads) itr.join(); - std::cout << "Configured" << std::endl; + // std::cout << "Configured" << std::endl; } static void TearDownTestSuite() { tim::timemory_finalize(); tim::dmp::finalize(); - std::cout << "Finalized" << std::endl; + // std::cout << "Finalized" << std::endl; } static std::map f_results; diff --git a/source/tests/argparse_tests.cpp b/source/tests/argparse_tests.cpp index 50cd5e4f5..c62d86623 100644 --- a/source/tests/argparse_tests.cpp +++ b/source/tests/argparse_tests.cpp @@ -37,8 +37,8 @@ #include #include -static int _argc = 0; -static char** _argv = nullptr; +static int test_argc = 0; +static char** test_argv = nullptr; static int _margc = 0; static char** _margv = nullptr; static int _log_once = 0; @@ -96,11 +96,11 @@ parse_function() inline void cleanup() { - if(_argv) + if(test_argv) { - for(int i = 0; i < _argc; ++i) - free(_argv[i]); - delete[] _argv; + for(int i = 0; i < test_argc; ++i) + free(test_argv[i]); + delete[] test_argv; } } // @@ -197,13 +197,13 @@ parse(argparse_t& parser, Args&&... args) .max_count(1); parser.add_argument({ "--load" }, "Extra libraries to load"); - _argc = sizeof...(Args) + 1; - _argv = new char*[_argc]; - _argv[0] = strdup(_arg0); + test_argc = sizeof...(Args) + 1; + test_argv = new char*[test_argc]; + test_argv[0] = strdup(_arg0); int i = 1; - TIMEMORY_FOLD_EXPRESSION((_argv[i] = strdup(std::forward(args)), ++i)); + TIMEMORY_FOLD_EXPRESSION((test_argv[i] = strdup(std::forward(args)), ++i)); - auto err = parse_function()(parser, _argc, _argv); + auto err = parse_function()(parser, test_argc, test_argv); // only log the help function once auto _log_id = _log_once++; @@ -575,11 +575,11 @@ TEST_F(argparse_tests, parse_known_options) EXPECT_TRUE(arg.at(2) == "and"); EXPECT_TRUE(arg.at(3) == "long"); - EXPECT_EQ(_argc, 3); - EXPECT_EQ(std::string(_argv[0]), std::string(_arg0)); - EXPECT_EQ(std::string(_argv[1]), std::string("10")); - EXPECT_EQ(std::string(_argv[2]), std::string("20")); - EXPECT_TRUE(_argv[3] == nullptr); + EXPECT_EQ(test_argc, 3); + EXPECT_EQ(std::string(test_argv[0]), std::string(_arg0)); + EXPECT_EQ(std::string(test_argv[1]), std::string("10")); + EXPECT_EQ(std::string(test_argv[2]), std::string("20")); + EXPECT_TRUE(test_argv[3] == nullptr); details::parse_function() = orig; } @@ -613,10 +613,10 @@ TEST_F(argparse_tests, parse_known_options_without_options) EXPECT_FALSE(parser.get("p")); EXPECT_FALSE(parser.get("pid")); - EXPECT_EQ(_argc, 3); - EXPECT_EQ(std::string(_argv[0]), std::string(_arg0)); - EXPECT_EQ(std::string(_argv[1]), std::string("10")); - EXPECT_EQ(std::string(_argv[2]), std::string("20")); + EXPECT_EQ(test_argc, 3); + EXPECT_EQ(std::string(test_argv[0]), std::string(_arg0)); + EXPECT_EQ(std::string(test_argv[1]), std::string("10")); + EXPECT_EQ(std::string(test_argv[2]), std::string("20")); details::parse_function() = orig; } diff --git a/source/tests/cache_tests.cpp b/source/tests/cache_tests.cpp index d708e56d2..0d4076d14 100644 --- a/source/tests/cache_tests.cpp +++ b/source/tests/cache_tests.cpp @@ -648,14 +648,14 @@ TEST_F(cache_tests, io) TEST_F(cache_tests, validation) { - puts("\n>>> INITIAL CACHE <<<\n"); - puts(print_rusage_cache(*cache.at(0)).c_str()); - puts("\n>>> BUNDLE <<<\n"); - std::cout << *bundle << std::endl; - puts("\n>>> CACHE BUNDLE <<<\n"); - std::cout << *cache_bundle << std::endl; - puts("\n>>> FINAL CACHE <<<\n"); - puts(print_rusage_cache(*cache.at(1)).c_str()); + // puts("\n>>> INITIAL CACHE <<<\n"); + // puts(print_rusage_cache(*cache.at(0)).c_str()); + // puts("\n>>> BUNDLE <<<\n"); + // std::cout << *bundle << std::endl; + // puts("\n>>> CACHE BUNDLE <<<\n"); + // std::cout << *cache_bundle << std::endl; + // puts("\n>>> FINAL CACHE <<<\n"); + // puts(print_rusage_cache(*cache.at(1)).c_str()); EXPECT_NEAR(tot_size, bundle->get()->get(), peak_tolerance); EXPECT_NEAR(std::get<0>(bundle->get()->get()), @@ -683,12 +683,12 @@ TEST_F(cache_tests, complete_tuple) _bundle.store(mpl::piecewise_ignore{}, 1000.0); _bundle.stop(_ecache); - puts("\n>>> INITIAL CACHE <<<\n"); - puts(print_rusage_cache(_bcache).c_str()); - puts("\n>>> BUNDLE <<<\n"); - std::cout << _bundle << std::endl; - puts("\n>>> FINAL CACHE <<<\n"); - puts(print_rusage_cache(_ecache).c_str()); + // puts("\n>>> INITIAL CACHE <<<\n"); + // puts(print_rusage_cache(_bcache).c_str()); + // puts("\n>>> BUNDLE <<<\n"); + // std::cout << _bundle << std::endl; + // puts("\n>>> FINAL CACHE <<<\n"); + // puts(print_rusage_cache(_ecache).c_str()); _bundle.push(mpl::piecewise_select{}); diff --git a/source/tests/component_bundle_tests.cpp b/source/tests/component_bundle_tests.cpp index ee2dfbb56..fac86b3e9 100644 --- a/source/tests/component_bundle_tests.cpp +++ b/source/tests/component_bundle_tests.cpp @@ -162,10 +162,10 @@ TEST_F(component_bundle_tests, variadic) sizes[6] = bundle_t::size(); } - std::cout << "\n"; - for(size_t i = 0; i < nz; ++i) - std::cout << "size[" << i << "] = " << sizes[i] << std::endl; - std::cout << "\n"; + // std::cout << "\n"; + // for(size_t i = 0; i < nz; ++i) + // std::cout << "size[" << i << "] = " << sizes[i] << std::endl; + // std::cout << "\n"; EXPECT_EQ(sizes[0], sizes[1]); @@ -184,8 +184,8 @@ TEST_F(component_bundle_tests, variadic) auto csize = tim::storage::instance()->size(); auto psize = tim::storage::instance()->size(); - std::cout << "\nbundle : " << tim::demangle() << "\n"; - std::cout << "\n"; + // std::cout << "\nbundle : " << tim::demangle() << "\n"; + // std::cout << "\n"; long nfib = 30; long ival = 200; long nitr = 1000; @@ -221,9 +221,9 @@ TEST_F(component_bundle_tests, get) using rhs_t = tim::auto_bundle_t*, gpu_roofline>; - using lhs_data_t = typename lhs_t::data_type; - using rhs_data_t = typename rhs_t::data_type; - using rhs_comp_t = typename rhs_t::component_type; + // using lhs_data_t = typename lhs_t::data_type; + // using rhs_data_t = typename rhs_t::data_type; + // using rhs_comp_t = typename rhs_t::component_type; lhs_t::get_initializer() = [](auto& cl) { cl.template initialize(); @@ -247,20 +247,20 @@ TEST_F(component_bundle_tests, get) auto cb = lhs.get(); auto ab = rhs.get(); - std::cout << "\n" << std::flush; + // std::cout << "\n" << std::flush; - std::cout << "rhs_t = " << tim::demangle() << "\n"; - std::cout << "lhs_t = " << tim::demangle() << "\n"; - std::cout << "rhs_comp_t = " << tim::demangle() << "\n"; - std::cout << "\n" << std::flush; + // std::cout << "rhs_t = " << tim::demangle() << "\n"; + // std::cout << "lhs_t = " << tim::demangle() << "\n"; + // std::cout << "rhs_comp_t = " << tim::demangle() << "\n"; + // std::cout << "\n" << std::flush; - std::cout << "lhs_data_t = " << tim::demangle() << "\n"; - std::cout << "rhs_data_t = " << tim::demangle() << "\n"; - std::cout << "\n" << std::flush; + // std::cout << "lhs_data_t = " << tim::demangle() << "\n"; + // std::cout << "rhs_data_t = " << tim::demangle() << "\n"; + // std::cout << "\n" << std::flush; - std::cout << "cb = " << tim::demangle() << "\n"; - std::cout << "ab = " << tim::demangle() << "\n"; - std::cout << "\n" << std::flush; + // std::cout << "cb = " << tim::demangle() << "\n"; + // std::cout << "ab = " << tim::demangle() << "\n"; + // std::cout << "\n" << std::flush; tim::invoke::print(std::cout, lhs, rhs); @@ -719,9 +719,9 @@ run(Args&&... args) // this should have no effect foo.stop(); - std::cout << tim::demangle() << std::endl; - std::cout << foo << std::endl; - std::cout << bar << std::endl; + // std::cout << tim::demangle() << std::endl; + // std::cout << foo << std::endl; + // std::cout << bar << std::endl; } // auto @@ -930,8 +930,8 @@ rekey(const std::string& _initial) auto _other_srcloc = TIMEMORY_SOURCE_LOCATION(TIMEMORY_CAPTURE_MODE(blank), _other.c_str()); - std::cout << "[" << tim::demangle() << "] initial: " << _initial - << ", random: " << _other << std::endl; + // std::cout << "[" << tim::demangle() << "] initial: " << _initial + // << ", random: " << _other << std::endl; { Tp _obj{ _initial }; @@ -969,7 +969,7 @@ rekey(const std::string& _initial) EXPECT_NE(_obj.hash(), _init_hash) << "[" << tim::demangle() << "] " << _obj; } - std::cout << std::endl; + // std::cout << std::endl; } template diff --git a/source/tests/data_tracker_tests.cpp b/source/tests/data_tracker_tests.cpp index a9ec50b5a..270394b9e 100644 --- a/source/tests/data_tracker_tests.cpp +++ b/source/tests/data_tracker_tests.cpp @@ -338,7 +338,7 @@ TEST_F(data_tracker_tests, convergence_test) tim::trait::runtime_enabled::set(true); auto _run = [&err_diffs, &num_iters, nthreads](size_t i, auto lbl, size_t nitr, - size_t modulo) { + size_t /*modulo*/) { details::get_rng().seed(1000 * i); auto _name = TIMEMORY_JOIN('/', details::get_test_name(), lbl); @@ -382,16 +382,16 @@ TEST_F(data_tracker_tests, convergence_test) num_iters.at(i) += num_iter; _bundle.stop(); - if(j % modulo == (modulo - 1)) - { - tim::auto_lock_t _lk{ tim::type_mutex() }; - if(tim::settings::debug()) - std::cout << "\niteration " << i << "\n" << _tcout.str() << std::endl; - std::cout << "\niteration " << i << "\n\t" << _bundle - << "\n\tnum_iter : " << num_iter << "\n\terror : " << err - << "\n" - << std::endl; - } + // if(j % modulo == (modulo - 1)) + // { + // tim::auto_lock_t _lk{ tim::type_mutex() }; + // if(tim::settings::debug()) + // std::cout << "\niteration " << i << "\n" << _tcout.str() << std::endl; + // std::cout << "\niteration " << i << "\n\t" << _bundle + // << "\n\tnum_iter : " << num_iter << "\n\terror : " << err + // << "\n" + // << std::endl; + // } } }; @@ -418,11 +418,11 @@ TEST_F(data_tracker_tests, convergence_test) auto err_storage = tim::storage::instance()->get(); auto wc_storage = tim::storage::instance()->get(); - for(auto& itr : itr_storage) - std::cout << itr.prefix() << " :: " << itr.data() << std::endl; + // for(auto& itr : itr_storage) + // std::cout << itr.prefix() << " :: " << itr.data() << std::endl; for(auto& itr : wc_storage) { - std::cout << itr.prefix() << " :: " << itr.data() << std::endl; + // std::cout << itr.prefix() << " :: " << itr.data() << std::endl; ASSERT_EQ(itr.prefix().find("ignore"), std::string::npos) << itr.prefix() << " :: " << itr.data() << "\n"; } @@ -430,10 +430,10 @@ TEST_F(data_tracker_tests, convergence_test) ASSERT_EQ(itr_storage.size(), nthreads); ASSERT_EQ(err_storage.size(), nthreads); - for(size_t i = 0; i < nthreads; ++i) - { - std::cout << itr_storage.at(i).data() << std::endl; - } + // for(size_t i = 0; i < nthreads; ++i) + // { + // std::cout << itr_storage.at(i).data() << std::endl; + // } std::sort(itr_storage.begin(), itr_storage.end(), _compare); std::sort(err_storage.begin(), err_storage.end(), _compare); diff --git a/source/tests/derived_tests.cpp b/source/tests/derived_tests.cpp index f1e96056d..c0d9c163a 100644 --- a/source/tests/derived_tests.cpp +++ b/source/tests/derived_tests.cpp @@ -121,7 +121,7 @@ class derived_tests : public ::testing::Test TEST_F(derived_tests, cpu_util_tuple_wc_cc) { - std::cout << '\n'; + // std::cout << '\n'; using toolset_t = tim::component_tuple; toolset_t obj(details::get_test_name()); @@ -129,57 +129,57 @@ TEST_F(derived_tests, cpu_util_tuple_wc_cc) details::consume(1000); obj.stop(); - std::cout << obj << "\n"; + // std::cout << obj << "\n"; ASSERT_TRUE(obj.get()->is_derived()); auto manual_calc = 100. * obj.get()->get() / obj.get()->get(); ASSERT_NEAR(obj.get()->get(), manual_calc, 1.0e-6); - std::cout << '\n'; + // std::cout << '\n'; } //--------------------------------------------------------------------------------------// TEST_F(derived_tests, cpu_util_tuple_wc_uc_sc) { - std::cout << '\n'; + // std::cout << '\n'; using toolset_t = tim::auto_tuple; toolset_t obj(details::get_test_name()); details::consume(1000); obj.stop(); - std::cout << obj << "\n"; + // std::cout << obj << "\n"; ASSERT_TRUE(obj.get()->is_derived()); auto manual_calc = 100. * (obj.get()->get() + obj.get()->get()) / obj.get()->get(); ASSERT_NEAR(obj.get()->get(), manual_calc, 1.0e-6); - std::cout << '\n'; + // std::cout << '\n'; } //--------------------------------------------------------------------------------------// TEST_F(derived_tests, cpu_util_tuple_wc) { - std::cout << '\n'; + // std::cout << '\n'; using toolset_t = tim::auto_tuple; toolset_t obj(details::get_test_name()); details::consume(1000); obj.stop(); - std::cout << obj << "\n"; + // std::cout << obj << "\n"; ASSERT_FALSE(obj.get()->is_derived()); - std::cout << '\n'; + // std::cout << '\n'; } //--------------------------------------------------------------------------------------// TEST_F(derived_tests, cpu_util_list_wc_cc) { - std::cout << '\n'; + // std::cout << '\n'; using toolset_t = tim::component_list; toolset_t::get_initializer() = [](toolset_t& cl) { @@ -191,19 +191,19 @@ TEST_F(derived_tests, cpu_util_list_wc_cc) details::consume(1000); obj.stop(); - std::cout << obj << "\n"; + // std::cout << obj << "\n"; ASSERT_TRUE(obj.get()->is_derived()); auto manual_calc = 100. * obj.get()->get() / obj.get()->get(); ASSERT_NEAR(obj.get()->get(), manual_calc, 1.0e-6); - std::cout << '\n'; + // std::cout << '\n'; } //--------------------------------------------------------------------------------------// TEST_F(derived_tests, cpu_util_list_wc_uc_sc) { - std::cout << '\n'; + // std::cout << '\n'; using toolset_t = tim::auto_list; toolset_t::get_initializer() = [](toolset_t& cl) { @@ -214,21 +214,21 @@ TEST_F(derived_tests, cpu_util_list_wc_uc_sc) details::consume(1000); obj.stop(); - std::cout << obj << "\n"; + // std::cout << obj << "\n"; ASSERT_TRUE(obj.get()->is_derived()); auto manual_calc = 100. * (obj.get()->get() + obj.get()->get()) / obj.get()->get(); ASSERT_NEAR(obj.get()->get(), manual_calc, 1.0e-6); - std::cout << '\n'; + // std::cout << '\n'; } //--------------------------------------------------------------------------------------// TEST_F(derived_tests, cpu_util_list_wc) { - std::cout << '\n'; + // std::cout << '\n'; using toolset_t = tim::auto_list; toolset_t::get_initializer() = [](toolset_t& cl) { @@ -239,17 +239,17 @@ TEST_F(derived_tests, cpu_util_list_wc) details::consume(1000); obj.stop(); - std::cout << obj << "\n"; + // std::cout << obj << "\n"; ASSERT_FALSE(obj.get()->is_derived()); - std::cout << '\n'; + // std::cout << '\n'; } //--------------------------------------------------------------------------------------// TEST_F(derived_tests, cpu_util_bundle_wc_cc) { - std::cout << '\n'; + // std::cout << '\n'; using toolset_t = tim::component_bundle; @@ -262,7 +262,7 @@ TEST_F(derived_tests, cpu_util_bundle_wc_cc) details::consume(1000); obj.stop(); - std::cout << obj << "\n"; + // std::cout << obj << "\n"; ASSERT_TRUE(obj.get_component() != nullptr); ASSERT_TRUE(obj.get_component() != nullptr); @@ -270,14 +270,14 @@ TEST_F(derived_tests, cpu_util_bundle_wc_cc) auto manual_calc = 100. * obj.get_component()->get() / obj.get_component()->get(); EXPECT_NEAR(obj.get_component()->get(), manual_calc, 1.0e-6); - std::cout << '\n'; + // std::cout << '\n'; } //--------------------------------------------------------------------------------------// TEST_F(derived_tests, cpu_util_bundle_wc_uc_sc) { - std::cout << '\n'; + // std::cout << '\n'; using toolset_t = tim::auto_bundle; @@ -289,7 +289,7 @@ TEST_F(derived_tests, cpu_util_bundle_wc_uc_sc) details::consume(1000); obj.stop(); - std::cout << obj << "\n"; + // std::cout << obj << "\n"; ASSERT_TRUE(obj.get_component()->is_derived()); auto manual_calc = 100. * @@ -297,14 +297,14 @@ TEST_F(derived_tests, cpu_util_bundle_wc_uc_sc) obj.get_component()->get()) / obj.get_component()->get(); ASSERT_NEAR(obj.get_component()->get(), manual_calc, 1.0e-6); - std::cout << '\n'; + // std::cout << '\n'; } //--------------------------------------------------------------------------------------// TEST_F(derived_tests, cpu_util_bundle_wc) { - std::cout << '\n'; + // std::cout << '\n'; using toolset_t = tim::auto_bundle; toolset_t::get_initializer() = [](toolset_t& cl) { cl.initialize(); }; @@ -313,10 +313,10 @@ TEST_F(derived_tests, cpu_util_bundle_wc) details::consume(1000); obj.stop(); - std::cout << obj << "\n"; + // std::cout << obj << "\n"; ASSERT_FALSE(obj.get_component()->is_derived()); - std::cout << '\n'; + // std::cout << '\n'; } //--------------------------------------------------------------------------------------// diff --git a/source/tests/flat_tests.cpp b/source/tests/flat_tests.cpp index 94d8cd983..da88a9117 100644 --- a/source/tests/flat_tests.cpp +++ b/source/tests/flat_tests.cpp @@ -156,8 +156,8 @@ class flat_tests : public ::testing::Test tim::settings::debug() = false; tim::settings::json_output() = true; tim::settings::mpi_thread() = false; - tim::dmp::initialize(_argc, _argv); - tim::timemory_init(_argc, _argv); + tim::dmp::initialize(test_argc, test_argv); + tim::timemory_init(test_argc, test_argv); tim::settings::dart_output() = true; tim::settings::dart_count() = 1; tim::settings::banner() = false; diff --git a/source/tests/gotcha_tests.cpp b/source/tests/gotcha_tests.cpp index 4d3bb4777..43bd48af9 100644 --- a/source/tests/gotcha_tests.cpp +++ b/source/tests/gotcha_tests.cpp @@ -203,8 +203,8 @@ class gotcha_tests : public ::testing::Test tim::settings::debug() = false; tim::settings::json_output() = true; tim::settings::mpi_thread() = false; - tim::dmp::initialize(_argc, _argv); - tim::timemory_init(&_argc, &_argv); + tim::dmp::initialize(test_argc, test_argv); + tim::timemory_init(&test_argc, &test_argv); tim::settings::dart_output() = true; tim::settings::dart_count() = 1; tim::settings::dart_type() = "peak_rss"; diff --git a/source/tests/hybrid_tests.cpp b/source/tests/hybrid_tests.cpp index fc7c24f49..ebd86c31c 100644 --- a/source/tests/hybrid_tests.cpp +++ b/source/tests/hybrid_tests.cpp @@ -161,22 +161,22 @@ allocate() printf("fibonacci(%li) * %li = %li\n", (long) nfib, (long) niter, ret); } -template > -inline void -print_info( - const Tp& obj, const Up& expected, const string_t& unit, - FuncT _func = [](const Vp& _obj) { return _obj; }) -{ - std::cout << std::endl; - std::cout << "[" << get_test_name() << "]> measured : " << obj << std::endl; - std::cout << "[" << get_test_name() << "]> expected : " << expected << " " << unit - << std::endl; - std::cout << "[" << get_test_name() << "]> value : " << _func(obj.get_value()) - << std::endl; - std::cout << "[" << get_test_name() << "]> accum : " << _func(obj.get_accum()) - << std::endl; -} +// template > +// inline void +// print_info( +// const Tp& obj, const Up& expected, const string_t& unit, +// FuncT _func = [](const Vp& _obj) { return _obj; }) +// { +// std::cout << std::endl; +// std::cout << "[" << get_test_name() << "]> measured : " << obj << std::endl; +// std::cout << "[" << get_test_name() << "]> expected : " << expected << " " << unit +// << std::endl; +// std::cout << "[" << get_test_name() << "]> value : " << _func(obj.get_value()) +// << std::endl; +// std::cout << "[" << get_test_name() << "]> accum : " << _func(obj.get_accum()) +// << std::endl; +// } } // namespace details @@ -256,20 +256,20 @@ TEST_F(hybrid_tests, hybrid) details::consume(1500); t.join(); obj.stop(); - std::cout << "\n" << obj << std::endl; + // std::cout << "\n" << obj << std::endl; - auto clock_convert = [](const int64_t& _obj) { return _obj; }; - auto cpu_util_convert = [](const std::pair& val) { - return static_cast(val.first) / val.second * 100.0; - }; + // auto clock_convert = [](const int64_t& _obj) { return _obj; }; + // auto cpu_util_convert = [](const std::pair& val) { + // return static_cast(val.first) / val.second * 100.0; + // }; auto* t_rc = obj.get(); auto* t_cpu = obj.get(); auto* t_util = obj.get(); - details::print_info(*t_rc, 2.0, "sec", clock_convert); - details::print_info(*t_cpu, 2.5, "sec", clock_convert); - details::print_info(*t_util, 125.0, "%", cpu_util_convert); + // details::print_info(*t_rc, 2.0, "sec", clock_convert); + // details::print_info(*t_cpu, 2.5, "sec", clock_convert); + // details::print_info(*t_util, 125.0, "%", cpu_util_convert); ASSERT_TRUE(t_rc != nullptr) << obj; ASSERT_TRUE(t_cpu != nullptr) << obj; @@ -294,7 +294,7 @@ TEST_F(hybrid_tests, hybrid) auto page_size = tim::units::get_page_size(); - details::print_info(*l_page, page_size, tim::settings::memory_units(), clock_convert); + // details::print_info(*l_page, page_size, tim::settings::memory_units(), clock_convert); EXPECT_NEAR(l_page->get(), page_size, 2.0 * page_size) << obj; } @@ -309,20 +309,20 @@ TEST_F(hybrid_tests, auto_timer) details::consume(750); t.join(); obj.stop(); - std::cout << "\n" << obj << std::endl; + // std::cout << "\n" << obj << std::endl; - auto clock_convert = [](const int64_t& _obj) { return _obj; }; - auto cpu_util_convert = [](const std::pair& val) { - return static_cast(val.first) / val.second * 100.0; - }; + // auto clock_convert = [](const int64_t& _obj) { return _obj; }; + // auto cpu_util_convert = [](const std::pair& val) { + // return static_cast(val.first) / val.second * 100.0; + // }; auto _cpu = *obj.get(); auto& _rc = *obj.get(); auto& _util = *obj.get(); - details::print_info(_rc, 1.0, "sec", clock_convert); - details::print_info(_cpu, 1.25, "sec", clock_convert); - details::print_info(_util, 125.0, "%", cpu_util_convert); + // details::print_info(_rc, 1.0, "sec", clock_convert); + // details::print_info(_cpu, 1.25, "sec", clock_convert); + // details::print_info(_util, 125.0, "%", cpu_util_convert); EXPECT_NEAR(1.0, _rc.get(), timer_tolerance); EXPECT_NEAR(1.25, _cpu.get(), 2.0 * timer_tolerance); @@ -331,7 +331,7 @@ TEST_F(hybrid_tests, auto_timer) cpu_clock _cpu_obj = *obj.get(); double _cpu_val = obj.get()->get(); EXPECT_NEAR(_cpu_obj.get(), _cpu_val, compose_tolerance); - details::print_info(_cpu_obj, _cpu_val, "sec"); + // details::print_info(_cpu_obj, _cpu_val, "sec"); auto _obj = tim::get(obj); auto _cpu2 = std::get<1>(_obj); @@ -351,13 +351,13 @@ TEST_F(hybrid_tests, compose) details::do_sleep(250); // in millseconds details::consume(750); // in millseconds obj.stop(); - std::cout << "\n" << obj << std::endl; + // std::cout << "\n" << obj << std::endl; result_t _cpu_ret = obj.get(); cpu_clock _cpu_obj = *obj.get() + *obj.get(); double _cpu_val = obj.get()->get() + obj.get()->get(); - details::print_info(_cpu_obj, 0.75, "sec"); + // details::print_info(_cpu_obj, 0.75, "sec"); EXPECT_NEAR(0.75, _cpu_val, 2.0 * timer_tolerance); EXPECT_NEAR(_cpu_obj.get(), _cpu_val, compose_tolerance); diff --git a/source/tests/kokkosp_tests.cpp b/source/tests/kokkosp_tests.cpp index 94a1e8c12..1e514bfa6 100644 --- a/source/tests/kokkosp_tests.cpp +++ b/source/tests/kokkosp_tests.cpp @@ -106,7 +106,7 @@ class kokkosp_tests : public ::testing::Test { tim::settings::memory_units() = "kb"; kokkosp_init_library(0, 0, 0, nullptr); - kokkosp_parse_args(_argc, _argv); + kokkosp_parse_args(test_argc, test_argv); kokkosp_declare_metadata( "test_suite", ::testing::UnitTest::GetInstance()->current_test_suite()->name()); diff --git a/source/tests/library_tests.cpp b/source/tests/library_tests.cpp index d27539c2a..021a62d82 100644 --- a/source/tests/library_tests.cpp +++ b/source/tests/library_tests.cpp @@ -65,8 +65,8 @@ get_sc_storage_size(); // gets system_clock storage size //--------------------------------------------------------------------------------------// -static int _argc = 0; -static char** _argv = nullptr; +static int test_argc = 0; +static char** test_argv = nullptr; namespace details { @@ -128,7 +128,7 @@ class library_tests : public ::testing::Test timemory_set_environ("TIMEMORY_DART_OUTPUT", "OFF", 1, 0); if(!timemory_library_is_initialized()) - timemory_init_library(_argc, _argv); + timemory_init_library(test_argc, test_argv); } static void TearDownTestSuite() diff --git a/source/tests/mpi_tests.cpp b/source/tests/mpi_tests.cpp index 214f8687d..e58419598 100644 --- a/source/tests/mpi_tests.cpp +++ b/source/tests/mpi_tests.cpp @@ -137,8 +137,8 @@ class mpi_tests : public ::testing::Test tim::settings::debug() = false; tim::settings::json_output() = true; tim::settings::mpi_thread() = false; - tim::mpi::initialize(_argc, _argv); - tim::timemory_init(_argc, _argv); + tim::mpi::initialize(test_argc, test_argv); + tim::timemory_init(test_argc, test_argv); tim::settings::dart_output() = true; tim::settings::dart_count() = 1; tim::settings::banner() = false; diff --git a/source/tests/nccl_tests.cpp b/source/tests/nccl_tests.cpp index 1542d64e0..462334ea7 100644 --- a/source/tests/nccl_tests.cpp +++ b/source/tests/nccl_tests.cpp @@ -131,18 +131,18 @@ class nccl_tests : public ::testing::Test protected: static void setup_args() { - _test_argc = _argc + 2; + _test_argc = test_argc + 2; _test_argv = new char*[_test_argc]; - for(int i = 0; i < _argc; ++i) - _test_argv[i] = _argv[i]; - _test_argv[_argc + 0] = strdup("-c"); - _test_argv[_argc + 1] = strdup("0"); + for(int i = 0; i < test_argc; ++i) + _test_argv[i] = test_argv[i]; + _test_argv[test_argc + 0] = strdup("-c"); + _test_argv[test_argc + 1] = strdup("0"); } static void cleanup_args() { - free(_test_argv[_argc + 0]); - free(_test_argv[_argc + 1]); + free(_test_argv[test_argc + 0]); + free(_test_argv[test_argc + 1]); } TIMEMORY_TEST_SUITE_SETUP(setup_args()) @@ -151,7 +151,7 @@ class nccl_tests : public ::testing::Test virtual void SetUp() override { TIMEMORY_TEST_CHECK_SKIP; - EXPECT_EQ(_argc + 2, _test_argc); + EXPECT_EQ(test_argc + 2, _test_argc); ASSERT_TRUE(_test_argv != nullptr); tim::set_env("TIMEMORY_NCCLP_REJECT_LIST", diff --git a/source/tests/priority_tests.cpp b/source/tests/priority_tests.cpp index c080d8bfe..f4403e9e9 100644 --- a/source/tests/priority_tests.cpp +++ b/source/tests/priority_tests.cpp @@ -167,9 +167,9 @@ class priority_tests : public ::testing::Test TEST_F(priority_tests, simple_check) { - std::cout << "plus : " << tim::demangle() << "\n"; - std::cout << "start : " << tim::demangle() << "\n"; - std::cout << "stop : " << tim::demangle() << "\n"; + // std::cout << "plus : " << tim::demangle() << "\n"; + // std::cout << "start : " << tim::demangle() << "\n"; + // std::cout << "stop : " << tim::demangle() << "\n"; tuple_t t(details::get_test_name(), true); @@ -207,13 +207,13 @@ TEST_F(priority_tests, simple_check) auto& pstart_wc = *t.get(); auto& pstop_wc = *t.get(); - printf("\n"); - std::cout << native_wc << std::endl; - std::cout << pstart_wc << std::endl; - std::cout << pstop_wc << std::endl; - printf("\n"); - std::cout << t << std::endl; - printf("\n"); + // printf("\n"); + // std::cout << native_wc << std::endl; + // std::cout << pstart_wc << std::endl; + // std::cout << pstop_wc << std::endl; + // printf("\n"); + // std::cout << t << std::endl; + // printf("\n"); // each start()/stop() on tuple_t resets internal lap count to zero ASSERT_EQ(native_wc.get_laps(), 1); @@ -227,9 +227,9 @@ TEST_F(priority_tests, simple_check) TEST_F(priority_tests, start_stop) { - std::cout << "plus : " << tim::demangle() << "\n"; - std::cout << "start : " << tim::demangle() << "\n"; - std::cout << "stop : " << tim::demangle() << "\n"; + // std::cout << "plus : " << tim::demangle() << "\n"; + // std::cout << "start : " << tim::demangle() << "\n"; + // std::cout << "stop : " << tim::demangle() << "\n"; tuple_t t(details::get_test_name(), true); @@ -243,13 +243,13 @@ TEST_F(priority_tests, start_stop) auto& pstart_wc = *t.get(); auto& pstop_wc = *t.get(); - printf("\n"); - std::cout << native_wc << std::endl; - std::cout << pstart_wc << std::endl; - std::cout << pstop_wc << std::endl; - printf("\n"); - std::cout << t << std::endl; - printf("\n"); + // printf("\n"); + // std::cout << native_wc << std::endl; + // std::cout << pstart_wc << std::endl; + // std::cout << pstop_wc << std::endl; + // printf("\n"); + // std::cout << t << std::endl; + // printf("\n"); double native_exp = 1.0; double pstart_exp = 1.5; diff --git a/source/tests/ptl_tests.cpp b/source/tests/ptl_tests.cpp index cac19cc7a..5911c2ac0 100644 --- a/source/tests/ptl_tests.cpp +++ b/source/tests/ptl_tests.cpp @@ -123,7 +123,7 @@ class ptl_tests : public ::testing::Test tim::settings::debug() = false; tim::settings::json_output() = false; tim::settings::flamegraph_output() = false; - tim::timemory_init(&_argc, &_argv); + tim::timemory_init(&test_argc, &test_argv); tim::settings::dart_output() = false; tim::settings::dart_count() = 1; diff --git a/source/tests/rusage_tests.cpp b/source/tests/rusage_tests.cpp index 35308de5a..1aaa97a7b 100644 --- a/source/tests/rusage_tests.cpp +++ b/source/tests/rusage_tests.cpp @@ -231,8 +231,8 @@ class rusage_tests : public ::testing::Test tim::settings::mpi_thread() = false; tim::settings::precision() = 9; tim::settings::memory_units() = memory_unit.second; - tim::dmp::initialize(_argc, _argv); - tim::timemory_init(_argc, _argv); + tim::dmp::initialize(test_argc, test_argv); + tim::timemory_init(test_argc, test_argv); tim::settings::file_output() = false; // preform allocation only once here diff --git a/source/tests/socket_tests.cpp b/source/tests/socket_tests.cpp index 7afcef00a..8c7e55ca4 100644 --- a/source/tests/socket_tests.cpp +++ b/source/tests/socket_tests.cpp @@ -34,8 +34,8 @@ #include #include -static int _argc = 0; -static char** _argv = nullptr; +static int test_argc = 0; +static char** test_argv = nullptr; using mutex_t = std::mutex; using lock_t = std::unique_lock; @@ -112,8 +112,8 @@ class socket_tests : public ::testing::Test tim::settings::debug() = false; tim::settings::json_output() = true; tim::settings::mpi_thread() = false; - tim::dmp::initialize(_argc, _argv); - tim::timemory_init(_argc, _argv); + tim::dmp::initialize(test_argc, test_argv); + tim::timemory_init(test_argc, test_argv); tim::settings::dart_output() = true; tim::settings::dart_count() = 1; tim::settings::banner() = false; @@ -204,8 +204,8 @@ int main(int argc, char** argv) { ::testing::InitGoogleTest(&argc, argv); - _argc = argc; - _argv = argv; + test_argc = argc; + test_argv = argv; auto ret = RUN_ALL_TESTS(); diff --git a/source/tests/test_macros.hpp b/source/tests/test_macros.hpp index 7980602af..943237fa1 100644 --- a/source/tests/test_macros.hpp +++ b/source/tests/test_macros.hpp @@ -74,15 +74,15 @@ as_string(const Tp&) #if !defined(DISABLE_TIMEMORY) # define TIMEMORY_TEST_ARGS \ - static int _argc = 0; \ - static char** _argv = nullptr; + static int test_argc = 0; \ + static char** test_argv = nullptr; # define TIMEMORY_TEST_MAIN \ int main(int argc, char** argv) \ { \ ::testing::InitGoogleTest(&argc, argv); \ - _argc = argc; \ - _argv = argv; \ + test_argc = argc; \ + test_argv = argv; \ return RUN_ALL_TESTS(); \ } @@ -99,9 +99,9 @@ as_string(const Tp&) tim::settings::debug() = false; \ tim::settings::json_output() = true; \ puts("[SetupTestSuite] initializing dmp"); \ - tim::dmp::initialize(_argc, _argv); \ + tim::dmp::initialize(test_argc, test_argv); \ puts("[SetupTestSuite] initializing timemory"); \ - tim::timemory_init(_argc, _argv); \ + tim::timemory_init(test_argc, test_argv); \ puts("[SetupTestSuite] timemory initialized"); \ tim::settings::dart_output() = false; \ tim::settings::dart_count() = 1; \ diff --git a/source/tests/throttle_tests.cpp b/source/tests/throttle_tests.cpp index acf7a15c2..cefa2c7dd 100644 --- a/source/tests/throttle_tests.cpp +++ b/source/tests/throttle_tests.cpp @@ -86,9 +86,9 @@ class throttle_tests : public ::testing::Test tim::settings::json_output() = true; tim::settings::mpi_thread() = false; puts("[SetupTestSuite] initializing dmp"); - tim::dmp::initialize(_argc, _argv); + tim::dmp::initialize(test_argc, test_argv); puts("[SetupTestSuite] initializing timemory"); - tim::timemory_init(_argc, _argv); + tim::timemory_init(test_argc, test_argv); tim::settings::dart_output() = true; tim::settings::dart_count() = 1; tim::settings::banner() = false; diff --git a/source/tests/timeline_tests.cpp b/source/tests/timeline_tests.cpp index 8e3523ea2..4eefbfd17 100644 --- a/source/tests/timeline_tests.cpp +++ b/source/tests/timeline_tests.cpp @@ -157,8 +157,8 @@ class timeline_tests : public ::testing::Test tim::settings::debug() = false; tim::settings::file_output() = false; tim::settings::mpi_thread() = false; - tim::dmp::initialize(_argc, _argv); - tim::timemory_init(_argc, _argv); + tim::dmp::initialize(test_argc, test_argv); + tim::timemory_init(test_argc, test_argv); tim::settings::dart_output() = true; tim::settings::dart_count() = 1; tim::settings::banner() = false; diff --git a/source/tests/trace_tests.cpp b/source/tests/trace_tests.cpp index 7555d894a..919e08776 100644 --- a/source/tests/trace_tests.cpp +++ b/source/tests/trace_tests.cpp @@ -105,9 +105,9 @@ class trace_tests : public ::testing::Test timemory_trace_set_env("TIMEMORY_PRECISION", "6"); timemory_trace_set_env("TIMEMORY_DART_OUTPUT", "ON"); timemory_trace_set_env("TIMEMORY_DART_COUNT", "1"); - timemory_trace_init("peak_rss", true, _argv[0]); - tim::dmp::initialize(_argc, _argv); - tim::timemory_init(_argc, _argv); + timemory_trace_init("peak_rss", true, test_argv[0]); + tim::dmp::initialize(test_argc, test_argv); + tim::timemory_init(test_argc, test_argv); timemory_push_trace("setup"); } diff --git a/source/tests/tuple_tests.cpp b/source/tests/tuple_tests.cpp index ab49c2e5a..373ce2f65 100644 --- a/source/tests/tuple_tests.cpp +++ b/source/tests/tuple_tests.cpp @@ -211,9 +211,9 @@ TEST_F(tuple_tests, usage) _use_delta.stop(); _use_end.record(); - std::cout << "usage (begin): " << _use_beg << std::endl; - std::cout << "usage (delta): " << _use_delta << std::endl; - std::cout << "usage (end): " << _use_end << std::endl; + // std::cout << "usage (begin): " << _use_beg << std::endl; + // std::cout << "usage (delta): " << _use_delta << std::endl; + // std::cout << "usage (end): " << _use_end << std::endl; std::vector> measurements = { { "begin", _use_beg }, @@ -286,12 +286,12 @@ TEST_F(tuple_tests, all_threads) runtime_printed.stop(); } - std::cout << "\n" << lambda_ss.str() << std::endl; - std::cout << "total runtime: " << runtime << std::endl; - std::cout << "std::get: " << std::get<0>(runtime) << std::endl; - std::cout << "fibonacci total: " << ret.load() << "\n" << std::endl; + std::cout << "\n" << lambda_ss.str() << '\n'; + std::cout << "total runtime: " << runtime << '\n'; + std::cout << "std::get: " << std::get<0>(runtime) << '\n'; + std::cout << "fibonacci total: " << ret.load() << "\n" << '\n'; std::cout << "runtime process cpu time: " << runtime.get() << "\n"; - std::cout << "measured data: " << runtime_printed.get() << std::endl; + std::cout << "measured data: " << runtime_printed.get() << '\n'; measurements.insert(measurements.begin(), pair_t("run", runtime)); // serialize("timing.json", "runtime", measurements); @@ -299,30 +299,6 @@ TEST_F(tuple_tests, all_threads) // auto _test = std::tuple{ 0, 0.2, "test" }; // std::cout << "\nVARIADIC TUPLE PRINT: " << _test << "\n" << std::endl; - auto rc_storage = tim::storage::instance()->get(); - { - printf("\n"); - size_t w = 0; - for(const auto& itr : rc_storage) - w = std::max(w, std::get<5>(itr).length()); - for(const auto& itr : rc_storage) - { - std::cout << std::setw(w) << std::left << std::get<5>(itr) << " : " - << std::get<7>(itr); - auto _hierarchy = std::get<6>(itr); - for(size_t i = 0; i < _hierarchy.size(); ++i) - { - if(i == 0) - std::cout << " :: "; - std::cout << _hierarchy[i]; - if(i + 1 < _hierarchy.size()) - std::cout << "/"; - } - std::cout << std::endl; - } - printf("\n"); - } - auto final_storage_size = tim::manager::get_storage::size(manager); auto expected = (final_storage_size - starting_storage_size); @@ -421,30 +397,6 @@ TEST_F(tuple_tests, collapsed_threads) std::cout << "\nfibonacci total: " << ret.load() << "\n" << std::endl; - auto rc_storage = tim::storage::instance()->get(); - { - printf("\n"); - size_t w = 0; - for(const auto& itr : rc_storage) - w = std::max(w, std::get<5>(itr).length()); - for(const auto& itr : rc_storage) - { - std::cout << std::setw(w) << std::left << std::get<5>(itr) << " : " - << std::get<7>(itr); - auto _hierarchy = std::get<6>(itr); - for(size_t i = 0; i < _hierarchy.size(); ++i) - { - if(i == 0) - std::cout << " :: "; - std::cout << _hierarchy[i]; - if(i + 1 < _hierarchy.size()) - std::cout << "/"; - } - std::cout << std::endl; - } - printf("\n"); - } - auto final_storage_size = tim::manager::get_storage::size(manager); auto expected = (final_storage_size - starting_storage_size); @@ -541,14 +493,14 @@ TEST_F(tuple_tests, concat) using data_t1 = tim::mpl::remove_duplicates_t< typename tim::auto_list::data_type>; - std::cout << "\n" << std::flush; - std::cout << "comp_t0 = " << tim::demangle() << "\n"; - std::cout << "comp_t1 = " << tim::demangle() << "\n"; - std::cout << "\n" << std::flush; + // std::cout << "\n" << std::flush; + // std::cout << "comp_t0 = " << tim::demangle() << "\n"; + // std::cout << "comp_t1 = " << tim::demangle() << "\n"; + // std::cout << "\n" << std::flush; - std::cout << "data_t0 = " << tim::demangle() << "\n"; - std::cout << "data_t1 = " << tim::demangle() << "\n"; - std::cout << "\n" << std::flush; + // std::cout << "data_t0 = " << tim::demangle() << "\n"; + // std::cout << "data_t1 = " << tim::demangle() << "\n"; + // std::cout << "\n" << std::flush; EXPECT_EQ(comp_t0::size(), 3); EXPECT_EQ(comp_t1::size(), 4); @@ -581,12 +533,12 @@ TEST_F(tuple_tests, get) label_t cc_l; std::tie(wc_l, cc_l) = labels; - std::cout << "\n" << std::flush; - std::cout << std::fixed; - std::cout.precision(6); - std::cout << std::setw(12) << std::get<0>(wc_l) << " = " << wc_v << "\n"; - std::cout << std::setw(12) << std::get<0>(cc_l) << " = " << cc_v << "\n"; - std::cout << "\n" << std::flush; + // std::cout << "\n" << std::flush; + // std::cout << std::fixed; + // std::cout.precision(6); + // std::cout << std::setw(12) << std::get<0>(wc_l) << " = " << wc_v << "\n"; + // std::cout << std::setw(12) << std::get<0>(cc_l) << " = " << cc_v << "\n"; + // std::cout << "\n" << std::flush; ASSERT_TRUE(std::get<0>(wc_l) == "wall_clock"); ASSERT_TRUE(std::get<0>(cc_l) == "cpu_clock"); @@ -629,9 +581,9 @@ TEST_F(tuple_tests, explicit_start) value[0] = obj.get()->get(); value[1] = obj.get()->get(); value[2] = obj.get()->get(); - std::cout << "\n" << std::flush; - std::cout << obj << "\n"; - std::cout << "\n" << std::flush; + // std::cout << "\n" << std::flush; + // std::cout << obj << "\n"; + // std::cout << "\n" << std::flush; } EXPECT_EQ(ex_check_start_t, true); @@ -670,9 +622,9 @@ TEST_F(tuple_tests, auto_start) value[0] = obj.get()->get(); value[1] = obj.get()->get(); value[2] = obj.get()->get(); - std::cout << "\n" << std::flush; - std::cout << obj << "\n"; - std::cout << "\n" << std::flush; + // std::cout << "\n" << std::flush; + // std::cout << obj << "\n"; + // std::cout << "\n" << std::flush; } EXPECT_EQ(ex_check_start_t, true); @@ -710,7 +662,7 @@ template auto validate(const std::string& lbl, int n) { - std::cout << "\n##### " << lbl << " #####\n"; + // std::cout << "\n##### " << lbl << " #####\n"; std::shared_ptr obj{}; double val = 0.0; { diff --git a/source/tests/upcxx_tests.cpp b/source/tests/upcxx_tests.cpp index 88ab974d2..ab75f2234 100644 --- a/source/tests/upcxx_tests.cpp +++ b/source/tests/upcxx_tests.cpp @@ -168,48 +168,48 @@ TEST_F(upcxx_tests, general) auto upc_rank = tim::upc::rank(); auto upc_size = tim::upc::size(); - auto rc_print = [=](const decltype(rc_storage)& _storage) { - printf("\n"); - size_t w = 0; - for(const auto& ritr : _storage) - for(const auto& itr : ritr) - w = std::max(w, std::get<2>(itr).length()); - int64_t idx = 0; - for(const auto& ritr : _storage) - { - printf("[%i]> idx: %i, size: %i\n", (int) upc_rank, (int) idx, - (int) ritr.size()); - for(const auto& itr : ritr) - { - std::cout << std::setw(w) << std::left << std::get<2>(itr) << " : " - << std::get<1>(itr); - auto _hierarchy = std::get<5>(itr); - for(size_t i = 0; i < _hierarchy.size(); ++i) - { - if(i == 0) - std::cout << " :: "; - std::cout << _hierarchy[i]; - if(i + 1 < _hierarchy.size()) - std::cout << "/"; - } - std::cout << std::endl; - } - ++idx; - } - printf("\n"); - }; + // auto rc_print = [=](const decltype(rc_storage)& _storage) { + // printf("\n"); + // size_t w = 0; + // for(const auto& ritr : _storage) + // for(const auto& itr : ritr) + // w = std::max(w, std::get<2>(itr).length()); + // int64_t idx = 0; + // for(const auto& ritr : _storage) + // { + // printf("[%i]> idx: %i, size: %i\n", (int) upc_rank, (int) idx, + // (int) ritr.size()); + // for(const auto& itr : ritr) + // { + // std::cout << std::setw(w) << std::left << std::get<2>(itr) << " : " + // << std::get<1>(itr); + // auto _hierarchy = std::get<5>(itr); + // for(size_t i = 0; i < _hierarchy.size(); ++i) + // { + // if(i == 0) + // std::cout << " :: "; + // std::cout << _hierarchy[i]; + // if(i + 1 < _hierarchy.size()) + // std::cout << "/"; + // } + // std::cout << std::endl; + // } + // ++idx; + // } + // printf("\n"); + // }; if(upc_rank == 0) { std::this_thread::sleep_for(std::chrono::seconds(upc_size - upc_rank - 1)); EXPECT_EQ(rc_storage.size(), upc_size); - rc_print(rc_storage); + // rc_print(rc_storage); } else { std::this_thread::sleep_for(std::chrono::seconds(upc_size - upc_rank - 1)); EXPECT_EQ(rc_storage.size(), 1); - rc_print(rc_storage); + // rc_print(rc_storage); } auto final_storage_size = tim::manager::get_storage::size(manager); diff --git a/source/tests/variadic_tests.cpp b/source/tests/variadic_tests.cpp index d9ccf92ab..60c909a0d 100644 --- a/source/tests/variadic_tests.cpp +++ b/source/tests/variadic_tests.cpp @@ -165,10 +165,10 @@ TEST_F(variadic_tests, variadic) sizes[6] = hybrid_t::size(); } - std::cout << "\n"; - for(size_t i = 0; i < nz; ++i) - std::cout << "size[" << i << "] = " << sizes[i] << std::endl; - std::cout << "\n"; + // std::cout << "\n"; + // for(size_t i = 0; i < nz; ++i) + // std::cout << "size[" << i << "] = " << sizes[i] << std::endl; + // std::cout << "\n"; EXPECT_EQ(sizes[0], sizes[1]); EXPECT_EQ(sizes[0], sizes[2]); @@ -189,10 +189,10 @@ TEST_F(variadic_tests, variadic) // auto tsize = hybrid_t::tuple_t::size(); // auto lsize = hybrid_t::list_t::size(); - std::cout << "\nhybrid : " << tim::demangle() << "\n"; + // std::cout << "\nhybrid : " << tim::demangle() << "\n"; // std::cout << "\nhybrid tuple : " << tim::demangle(); // std::cout << "\nhybrid list : " << tim::demangle(); - std::cout << "\n"; + // std::cout << "\n"; { hybrid_t hybrid(details::get_test_name()); auto ret = details::fibonacci(41); @@ -230,38 +230,38 @@ TEST_F(variadic_tests, concat) using data_t0 = tim::mpl::remove_duplicates_t; using data_t1 = tim::mpl::remove_duplicates_t; - using data_t2 = tim::mpl::remove_duplicates_t; + // using data_t2 = tim::mpl::remove_duplicates_t; using data_t3 = tim::mpl::remove_duplicates_t; - std::cout << "\n" << std::flush; + // std::cout << "\n" << std::flush; - std::cout << "lhs_t = " << tim::demangle() << "\n"; - std::cout << "rhs_t = " << tim::demangle() << "\n"; - std::cout << "lhs_l = " << tim::demangle() << "\n"; - std::cout << "rhs_l = " << tim::demangle() << "\n"; - std::cout << "\n" << std::flush; + // std::cout << "lhs_t = " << tim::demangle() << "\n"; + // std::cout << "rhs_t = " << tim::demangle() << "\n"; + // std::cout << "lhs_l = " << tim::demangle() << "\n"; + // std::cout << "rhs_l = " << tim::demangle() << "\n"; + // std::cout << "\n" << std::flush; - std::cout << "join_t0 = " << tim::demangle() << "\n"; - std::cout << "join_t1 = " << tim::demangle() << "\n"; - std::cout << "join_t2 = " << tim::demangle() << "\n"; - std::cout << "\n" << std::flush; + // std::cout << "join_t0 = " << tim::demangle() << "\n"; + // std::cout << "join_t1 = " << tim::demangle() << "\n"; + // std::cout << "join_t2 = " << tim::demangle() << "\n"; + // std::cout << "\n" << std::flush; - std::cout << "comp_t0 = " << tim::demangle() << "\n"; - std::cout << "comp_t1 = " << tim::demangle() << "\n"; - std::cout << "comp_t2 = " << tim::demangle() << "\n"; - std::cout << "\n" << std::flush; + // std::cout << "comp_t0 = " << tim::demangle() << "\n"; + // std::cout << "comp_t1 = " << tim::demangle() << "\n"; + // std::cout << "comp_t2 = " << tim::demangle() << "\n"; + // std::cout << "\n" << std::flush; - std::cout << "dbeg_t0 = " << tim::demangle() << "\n"; - std::cout << "dbeg_t1 = " << tim::demangle() << "\n"; - std::cout << "dbeg_t2 = " << tim::demangle() << "\n"; - std::cout << "dbeg_t3 = " << tim::demangle() << "\n"; - std::cout << "\n" << std::flush; + // std::cout << "dbeg_t0 = " << tim::demangle() << "\n"; + // std::cout << "dbeg_t1 = " << tim::demangle() << "\n"; + // std::cout << "dbeg_t2 = " << tim::demangle() << "\n"; + // std::cout << "dbeg_t3 = " << tim::demangle() << "\n"; + // std::cout << "\n" << std::flush; - std::cout << "data_t0 = " << tim::demangle() << "\n"; - std::cout << "data_t1 = " << tim::demangle() << "\n"; - std::cout << "data_t2 = " << tim::demangle() << "\n"; - std::cout << "data_t3 = " << tim::demangle() << "\n"; - std::cout << "\n" << std::flush; + // std::cout << "data_t0 = " << tim::demangle() << "\n"; + // std::cout << "data_t1 = " << tim::demangle() << "\n"; + // std::cout << "data_t2 = " << tim::demangle() << "\n"; + // std::cout << "data_t3 = " << tim::demangle() << "\n"; + // std::cout << "\n" << std::flush; EXPECT_EQ(comp_t0::size(), 3); EXPECT_EQ(comp_t1::size(), 4); @@ -319,29 +319,29 @@ TEST_F(variadic_tests, get) using list_t2 = tim::mpl::remove_duplicates_t>; using list_t3 = tim::mpl::remove_duplicates_t>; - std::cout << "\n" << std::flush; + // std::cout << "\n" << std::flush; - std::cout << "lhs_t = " << tim::demangle() << "\n"; - std::cout << "rhs_t = " << tim::demangle() << "\n"; - std::cout << "lhs_l = " << tim::demangle() << "\n"; - std::cout << "rhs_l = " << tim::demangle() << "\n"; - std::cout << "\n" << std::flush; + // std::cout << "lhs_t = " << tim::demangle() << "\n"; + // std::cout << "rhs_t = " << tim::demangle() << "\n"; + // std::cout << "lhs_l = " << tim::demangle() << "\n"; + // std::cout << "rhs_l = " << tim::demangle() << "\n"; + // std::cout << "\n" << std::flush; - std::cout << "join_t0 = " << tim::demangle() << "\n"; - std::cout << "join_t1 = " << tim::demangle() << "\n"; - std::cout << "join_t2 = " << tim::demangle() << "\n"; - std::cout << "\n" << std::flush; + // std::cout << "join_t0 = " << tim::demangle() << "\n"; + // std::cout << "join_t1 = " << tim::demangle() << "\n"; + // std::cout << "join_t2 = " << tim::demangle() << "\n"; + // std::cout << "\n" << std::flush; - std::cout << "comp_t0 = " << tim::demangle() << "\n"; - std::cout << "comp_t1 = " << tim::demangle() << "\n"; - std::cout << "comp_t2 = " << tim::demangle() << "\n"; - std::cout << "\n" << std::flush; + // std::cout << "comp_t0 = " << tim::demangle() << "\n"; + // std::cout << "comp_t1 = " << tim::demangle() << "\n"; + // std::cout << "comp_t2 = " << tim::demangle() << "\n"; + // std::cout << "\n" << std::flush; - std::cout << "list_t0 = " << tim::demangle() << "\n"; - std::cout << "list_t1 = " << tim::demangle() << "\n"; - std::cout << "list_t2 = " << tim::demangle() << "\n"; - std::cout << "list_t3 = " << tim::demangle() << "\n"; - std::cout << "\n" << std::flush; + // std::cout << "list_t0 = " << tim::demangle() << "\n"; + // std::cout << "list_t1 = " << tim::demangle() << "\n"; + // std::cout << "list_t2 = " << tim::demangle() << "\n"; + // std::cout << "list_t3 = " << tim::demangle() << "\n"; + // std::cout << "\n" << std::flush; list_t0::get_initializer() = [](auto& cl) { cl.template initialize(); }; list_t1::get_initializer() = [](auto& cl) { cl.template initialize(); }; @@ -385,24 +385,24 @@ TEST_F(variadic_tests, get) auto dl2 = cl2.get(); auto dl3 = cl3.get(); - std::cout << "dt0 = " << tim::demangle() << "\n"; - std::cout << "dt1 = " << tim::demangle() << "\n"; - std::cout << "dt2 = " << tim::demangle() << "\n"; - std::cout << "\n" << std::flush; + // std::cout << "dt0 = " << tim::demangle() << "\n"; + // std::cout << "dt1 = " << tim::demangle() << "\n"; + // std::cout << "dt2 = " << tim::demangle() << "\n"; + // std::cout << "\n" << std::flush; - std::cout << "dl0 = " << tim::demangle() << "\n"; - std::cout << "dl1 = " << tim::demangle() << "\n"; - std::cout << "dl2 = " << tim::demangle() << "\n"; - std::cout << "dl3 = " << tim::demangle() << "\n"; - std::cout << "\n" << std::flush; + // std::cout << "dl0 = " << tim::demangle() << "\n"; + // std::cout << "dl1 = " << tim::demangle() << "\n"; + // std::cout << "dl2 = " << tim::demangle() << "\n"; + // std::cout << "dl3 = " << tim::demangle() << "\n"; + // std::cout << "\n" << std::flush; tim::invoke::print(std::cout, ct0, ct1, ct2, cl0, cl1, cl2, cl3); - std::cout << '\n'; + // std::cout << '\n'; disjoint::invoke(std::tie(ct0, ct1, ct2, cl0, cl1, cl2, cl3), [](auto& itr) { std::cout << itr << std::endl; }); - std::cout << "\nCheck get<0>()" << std::endl; + // std::cout << "\nCheck get<0>()" << std::endl; EXPECT_NEAR(std::get<0>(dt0), 1.0, 0.1); EXPECT_NEAR(std::get<0>(dt1), 1.0, 0.1); EXPECT_NEAR(std::get<0>(dt2), 1.0, 0.1); @@ -412,35 +412,35 @@ TEST_F(variadic_tests, get) EXPECT_NEAR(std::get<0>(dl2), 1.0, 0.1); EXPECT_NEAR(std::get<0>(dl3), 1.0, 0.1); - std::cout << "disjoint::reset" << std::endl; + // std::cout << "disjoint::reset" << std::endl; disjoint::reset(std::tie(ct0, ct1, ct2, cl0, cl1, cl2, cl3)); - std::cout << "disjoint::set_prefix" << std::endl; + // std::cout << "disjoint::set_prefix" << std::endl; disjoint::set_prefix(std::tie(ct0, ct1, ct2, cl0, cl1, cl2, cl3), "set_prefix"); - std::cout << "disjoint::set_scope" << std::endl; + // std::cout << "disjoint::set_scope" << std::endl; disjoint::set_scope(std::tie(ct0, ct1, ct2, cl0, cl1, cl2, cl3), tim::scope::flat{} + tim::scope::timeline{}); - std::cout << "disjoint::push" << std::endl; + // std::cout << "disjoint::push" << std::endl; disjoint::push(std::tie(ct0, ct1, ct2, cl0, cl1, cl2, cl3)); - std::cout << "disjoint::assemble" << std::endl; + // std::cout << "disjoint::assemble" << std::endl; disjoint::assemble(std::tie(ct0, ct1, ct2, cl0, cl1, cl2, cl3)); - std::cout << "disjoint::audit" << std::endl; + // std::cout << "disjoint::audit" << std::endl; disjoint::audit(std::tie(ct0, ct1, ct2, cl0, cl1, cl2, cl3), 10); - std::cout << "disjoint::derive" << std::endl; + // std::cout << "disjoint::derive" << std::endl; disjoint::derive(std::tie(ct0, ct1, ct2, cl0, cl1, cl2, cl3)); - std::cout << "disjoint::add_secondary" << std::endl; + // std::cout << "disjoint::add_secondary" << std::endl; disjoint::add_secondary(std::tie(ct0, ct1, ct2, cl0, cl1, cl2, cl3)); - std::cout << "disjoint::pop" << std::endl; + // std::cout << "disjoint::pop" << std::endl; disjoint::pop(std::tie(ct0, ct1, ct2, cl0, cl1, cl2, cl3)); - std::cout << "\nCheck get()" << std::endl; + // std::cout << "\nCheck get()" << std::endl; dt0 = ct0.get(); dt1 = ct1.get(); dt2 = ct2.get(); @@ -459,7 +459,7 @@ TEST_F(variadic_tests, get) EXPECT_NEAR(std::get<0>(dl2), 0.0, 1.e-3); EXPECT_NEAR(std::get<0>(dl3), 0.0, 1.e-3); - std::cout << "Done" << std::endl; + // std::cout << "Done" << std::endl; } //--------------------------------------------------------------------------------------// diff --git a/source/tests/warning_tests.cpp b/source/tests/warning_tests.cpp index a6cbb41a2..c167739dc 100644 --- a/source/tests/warning_tests.cpp +++ b/source/tests/warning_tests.cpp @@ -28,8 +28,8 @@ #include #include -static int _argc = 0; -static char** _argv = nullptr; +static int test_argc = 0; +static char** test_argv = nullptr; //--------------------------------------------------------------------------------------// @@ -65,7 +65,7 @@ TEST_F(warning_tests, enabled) tim::set_env(TIMEMORY_SETTINGS_PREFIX "SUPPRESS_PARSING", "ON", 1); - tim::timemory_init(_argc, _argv); + tim::timemory_init(test_argc, test_argv); auto _settings = tim::settings::instance(); auto _rsuccess = _settings->read(ss); @@ -143,8 +143,8 @@ int main(int argc, char** argv) { ::testing::InitGoogleTest(&argc, argv); - _argc = argc; - _argv = argv; + test_argc = argc; + test_argv = argv; return RUN_ALL_TESTS(); }