From 1f7d58ef1c5b84e7c3039e2bb5965c8566c7ba73 Mon Sep 17 00:00:00 2001 From: blenderfreaky Date: Wed, 4 Dec 2024 22:48:21 +0100 Subject: [PATCH] opensycl: remove and alias to adaptivecpp --- .../compilers/opensycl/default.nix | 84 ------------------- pkgs/top-level/aliases.nix | 2 + pkgs/top-level/all-packages.nix | 3 - 3 files changed, 2 insertions(+), 87 deletions(-) delete mode 100644 pkgs/development/compilers/opensycl/default.nix diff --git a/pkgs/development/compilers/opensycl/default.nix b/pkgs/development/compilers/opensycl/default.nix deleted file mode 100644 index bdc36efcd0692..0000000000000 --- a/pkgs/development/compilers/opensycl/default.nix +++ /dev/null @@ -1,84 +0,0 @@ -{ lib -, fetchFromGitHub -, llvmPackages_15 -, lld_15 -, python3 -, cmake -, boost -, libxml2 -, libffi -, makeWrapper -, config -, cudaPackages -, rocmPackages_5 -, ompSupport ? true -, openclSupport ? false -, rocmSupport ? config.rocmSupport -, cudaSupport ? config.cudaSupport -, autoAddDriverRunpath -}: -let - inherit (llvmPackages_15) stdenv; - # move to newer ROCm version once supported - rocmPackages = rocmPackages_5; -in -stdenv.mkDerivation rec { - pname = "OpenSYCL"; - version = "0.9.4"; - - src = fetchFromGitHub { - owner = "OpenSYCL"; - repo = "OpenSYCL"; - rev = "v${version}"; - sha256 = "sha256-5YkuUOAnvoAD5xDKxKMPq0B7+1pb6hVisPAhs0Za1ls="; - }; - - nativeBuildInputs = [ - cmake - makeWrapper - ] ++ lib.optionals cudaSupport [ - autoAddDriverRunpath - cudaPackages.cuda_nvcc - ]; - - buildInputs = [ - libxml2 - libffi - boost - llvmPackages_15.openmp - llvmPackages_15.libclang.dev - llvmPackages_15.llvm - ] ++ lib.optionals rocmSupport [ - rocmPackages.clr - rocmPackages.rocm-runtime - ] ++ lib.optionals cudaSupport [ - cudaPackages.cuda_cudart - (lib.getOutput "stubs" cudaPackages.cuda_cudart) - ]; - - # opensycl makes use of clangs internal headers. Its cmake does not successfully discover them automatically on nixos, so we supply the path manually - cmakeFlags = [ - "-DCLANG_INCLUDE_PATH=${llvmPackages_15.libclang.dev}/include" - (lib.cmakeBool "WITH_CPU_BACKEND" ompSupport) - (lib.cmakeBool "WITH_CUDA_BACKEND" cudaSupport) - (lib.cmakeBool "WITH_ROCM_BACKEND" rocmSupport) - ] ++ lib.optionals (lib.versionAtLeast version "24") [ - (lib.cmakeBool "WITH_OPENCL_BACKEND" openclSupport) - ]; - - postFixup = '' - wrapProgram $out/bin/syclcc-clang \ - --prefix PATH : ${lib.makeBinPath [ python3 lld_15 ]} \ - --add-flags "-L${llvmPackages_15.openmp}/lib" \ - --add-flags "-I${llvmPackages_15.openmp.dev}/include" \ - '' + lib.optionalString rocmSupport '' - --add-flags "--rocm-device-lib-path=${rocmPackages.rocm-device-libs}/amdgcn/bitcode" - ''; - - meta = with lib; { - homepage = "https://github.com/OpenSYCL/OpenSYCL"; - description = "Multi-backend implementation of SYCL for CPUs and GPUs"; - maintainers = with maintainers; [ yboettcher ]; - license = licenses.bsd2; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 61f8f88d0745d..84f6154a97229 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -933,6 +933,8 @@ mapAliases { openlp = throw "openlp has been removed for now because the outdated version depended on insecure and removed packages and it needs help to upgrade and maintain it; see https://github.com/NixOS/nixpkgs/pull/314882"; # Added 2024-07-29 openmpt123 = throw "'openmpt123' has been renamed to/replaced by 'libopenmpt'"; # Converted to throw 2024-10-17 openssl_3_0 = openssl_3; # Added 2022-06-27 + opensycl = lib.warn "'opensycl' has been renamed to 'adaptivecpp'" adaptivecpp; # Added 2024-12-04 + opensyclWithRocm = lib.warn "'opensyclWithRocm ' has been renamed to 'adaptivecppWithRocm '" adaptivecppWithRocm; # Added 2024-12-04 orchis = throw "'orchis' has been renamed to/replaced by 'orchis-theme'"; # Converted to throw 2024-10-17 onlyoffice-bin = onlyoffice-desktopeditors; # Added 2024-09-20 onlyoffice-bin_latest = onlyoffice-bin; # Added 2024-07-03 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bb1818bde2a7b..71d67d25fa365 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6966,9 +6966,6 @@ with pkgs; opensmalltalk-vm = callPackage ../development/compilers/opensmalltalk-vm { }; - opensycl = darwin.apple_sdk_11_0.callPackage ../development/compilers/opensycl { }; - opensyclWithRocm = opensycl.override { rocmSupport = true; }; - rustfmt = rustPackages.rustfmt; rust-bindgen-unwrapped = callPackage ../development/tools/rust/bindgen/unwrapped.nix { }; rust-bindgen = callPackage ../development/tools/rust/bindgen { };