15f9870eb3
Update all of the ROCm packages at the same time as they share a version
number and should be upgraded together, including llvm-for-rocm.
* gnu/packages/llvm.scm (llvm-for-rocm): Update to 5.6.0.
[source]{patches}: Remove unneeded patches (linkdl and remove-isystem-usr-include).
* gnu/packages/rocm.scm (rocm-cmake, roct-thunk-interface): Update
to 5.6.0.
(rocclr-src): Update to 5.6.0.
[source]{patches}: Add enable-gfx800 patch.
(rocm-device-libs): Update to 5.6.0.
[inputs]: Update style.
(rocm-comgr): Update to 5.6.0.
[inputs]: Remove lld. Update style.
(rocr-runtime): Update to 5.6.0.
[arguments]: Use gexps. Remove configure-flags. Add add-rocm-device-lib-path
phase.
[inputs]: Add libdrm. Update style.
[native-inputs]: Add pkg-config. Update style.
(rocm-opencl-runtime): Update to 5.6.0.
[source]{patches}: Remove noopencl patch.
[arguments]{configure-flags}: Add BUILD_ICD=OFF and
FILE_REORG_BACKWARD_COMPATIBILITY=OFF flags.
[inputs]: Add opencl-headers.
(rocminfo): Update to 5.6.0.
[arguments]: Use gexps. Use search-input-file instead of assoc-ref and which.
(rocm-bandwidth-test): Update to 5.6.0.
[source]{patches}: Add fix-includes patch.
* gnu/packages/patches/rocm-comgr-3.1.0-dependencies.patch,
gnu/packages/patches/rocm-opencl-runtime-4.3-noclinfo.patch: Update patches.
* gnu/packages/patches/llvm-roc-4.0.0-remove-isystem-usr-include.patch,
gnu/packages/patches/llvm-roc-5.0.0-linkdl.patch,
gnu/packages/patches/rocm-opencl-runtime-4.3-noopencl.patch: Delete files.
* gnu/packages/patches/rocm-bandwidth-test-5.5.0-fix-includes.patch,
gnu/packages/patches/rocclr-5.6.0-enable-gfx800.patch: New files.
* gnu/local.mk (dist_patch_DATA): Update patches.
80 lines
2.3 KiB
Diff
80 lines
2.3 KiB
Diff
See <https://github.com/RadeonOpenCompute/rocm_bandwidth_test/pull/90>.
|
|
|
|
From a58f9fd4cb5d1120b9ce58c912ca87fa14720f73 Mon Sep 17 00:00:00 2001
|
|
From: pppig236 <weikaik@umich.edu>
|
|
Date: Tue, 2 May 2023 15:19:52 -0400
|
|
Subject: [PATCH] fix include for rocm 5.5.0
|
|
|
|
---
|
|
base_test.hpp | 8 +-------
|
|
common.hpp | 11 ++---------
|
|
rocm_bandwidth_test.hpp | 8 +-------
|
|
3 files changed, 4 insertions(+), 23 deletions(-)
|
|
|
|
diff --git a/base_test.hpp b/base_test.hpp
|
|
index 3e79de1..af99a85 100755
|
|
--- a/base_test.hpp
|
|
+++ b/base_test.hpp
|
|
@@ -42,14 +42,8 @@
|
|
|
|
#ifndef ROC_BANDWIDTH_TEST_BASE_H_
|
|
#define ROC_BANDWIDTH_TEST_BASE_H_
|
|
-#if(defined(RBT_HSA_VERSION_FLAT) && ((RBT_HSA_VERSION_FLAT) < RBT_HSA_VERSION_FILEREORG))
|
|
-// Hsa package with out file reorganization
|
|
-// This is for backward compatibility and will be deprecated from future release
|
|
-#include "hsa.h"
|
|
-#else
|
|
// Hsa package with file reorganization
|
|
-#include "hsa/hsa.h"
|
|
-#endif
|
|
+#include <hsa/hsa.h>
|
|
#include <iostream>
|
|
#include <string>
|
|
#include <vector>
|
|
diff --git a/common.hpp b/common.hpp
|
|
index d2933a0..3c4858f 100755
|
|
--- a/common.hpp
|
|
+++ b/common.hpp
|
|
@@ -48,16 +48,9 @@
|
|
#include <vector>
|
|
#include <cmath>
|
|
#include <stdio.h>
|
|
-#if(defined(RBT_HSA_VERSION_FLAT) && ((RBT_HSA_VERSION_FLAT) < RBT_HSA_VERSION_FILEREORG))
|
|
-// Hsa package with out file reorganization
|
|
-// This is for backward compatibility and will be deprecated from future release
|
|
-#include "hsa.h"
|
|
-#include "hsa_ext_amd.h"
|
|
-#else
|
|
// Hsa package with file reorganization
|
|
-#include "hsa/hsa.h"
|
|
-#include "hsa/hsa_ext_amd.h"
|
|
-#endif
|
|
+#include <hsa/hsa.h>
|
|
+#include <hsa/hsa_ext_amd.h>
|
|
|
|
using namespace std;
|
|
|
|
diff --git a/rocm_bandwidth_test.hpp b/rocm_bandwidth_test.hpp
|
|
index f7eb338..b8550a7 100755
|
|
--- a/rocm_bandwidth_test.hpp
|
|
+++ b/rocm_bandwidth_test.hpp
|
|
@@ -43,14 +43,8 @@
|
|
#ifndef __ROC_BANDWIDTH_TEST_H__
|
|
#define __ROC_BANDWIDTH_TEST_H__
|
|
|
|
-#if(defined(RBT_HSA_VERSION_FLAT) && ((RBT_HSA_VERSION_FLAT) < RBT_HSA_VERSION_FILEREORG))
|
|
-// Hsa package with out file reorganization
|
|
-// This is for backward compatibility and will be deprecated from future release
|
|
-#include "hsa.h"
|
|
-#else
|
|
// Hsa package with file reorganization
|
|
-#include "hsa/hsa.h"
|
|
-#endif
|
|
+#include <hsa/hsa.h>
|
|
#include "base_test.hpp"
|
|
#include "common.hpp"
|
|
|
|
--
|
|
2.40.1
|
|
|