Unverified Commit 02a13bda authored by Luna Nova's avatar Luna Nova Committed by GitHub
Browse files

rocmPackages.rpp-opencl: drop as OpenCL variant is broken and unmaintained (#498102)

parents 5f8db895 f3ed5bfd
Loading
Loading
Loading
Loading
+7 −13
Original line number Diff line number Diff line
@@ -175,20 +175,9 @@ let

      rpp = self.callPackage ./rpp { };

      rpp-hip = self.rpp.override {
        useOpenCL = false;
        useCPU = false;
      };

      rpp-opencl = self.rpp.override {
        useOpenCL = true;
        useCPU = false;
      };
      rpp-hip = self.rpp.override { useCPU = false; };

      rpp-cpu = self.rpp.override {
        useOpenCL = false;
        useCPU = true;
      };
      rpp-cpu = self.rpp.override { useCPU = true; };

      mivisionx = self.callPackage ./mivisionx {
        stdenv = origStdenv;
@@ -256,6 +245,11 @@ let
      };
    }
    // lib.optionalAttrs config.allowAliases {
      rpp-opencl = throw ''
        'rpp-opencl' has been removed as it has been broken for a year and has no consuming packages.
        Use 'rpp' or 'rpp-cpu' instead.
      ''; # Added 2026-03-08

      rocmPath = throw ''
        'rocm-path' has been removed. If a ROCM_PATH value is required in nixpkgs please
        construct one with the minimal set of required deps.
+3 −22
Original line number Diff line number Diff line
@@ -12,22 +12,12 @@
  boost,
  python3Packages,
  buildDocs ? false, # Needs internet
  useOpenCL ? false,
  useCPU ? false,
  gpuTargets ? clr.localGpuTargets or [ ],
}:

stdenv.mkDerivation (finalAttrs: {
  pname =
    "rpp-"
    + (
      if (!useOpenCL && !useCPU) then
        "hip"
      else if (!useOpenCL && !useCPU) then
        "opencl"
      else
        "cpu"
    );
  pname = "rpp-${if useCPU then "cpu" else "hip"}";

  version = "7.2.0";

@@ -59,21 +49,13 @@ stdenv.mkDerivation (finalAttrs: {
    "-DCMAKE_INSTALL_BINDIR=bin"
    "-DCMAKE_INSTALL_LIBDIR=lib"
    "-DCMAKE_INSTALL_INCLUDEDIR=include"
    "-DBACKEND=${if useCPU then "CPU" else "HIP"}"
  ]
  ++ lib.optionals (gpuTargets != [ ]) [
    "-DAMDGPU_TARGETS=${lib.concatStringsSep ";" gpuTargets}"
  ]
  ++ lib.optionals (!useOpenCL && !useCPU) [
    "-DBACKEND=HIP"
  ]
  ++ lib.optionals (useOpenCL && !useCPU) [
    "-DBACKEND=OCL"
  ]
  ++ lib.optionals useCPU [
    "-DBACKEND=CPU"
  ];

  postPatch = lib.optionalString (!useOpenCL && !useCPU) ''
  postPatch = lib.optionalString (!useCPU) ''
    # Bad path
    substituteInPlace CMakeLists.txt \
      --replace "COMPILER_FOR_HIP \''${ROCM_PATH}/llvm/bin/clang++" "COMPILER_FOR_HIP ${clr}/bin/hipcc"
@@ -95,6 +77,5 @@ stdenv.mkDerivation (finalAttrs: {
    license = with lib.licenses; [ mit ];
    teams = [ lib.teams.rocm ];
    platforms = lib.platforms.linux;
    broken = useOpenCL;
  };
})