diff options
| author | Martin Schwaighofer <mschwaig@users.noreply.github.com> | 2024-03-03 01:40:15 +0100 |
|---|---|---|
| committer | Martin Schwaighofer <mschwaig@users.noreply.github.com> | 2024-03-21 22:48:33 +0100 |
| commit | 50bf7fb589ff50470da93a23b3a346792a2ab690 (patch) | |
| tree | 4ccbbeb57a7657779dd2ce5dc089cd81f458b768 | |
| parent | 1c842526a434290b974809a2c7602ec88e856b3e (diff) | |
| download | nixlib-50bf7fb589ff50470da93a23b3a346792a2ab690.tar nixlib-50bf7fb589ff50470da93a23b3a346792a2ab690.tar.gz nixlib-50bf7fb589ff50470da93a23b3a346792a2ab690.tar.bz2 nixlib-50bf7fb589ff50470da93a23b3a346792a2ab690.tar.lz nixlib-50bf7fb589ff50470da93a23b3a346792a2ab690.tar.xz nixlib-50bf7fb589ff50470da93a23b3a346792a2ab690.tar.zst nixlib-50bf7fb589ff50470da93a23b3a346792a2ab690.zip | |
rocmPackages: remove miopen-opencl since its deprecated
| -rw-r--r-- | pkgs/development/rocm-modules/6/default.nix | 11 | ||||
| -rw-r--r-- | pkgs/development/rocm-modules/6/miopen/default.nix | 6 |
2 files changed, 6 insertions, 11 deletions
diff --git a/pkgs/development/rocm-modules/6/default.nix b/pkgs/development/rocm-modules/6/default.nix index 982a9296a253..4bd3679ce77f 100644 --- a/pkgs/development/rocm-modules/6/default.nix +++ b/pkgs/development/rocm-modules/6/default.nix @@ -256,13 +256,12 @@ in rec { boost = boost179.override { enableStatic = true; }; }; - miopen-hip = miopen.override { - useOpenCL = false; - }; + miopen-hip = miopen; - miopen-opencl = miopen.override { - useOpenCL = true; - }; + miopen-opencl= throw '' + 'miopen-opencl' has been deprecated. + It is still available for some time as part of rocmPackages_5. + ''; # Added 2024-3-3; migraphx = callPackage ./migraphx { inherit rocmUpdateScript rocm-cmake rocblas composable_kernel miopen clr half rocm-device-libs; diff --git a/pkgs/development/rocm-modules/6/miopen/default.nix b/pkgs/development/rocm-modules/6/miopen/default.nix index ca52ec397542..f78bcb602e69 100644 --- a/pkgs/development/rocm-modules/6/miopen/default.nix +++ b/pkgs/development/rocm-modules/6/miopen/default.nix @@ -31,7 +31,6 @@ , python3Packages , buildDocs ? false # Needs internet because of rocm-docs-core , buildTests ? false -, useOpenCL ? false }: let @@ -167,12 +166,9 @@ in stdenv.mkDerivation (finalAttrs: { "-DCMAKE_INSTALL_BINDIR=bin" "-DCMAKE_INSTALL_LIBDIR=lib" "-DCMAKE_INSTALL_INCLUDEDIR=include" - ] ++ lib.optionals (!useOpenCL) [ "-DCMAKE_C_COMPILER=hipcc" "-DCMAKE_CXX_COMPILER=hipcc" "-DMIOPEN_BACKEND=HIP" - ] ++ lib.optionals useOpenCL [ - "-DMIOPEN_BACKEND=OpenCL" ] ++ lib.optionals buildTests [ "-DBUILD_TESTS=ON" "-DMIOPEN_TEST_ALL=ON" @@ -211,7 +207,7 @@ in stdenv.mkDerivation (finalAttrs: { ln -sf ${gfx90a} $out/share/miopen/db/gfx90a.kdb ln -sf ${gfx1030} $out/share/miopen/db/gfx1030.kdb '' + lib.optionalString buildDocs '' - mv ../doc/html $out/share/doc/miopen-${if useOpenCL then "opencl" else "hip"} + mv ../doc/html $out/share/doc/miopen-hip '' + lib.optionalString buildTests '' mkdir -p $test/bin mv bin/test_* $test/bin |