Fix for init of cpu context

Author: Alexsandruss

cpp/daal/src/services/env_detect.cpp

@@ -128,32 +128,21 @@ DAAL_EXPORT daal::services::Environment::Environment(const Environment & e) : da
 /*This functionality has been moved to oneDAL side*/
 DAAL_EXPORT void daal::services::Environment::initNumberOfThreads()
 {
-    if (externalThreadingControl)
-    {
-        if (!isInit)
-        {
-            daal::services::Environment::setNumberOfThreads(_daal_threader_get_max_threads());
-            isInit = true;
-        }
-    }
-    else
+    if (!isInit && !externalThreadingControl)
     {
-        if (!isInit)
+        /* if HT enabled - set _numThreads to physical cores num */
+        if (daal::internal::ServiceInst::serv_get_ht())
         {
-            /* if HT enabled - set _numThreads to physical cores num */
-            if (daal::internal::ServiceInst::serv_get_ht())
+            /* Number of cores = number of cpu packages * number of cores per cpu package */
+            int ncores = daal::internal::ServiceInst::serv_get_ncpus() * daal::internal::ServiceInst::serv_get_ncorespercpu();
+
+            /*  Re-set number of threads if ncores is valid and different to _numThreads */
+            if ((ncores > 0) && (ncores < _daal_threader_get_max_threads()))
             {
-                /* Number of cores = number of cpu packages * number of cores per cpu package */
-                int ncores = daal::internal::ServiceInst::serv_get_ncpus() * daal::internal::ServiceInst::serv_get_ncorespercpu();
-
-                /*  Re-set number of threads if ncores is valid and different to _numThreads */
-                if ((ncores > 0) && (ncores < _daal_threader_get_max_threads()))
-                {
-                    daal::services::Environment::setNumberOfThreads(ncores);
-                }
+                daal::services::Environment::setNumberOfThreads(ncores);
             }
-            isInit = true;
         }
+        isInit = true;
     }
 }
 
@@ -206,4 +195,8 @@ DAAL_EXPORT void daal::services::Environment::modifyExternalThreadingControl(boo
 {
     externalThreadingControl = assumeExternalControl;
     isInit                   = false;
+    if (externalThreadingControl)
+    {
+        daal::services::Environment::setNumberOfThreads(_daal_threader_get_max_threads());
+    }
 }

cpp/oneapi/dal/backend/dispatcher.cpp

@@ -27,12 +27,15 @@ struct global_context_cpu_init {
         // Call to `getCpuId` changes global settings, in particular,
         // changes default number of threads in the threading layer
         Environment::getInstance()->getCpuId();
-        Environment::getInstance()->modifyExternalThreadingControl();
     }
 };
 
 void context_cpu::global_init() {
+    using daal::services::Environment;
+
     [[maybe_unused]] static volatile global_context_cpu_init init;
+
+    Environment::getInstance()->modifyExternalThreadingControl();
 }
 
 inline constexpr detail::cpu_extension from_daal_cpu_type(daal::CpuType cpu) {