diff --git a/pkgs/development/python-modules/accelerate/default.nix b/pkgs/development/python-modules/accelerate/default.nix index a97f2498d6e2..13817fe7278b 100644 --- a/pkgs/development/python-modules/accelerate/default.nix +++ b/pkgs/development/python-modules/accelerate/default.nix @@ -44,8 +44,6 @@ buildPythonPackage (finalAttrs: { hash = "sha256-IfKePiU38fUd5HefaS7J1s8Mb6hVmldINemxAJY+83o="; }; - buildInputs = [ llvmPackages.openmp ]; - build-system = [ setuptools ]; dependencies = [ diff --git a/pkgs/development/python-modules/compressed-tensors/default.nix b/pkgs/development/python-modules/compressed-tensors/default.nix index 06f3b6d3e459..5d89c2097ad0 100644 --- a/pkgs/development/python-modules/compressed-tensors/default.nix +++ b/pkgs/development/python-modules/compressed-tensors/default.nix @@ -7,7 +7,6 @@ # build-system setuptools, setuptools-scm, - llvmPackages, # dependencies frozendict, @@ -47,10 +46,6 @@ buildPythonPackage (finalAttrs: { setuptools-scm ]; - buildInputs = lib.optionals stdenv.cc.isClang [ - llvmPackages.openmp - ]; - dependencies = [ frozendict loguru diff --git a/pkgs/development/python-modules/e3nn/default.nix b/pkgs/development/python-modules/e3nn/default.nix index 4382881a2302..372a0c7359e2 100644 --- a/pkgs/development/python-modules/e3nn/default.nix +++ b/pkgs/development/python-modules/e3nn/default.nix @@ -62,12 +62,6 @@ buildPythonPackage (finalAttrs: { "test_variance" ]; - propagatedBuildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - # Otherwise, torch will fail to include `omp.h`: - # torch._inductor.exc.InductorError: CppCompileError: C++ compile error OpenMP support not found - llvmPackages.openmp - ]; - meta = { description = "Modular framework for neural networks with Euclidean symmetry"; homepage = "https://github.com/e3nn/e3nn"; diff --git a/pkgs/development/python-modules/hoptorch/default.nix b/pkgs/development/python-modules/hoptorch/default.nix index 791367818bd8..e9871e0f629e 100644 --- a/pkgs/development/python-modules/hoptorch/default.nix +++ b/pkgs/development/python-modules/hoptorch/default.nix @@ -40,12 +40,6 @@ buildPythonPackage (finalAttrs: { pythonImportsCheck = [ "hoptorch" ]; - checkInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - # torch._inductor.exc.InductorError: CppCompileError: C++ compile error - # fatal error: 'omp.h' file not found - llvmPackages.openmp - ]; - nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/lerobot/default.nix b/pkgs/development/python-modules/lerobot/default.nix index f0fab063e976..7092e229d80e 100644 --- a/pkgs/development/python-modules/lerobot/default.nix +++ b/pkgs/development/python-modules/lerobot/default.nix @@ -59,11 +59,6 @@ buildPythonPackage (finalAttrs: { ]; dontUseCmakeConfigure = true; - checkInputs = lib.optionals stdenv.cc.isClang [ - # test_async_iterator_* hangs after failing to find OMP headers - llvmPackages.openmp - ]; - pythonRelaxDeps = [ "av" "diffusers" diff --git a/pkgs/development/python-modules/skorch/default.nix b/pkgs/development/python-modules/skorch/default.nix index b916413ab003..ede1c6551fa4 100644 --- a/pkgs/development/python-modules/skorch/default.nix +++ b/pkgs/development/python-modules/skorch/default.nix @@ -53,8 +53,6 @@ buildPythonPackage rec { transformers ]; - checkInputs = lib.optionals stdenv.cc.isClang [ llvmPackages.openmp ]; - disabledTests = [ # on CPU, these expect artifacts from previous GPU run "test_load_cuda_params_to_cpu" diff --git a/pkgs/development/python-modules/torch/source/default.nix b/pkgs/development/python-modules/torch/source/default.nix index 1f1a5948f586..19a85037b016 100644 --- a/pkgs/development/python-modules/torch/source/default.nix +++ b/pkgs/development/python-modules/torch/source/default.nix @@ -389,7 +389,7 @@ buildPythonPackage.override { inherit stdenv; } (finalAttrs: { # Otherwise, torch compile will fail at runtime if openmp is not available # torch._inductor.exc.InductorError: CppCompileError: C++ compile error # fatal error: 'omp.h' file not found - + lib.optionalString stdenv.hostPlatform.isDarwin '' + + lib.optionalString stdenv.cc.isClang '' substituteInPlace torch/csrc/inductor/cpp_prefix.h \ --replace-fail \ "#include " \ diff --git a/pkgs/development/python-modules/torchao/default.nix b/pkgs/development/python-modules/torchao/default.nix index ae20677483af..d401264b71c2 100644 --- a/pkgs/development/python-modules/torchao/default.nix +++ b/pkgs/development/python-modules/torchao/default.nix @@ -77,13 +77,6 @@ buildPythonPackage (finalAttrs: { cpuinfo ]; - propagatedBuildInputs = lib.optionals isDarwin [ - # Otherwise, torch will fail to include `omp.h`: - # torch._inductor.exc.InductorError: CppCompileError: C++ compile error - # OpenMP support not found. - llvmPackages.openmp - ]; - dependencies = [ torch ]; diff --git a/pkgs/development/python-modules/torchaudio/default.nix b/pkgs/development/python-modules/torchaudio/default.nix index 9c1e4b494cc7..5c3eba58afdb 100644 --- a/pkgs/development/python-modules/torchaudio/default.nix +++ b/pkgs/development/python-modules/torchaudio/default.nix @@ -4,9 +4,6 @@ buildPythonPackage, fetchFromGitHub, - # buildInputs - llvmPackages, - # build-system setuptools, @@ -89,13 +86,9 @@ buildPythonPackage.override { inherit (torch) stdenv; } (finalAttrs: { cudaPackages.cuda_nvcc ]; - buildInputs = - lib.optionals cudaSupport [ - cudaPackages.cuda_cudart - ] - ++ lib.optionals torch.stdenv.cc.isClang [ - llvmPackages.openmp - ]; + buildInputs = lib.optionals cudaSupport [ + cudaPackages.cuda_cudart + ]; dependencies = [ torch diff --git a/pkgs/development/python-modules/torchmd-net/default.nix b/pkgs/development/python-modules/torchmd-net/default.nix index 5651c4428ef9..6eea291ec433 100644 --- a/pkgs/development/python-modules/torchmd-net/default.nix +++ b/pkgs/development/python-modules/torchmd-net/default.nix @@ -22,7 +22,6 @@ pytest-xdist, pytestCheckHook, writableTmpDirAsHomeHook, - llvmPackages, }: buildPythonPackage (finalAttrs: { @@ -66,12 +65,6 @@ buildPythonPackage (finalAttrs: { writableTmpDirAsHomeHook ]; - checkInputs = lib.optionals stdenv.cc.isClang [ - # torch._inductor.exc.InductorError: CppCompileError: C++ compile error - # fatal error: 'omp.h' file not found - llvmPackages.openmp - ]; - disabledTests = [ # Require internet access "test_dataset_s66x8"