Skip to content

Commit 55d432c

Browse files
kbenziekbenzie
authored
Merge pull request #1015 from oneapi-src/revert-1005-merge-some-main-changes-into-adapters
Revert "Bump adapters branch"
2 parents 2417fcf + b232631 commit 55d432c

File tree

19 files changed

+337
-285
lines changed

19 files changed

+337
-285
lines changed

‎CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
55

66
cmake_minimum_required(VERSION 3.14.0 FATAL_ERROR)
7-
project(unified-runtime VERSION 0.8.0)
7+
project(unified-runtime VERSION 0.7.0)
88

99
include(GNUInstallDirs)
1010
include(CheckCXXSourceCompiles)

‎cmake/helpers.cmake‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ function(add_ur_target_compile_options name)
7878
endif()
7979
elseif(MSVC)
8080
target_compile_options(${name} PRIVATE
81-
$<$<CXX_COMPILER_ID:MSVC>:/MP> # clang-cl.exe does not support /MP
81+
/MP
8282
/W3
8383
/MD$<$<CONFIG:Debug>:d>
8484
/GS

‎include/ur.py‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
77
88
@file ur.py
9-
@version v0.8-r0
9+
@version v0.7-r0
1010
1111
"""
1212
import platform
@@ -570,8 +570,7 @@ def __str__(self):
570570
class ur_api_version_v(IntEnum):
571571
_0_6 = UR_MAKE_VERSION( 0, 6 ) ## version 0.6
572572
_0_7 = UR_MAKE_VERSION( 0, 7 ) ## version 0.7
573-
_0_8 = UR_MAKE_VERSION( 0, 8 ) ## version 0.8
574-
CURRENT = UR_MAKE_VERSION( 0, 8 ) ## latest known version
573+
CURRENT = UR_MAKE_VERSION( 0, 7 ) ## latest known version
575574

576575
class ur_api_version_t(c_int):
577576
def __str__(self):

‎include/ur_api.h‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
* SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
88
*
99
* @file ur_api.h
10-
* @version v0.8-r0
10+
* @version v0.7-r0
1111
*
1212
*/
1313
#ifndef UR_API_H_INCLUDED
@@ -1022,8 +1022,7 @@ urPlatformGetInfo(
10221022
typedef enum ur_api_version_t {
10231023
UR_API_VERSION_0_6 = UR_MAKE_VERSION(0, 6), ///< version 0.6
10241024
UR_API_VERSION_0_7 = UR_MAKE_VERSION(0, 7), ///< version 0.7
1025-
UR_API_VERSION_0_8 = UR_MAKE_VERSION(0, 8), ///< version 0.8
1026-
UR_API_VERSION_CURRENT = UR_MAKE_VERSION(0, 8), ///< latest known version
1025+
UR_API_VERSION_CURRENT = UR_MAKE_VERSION(0, 7), ///< latest known version
10271026
/// @cond
10281027
UR_API_VERSION_FORCE_UINT32 = 0x7fffffff
10291028
/// @endcond

‎include/ur_ddi.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
* SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
88
*
99
* @file ur_ddi.h
10-
* @version v0.8-r0
10+
* @version v0.7-r0
1111
*
1212
*/
1313
#ifndef UR_DDI_H_INCLUDED

‎scripts/Doxyfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ PROJECT_NAME = "Intel One API Unified Runtime API"
3838
# could be handy for archiving the generated documentation or if some version
3939
# control system is used.
4040

41-
PROJECT_NUMBER = v0.8
41+
PROJECT_NUMBER = v0.7
4242

4343
# Using the PROJECT_BRIEF tag one can provide an optional one line description
4444
# for a project that appears at the top of each page and should give viewer a

‎scripts/ci.py‎

Lines changed: 80 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,80 @@
1+
import os
2+
import sys
3+
import argparse
4+
import re
5+
import fileinput
6+
from distutils import dir_util
7+
import util
8+
9+
script_dir = os.path.dirname(os.path.abspath(__file__))
10+
root_dir = os.path.dirname(script_dir)
11+
12+
13+
"""
14+
Entry-point:
15+
publishes HTML for GitLab pages
16+
"""
17+
def publish_gitlab_html():
18+
src_html_dir = os.path.join(root_dir, "docs", "html")
19+
src_img_dir = os.path.join(root_dir, "images")
20+
tmp_dir = os.path.join(root_dir, ".public")
21+
tmp_img_dir = os.path.join(root_dir, ".public/images")
22+
publishing_dir = os.path.join(root_dir, "public")
23+
24+
# Remove dest dirs
25+
if os.path.exists(tmp_dir):
26+
print("Deleting temp dir: %s" % tmp_dir)
27+
util.removePath(tmp_dir)
28+
if os.path.exists(publishing_dir):
29+
print("Deleting publishing dir: %s" % publishing_dir)
30+
util.removePath(publishing_dir)
31+
32+
# Copy over generated content to new folder
33+
print("Copying html files from '%s' to '%s'" % (src_html_dir, tmp_dir))
34+
dir_util.copy_tree(src_html_dir, tmp_dir)
35+
36+
# Fixes html files by converting paths relative to root html folder instead of repo
37+
print("Fixing paths in html files in '%s' to be relative to root..." % (tmp_dir))
38+
regex_pattern = re.compile(r'\.\.[\/|\\]images')
39+
files = util.findFiles(tmp_dir, "*.html")
40+
print("Found %s files" % (len(files)))
41+
with fileinput.FileInput(files=files, inplace=True) as f:
42+
for line in f:
43+
print(re.sub(regex_pattern, './images', line), end='')
44+
45+
# Publish new folder to GitLab Pages folder (/public)
46+
print("Publishing to GitLab pages by renaming '%s' to '%s'" % (tmp_dir, publishing_dir))
47+
os.rename(tmp_dir, publishing_dir)
48+
49+
50+
"""
51+
Entry-point:
52+
main()
53+
"""
54+
def main(args=sys.argv[1:]):
55+
# Define args
56+
parser = argparse.ArgumentParser()
57+
parser.add_argument(
58+
"--publish-html",
59+
help="Publish html",
60+
action="store_true")
61+
62+
# Parse args
63+
options = parser.parse_args(args)
64+
65+
# Publish GitLab html
66+
if options.publish_html:
67+
try:
68+
publish_gitlab_html()
69+
except Exception as e:
70+
print(e)
71+
print("Failed")
72+
return 1
73+
74+
print("Done")
75+
return 0
76+
77+
78+
if __name__ == '__main__':
79+
sys.exit(main())
80+
# END OF FILE

‎scripts/core/INTRO.rst‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -296,15 +296,6 @@ Specific environment variables can be set to control the behavior of unified run
296296

297297
This environment variable is ignored when :envvar:`UR_ADAPTERS_FORCE_LOAD` environment variable is used.
298298

299-
.. envvar:: UR_ADAPTERS_DEEP_BIND
300-
301-
If set, the loader will use `RTLD_DEEPBIND` when opening adapter libraries. This might be useful if an adapter
302-
requires a different version of a shared library compared to the rest of the applcation.
303-
304-
.. note::
305-
306-
This environment variable is Linux-only.
307-
308299
.. envvar:: UR_ENABLE_LAYERS
309300

310301
Holds a comma-separated list of layers to enable in addition to any specified via ``urInit``.

‎scripts/core/platform.yml‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -133,9 +133,6 @@ etors:
133133
- name: "0_7"
134134
value: "$X_MAKE_VERSION( 0, 7 )"
135135
desc: "version 0.7"
136-
- name: "0_8"
137-
value: "$X_MAKE_VERSION( 0, 8 )"
138-
desc: "version 0.8"
139136
--- #--------------------------------------------------------------------------
140137
type: function
141138
desc: "Returns the API version supported by the specified platform"

‎scripts/parse_specs.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818
import ctypes
1919
import itertools
2020

21-
default_version = "0.8"
22-
all_versions = ["0.6", "0.7", "0.8"]
21+
default_version = "0.7"
22+
all_versions = ["0.6", "0.7"]
2323

2424
"""
2525
preprocess object

0 commit comments

Comments
 (0)