Merge pull request #755 from kbenzie/benie/v0.7

kbenzie · web-flow · commit 4dbbe01ea668 · 2023-08-02T17:12:07.000+01:00
[ur] Bump version to v0.7.0
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -4,7 +4,7 @@
 # SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
 cmake_minimum_required(VERSION 3.14.0 FATAL_ERROR)
-project(unified-runtime VERSION 0.6.0)
+project(unified-runtime VERSION 0.7.0)
 
 include(GNUInstallDirs)
 include(CheckCXXSourceCompiles)
diff --git a/include/ur.py b/include/ur.py
@@ -6,7 +6,7 @@
  SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
  @file ur.py
- @version v0.6-r0
+ @version v0.7-r0
 
  """
 import platform
@@ -569,7 +569,8 @@ def __str__(self):
 ##       ::UR_MAJOR_VERSION and ::UR_MINOR_VERSION
 class ur_api_version_v(IntEnum):
     _0_6 = UR_MAKE_VERSION( 0, 6 )                  ## version 0.6
-    CURRENT = UR_MAKE_VERSION( 0, 6 )               ## latest known version
+    _0_7 = UR_MAKE_VERSION( 0, 7 )                  ## version 0.7
+    CURRENT = UR_MAKE_VERSION( 0, 7 )               ## latest known version
 
 class ur_api_version_t(c_int):
     def __str__(self):
diff --git a/include/ur_api.h b/include/ur_api.h
@@ -7,7 +7,7 @@
  * SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
  *
  * @file ur_api.h
- * @version v0.6-r0
+ * @version v0.7-r0
  *
  */
 #ifndef UR_API_H_INCLUDED
@@ -1021,7 +1021,8 @@ urPlatformGetInfo(
 ///       ::UR_MAJOR_VERSION and ::UR_MINOR_VERSION
 typedef enum ur_api_version_t {
     UR_API_VERSION_0_6 = UR_MAKE_VERSION(0, 6),     ///< version 0.6
-    UR_API_VERSION_CURRENT = UR_MAKE_VERSION(0, 6), ///< latest known version
+    UR_API_VERSION_0_7 = UR_MAKE_VERSION(0, 7),     ///< version 0.7
+    UR_API_VERSION_CURRENT = UR_MAKE_VERSION(0, 7), ///< latest known version
     /// @cond
     UR_API_VERSION_FORCE_UINT32 = 0x7fffffff
     /// @endcond
diff --git a/include/ur_ddi.h b/include/ur_ddi.h
@@ -7,7 +7,7 @@
  * SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
  *
  * @file ur_ddi.h
- * @version v0.6-r0
+ * @version v0.7-r0
  *
  */
 #ifndef UR_DDI_H_INCLUDED
diff --git a/scripts/Doxyfile b/scripts/Doxyfile
@@ -38,7 +38,7 @@ PROJECT_NAME           = "Intel One API Unified Runtime API"
 # could be handy for archiving the generated documentation or if some version
 # control system is used.
 
-PROJECT_NUMBER         = v0.6
+PROJECT_NUMBER         = v0.7
 
 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewer a
diff --git a/scripts/core/platform.yml b/scripts/core/platform.yml
@@ -130,6 +130,9 @@ etors:
     - name: "0_6"
       value: "$X_MAKE_VERSION( 0, 6 )"
       desc: "version 0.6"
+    - name: "0_7"
+      value: "$X_MAKE_VERSION( 0, 7 )"
+      desc: "version 0.7"
 --- #--------------------------------------------------------------------------
 type: function
 desc: "Returns the API version supported by the specified platform"
diff --git a/scripts/parse_specs.py b/scripts/parse_specs.py
@@ -18,8 +18,8 @@
 import ctypes
 import itertools
 
-default_version = "0.5"
-all_versions = ["0.5", "1.0", "1.1", "2.0"]
+default_version = "0.7"
+all_versions = ["0.6", "0.7"]
 
 """
     preprocess object
@@ -915,9 +915,9 @@ def parse(section, version, tags, meta, ref):
                 for c in '_-':
                     name = name.replace(c, ' ')
             elif header:
