From 85f2404cc2fdf4028745600f51bd8d3dc1748c4a Mon Sep 17 00:00:00 2001 From: Emily Date: Sat, 5 Oct 2024 21:48:30 +0100 Subject: [PATCH] python312Packages.torch: remove code for macOS < 11 --- .../python-modules/torch/default.nix | 8 ---- .../torch/pthreadpool-disable-gcd.diff | 45 ------------------- 2 files changed, 53 deletions(-) delete mode 100644 pkgs/development/python-modules/torch/pthreadpool-disable-gcd.diff diff --git a/pkgs/development/python-modules/torch/default.nix b/pkgs/development/python-modules/torch/default.nix index ddf5bf3ae98a..0eb31d2d1f58 100644 --- a/pkgs/development/python-modules/torch/default.nix +++ b/pkgs/development/python-modules/torch/default.nix @@ -275,14 +275,6 @@ buildPythonPackage rec { patches = lib.optionals cudaSupport [ ./fix-cmake-cuda-toolkit.patch ] - ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) [ - # pthreadpool added support for Grand Central Dispatch in April - # 2020. However, this relies on functionality (DISPATCH_APPLY_AUTO) - # that is available starting with macOS 10.13. However, our current - # base is 10.12. Until we upgrade, we can fall back on the older - # pthread support. - ./pthreadpool-disable-gcd.diff - ] ++ lib.optionals stdenv.hostPlatform.isLinux [ # Propagate CUPTI to Kineto by overriding the search path with environment variables. # https://github.com/pytorch/pytorch/pull/108847 diff --git a/pkgs/development/python-modules/torch/pthreadpool-disable-gcd.diff b/pkgs/development/python-modules/torch/pthreadpool-disable-gcd.diff deleted file mode 100644 index eddd45723f8b..000000000000 --- a/pkgs/development/python-modules/torch/pthreadpool-disable-gcd.diff +++ /dev/null @@ -1,45 +0,0 @@ -diff --git a/third_party/pthreadpool/CMakeLists.txt b/third_party/pthreadpool/CMakeLists.txt -index 0db3264..1ba91c4 100644 ---- a/third_party/pthreadpool/CMakeLists.txt -+++ b/third_party/pthreadpool/CMakeLists.txt -@@ -74,9 +74,7 @@ IF(EMSCRIPTEN) - LIST(APPEND PTHREADPOOL_SRCS src/shim.c) - ELSE() - LIST(APPEND PTHREADPOOL_SRCS src/portable-api.c src/memory.c) -- IF(APPLE AND (PTHREADPOOL_SYNC_PRIMITIVE STREQUAL "default" OR PTHREADPOOL_SYNC_PRIMITIVE STREQUAL "gcd")) -- LIST(APPEND PTHREADPOOL_SRCS src/gcd.c) -- ELSEIF(CMAKE_SYSTEM_NAME MATCHES "^(Windows|CYGWIN|MSYS)$" AND (PTHREADPOOL_SYNC_PRIMITIVE STREQUAL "default" OR PTHREADPOOL_SYNC_PRIMITIVE STREQUAL "event")) -+ IF(CMAKE_SYSTEM_NAME MATCHES "^(Windows|CYGWIN|MSYS)$" AND (PTHREADPOOL_SYNC_PRIMITIVE STREQUAL "default" OR PTHREADPOOL_SYNC_PRIMITIVE STREQUAL "event")) - LIST(APPEND PTHREADPOOL_SRCS src/windows.c) - ELSE() - LIST(APPEND PTHREADPOOL_SRCS src/pthreads.c) -@@ -111,10 +109,6 @@ ELSEIF(PTHREADPOOL_SYNC_PRIMITIVE STREQUAL "futex") - TARGET_COMPILE_DEFINITIONS(pthreadpool PRIVATE PTHREADPOOL_USE_FUTEX=1) - TARGET_COMPILE_DEFINITIONS(pthreadpool PRIVATE PTHREADPOOL_USE_GCD=0) - TARGET_COMPILE_DEFINITIONS(pthreadpool PRIVATE PTHREADPOOL_USE_EVENT=0) --ELSEIF(PTHREADPOOL_SYNC_PRIMITIVE STREQUAL "gcd") -- TARGET_COMPILE_DEFINITIONS(pthreadpool PRIVATE PTHREADPOOL_USE_FUTEX=0) -- TARGET_COMPILE_DEFINITIONS(pthreadpool PRIVATE PTHREADPOOL_USE_GCD=1) -- TARGET_COMPILE_DEFINITIONS(pthreadpool PRIVATE PTHREADPOOL_USE_EVENT=0) - ELSEIF(PTHREADPOOL_SYNC_PRIMITIVE STREQUAL "event") - TARGET_COMPILE_DEFINITIONS(pthreadpool PRIVATE PTHREADPOOL_USE_FUTEX=0) - TARGET_COMPILE_DEFINITIONS(pthreadpool PRIVATE PTHREADPOOL_USE_GCD=0) -diff --git a/third_party/pthreadpool/src/threadpool-common.h b/third_party/pthreadpool/src/threadpool-common.h -index ca84744..244d0ca 100644 ---- a/third_party/pthreadpool/src/threadpool-common.h -+++ b/third_party/pthreadpool/src/threadpool-common.h -@@ -14,14 +14,6 @@ - #endif - #endif - --#ifndef PTHREADPOOL_USE_GCD -- #if defined(__APPLE__) -- #define PTHREADPOOL_USE_GCD 1 -- #else -- #define PTHREADPOOL_USE_GCD 0 -- #endif --#endif -- - #ifndef PTHREADPOOL_USE_EVENT - #if defined(_WIN32) || defined(__CYGWIN__) - #define PTHREADPOOL_USE_EVENT 1