Use cpuinfo_get_current_uarch_index_with_default for parallelization with uarch

index

3 files changed, 14 insertions, 14 deletions

diff --git a/cmake/DownloadCpuinfo.cmake b/cmake/DownloadCpuinfo.cmake
index 25213a0..e6f2893 100644
--- a/cmake/DownloadCpuinfo.cmake
+++ b/cmake/DownloadCpuinfo.cmake
@@ -4,8 +4,8 @@ PROJECT(cpuinfo-download NONE)
 
 INCLUDE(ExternalProject)
 ExternalProject_Add(cpuinfo
-	URL https://github.com/pytorch/cpuinfo/archive/0cc563acb9baac39f2c1349bc42098c4a1da59e3.tar.gz
-	URL_HASH SHA256=80625d0b69a3d69b70c2236f30db2c542d0922ccf9bb51a61bc39c49fac91a35
+	URL https://github.com/pytorch/cpuinfo/archive/19b9316c71e4e45b170a664bf62ddefd7ac9feb5.zip
+	URL_HASH SHA256=e0a485c072de957668eb324c49d726dc0fd736cfb9436b334325f20d93085003
 	SOURCE_DIR "${CMAKE_BINARY_DIR}/cpuinfo-source"
 	BINARY_DIR "${CMAKE_BINARY_DIR}/cpuinfo"
 	CONFIGURE_COMMAND ""
diff --git a/src/fastpath.c b/src/fastpath.c
index b4e40c5..6abbebe 100644
--- a/src/fastpath.c
+++ b/src/fastpath.c
@@ -71,7 +71,7 @@ PTHREADPOOL_INTERNAL void pthreadpool_thread_parallelize_1d_with_uarch_fastpath(
 	const uint32_t default_uarch_index = threadpool->params.parallelize_1d_with_uarch.default_uarch_index;
 	uint32_t uarch_index = default_uarch_index;
 	#if PTHREADPOOL_USE_CPUINFO
-		uarch_index = cpuinfo_get_current_uarch_index();
+		uarch_index = cpuinfo_get_current_uarch_index_with_default(default_uarch_index);
 		if (uarch_index > threadpool->params.parallelize_1d_with_uarch.max_uarch_index) {
 			uarch_index = default_uarch_index;
 		}
@@ -307,7 +307,7 @@ PTHREADPOOL_INTERNAL void pthreadpool_thread_parallelize_2d_tile_2d_with_uarch_f
 	const uint32_t default_uarch_index = threadpool->params.parallelize_2d_tile_2d_with_uarch.default_uarch_index;
 	uint32_t uarch_index = default_uarch_index;
 	#if PTHREADPOOL_USE_CPUINFO
-		uarch_index = cpuinfo_get_current_uarch_index();
+		uarch_index = cpuinfo_get_current_uarch_index_with_default(default_uarch_index);
 		if (uarch_index > threadpool->params.parallelize_2d_tile_2d_with_uarch.max_uarch_index) {
 			uarch_index = default_uarch_index;
 		}
@@ -540,7 +540,7 @@ PTHREADPOOL_INTERNAL void pthreadpool_thread_parallelize_3d_tile_2d_with_uarch_f
 	const uint32_t default_uarch_index = threadpool->params.parallelize_3d_tile_2d_with_uarch.default_uarch_index;
 	uint32_t uarch_index = default_uarch_index;
 	#if PTHREADPOOL_USE_CPUINFO
-		uarch_index = cpuinfo_get_current_uarch_index();
+		uarch_index = cpuinfo_get_current_uarch_index_with_default(default_uarch_index);
 		if (uarch_index > threadpool->params.parallelize_3d_tile_2d_with_uarch.max_uarch_index) {
 			uarch_index = default_uarch_index;
 		}
@@ -804,7 +804,7 @@ PTHREADPOOL_INTERNAL void pthreadpool_thread_parallelize_4d_tile_2d_with_uarch_f
 	const uint32_t default_uarch_index = threadpool->params.parallelize_4d_tile_2d_with_uarch.default_uarch_index;
 	uint32_t uarch_index = default_uarch_index;
 	#if PTHREADPOOL_USE_CPUINFO
-		uarch_index = cpuinfo_get_current_uarch_index();
+		uarch_index = cpuinfo_get_current_uarch_index_with_default(default_uarch_index);
 		if (uarch_index > threadpool->params.parallelize_4d_tile_2d_with_uarch.max_uarch_index) {
 			uarch_index = default_uarch_index;
 		}
diff --git a/src/portable-api.c b/src/portable-api.c
index 6a8ccf2..ef36578 100644
--- a/src/portable-api.c
+++ b/src/portable-api.c
@@ -70,7 +70,7 @@ static void thread_parallelize_1d_with_uarch(struct pthreadpool* threadpool, str
 	const uint32_t default_uarch_index = threadpool->params.parallelize_1d_with_uarch.default_uarch_index;
 	uint32_t uarch_index = default_uarch_index;
 	#if PTHREADPOOL_USE_CPUINFO
-		uarch_index = cpuinfo_get_current_uarch_index();
+		uarch_index = cpuinfo_get_current_uarch_index_with_default(default_uarch_index);
 		if (uarch_index > threadpool->params.parallelize_1d_with_uarch.max_uarch_index) {
 			uarch_index = default_uarch_index;
 		}
@@ -281,7 +281,7 @@ static void thread_parallelize_2d_tile_2d_with_uarch(struct pthreadpool* threadp
 	const uint32_t default_uarch_index = threadpool->params.parallelize_2d_tile_2d_with_uarch.default_uarch_index;
 	uint32_t uarch_index = default_uarch_index;
 	#if PTHREADPOOL_USE_CPUINFO
-		uarch_index = cpuinfo_get_current_uarch_index();
+		uarch_index = cpuinfo_get_current_uarch_index_with_default(default_uarch_index);
 		if (uarch_index > threadpool->params.parallelize_2d_tile_2d_with_uarch.max_uarch_index) {
 			uarch_index = default_uarch_index;
 		}
@@ -494,7 +494,7 @@ static void thread_parallelize_3d_tile_2d_with_uarch(struct pthreadpool* threadp
 	const uint32_t default_uarch_index = threadpool->params.parallelize_3d_tile_2d_with_uarch.default_uarch_index;
 	uint32_t uarch_index = default_uarch_index;
 	#if PTHREADPOOL_USE_CPUINFO
-		uarch_index = cpuinfo_get_current_uarch_index();
+		uarch_index = cpuinfo_get_current_uarch_index_with_default(default_uarch_index);
 		if (uarch_index > threadpool->params.parallelize_3d_tile_2d_with_uarch.max_uarch_index) {
 			uarch_index = default_uarch_index;
 		}
@@ -738,7 +738,7 @@ static void thread_parallelize_4d_tile_2d_with_uarch(struct pthreadpool* threadp
 	const uint32_t default_uarch_index = threadpool->params.parallelize_4d_tile_2d_with_uarch.default_uarch_index;
 	uint32_t uarch_index = default_uarch_index;
 	#if PTHREADPOOL_USE_CPUINFO
-		uarch_index = cpuinfo_get_current_uarch_index();
+		uarch_index = cpuinfo_get_current_uarch_index_with_default(default_uarch_index);
 		if (uarch_index > threadpool->params.parallelize_4d_tile_2d_with_uarch.max_uarch_index) {
 			uarch_index = default_uarch_index;
 		}
@@ -1131,7 +1131,7 @@ void pthreadpool_parallelize_1d_with_uarch(
 
 		uint32_t uarch_index = default_uarch_index;
 		#if PTHREADPOOL_USE_CPUINFO
-			uarch_index = cpuinfo_get_current_uarch_index();
+			uarch_index = cpuinfo_get_current_uarch_index_with_default(default_uarch_index);
 			if (uarch_index > max_uarch_index) {
 				uarch_index = default_uarch_index;
 			}
@@ -1363,7 +1363,7 @@ void pthreadpool_parallelize_2d_tile_2d_with_uarch(
 
 		uint32_t uarch_index = default_uarch_index;
 		#if PTHREADPOOL_USE_CPUINFO
-			uarch_index = cpuinfo_get_current_uarch_index();
+			uarch_index = cpuinfo_get_current_uarch_index_with_default(default_uarch_index);
 			if (uarch_index > max_uarch_index) {
 				uarch_index = default_uarch_index;
 			}
@@ -1577,7 +1577,7 @@ void pthreadpool_parallelize_3d_tile_2d_with_uarch(
 
 		uint32_t uarch_index = default_uarch_index;
 		#if PTHREADPOOL_USE_CPUINFO
-			uarch_index = cpuinfo_get_current_uarch_index();
+			uarch_index = cpuinfo_get_current_uarch_index_with_default(default_uarch_index);
 			if (uarch_index > max_uarch_index) {
 				uarch_index = default_uarch_index;
 			}
@@ -1812,7 +1812,7 @@ void pthreadpool_parallelize_4d_tile_2d_with_uarch(
 
 		uint32_t uarch_index = default_uarch_index;
 		#if PTHREADPOOL_USE_CPUINFO
-			uarch_index = cpuinfo_get_current_uarch_index();
+			uarch_index = cpuinfo_get_current_uarch_index_with_default(default_uarch_index);
 			if (uarch_index > max_uarch_index) {
 				uarch_index = default_uarch_index;
 			}