From 109b7d54b246a025d773411b5c553b682d0a6489 Mon Sep 17 00:00:00 2001 From: Luna Nova Date: Tue, 10 Mar 2026 09:26:15 -0700 Subject: [PATCH] rocmPackages.clr: drop unmaintained AMD opencl-example test Will be replaced with an opencl-cts based basic conformance suite, AMD aren't maintaining their amd-app-samples repo. --- pkgs/development/rocm-modules/clr/default.nix | 4 +- .../rocm-modules/clr/test-opencl-example.nix | 88 ------------------- 2 files changed, 1 insertion(+), 91 deletions(-) delete mode 100644 pkgs/development/rocm-modules/clr/test-opencl-example.nix diff --git a/pkgs/development/rocm-modules/clr/default.nix b/pkgs/development/rocm-modules/clr/default.nix index 71451c81e443..b70d9ec68c12 100644 --- a/pkgs/development/rocm-modules/clr/default.nix +++ b/pkgs/development/rocm-modules/clr/default.nix @@ -266,9 +266,7 @@ stdenv.mkDerivation (finalAttrs: { inherit rocm-smi; clr = finalAttrs.finalPackage; }; - opencl-example = callPackage ./test-opencl-example.nix { - clr = finalAttrs.finalPackage; - }; + # TODO(@LunNova): add OpenCL test with opencl-cts generic-arch = callPackage ./test-isa-compat.nix { clr = finalAttrs.finalPackage; name = "generic-arch"; diff --git a/pkgs/development/rocm-modules/clr/test-opencl-example.nix b/pkgs/development/rocm-modules/clr/test-opencl-example.nix deleted file mode 100644 index 34b97755a7bf..000000000000 --- a/pkgs/development/rocm-modules/clr/test-opencl-example.nix +++ /dev/null @@ -1,88 +0,0 @@ -{ - lib, - stdenv, - makeImpureTest, - fetchFromGitHub, - clr, - cmake, - pkg-config, - glew, - libglut, - opencl-headers, - ocl-icd, -}: - -let - - examples = stdenv.mkDerivation { - pname = "amd-app-samples"; - version = "2018-06-10"; - - src = fetchFromGitHub { - owner = "OpenCL"; - repo = "AMD_APP_samples"; - rev = "54da6ca465634e78fc51fc25edf5840467ee2411"; - hash = "sha256-qARQpUiYsamHbko/I1gPZE9pUGJ+3396Vk2n7ERSftA="; - }; - - nativeBuildInputs = [ - cmake - pkg-config - ]; - - buildInputs = [ - glew - libglut - opencl-headers - ocl-icd - ]; - - installPhase = '' - runHook preInstall - - mkdir -p $out/bin - # Example path is bin/x86_64/Release/cl/Reduction/Reduction - cp -r bin/*/*/*/*/* $out/bin/ - - runHook postInstall - ''; - - cmakeFlags = [ "-DBUILD_CPP_CL=OFF" ]; - - meta = { - description = "Samples from the AMD APP SDK (with OpenCRun support)"; - homepage = "https://github.com/OpenCL/AMD_APP_samples"; - license = lib.licenses.bsd2; - platforms = lib.platforms.linux; - teams = [ lib.teams.rocm ]; - }; - }; - -in -makeImpureTest { - name = "opencl-example"; - testedPackage = "rocmPackages.clr"; - - sandboxPaths = [ - "/sys" - "/dev/dri" - "/dev/kfd" - ]; - - nativeBuildInputs = [ examples ]; - - OCL_ICD_VENDORS = "${clr.icd}/etc/OpenCL/vendors"; - - testScript = '' - # Examples load resources from current directory - cd ${examples}/bin - echo OCL_ICD_VENDORS=$OCL_ICD_VENDORS - pwd - - HelloWorld | grep HelloWorld - ''; - - meta = { - teams = [ lib.teams.rocm ]; - }; -}