Skip to content

Commit 43016c6

Browse files
fix driver version reporting
Change-Id: I187f1e1a71f07dbd83dfadbd9c51ff910be356b8 Signed-off-by: Artur Harasimiuk <[email protected]>
1 parent 44da4a4 commit 43016c6

File tree

4 files changed

+6
-6
lines changed

4 files changed

+6
-6
lines changed

driver_version.h.in

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (C) 2018 Intel Corporation
2+
* Copyright (C) 2018-2020 Intel Corporation
33
*
44
* SPDX-License-Identifier: MIT
55
*
@@ -8,6 +8,6 @@
88
#ifndef DRIVER_VERSION_H
99
#define DRIVER_VERSION_H
1010

11-
#cmakedefine NEO_DRIVER_VERSION ${NEO_DRIVER_VERSION}
11+
#cmakedefine NEO_OCL_DRIVER_VERSION ${NEO_OCL_DRIVER_VERSION}
1212

1313
#endif /* DRIVER_VERSION_H */

opencl/source/device/device_caps.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ static std::string spirVersions = "1.2 ";
3333
static const char *spirvVersion = "SPIR-V_1.2 ";
3434
#define QTR(a) #a
3535
#define TOSTR(b) QTR(b)
36-
static std::string driverVersion = TOSTR(NEO_DRIVER_VERSION);
36+
static std::string driverVersion = TOSTR(NEO_OCL_DRIVER_VERSION);
3737

3838
const char *builtInKernels = ""; // the "always available" (extension-independent) builtin kernels
3939

@@ -186,7 +186,7 @@ void ClDevice::initializeCaps() {
186186
deviceExtensions.clear();
187187
deviceExtensions.append(deviceExtensionsList);
188188

189-
driverVersion = TOSTR(NEO_DRIVER_VERSION);
189+
driverVersion = TOSTR(NEO_OCL_DRIVER_VERSION);
190190

191191
// Add our graphics family name to the device name
192192
name += "Intel(R) ";

opencl/source/helpers/neo_driver_version.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
#define TOSTR(b) QTR(b)
2121

2222
namespace NEO {
23-
constexpr const char *driverVersion = TOSTR(NEO_DRIVER_VERSION);
23+
constexpr const char *driverVersion = TOSTR(NEO_OCL_DRIVER_VERSION);
2424
}
2525

2626
#undef QTR

opencl/test/unit_test/device/device_caps_tests.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1019,7 +1019,7 @@ TEST_F(DeviceGetCapsTest, givenSystemWithNoDriverInfoWhenGettingNameAndVersionTh
10191019

10201020
#define QTR(a) #a
10211021
#define TOSTR(b) QTR(b)
1022-
const std::string expectedVersion = TOSTR(NEO_DRIVER_VERSION);
1022+
const std::string expectedVersion = TOSTR(NEO_OCL_DRIVER_VERSION);
10231023
#undef QTR
10241024
#undef TOSTR
10251025

0 commit comments

Comments
 (0)