diff options
Diffstat (limited to 'science/py-tensorflow/files/bazel/fix_cpuinfo.patch')
-rw-r--r-- | science/py-tensorflow/files/bazel/fix_cpuinfo.patch | 80 |
1 files changed, 0 insertions, 80 deletions
diff --git a/science/py-tensorflow/files/bazel/fix_cpuinfo.patch b/science/py-tensorflow/files/bazel/fix_cpuinfo.patch deleted file mode 100644 index 1041a2319286..000000000000 --- a/science/py-tensorflow/files/bazel/fix_cpuinfo.patch +++ /dev/null @@ -1,80 +0,0 @@ ---- a/src/mach/topology.c 2022-09-01 12:09:36.036365000 +0100 -+++ b/src/mach/topology.c 2022-09-01 12:09:07.146529000 +0100 -@@ -1,5 +1,4 @@ - #include <string.h> --#include <alloca.h> - #include <errno.h> - - #include <sys/types.h> -@@ -8,38 +7,27 @@ - #include <cpuinfo/log.h> - #include <mach/api.h> - --#include <TargetConditionals.h> - -- - struct cpuinfo_mach_topology cpuinfo_mach_detect_topology(void) { - int cores = 1; - size_t sizeof_cores = sizeof(cores); -- if (sysctlbyname("hw.physicalcpu_max", &cores, &sizeof_cores, NULL, 0) != 0) { -- cpuinfo_log_error("sysctlbyname(\"hw.physicalcpu_max\") failed: %s", strerror(errno)); -+ if (sysctlbyname("hw.ncpu", &cores, &sizeof_cores, NULL, 0) != 0) { -+ cpuinfo_log_error("sysctlbyname(\"hw.ncpu\") failed: %s", strerror(errno)); - } else if (cores <= 0) { -- cpuinfo_log_error("sysctlbyname(\"hw.physicalcpu_max\") returned invalid value %d", cores); -+ cpuinfo_log_error("sysctlbyname(\"hw.ncpu\") returned invalid value %d", cores); - cores = 1; - } - - int threads = 1; - size_t sizeof_threads = sizeof(threads); -- if (sysctlbyname("hw.logicalcpu_max", &threads, &sizeof_threads, NULL, 0) != 0) { -- cpuinfo_log_error("sysctlbyname(\"hw.logicalcpu_max\") failed: %s", strerror(errno)); -+ if (sysctlbyname("hw.ncpu", &threads, &sizeof_threads, NULL, 0) != 0) { -+ cpuinfo_log_error("sysctlbyname(\"ncpu\") failed: %s", strerror(errno)); - } else if (threads <= 0) { -- cpuinfo_log_error("sysctlbyname(\"hw.logicalcpu_max\") returned invalid value %d", threads); -+ cpuinfo_log_error("sysctlbyname(\"ncpu\") returned invalid value %d", threads); - threads = cores; - } - - int packages = 1; --#if !TARGET_OS_IPHONE -- size_t sizeof_packages = sizeof(packages); -- if (sysctlbyname("hw.packages", &packages, &sizeof_packages, NULL, 0) != 0) { -- cpuinfo_log_error("sysctlbyname(\"hw.packages\") failed: %s", strerror(errno)); -- } else if (packages <= 0) { -- cpuinfo_log_error("sysctlbyname(\"hw.packages\") returned invalid value %d", packages); -- packages = 1; -- } --#endif - - cpuinfo_log_debug("mach topology: packages = %d, cores = %d, threads = %d", packages, (int) cores, (int) threads); - struct cpuinfo_mach_topology topology = { -@@ -48,26 +36,5 @@ - .threads = (uint32_t) threads - }; - --#if !TARGET_OS_IPHONE -- size_t cacheconfig_size = 0; -- if (sysctlbyname("hw.cacheconfig", NULL, &cacheconfig_size, NULL, 0) != 0) { -- cpuinfo_log_error("sysctlbyname(\"hw.cacheconfig\") failed: %s", strerror(errno)); -- } else { -- uint64_t* cacheconfig = alloca(cacheconfig_size); -- if (sysctlbyname("hw.cacheconfig", cacheconfig, &cacheconfig_size, NULL, 0) != 0) { -- cpuinfo_log_error("sysctlbyname(\"hw.cacheconfig\") failed: %s", strerror(errno)); -- } else { -- size_t cache_configs = cacheconfig_size / sizeof(uint64_t); -- cpuinfo_log_debug("mach hw.cacheconfig count: %zu", cache_configs); -- if (cache_configs > CPUINFO_MACH_MAX_CACHE_LEVELS) { -- cache_configs = CPUINFO_MACH_MAX_CACHE_LEVELS; -- } -- for (size_t i = 0; i < cache_configs; i++) { -- cpuinfo_log_debug("mach hw.cacheconfig[%zu]: %"PRIu64, i, cacheconfig[i]); -- topology.threads_per_cache[i] = cacheconfig[i]; -- } -- } -- } --#endif - return topology; - } |