From bfca76c4dd52d3e393f6889a829e9103552a049b Mon Sep 17 00:00:00 2001 From: Martin Schwaighofer Date: Sun, 24 Mar 2024 11:57:12 +0100 Subject: [PATCH 1/2] rocmPackages: fix miopengemm deprecation notices --- pkgs/development/rocm-modules/6/default.nix | 6 +++--- pkgs/top-level/aliases.nix | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/rocm-modules/6/default.nix b/pkgs/development/rocm-modules/6/default.nix index e4e745f74b56..d6293b4b4ab3 100644 --- a/pkgs/development/rocm-modules/6/default.nix +++ b/pkgs/development/rocm-modules/6/default.nix @@ -236,9 +236,9 @@ in rec { # hipTensor - Only supports GFX9 miopengemm= throw '' - 'miopen-opencl' has been deprecated. + 'miopengemm' has been deprecated. It is still available for some time as part of rocmPackages_5. - ''; # Added 2024-3-3; + ''; # Added 2024-3-3 composable_kernel = callPackage ./composable_kernel { inherit rocmUpdateScript rocm-cmake clr; @@ -264,7 +264,7 @@ in rec { miopen-opencl= throw '' 'miopen-opencl' has been deprecated. It is still available for some time as part of rocmPackages_5. - ''; # Added 2024-3-3; + ''; # Added 2024-3-3 migraphx = callPackage ./migraphx { inherit rocmUpdateScript rocm-cmake rocblas composable_kernel miopen clr half rocm-device-libs; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 12a5057bc5f7..3b131082d722 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -762,7 +762,7 @@ mapAliases ({ migraphx = throw "'migraphx' has been replaced with 'rocmPackages.migraphx'"; # Added 2023-10-08 minishift = throw "'minishift' has been removed as it was discontinued upstream. Use 'crc' to setup a microshift cluster instead"; # Added 2023-12-30 miopen = throw "'miopen' has been replaced with 'rocmPackages.miopen'"; # Added 2023-10-08 - miopengemm = throw "'miopengemm' has been replaced with 'rocmPackages.miopengemm'"; # Added 2023-10-08 + miopengemm = throw "'miopengemm' has been replaced with 'rocmPackages_5.miopengemm'"; # Added 2023-10-08 miopen-hip = throw "'miopen-hip' has been replaced with 'rocmPackages.miopen-hip'"; # Added 2023-10-08 miopen-opencl = throw "'miopen-opencl' has been replaced with 'rocmPackages.miopen-opencl'"; # Added 2023-10-08 mime-types = mailcap; # Added 2022-01-21 From 710e06c1f18111d72571dd59659c87f5c72e8a34 Mon Sep 17 00:00:00 2001 From: Martin Schwaighofer Date: Sun, 24 Mar 2024 12:04:50 +0100 Subject: [PATCH 2/2] rocmPackages: add deprecation notice for 'mivisionx-opencl' --- pkgs/development/rocm-modules/6/default.nix | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/pkgs/development/rocm-modules/6/default.nix b/pkgs/development/rocm-modules/6/default.nix index d6293b4b4ab3..90a9da83bf83 100644 --- a/pkgs/development/rocm-modules/6/default.nix +++ b/pkgs/development/rocm-modules/6/default.nix @@ -322,12 +322,11 @@ in rec { useCPU = false; }; - mivisionx-opencl = mivisionx.override { - rpp = rpp-opencl; - miopen = miopen-opencl; - useOpenCL = true; - useCPU = false; - }; + mivisionx-opencl = throw '' + 'mivisionx-opencl' has been deprecated. + Other versions of mivisionx are still available. + It is also still available for some time as part of rocmPackages_5. + ''; # Added 2024-3-24 mivisionx-cpu = mivisionx.override { rpp = rpp-cpu;