Revert "Disable thread pool creation when enabled OpenMP (#2485)" (#2535)

This reverts commit 7c7d5a1.

Author: fs-eire

onnxruntime/core/framework/session_options.h

@@ -55,7 +55,6 @@ struct SessionOptions {
   TransformerLevel graph_optimization_level = TransformerLevel::Level1;
 
   // controls the size of the thread pool used to parallelize the execution of tasks within individual nodes (ops)
-  // if OpenMP is enabled, this configuration will be ignored
   int intra_op_num_threads = 0;
 
   // controls the size of the thread pool used to parallelize the execution of nodes (ops)

onnxruntime/core/session/inference_session.cc

@@ -173,12 +173,9 @@ void InferenceSession::ConstructorCommon(const SessionOptions& session_options,
   graph_transformation_mgr_ = onnxruntime::make_unique<GraphTransformerManager>(
       session_options_.max_num_graph_transformation_steps);
   logging_manager_ = logging_manager;
-#ifndef USE_OPENMP
+
   thread_pool_ = concurrency::CreateThreadPool("intra_op_thread_pool",
                                                session_options_.intra_op_num_threads);
-#else
-  thread_pool_ = nullptr;
-#endif
 
   inter_op_thread_pool_ = session_options_.execution_mode == ExecutionMode::ORT_PARALLEL
                               ? concurrency::CreateThreadPool("inter_op_thread_pool",

onnxruntime/test/perftest/README.md

@@ -32,7 +32,7 @@ Options:
         
 	-v: Show verbose information.
         
-	-x: [intra_op_num_threads]: Sets the number of threads used to parallelize the execution within nodes. A value of 0 means the test will auto-select a default. Must >=0. If OpenMP is enabled, this configuration will be ignored.
+	-x: [intra_op_num_threads]: Sets the number of threads used to parallelize the execution within nodes. A value of 0 means the test will auto-select a default. Must >=0.
 
 	-y: [inter_op_num_threads]: Sets the number of threads used to parallelize the execution of the graph (across nodes), A value of 0 means the test will auto-select a default. Must >=0.
 

onnxruntime/test/perftest/command_args_parser.cc

@@ -123,15 +123,10 @@ namespace perftest {
         test_config.run_config.f_verbose = true;
         break;
       case 'x':
-#ifdef USE_OPENMP
-        fprintf(stderr, "cannot use argument '-x' when OpenMP is enabled.\n");
-        return false;
-#else
         test_config.run_config.intra_op_num_threads = static_cast<int>(OrtStrtol<PATH_CHAR_TYPE>(optarg, nullptr));
         if (test_config.run_config.intra_op_num_threads < 0) {
           return false;
         }
-#endif
         break;
       case 'y':
         test_config.run_config.inter_op_num_threads = static_cast<int>(OrtStrtol<PATH_CHAR_TYPE>(optarg, nullptr));

onnxruntime/test/perftest/ort_test_session.cc

@@ -82,7 +82,7 @@ OnnxRuntimeTestSession::OnnxRuntimeTestSession(Ort::Env& env, std::random_device
   } else if (provider_name == onnxruntime::kAclExecutionProvider) {
 #ifdef USE_ACL
     Ort::ThrowOnError(OrtSessionOptionsAppendExecutionProvider_ACL(session_options,
-                                                                   performance_test_config.run_config.enable_cpu_mem_arena ? 1 : 0));
+	performance_test_config.run_config.enable_cpu_mem_arena ? 1 : 0));
 #else
     ORT_THROW("Acl is not supported in this build\n");
 #endif
@@ -100,11 +100,8 @@ OnnxRuntimeTestSession::OnnxRuntimeTestSession(Ort::Env& env, std::random_device
   else
     session_options.DisableMemPattern();
   session_options.SetExecutionMode(performance_test_config.run_config.execution_mode);
-
-#ifndef USE_OPENMP
   fprintf(stdout, "Setting intra_op_num_threads to %d\n", performance_test_config.run_config.intra_op_num_threads);
   session_options.SetIntraOpNumThreads(performance_test_config.run_config.intra_op_num_threads);
-#endif
 
   if (performance_test_config.run_config.execution_mode == ExecutionMode::ORT_PARALLEL) {
     fprintf(stdout, "Setting inter_op_num_threads to %d\n", performance_test_config.run_config.inter_op_num_threads);