Merge branch 'master' of https://github.com/ROCm-Developer-Tools/HIP into feature_purge_genco
[ROCm/hip commit: e14ac87474]
Этот коммит содержится в:
Коммит
044ae14b92
18 files changed
+34
-31
No files matched your search
@@ -39,14 +39,14 @@ THE SOFTWARE.
|
||||
exit(EXIT_FAILURE);\
|
||||
}
|
||||
|
||||
hipError_t test_hipDeviceGetAttribute(int deviceId, hipDeviceAttribute_t attr, int expectedValue = 0)
|
||||
hipError_t test_hipDeviceGetAttribute(int deviceId, hipDeviceAttribute_t attr, int expectedValue = -1)
|
||||
{
|
||||
int value = 0;
|
||||
std::cout << "Test hipDeviceGetAttribute attribute " << attr;
|
||||
if (expectedValue) { std::cout << " expected value " << expectedValue; }
|
||||
if (expectedValue != -1) { std::cout << " expected value " << expectedValue; }
|
||||
hipError_t e = hipDeviceGetAttribute(&value, attr, deviceId);
|
||||
std::cout << " actual value " << value << std::endl;
|
||||
if (expectedValue && value != expectedValue) {
|
||||
if ((expectedValue != -1) && value != expectedValue) {
|
||||
std::cout << "fail" << std::endl;
|
||||
return hipErrorInvalidValue;
|
||||
}
|
||||
|
||||
@@ -192,8 +192,6 @@ HostMemory<T>::~HostMemory ()
|
||||
free(A_hh);
|
||||
free(B_hh);
|
||||
}
|
||||
T *A_hh = NULL;
|
||||
T *B_hh = NULL;
|
||||
|
||||
};
|
||||
|
||||
|
||||
@@ -32,7 +32,6 @@ THE SOFTWARE.
|
||||
|
||||
int main()
|
||||
{
|
||||
hipDevice_t device;
|
||||
size_t Nbytes = N*sizeof(int);
|
||||
int numDevices = 0;
|
||||
int *A_d, *B_d, *C_d, *X_d, *Y_d, *Z_d;
|
||||
|
||||
@@ -188,7 +188,6 @@ int main(int argc, char *argv[])
|
||||
{
|
||||
HipTest::parseStandardArguments(argc, argv, true);
|
||||
|
||||
int numElements = N;
|
||||
|
||||
int dev0 = 0;
|
||||
int dev1 = 1;
|
||||
|
||||
@@ -27,7 +27,10 @@ THE SOFTWARE.
|
||||
|
||||
#include "hip/hip_runtime.h"
|
||||
#include "test_common.h"
|
||||
|
||||
#ifdef __HIP_PLATFORM_HCC__
|
||||
#define HIPRT_CB
|
||||
#endif
|
||||
|
||||
class CallbackClass
|
||||
{
|
||||
|
||||
Reference in new issue
Block a user