Merge pull request #1015 from oneapi-src/revert-1005-merge-some-main-changes-into-adapters

kbenzie · web-flow · commit 55d432c6ca9b · 2023-10-30T14:37:55.000Z
Revert "Bump adapters branch"
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.8.0)
+project(unified-runtime VERSION 0.7.0)
 
 include(GNUInstallDirs)
 include(CheckCXXSourceCompiles)
diff --git a/cmake/helpers.cmake b/cmake/helpers.cmake
@@ -78,7 +78,7 @@ function(add_ur_target_compile_options name)
         endif()
     elseif(MSVC)
         target_compile_options(${name} PRIVATE
-            $<$<CXX_COMPILER_ID:MSVC>:/MP>  # clang-cl.exe does not support /MP
+            /MP
             /W3
             /MD$<$<CONFIG:Debug>:d>
             /GS
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.8-r0
+ @version v0.7-r0
 
  """
 import platform
@@ -570,8 +570,7 @@ def __str__(self):
 class ur_api_version_v(IntEnum):
     _0_6 = UR_MAKE_VERSION( 0, 6 )                  ## version 0.6
     _0_7 = UR_MAKE_VERSION( 0, 7 )                  ## version 0.7
-    _0_8 = UR_MAKE_VERSION( 0, 8 )                  ## version 0.8
-    CURRENT = UR_MAKE_VERSION( 0, 8 )               ## latest known version
+    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.8-r0
+ * @version v0.7-r0
  *
  */
 #ifndef UR_API_H_INCLUDED
@@ -1022,8 +1022,7 @@ urPlatformGetInfo(
 typedef enum ur_api_version_t {
     UR_API_VERSION_0_6 = UR_MAKE_VERSION(0, 6),     ///< version 0.6
     UR_API_VERSION_0_7 = UR_MAKE_VERSION(0, 7),     ///< version 0.7
-    UR_API_VERSION_0_8 = UR_MAKE_VERSION(0, 8),     ///< version 0.8
-    UR_API_VERSION_CURRENT = UR_MAKE_VERSION(0, 8), ///< latest known version
+    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.8-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.8
+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/ci.py b/scripts/ci.py
@@ -0,0 +1,80 @@
+import os
+import sys
+import argparse
+import re
+import fileinput
+from distutils import dir_util
+import util
+
+script_dir = os.path.dirname(os.path.abspath(__file__))
+root_dir = os.path.dirname(script_dir)
+
+
+"""
+Entry-point:
+    publishes HTML for GitLab pages
+"""
+def publish_gitlab_html():
+    src_html_dir = os.path.join(root_dir, "docs", "html")
+    src_img_dir = os.path.join(root_dir, "images")
+    tmp_dir = os.path.join(root_dir, ".public")
+    tmp_img_dir = os.path.join(root_dir, ".public/images")
+    publishing_dir = os.path.join(root_dir, "public")
+
+    # Remove dest dirs
+    if os.path.exists(tmp_dir):
+        print("Deleting temp dir: %s" % tmp_dir)
+        util.removePath(tmp_dir)
+    if os.path.exists(publishing_dir):
+        print("Deleting publishing dir: %s" % publishing_dir)
+        util.removePath(publishing_dir)
+
+    # Copy over generated content to new folder
+    print("Copying html files from '%s' to '%s'" % (src_html_dir, tmp_dir))
+    dir_util.copy_tree(src_html_dir, tmp_dir)
+
+    # Fixes html files by converting paths relative to root html folder instead of repo
+    print("Fixing paths in html files in '%s' to be relative to root..." % (tmp_dir))
+    regex_pattern = re.compile(r'\.\.[\/|\\]images')
+    files = util.findFiles(tmp_dir, "*.html")
+    print("Found %s files" % (len(files)))
+    with fileinput.FileInput(files=files, inplace=True) as f:
+        for line in f:
+            print(re.sub(regex_pattern, './images', line), end='')
+
+    # Publish new folder to GitLab Pages folder (/public)
+    print("Publishing to GitLab pages by renaming '%s' to '%s'" % (tmp_dir, publishing_dir))
+    os.rename(tmp_dir, publishing_dir)
+
+
+"""
+Entry-point:
+    main()
+"""
+def main(args=sys.argv[1:]):
+    # Define args
+    parser = argparse.ArgumentParser()
+    parser.add_argument(
+        "--publish-html",
+        help="Publish html",
+        action="store_true")
+
+    # Parse args
+    options = parser.parse_args(args)
+
+    # Publish GitLab html
+    if options.publish_html:
+        try:
+            publish_gitlab_html()
+        except Exception as e:
+            print(e)
+            print("Failed")
+            return 1
+
+    print("Done")
+    return 0
+
+
+if __name__ == '__main__':
+    sys.exit(main())
+# END OF FILE
diff --git a/scripts/core/INTRO.rst b/scripts/core/INTRO.rst
@@ -296,15 +296,6 @@ Specific environment variables can be set to control the behavior of unified run
 
     This environment variable is ignored when :envvar:`UR_ADAPTERS_FORCE_LOAD` environment variable is used.
 
-.. envvar:: UR_ADAPTERS_DEEP_BIND
-
-   If set, the loader will use `RTLD_DEEPBIND` when opening adapter libraries. This might be useful if an adapter
-   requires a different version of a shared library compared to the rest of the applcation.
-
-   .. note::
-
-    This environment variable is Linux-only.
-
 .. envvar:: UR_ENABLE_LAYERS
 
     Holds a comma-separated list of layers to enable in addition to any specified via ``urInit``.
diff --git a/scripts/core/platform.yml b/scripts/core/platform.yml
@@ -133,9 +133,6 @@ etors:
     - name: "0_7"
       value: "$X_MAKE_VERSION( 0, 7 )"
       desc: "version 0.7"
-    - name: "0_8"
-      value: "$X_MAKE_VERSION( 0, 8 )"
-      desc: "version 0.8"
 --- #--------------------------------------------------------------------------
 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.8"
-all_versions = ["0.6", "0.7", "0.8"]
+default_version = "0.7"
+all_versions = ["0.6", "0.7"]
 
 """
     preprocess object
diff --git a/scripts/templates/params.hpp.mako b/scripts/templates/params.hpp.mako
@@ -36,8 +36,6 @@ from templates import helper as th
         ${x}_params::serializePtr(os, ${caller.body()});
     %elif th.type_traits.is_handle(itype):
         ${x}_params::serializePtr(os, ${caller.body()});
-    %elif iname and iname.startswith("pfn"):
-        os << reinterpret_cast<void*>(${caller.body()});
     %else:
         os << ${caller.body()};
     %endif
@@ -106,7 +104,7 @@ template <> struct is_handle<${th.make_type_name(n, tags, obj)}> : std::true_typ
 %endfor
 template <typename T>
 inline constexpr bool is_handle_v = is_handle<T>::value;
-template <typename T> inline void serializePtr(std::ostream &os, const T *ptr);
+template <typename T> inline void serializePtr(std::ostream &os, T *ptr);
 template <typename T> inline void serializeFlag(std::ostream &os, uint32_t flag);
 template <typename T> inline void serializeTagged(std::ostream &os, const void *ptr, T value, size_t size);
 
@@ -194,11 +192,7 @@ template <typename T> inline void serializeTagged(std::ostream &os, const void *
                 case ${ename}: {
                     %if th.value_traits.is_array(vtype):
                     <% atype = th.value_traits.get_array_name(vtype) %>
-                    %if 'void' in atype:
-                    const ${atype} const *tptr = (const ${atype} const*)ptr;
-                    %else:
                     const ${atype} *tptr = (const ${atype} *)ptr;
-                    %endif
                         %if "char" in atype: ## print char* arrays as simple NULL-terminated strings
                             serializePtr(os, tptr);
                         %else:
@@ -215,16 +209,12 @@ template <typename T> inline void serializeTagged(std::ostream &os, const void *
                             os << "}";
                         %endif
                     %else:
-                    %if 'void' in vtype:
-                    const ${vtype} const *tptr = (const ${vtype} const *)ptr;
-                    %else:
                     const ${vtype} *tptr = (const ${vtype} *)ptr;
-                    %endif
                     if (sizeof(${vtype}) > size) {
                         os << "invalid size (is: " << size << ", expected: >=" << sizeof(${vtype}) << ")";
                         return;
                     }
-                    os << (const void *)(tptr) << " (";
+                    os << (void *)(tptr) << " (";
                     <%call expr="member(tptr, vtype, False)">
                         *tptr
                     </%call>
@@ -247,7 +237,7 @@ template <typename T> inline void serializeTagged(std::ostream &os, const void *
         }
 
         ## structure type enum value must be first
-        const enum ${th.make_enum_name(n, tags, obj)} *value = (const enum ${th.make_enum_name(n, tags, obj)} *)ptr;
+        enum ${th.make_enum_name(n, tags, obj)} *value = (enum ${th.make_enum_name(n, tags, obj)} *)ptr;
         switch (*value) {
             %for n, item in enumerate(obj['etors']):
                 <%
@@ -372,21 +362,21 @@ inline std::ostream &operator<<(std::ostream &os, const struct ${th.make_pfncb_p
 
 namespace ${x}_params {
 
-template <typename T> inline void serializePtr(std::ostream &os, const T *ptr) {
+template <typename T> inline void serializePtr(std::ostream &os, T *ptr) {
     if (ptr == nullptr) {
         os << "nullptr";
     } else if constexpr (std::is_pointer_v<T>) {
-        os << (const void *)(ptr) << " (";
+        os << (void *)(ptr) << " (";
         serializePtr(os, *ptr);
         os << ")";
     } else if constexpr (std::is_void_v<T> || is_handle_v<T *>) {
-        os << (const void *)ptr;
+        os << (void *)ptr;
     } else if constexpr (std::is_same_v<std::remove_cv_t< T >, char>) {
-        os << (const void *)(ptr) << " (";
+        os << (void *)(ptr) << " (";
         os << ptr;
         os << ")";
     } else {
-        os << (const void *)(ptr) << " (";
+        os << (void *)(ptr) << " (";
         os << *ptr;
         os << ")";
     }
diff --git a/source/common/CMakeLists.txt b/source/common/CMakeLists.txt
@@ -3,25 +3,28 @@
 # See LICENSE.TXT
 # SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-add_subdirectory(unified_malloc_framework)
-add_subdirectory(umf_pools)
-
-add_ur_library(ur_common STATIC
-    umf_helpers.hpp
-    ur_pool_manager.hpp
-    $<$<PLATFORM_ID:Windows>:windows/ur_lib_loader.cpp>
-    $<$<PLATFORM_ID:Linux,Darwin>:linux/ur_lib_loader.cpp>
-)
+add_library(ur_common INTERFACE)
 add_library(${PROJECT_NAME}::common ALIAS ur_common)
 
-target_include_directories(ur_common PUBLIC
+target_include_directories(ur_common INTERFACE
     ${CMAKE_CURRENT_SOURCE_DIR}
     ${CMAKE_SOURCE_DIR}/include
 )
 
-target_link_libraries(ur_common PUBLIC
-    unified_malloc_framework
-    disjoint_pool
-    ${CMAKE_DL_LIBS}
-    ${PROJECT_NAME}::headers
-)
+add_subdirectory(unified_malloc_framework)
+add_subdirectory(umf_pools)
+target_link_libraries(ur_common INTERFACE unified_malloc_framework disjoint_pool ${CMAKE_DL_LIBS} ${PROJECT_NAME}::headers)
+
+if(WIN32)
+    target_sources(ur_common
+        INTERFACE
+            ${CMAKE_CURRENT_SOURCE_DIR}/windows/ur_lib_loader.cpp
+            umf_helpers.hpp ur_pool_manager.hpp
+    )
+else()
+    target_sources(ur_common
+        INTERFACE
+            ${CMAKE_CURRENT_SOURCE_DIR}/linux/ur_lib_loader.cpp
+            umf_helpers.hpp ur_pool_manager.hpp
+    )
+endif()
diff --git a/source/common/linux/ur_lib_loader.cpp b/source/common/linux/ur_lib_loader.cpp
@@ -12,7 +12,12 @@
 #include "logger/ur_logger.hpp"
 #include "ur_lib_loader.hpp"
 
-#define DEEP_BIND_ENV "UR_ADAPTERS_DEEP_BIND"
+#if defined(SANITIZER_ANY) || defined(__APPLE__)
+#define LOAD_DRIVER_LIBRARY(NAME) dlopen(NAME, RTLD_LAZY | RTLD_LOCAL)
+#else
+#define LOAD_DRIVER_LIBRARY(NAME)                                              \
+    dlopen(NAME, RTLD_LAZY | RTLD_LOCAL | RTLD_DEEPBIND)
+#endif
 
 namespace ur_loader {
 
@@ -29,21 +34,8 @@ void LibLoader::freeAdapterLibrary(HMODULE handle) {
 
 std::unique_ptr<HMODULE, LibLoader::lib_dtor>
 LibLoader::loadAdapterLibrary(const char *name) {
-    int mode = RTLD_LAZY | RTLD_LOCAL;
-#if !defined(__APPLE__)
-    bool deepbind = getenv_tobool(DEEP_BIND_ENV);
-    if (deepbind) {
-#if defined(SANITIZER_ANY)
-        logger::warning(
-            "Enabling RTLD_DEEPBIND while running under a sanitizer is likely "
-            "to cause issues. Consider disabling {} environment variable.",
-            DEEP_BIND_ENV);
-#endif
-        mode |= RTLD_DEEPBIND;
-    }
-#endif
-
-    return std::unique_ptr<HMODULE, LibLoader::lib_dtor>(dlopen(name, mode));
+    return std::unique_ptr<HMODULE, LibLoader::lib_dtor>(
+        LOAD_DRIVER_LIBRARY(name));
 }
 
 void *LibLoader::getFunctionPtr(HMODULE handle, const char *func_name) {
diff --git a/source/common/ur_params.hpp b/source/common/ur_params.hpp
diff --git a/source/loader/ur_adapter_registry.hpp b/source/loader/ur_adapter_registry.hpp
diff --git a/source/ur_api.cpp b/source/ur_api.cpp
diff --git a/test/conformance/context/context_adapter_level_zero.match b/test/conformance/context/context_adapter_level_zero.match
diff --git a/test/conformance/context/urContextCreateWithNativeHandle.cpp b/test/conformance/context/urContextCreateWithNativeHandle.cpp
diff --git a/test/loader/loader_config/CMakeLists.txt b/test/loader/loader_config/CMakeLists.txt

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.8-r0`
	`10`	`+ * @version v0.7-r0`
`11`	`11`	`*`
`12`	`12`	`*/`
`13`	`13`	`#ifndef UR_DDI_H_INCLUDED`