-                # for d in _make_versions(d, float(version)):
-                objects.append(d)
-                meta = _generate_meta(d, header['ordinal'], meta)
+                for d in _make_versions(d, float(version)):
+                    objects.append(d)
+                    meta = _generate_meta(d, header['ordinal'], meta)
 
         if header:
             specs.append({
diff --git a/source/loader/layers/ur_proxy_layer.hpp b/source/loader/layers/ur_proxy_layer.hpp
@@ -20,7 +20,7 @@
 ///////////////////////////////////////////////////////////////////////////////
 class __urdlllocal proxy_layer_context_t {
   public:
-    ur_api_version_t version = UR_API_VERSION_0_6;
+    ur_api_version_t version = UR_API_VERSION_CURRENT;
 
     virtual std::vector<std::string> getNames() const = 0;
     virtual bool isAvailable() const = 0;
diff --git a/source/loader/ur_loader.hpp b/source/loader/ur_loader.hpp
@@ -30,7 +30,7 @@ using platform_vector_t = std::vector<platform_t>;
 
 class context_t {
   public:
-    ur_api_version_t version = UR_API_VERSION_0_6;
+    ur_api_version_t version = UR_API_VERSION_CURRENT;
 
     platform_vector_t platforms;
     AdapterRegistry adapter_registry;
diff --git a/source/ur_api.cpp b/source/ur_api.cpp
@@ -7,7 +7,7 @@
  * SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
  *
  * @file ur_api.cpp
- * @version v0.6-r0
+ * @version v0.7-r0
  *
  */
 #include "ur_api.h"
diff --git a/test/tools/urtrace/CMakeLists.txt b/test/tools/urtrace/CMakeLists.txt
@@ -7,12 +7,17 @@ set(TEST_NAME trace-hello-world)
 
 function(add_trace_test name CLI_ARGS)
     set(TEST_NAME trace_test_${name})
+    configure_file(
+        ${CMAKE_CURRENT_SOURCE_DIR}/${name}.match
+        ${CMAKE_CURRENT_BINARY_DIR}/${name}.match
+        @ONLY
+    )
     add_test(NAME ${TEST_NAME}
         COMMAND ${CMAKE_COMMAND}
         -D TEST_FILE=${Python3_EXECUTABLE}
         -D TEST_ARGS="${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/urtrace --stdout ${CLI_ARGS} --flush info $<TARGET_FILE:hello_world>"
         -D MODE=stdout
-        -D MATCH_FILE=${CMAKE_CURRENT_SOURCE_DIR}/${name}.match
+        -D MATCH_FILE=${CMAKE_CURRENT_BINARY_DIR}/${name}.match
         -P ${PROJECT_SOURCE_DIR}/cmake/match.cmake
         DEPENDS ur_trace_cli hello_world
     )
diff --git a/test/tools/urtrace/null_hello_begin.match b/test/tools/urtrace/null_hello_begin.match
@@ -10,7 +10,7 @@ end(4) - urPlatformGet(.phAdapters = {{{.*}}}, .NumAdapters = 1, .NumEntries = 1
 begin(5) - urPlatformGet(.phAdapters = {{{.*}}}, .NumAdapters = 1, .NumEntries = 1, .phPlatforms = {nullptr}, .pNumPlatforms = nullptr);
 end(5) - urPlatformGet(.phAdapters = {{{.*}}}, .NumAdapters = 1, .NumEntries = 1, .phPlatforms = {{{.*}}}, .pNumPlatforms = nullptr) -> UR_RESULT_SUCCESS;
 begin(6) - urPlatformGetApiVersion(.hPlatform = {{.*}}, .pVersion = {{.*}} (0.0));
-end(6) - urPlatformGetApiVersion(.hPlatform = {{.*}}, .pVersion = {{.*}} (0.6)) -> UR_RESULT_SUCCESS;
+end(6) - urPlatformGetApiVersion(.hPlatform = {{.*}}, .pVersion = {{.*}} (@PROJECT_VERSION_MAJOR@.@PROJECT_VERSION_MINOR@)) -> UR_RESULT_SUCCESS;
 API version: {{.*}}
 begin(7) - urDeviceGet(.hPlatform = {{.*}}, .DeviceType = UR_DEVICE_TYPE_GPU, .NumEntries = 0, .phDevices = {}, .pNumDevices = {{.*}} (0));
 end(7) - urDeviceGet(.hPlatform = {{.*}}, .DeviceType = UR_DEVICE_TYPE_GPU, .NumEntries = 0, .phDevices = {}, .pNumDevices = {{.*}} (1)) -> UR_RESULT_SUCCESS;
diff --git a/test/tools/urtrace/null_hello_json.match b/test/tools/urtrace/null_hello_json.match
@@ -6,8 +6,8 @@ Platform initialized.
 {            "cat": "UR",             "ph": "X",            "pid": {{.*}},            "tid": {{.*}},            "ts": {{.*}},            "dur": {{.*}},            "name": "urAdapterGet",            "args": "(.NumEntries = 1, .phAdapters = {{{.*}}}, .pNumAdapters = nullptr)"        },
 {            "cat": "UR",             "ph": "X",            "pid": {{.*}},            "tid": {{.*}},            "ts": {{.*}},            "dur": {{.*}},            "name": "urPlatformGet",            "args": "(.phAdapters = {{{.*}}}, .NumAdapters = 1, .NumEntries = 1, .phPlatforms = {}, .pNumPlatforms = {{.*}} (1))"        },
 {            "cat": "UR",             "ph": "X",            "pid": {{.*}},            "tid": {{.*}},            "ts": {{.*}},            "dur": {{.*}},            "name": "urPlatformGet",            "args": "(.phAdapters = {{{.*}}}, .NumAdapters = 1, .NumEntries = 1, .phPlatforms = {{{.*}}}, .pNumPlatforms = nullptr)"        },
-{            "cat": "UR",             "ph": "X",            "pid": {{.*}},            "tid": {{.*}},            "ts": {{.*}},            "dur": {{.*}},            "name": "urPlatformGetApiVersion",            "args": "(.hPlatform = {{.*}}, .pVersion = {{.*}} (0.6))"        },
-API version: 0.6
+{            "cat": "UR",             "ph": "X",            "pid": {{.*}},            "tid": {{.*}},            "ts": {{.*}},            "dur": {{.*}},            "name": "urPlatformGetApiVersion",            "args": "(.hPlatform = {{.*}}, .pVersion = {{.*}} (@PROJECT_VERSION_MAJOR@.@PROJECT_VERSION_MINOR@))"        },
+API version: @PROJECT_VERSION_MAJOR@.@PROJECT_VERSION_MINOR@
 {            "cat": "UR",             "ph": "X",            "pid": {{.*}},            "tid": {{.*}},            "ts": {{.*}},            "dur": {{.*}},            "name": "urDeviceGet",            "args": "(.hPlatform = {{.*}}, .DeviceType = UR_DEVICE_TYPE_GPU, .NumEntries = 0, .phDevices = {}, .pNumDevices = {{.*}} (1))"        },
 {            "cat": "UR",             "ph": "X",            "pid": {{.*}},            "tid": {{.*}},            "ts": {{.*}},            "dur": {{.*}},            "name": "urDeviceGet",            "args": "(.hPlatform = {{.*}}, .DeviceType = UR_DEVICE_TYPE_GPU, .NumEntries = 1, .phDevices = {{{.*}}}, .pNumDevices = nullptr)"        },
 {            "cat": "UR",             "ph": "X",            "pid": {{.*}},            "tid": {{.*}},            "ts": {{.*}},            "dur": {{.*}},            "name": "urDeviceGetInfo",            "args": "(.hDevice = {{.*}}, .propName = UR_DEVICE_INFO_TYPE, .propSize = 4, .pPropValue = {{.*}} (UR_DEVICE_TYPE_GPU), .pPropSizeRet = nullptr)"        },

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`* SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception`
`8`	`8`	`*`
`9`	`9`	`* @file ur_ddi.h`
`10`		`- * @version v0.6-r0`
	`10`	`+ * @version v0.7-r0`
`11`	`11`	`*`
`12`	`12`	`*/`
`13`	`13`	`#ifndef UR_DDI_H_INCLUDED`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`* SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception`
`8`	`8`	`*`
`9`	`9`	`* @file ur_api.cpp`
`10`		`- * @version v0.6-r0`
	`10`	`+ * @version v0.7-r0`
`11`	`11`	`*`
`12`	`12`	`*/`
`13`	`13`	`#include "ur_api.h"`