From d045c2d72faf2e8056e82ad0e1e207e9db2f5b1d Mon Sep 17 00:00:00 2001 From: SundarRajan98 Date: Thu, 21 Mar 2024 07:03:41 +0000 Subject: [PATCH 1/2] Fixing issues with C++ unit tests --- apps/image_augmentation/image_augmentation.cpp | 1 + rocAL/include/parameters/parameter_simple.h | 1 + tests/cpp_api_tests/rocAL_basic_test/rocal_basic_test.cpp | 1 + tests/cpp_api_tests/rocAL_dataloader/rocAL_dataloader.cpp | 1 + tests/cpp_api_tests/rocAL_dataloader_mt/rocAL_dataloader_mt.cpp | 1 + tests/cpp_api_tests/rocAL_dataloader_tf/rocAL_dataloader_tf.cpp | 1 + .../rocAL_video_unittests/rocAL_video_unittests.cpp | 1 + 7 files changed, 7 insertions(+) diff --git a/apps/image_augmentation/image_augmentation.cpp b/apps/image_augmentation/image_augmentation.cpp index a21b89393..ecfca062f 100644 --- a/apps/image_augmentation/image_augmentation.cpp +++ b/apps/image_augmentation/image_augmentation.cpp @@ -107,6 +107,7 @@ int main(int argc, const char** argv) { std::cout << "Could not create the rocAL contex\n"; return -1; } + rocalSetSeed(0); RocalDecoderType dec_type = (RocalDecoderType)decoder_type; diff --git a/rocAL/include/parameters/parameter_simple.h b/rocAL/include/parameters/parameter_simple.h index 9b0245595..3b5077e93 100644 --- a/rocAL/include/parameters/parameter_simple.h +++ b/rocAL/include/parameters/parameter_simple.h @@ -58,6 +58,7 @@ class SimpleParameter : public Parameter { void create_array(unsigned array_size) override { if (param_values.size() == 0) param_values.resize(array_size); + update(_val); } ~SimpleParameter() = default; diff --git a/tests/cpp_api_tests/rocAL_basic_test/rocal_basic_test.cpp b/tests/cpp_api_tests/rocAL_basic_test/rocal_basic_test.cpp index a7a91e7ba..646fd9c2d 100644 --- a/tests/cpp_api_tests/rocAL_basic_test/rocal_basic_test.cpp +++ b/tests/cpp_api_tests/rocAL_basic_test/rocal_basic_test.cpp @@ -91,6 +91,7 @@ int main(int argc, const char **argv) { std::cout << "Could not create the Rocal contex\n"; return -1; } + rocalSetSeed(0); /*>>>>>>>>>>>>>>>>>>> Graph description <<<<<<<<<<<<<<<<<<<*/ RocalTensor decoded_output; diff --git a/tests/cpp_api_tests/rocAL_dataloader/rocAL_dataloader.cpp b/tests/cpp_api_tests/rocAL_dataloader/rocAL_dataloader.cpp index 540efd196..6a4d2334a 100644 --- a/tests/cpp_api_tests/rocAL_dataloader/rocAL_dataloader.cpp +++ b/tests/cpp_api_tests/rocAL_dataloader/rocAL_dataloader.cpp @@ -86,6 +86,7 @@ int main(int argc, const char **argv) { std::cout << "Could not create the Rocal contex\n"; return -1; } + rocalSetSeed(0); /*>>>>>>>>>>>>>>>> Creating Rocal parameters <<<<<<<<<<<<<<<<*/ diff --git a/tests/cpp_api_tests/rocAL_dataloader_mt/rocAL_dataloader_mt.cpp b/tests/cpp_api_tests/rocAL_dataloader_mt/rocAL_dataloader_mt.cpp index 5a00fd03f..50440ca85 100644 --- a/tests/cpp_api_tests/rocAL_dataloader_mt/rocAL_dataloader_mt.cpp +++ b/tests/cpp_api_tests/rocAL_dataloader_mt/rocAL_dataloader_mt.cpp @@ -87,6 +87,7 @@ int thread_func(const char *path, int gpu_mode, RocalImageColor color_format, in << " could not initialize : " << rocalGetErrorMessage(handle) << std::endl; return -1; } + rocalSetSeed(0); // create meta data reader rocalCreateLabelReader(handle, path); diff --git a/tests/cpp_api_tests/rocAL_dataloader_tf/rocAL_dataloader_tf.cpp b/tests/cpp_api_tests/rocAL_dataloader_tf/rocAL_dataloader_tf.cpp index 6fc4d6b6e..bbf14f892 100644 --- a/tests/cpp_api_tests/rocAL_dataloader_tf/rocAL_dataloader_tf.cpp +++ b/tests/cpp_api_tests/rocAL_dataloader_tf/rocAL_dataloader_tf.cpp @@ -110,6 +110,7 @@ int main(int argc, const char **argv) { std::cout << "JPEG source could not initialize : " << rocalGetErrorMessage(handle) << std::endl; return -1; } + rocalSetSeed(0); #if 0 const size_t num_values = 3; diff --git a/tests/cpp_api_tests/rocAL_video_unittests/rocAL_video_unittests.cpp b/tests/cpp_api_tests/rocAL_video_unittests/rocAL_video_unittests.cpp index dae9a3128..86da62295 100644 --- a/tests/cpp_api_tests/rocAL_video_unittests/rocAL_video_unittests.cpp +++ b/tests/cpp_api_tests/rocAL_video_unittests/rocAL_video_unittests.cpp @@ -152,6 +152,7 @@ int main(int argc, const char **argv) { std::cout << "Could not create the Rocal contex\n"; return -1; } + rocalSetSeed(0); if (reader_case == 3) { if (check_extension(source_path) < 0) { std::cerr << "\n[ERR] Text file/ Video File passed as input to SEQUENCE READER\n"; From 46616127a7d0947cecf6425a5b65b74c50845835 Mon Sep 17 00:00:00 2001 From: SundarRajan98 Date: Fri, 29 Mar 2024 18:51:38 +0000 Subject: [PATCH 2/2] Setting seed in master graph ctor and remove rocalSetSeed in cpp tests --- apps/image_augmentation/image_augmentation.cpp | 1 - rocAL/source/pipeline/master_graph.cpp | 1 + tests/cpp_api_tests/rocAL_basic_test/rocal_basic_test.cpp | 1 - tests/cpp_api_tests/rocAL_dataloader/rocAL_dataloader.cpp | 1 - tests/cpp_api_tests/rocAL_dataloader_mt/rocAL_dataloader_mt.cpp | 1 - tests/cpp_api_tests/rocAL_dataloader_tf/rocAL_dataloader_tf.cpp | 1 - .../rocAL_video_unittests/rocAL_video_unittests.cpp | 1 - 7 files changed, 1 insertion(+), 6 deletions(-) diff --git a/apps/image_augmentation/image_augmentation.cpp b/apps/image_augmentation/image_augmentation.cpp index ecfca062f..a21b89393 100644 --- a/apps/image_augmentation/image_augmentation.cpp +++ b/apps/image_augmentation/image_augmentation.cpp @@ -107,7 +107,6 @@ int main(int argc, const char** argv) { std::cout << "Could not create the rocAL contex\n"; return -1; } - rocalSetSeed(0); RocalDecoderType dec_type = (RocalDecoderType)decoder_type; diff --git a/rocAL/source/pipeline/master_graph.cpp b/rocAL/source/pipeline/master_graph.cpp index 917913338..478a79931 100644 --- a/rocAL/source/pipeline/master_graph.cpp +++ b/rocAL/source/pipeline/master_graph.cpp @@ -182,6 +182,7 @@ MasterGraph::MasterGraph(size_t batch_size, RocalAffinity affinity, size_t cpu_t _device.init_ocl(_context); #endif } + ParameterFactory::instance()->set_seed(0); // Setting default seed for ParameterFactory instance. User can set the seed manually by calling rocalSetSeed(seed_value) } catch (const std::exception &e) { release(); throw; diff --git a/tests/cpp_api_tests/rocAL_basic_test/rocal_basic_test.cpp b/tests/cpp_api_tests/rocAL_basic_test/rocal_basic_test.cpp index 646fd9c2d..a7a91e7ba 100644 --- a/tests/cpp_api_tests/rocAL_basic_test/rocal_basic_test.cpp +++ b/tests/cpp_api_tests/rocAL_basic_test/rocal_basic_test.cpp @@ -91,7 +91,6 @@ int main(int argc, const char **argv) { std::cout << "Could not create the Rocal contex\n"; return -1; } - rocalSetSeed(0); /*>>>>>>>>>>>>>>>>>>> Graph description <<<<<<<<<<<<<<<<<<<*/ RocalTensor decoded_output; diff --git a/tests/cpp_api_tests/rocAL_dataloader/rocAL_dataloader.cpp b/tests/cpp_api_tests/rocAL_dataloader/rocAL_dataloader.cpp index 6a4d2334a..540efd196 100644 --- a/tests/cpp_api_tests/rocAL_dataloader/rocAL_dataloader.cpp +++ b/tests/cpp_api_tests/rocAL_dataloader/rocAL_dataloader.cpp @@ -86,7 +86,6 @@ int main(int argc, const char **argv) { std::cout << "Could not create the Rocal contex\n"; return -1; } - rocalSetSeed(0); /*>>>>>>>>>>>>>>>> Creating Rocal parameters <<<<<<<<<<<<<<<<*/ diff --git a/tests/cpp_api_tests/rocAL_dataloader_mt/rocAL_dataloader_mt.cpp b/tests/cpp_api_tests/rocAL_dataloader_mt/rocAL_dataloader_mt.cpp index 50440ca85..5a00fd03f 100644 --- a/tests/cpp_api_tests/rocAL_dataloader_mt/rocAL_dataloader_mt.cpp +++ b/tests/cpp_api_tests/rocAL_dataloader_mt/rocAL_dataloader_mt.cpp @@ -87,7 +87,6 @@ int thread_func(const char *path, int gpu_mode, RocalImageColor color_format, in << " could not initialize : " << rocalGetErrorMessage(handle) << std::endl; return -1; } - rocalSetSeed(0); // create meta data reader rocalCreateLabelReader(handle, path); diff --git a/tests/cpp_api_tests/rocAL_dataloader_tf/rocAL_dataloader_tf.cpp b/tests/cpp_api_tests/rocAL_dataloader_tf/rocAL_dataloader_tf.cpp index bbf14f892..6fc4d6b6e 100644 --- a/tests/cpp_api_tests/rocAL_dataloader_tf/rocAL_dataloader_tf.cpp +++ b/tests/cpp_api_tests/rocAL_dataloader_tf/rocAL_dataloader_tf.cpp @@ -110,7 +110,6 @@ int main(int argc, const char **argv) { std::cout << "JPEG source could not initialize : " << rocalGetErrorMessage(handle) << std::endl; return -1; } - rocalSetSeed(0); #if 0 const size_t num_values = 3; diff --git a/tests/cpp_api_tests/rocAL_video_unittests/rocAL_video_unittests.cpp b/tests/cpp_api_tests/rocAL_video_unittests/rocAL_video_unittests.cpp index 86da62295..dae9a3128 100644 --- a/tests/cpp_api_tests/rocAL_video_unittests/rocAL_video_unittests.cpp +++ b/tests/cpp_api_tests/rocAL_video_unittests/rocAL_video_unittests.cpp @@ -152,7 +152,6 @@ int main(int argc, const char **argv) { std::cout << "Could not create the Rocal contex\n"; return -1; } - rocalSetSeed(0); if (reader_case == 3) { if (check_extension(source_path) < 0) { std::cerr << "\n[ERR] Text file/ Video File passed as input to SEQUENCE READER\n";