Skip to content

Don't use cpuinfo on s390x #109496

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

Don't use cpuinfo on s390x #109496

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion c10/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,9 @@ if(${USE_GLOG})
endif()
target_link_libraries(c10 PRIVATE fmt::fmt-header-only)

target_link_libraries(c10 PRIVATE cpuinfo)
if(NOT CMAKE_SYSTEM_PROCESSOR MATCHES "s390x")
target_link_libraries(c10 PRIVATE cpuinfo)
endif()

find_package(Backtrace)
if(Backtrace_FOUND)
Expand Down
7 changes: 6 additions & 1 deletion c10/core/thread_pool.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,20 @@
#include <c10/core/thread_pool.h>
#include <c10/util/Logging.h>
#if !defined(__s390x__)
#include <cpuinfo.h>
#endif

namespace c10 {

size_t TaskThreadPoolBase::defaultNumThreads() {
size_t num_threads = 0;
#if !defined(__s390x__)
cpuinfo_initialize();
size_t num_threads = cpuinfo_get_processors_count();
num_threads = cpuinfo_get_processors_count();
if (num_threads > 0) {
return num_threads;
}
#endif
num_threads = std::thread::hardware_concurrency();
if (num_threads == 0) {
num_threads = 1;
Expand Down