merge

Artelnics · Jan 14, 2021 · f93a740 · f93a740
2 parents 2944c23 + 972d265
commit f93a740
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/opennn/opennn_strings.cpp b/opennn/opennn_strings.cpp
@@ -134,8 +134,10 @@ void fill_tokens(const string& str, const char& separator, Tensor<string, 1>& to
     // Find first "non-delimiter"
 
     Index index = 0;
+
     Index old_pos;
 
+
     while(string::npos != position || string::npos != last_position)
     {
         // Found a token, add it to the vector

diff --git a/tests/correlations_test.cpp b/tests/correlations_test.cpp
@@ -483,7 +483,10 @@ void CorrelationsTest::test_exponential_correlation()
     {
         y[i] = exp(static_cast<type>(2.5)*x[i] + static_cast<type>(1.4));
     }
-    const ThreadPoolDevice* thread_pool_device = thread_pool_device;
+
+    const int n = omp_get_max_threads();
+    NonBlockingThreadPool* non_blocking_thread_pool = new NonBlockingThreadPool(n);
+    ThreadPoolDevice* thread_pool_device = new ThreadPoolDevice(non_blocking_thread_pool, n);
 
     type correlation = exponential_correlation(thread_pool_device,x,y);
     //@todo(assert_true(correlation > static_cast<type>(0.999999), LOG);)