From eb05e359d4dc000bf7eb7c3aa68b3bb583602a41 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Thu, 29 Aug 2024 08:08:41 +0200 Subject: [PATCH 1/6] python312Packages.pyopencl: don't use 'with lib;' in meta + formatting --- pkgs/development/python-modules/pyopencl/default.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/pyopencl/default.nix b/pkgs/development/python-modules/pyopencl/default.nix index 7a0e475a0058..2fb73da4a95f 100644 --- a/pkgs/development/python-modules/pyopencl/default.nix +++ b/pkgs/development/python-modules/pyopencl/default.nix @@ -24,7 +24,8 @@ }: let - os-specific-buildInputs = if stdenv.isDarwin then [ darwin.apple_sdk.frameworks.OpenCL ] else [ ocl-icd ]; + os-specific-buildInputs = + if stdenv.isDarwin then [ darwin.apple_sdk.frameworks.OpenCL ] else [ ocl-icd ]; in buildPythonPackage rec { pname = "pyopencl"; @@ -80,10 +81,10 @@ buildPythonPackage rec { "pyopencl.tools" ]; - meta = with lib; { - changelog = "https://github.com/inducer/pyopencl/releases/tag/v${version}"; + meta = { description = "Python wrapper for OpenCL"; - homepage = "https://github.com/inducer/pyopencl"; - license = licenses.mit; + homepage = "https://github.com/pyopencl/pyopencl"; + changelog = "https://github.com/inducer/pyopencl/releases/tag/v${version}"; + license = lib.licenses.mit; }; } From 436a898d290c87bf1e446c2458131d95291a5a85 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Thu, 29 Aug 2024 08:13:15 +0200 Subject: [PATCH 2/6] python312Packages.pyopencl: properly sort inputs --- .../python-modules/pyopencl/default.nix | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/pyopencl/default.nix b/pkgs/development/python-modules/pyopencl/default.nix index 2fb73da4a95f..62afa4959d7b 100644 --- a/pkgs/development/python-modules/pyopencl/default.nix +++ b/pkgs/development/python-modules/pyopencl/default.nix @@ -6,17 +6,19 @@ # build-system cmake, - scikit-build-core, - ninja, nanobind, + ninja, + numpy, + scikit-build-core, + + # buildInputs + opencl-headers, + pybind11, + darwin, + ocl-icd, # dependencies - darwin, - numpy, - ocl-icd, - opencl-headers, platformdirs, - pybind11, pytools, # tests From fe853def7b09f462e963db6886d79e57b7db3f3f Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Thu, 29 Aug 2024 17:12:53 +0200 Subject: [PATCH 3/6] python312Packages.pyopencl: add compyte to the imports check --- pkgs/development/python-modules/pyopencl/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/pyopencl/default.nix b/pkgs/development/python-modules/pyopencl/default.nix index 62afa4959d7b..c2a04c824cac 100644 --- a/pkgs/development/python-modules/pyopencl/default.nix +++ b/pkgs/development/python-modules/pyopencl/default.nix @@ -79,6 +79,7 @@ buildPythonPackage rec { "pyopencl" "pyopencl.array" "pyopencl.cltypes" + "pyopencl.compyte" "pyopencl.elementwise" "pyopencl.tools" ]; From 68079f8393e5c916e8d969c409272f9a09964eae Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Thu, 29 Aug 2024 17:16:45 +0200 Subject: [PATCH 4/6] python312Packages.pyopencl: add GaetanLepage as maintainer --- pkgs/development/python-modules/pyopencl/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/pyopencl/default.nix b/pkgs/development/python-modules/pyopencl/default.nix index c2a04c824cac..eaa336e933c8 100644 --- a/pkgs/development/python-modules/pyopencl/default.nix +++ b/pkgs/development/python-modules/pyopencl/default.nix @@ -89,5 +89,6 @@ buildPythonPackage rec { homepage = "https://github.com/pyopencl/pyopencl"; changelog = "https://github.com/inducer/pyopencl/releases/tag/v${version}"; license = lib.licenses.mit; + maintainers = with lib.maintainers; [ GaetanLepage ]; }; } From c722683f9a932f00a3469242ca4c81a3cb5d0c52 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Fri, 30 Aug 2024 00:23:35 +0200 Subject: [PATCH 5/6] python312Packages.pyopencl: mark as broken on aarch64-darwin --- pkgs/development/python-modules/pyopencl/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/pyopencl/default.nix b/pkgs/development/python-modules/pyopencl/default.nix index eaa336e933c8..4662b86f1e2c 100644 --- a/pkgs/development/python-modules/pyopencl/default.nix +++ b/pkgs/development/python-modules/pyopencl/default.nix @@ -90,5 +90,7 @@ buildPythonPackage rec { changelog = "https://github.com/inducer/pyopencl/releases/tag/v${version}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ GaetanLepage ]; + # ld: symbol(s) not found for architecture arm64 + broken = stdenv.isDarwin && stdenv.isAarch64; }; } From 53cdf12e18fdd60733b5543b1da2fbbbd9e6b3c6 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Fri, 30 Aug 2024 08:53:10 +0300 Subject: [PATCH 6/6] python312Packages.pyopencl: updated comments regarding tests --- pkgs/development/python-modules/pyopencl/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/pyopencl/default.nix b/pkgs/development/python-modules/pyopencl/default.nix index 4662b86f1e2c..6ec97843fa8f 100644 --- a/pkgs/development/python-modules/pyopencl/default.nix +++ b/pkgs/development/python-modules/pyopencl/default.nix @@ -68,11 +68,12 @@ buildPythonPackage rec { preCheck = '' export HOME=$(mktemp -d) - # import from $out - rm -r pyopencl + # https://github.com/NixOS/nixpkgs/issues/255262 + cd $out ''; - # pyopencl._cl.LogicError: clGetPlatformIDs failed: PLATFORM_NOT_FOUND_KHR + # https://github.com/inducer/pyopencl/issues/784 Note that these failing + # tests are all the tests that are available. doCheck = false; pythonImportsCheck = [