intel-compute-runtime: 24.52.32224.5 -> 25.09.32961.5, minor cleanup (#391718)
This commit is contained in:
@@ -12,13 +12,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "intel-compute-runtime";
|
||||
version = "24.52.32224.5";
|
||||
version = "25.09.32961.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "intel";
|
||||
repo = "compute-runtime";
|
||||
rev = version;
|
||||
hash = "sha256-Unoh33bZFsMCqJ2hWEYVEdMF2V/aSIDynThz1pUyM7Q=";
|
||||
tag = version;
|
||||
hash = "sha256-oOafnYq4p0MubgsjV2kdW/pd7s0N5xmUnWVLg2JAIS8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@@ -34,11 +34,11 @@ stdenv.mkDerivation rec {
|
||||
];
|
||||
|
||||
cmakeFlags = [
|
||||
"-DSKIP_UNIT_TESTS=1"
|
||||
"-DIGC_DIR=${intel-graphics-compiler}"
|
||||
"-DOCL_ICD_VENDORDIR=${placeholder "out"}/etc/OpenCL/vendors"
|
||||
(lib.cmakeBool "SKIP_UNIT_TESTS" true)
|
||||
(lib.cmakeFeature "IGC_DIR" (builtins.toString intel-graphics-compiler))
|
||||
(lib.cmakeFeature "OCL_ICD_VENDORDIR" "${placeholder "out"}/etc/OpenCL/vendors")
|
||||
# The install script assumes this path is relative to CMAKE_INSTALL_PREFIX
|
||||
"-DCMAKE_INSTALL_LIBDIR=lib"
|
||||
(lib.cmakeFeature "CMAKE_INSTALL_LIBDIR" "lib")
|
||||
];
|
||||
|
||||
outputs = [
|
||||
@@ -70,7 +70,7 @@ stdenv.mkDerivation rec {
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Intel Graphics Compute Runtime oneAPI Level Zero and OpenCL, supporting 12th Gen and newer";
|
||||
description = "Intel Graphics Compute Runtime oneAPI Level Zero and OpenCL, supporting 12th Gen and newer";
|
||||
mainProgram = "ocloc";
|
||||
homepage = "https://github.com/intel/compute-runtime";
|
||||
changelog = "https://github.com/intel/compute-runtime/releases/tag/${version}";
|
||||
|
||||
@@ -22,24 +22,33 @@ let
|
||||
vc_intrinsics_src = fetchFromGitHub {
|
||||
owner = "intel";
|
||||
repo = "vc-intrinsics";
|
||||
rev = "v0.19.0";
|
||||
hash = "sha256-vOK7xfOR+aDpdGd8oOFLJc1Ct1S5BCJmLN6Ubn5wlkQ=";
|
||||
rev = "v0.22.1";
|
||||
hash = "sha256-dSK+kNEZoF4bBx24S0No9aZLZiHK0U9TR1jRyEBL+2U=";
|
||||
};
|
||||
|
||||
inherit (llvmPackages_14) lld llvm;
|
||||
inherit (if buildWithPatches then opencl-clang else llvmPackages_14) clang libclang;
|
||||
spirv-llvm-translator' = spirv-llvm-translator.override { inherit llvm; };
|
||||
in
|
||||
|
||||
# Handholding the braindead build script
|
||||
# cmake requires an absolute path
|
||||
prebuilds = runCommandLocal "igc-cclang-prebuilds" { } ''
|
||||
mkdir $out
|
||||
ln -s ${clang}/bin/clang $out/
|
||||
ln -s ${opencl-clang}/lib/* $out/
|
||||
ln -s ${lib.getLib libclang}/lib/clang/${lib.getVersion clang}/include/opencl-c.h $out/
|
||||
ln -s ${lib.getLib libclang}/lib/clang/${lib.getVersion clang}/include/opencl-c-base.h $out/
|
||||
'';
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "intel-graphics-compiler";
|
||||
version = "1.0.17384.11";
|
||||
version = "2.8.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "intel";
|
||||
repo = "intel-graphics-compiler";
|
||||
rev = "igc-${version}";
|
||||
hash = "sha256-O4uMaPauRv2aMgM2B7XdzCcjI5JghsjX5XbkeloLyck=";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-1YzvzVmMW5s4keQfa7r6xfyVg7RWSdKNgBtdTN6SADg=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
@@ -77,16 +86,6 @@ stdenv.mkDerivation rec {
|
||||
# testing is done via intel-compute-runtime
|
||||
doCheck = false;
|
||||
|
||||
# Handholding the braindead build script
|
||||
# cmake requires an absolute path
|
||||
prebuilds = runCommandLocal "igc-cclang-prebuilds" { } ''
|
||||
mkdir $out
|
||||
ln -s ${clang}/bin/clang $out/
|
||||
ln -s ${opencl-clang}/lib/* $out/
|
||||
ln -s ${lib.getLib libclang}/lib/clang/${lib.getVersion clang}/include/opencl-c.h $out/
|
||||
ln -s ${lib.getLib libclang}/lib/clang/${lib.getVersion clang}/include/opencl-c-base.h $out/
|
||||
'';
|
||||
|
||||
cmakeFlags = [
|
||||
"-DVC_INTRINSICS_SRC=${vc_intrinsics_src}"
|
||||
"-DCCLANG_BUILD_PREBUILDS=ON"
|
||||
|
||||
@@ -49,9 +49,9 @@ let
|
||||
}
|
||||
else if llvmMajor == "14" then
|
||||
{
|
||||
version = "14.0.0+unstable-2024-07-15";
|
||||
rev = "2823e7052b7999c10fff63bc8089e5aa205716f4";
|
||||
hash = "sha256-8/4B74hYge6WiH7PzRGEgE3W7f9IkQ4VMmfkWKYA/l4=";
|
||||
version = "14.0.0+unstable-2025-01-28";
|
||||
rev = "9df26b6af308cb834a4013deb8094f386f29accd";
|
||||
hash = "sha256-8VRQwXFbLcYgHtWKs73yuTsy2kkCgYgPqD+W/GPy1BM=";
|
||||
}
|
||||
else if llvmMajor == "11" then
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user