Merge pull request #202373 from Madouura/pr/rocm-related (ce1f9354) · Commits · nix / nixpkgs

pkgs/development/compilers/hip/default.nix

+10 −10

Original line number	Diff line number	Diff line
		@@ -28,14 +28,14 @@
		}:

		let
		hip = stdenv.mkDerivation rec {
		hip = stdenv.mkDerivation (finalAttrs: {
		pname = "hip";
		version = "5.3.1";
		version = "5.3.3";

		src = fetchFromGitHub {
		owner = "ROCm-Developer-Tools";
		repo = "HIP";
		rev = "rocm-${version}";
		rev = "rocm-${finalAttrs.version}";
		hash = "sha256-kmRvrwnT0h2dBMI+H9d1vmeW3TmDBD+qW4YYhaMV2dE=";
		};

		@@ -103,19 +103,19 @@ let
		description = "C++ Heterogeneous-Compute Interface for Portability";
		homepage = "https://github.com/ROCm-Developer-Tools/HIP";
		license = licenses.mit;
		maintainers = with maintainers; [ lovesegfault Flakebi ];
		maintainers = with maintainers; [ lovesegfault ] ++ teams.rocm.members;
		platforms = platforms.linux;
		};
		};
		});
		in
		stdenv.mkDerivation rec {
		stdenv.mkDerivation (finalAttrs: {
		pname = "hip";
		version = "5.3.1";
		version = "5.3.3";

		src = fetchFromGitHub {
		owner = "ROCm-Developer-Tools";
		repo = "hipamd";
		rev = "rocm-${version}";
		rev = "rocm-${finalAttrs.version}";
		hash = "sha256-i7hT/j+V0LT6Va2XcQyyKXF1guoIyhcOHvn842wCRx4=";
		};

		@@ -200,7 +200,7 @@ stdenv.mkDerivation rec {
		description = "C++ Heterogeneous-Compute Interface for Portability";
		homepage = "https://github.com/ROCm-Developer-Tools/hipamd";
		license = licenses.mit;
		maintainers = with maintainers; [ lovesegfault Flakebi ];
		maintainers = with maintainers; [ lovesegfault ] ++ teams.rocm.members;
		platforms = platforms.linux;
		};
		}
		})

+1 −1

Original line number	Diff line number	Diff line
		{ stdenv, lib, buildPackages, fetchFromGitHub, callPackage, wrapCCWith, overrideCC }:

		let
		version = "5.3.1";
		version = "5.3.3";
		src = fetchFromGitHub {
		owner = "RadeonOpenCompute";
		repo = "llvm-project";

+3 −3

Original line number	Diff line number	Diff line
		@@ -24,7 +24,7 @@ let
		if stdenv.isx86_64 then "X86"
		else if stdenv.isAarch64 then "AArch64"
		else throw "Unsupported ROCm LLVM platform";
		in stdenv.mkDerivation rec {
		in stdenv.mkDerivation (finalAttrs: {
		inherit src version;

		pname = "rocm-llvm";
		@@ -85,7 +85,7 @@ in stdenv.mkDerivation rec {
		description = "ROCm fork of the LLVM compiler infrastructure";
		homepage = "https://github.com/RadeonOpenCompute/llvm-project";
		license = with licenses; [ ncsa ];
		maintainers = with maintainers; [ acowley lovesegfault Flakebi ];
		maintainers = with maintainers; [ acowley lovesegfault ] ++ teams.rocm.members;
		platforms = platforms.linux;
		};
		}
		})

+15 −7

Original line number	Diff line number	Diff line
		{ lib
		, stdenv
		, fetchFromGitHub
		, writeScript
		, cmake
		, rocm-cmake
		, rocm-device-libs
		, clang
		}:

		stdenv.mkDerivation rec {
		stdenv.mkDerivation (finalAttrs: {
		pname = "clang-ocl";
		rocmVersion = "5.3.1";
		version = rocmVersion;
		rocmVersion = "5.3.3";
		version = finalAttrs.rocmVersion;

		src = fetchFromGitHub {
		owner = "RadeonOpenCompute";
		repo = "clang-ocl";
		rev = "rocm-${rocmVersion}";
		rev = "rocm-${finalAttrs.rocmVersion}";
		hash = "sha256-uMSvcVJj+me2E+7FsXZ4l4hTcK6uKEegXpkHGcuist0=";
		};

		@@ -34,11 +35,18 @@ stdenv.mkDerivation rec {
		"-DCMAKE_CXX_COMPILER=clang++"
		];

		passthru.updateScript = writeScript "update.sh" ''
		#!/usr/bin/env nix-shell
		#!nix-shell -i bash -p curl jq common-updater-scripts
		rocmVersion="$(curl -sL "https://api.github.com/repos/RadeonOpenCompute/clang-ocl/releases?per_page=1" \| jq '.[0].tag_name \| split("-") \| .[1]' --raw-output)"
		update-source-version clang-ocl "$rocmVersion" --ignore-same-hash --version-key=rocmVersion
		'';

		meta = with lib; {
		description = "OpenCL compilation with clang compiler";
		homepage = "https://github.com/RadeonOpenCompute/clang-ocl";
		license = with licenses; [ mit ];
		maintainers = with maintainers; [ Madouura ];
		broken = rocmVersion != clang.version;
		maintainers = teams.rocm.members;
		broken = finalAttrs.rocmVersion != clang.version;
		};
		}
		})

+8 −6

Original line number	Diff line number	Diff line
		@@ -18,9 +18,9 @@ assert buildTests -> gtest != null;
		# Try removing this next update
		assert buildTests == false;

		stdenv.mkDerivation rec {
		stdenv.mkDerivation (finalAttrs: {
		pname = "composable_kernel";
		version = "unstable-2022-11-02";
		version = "unstable-2022-11-19";

		outputs = [
		"out"
		@@ -30,11 +30,13 @@ stdenv.mkDerivation rec {
		"example"
		];

		# There is now a release, but it's cpu-only it seems to be for a very specific purpose
		# Thus, we're sticking with the develop branch for now...
		src = fetchFromGitHub {
		owner = "ROCmSoftwarePlatform";
		repo = "composable_kernel";
		rev = "79aa3fb1793c265c59d392e916baa851a55521c8";
		hash = "sha256-vIfMdvRYCTqrjMGSb7gQfodzLw2wf3tGoCAa5jtfbvw=";
		rev = "43a889b72e3faabf04c16ff410d387ce28486c3e";
		hash = "sha256-DDRrWKec/RcOhW3CrN0gl9NZsp0Bjnja7HAiTcEh7qg=";
		};

		nativeBuildInputs = [
		@@ -86,6 +88,6 @@ stdenv.mkDerivation rec {
		description = "Performance portable programming model for machine learning tensor operators";
		homepage = "https://github.com/ROCmSoftwarePlatform/composable_kernel";
		license = with licenses; [ mit ];
		maintainers = with maintainers; [ Madouura ];
		maintainers = teams.rocm.members;
		};
		}
		})