Skip to content

Fix GUID gen and update to v1.22.3 #338

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nrspruit merged 1 commit into from
May 23, 2025
Merged

Fix GUID gen and update to v1.22.3 #338

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
# Level zero loader changelog

## v1.22.3
* Fix sysman-only initialization to block loader context retrieval when versions are incompatible
* Add ability to register a TeardownCallback to notify release of L0 resources
## v1.22.2
* Fix zesInit to init the correct requested api version
## v1.22.1
* fix ddi compatibility to avoid assigning values which don't exist
* Fix static loader to request current version as the latest APIs
Expand Down
36 changes: 20 additions & 16 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ if(MSVC AND (MSVC_VERSION LESS 1900))
endif()

# This project follows semantic versioning (https://semver.org/)
project(level-zero VERSION 1.22.2)
project(level-zero VERSION 1.22.3)

include(GNUInstallDirs)

Expand Down Expand Up @@ -252,30 +252,34 @@ install(FILES ${LEVEL_ZERO_LOADER_API_HEADERS}
COMPONENT ${SDK_COMPONENT_STRING}
)

if (MSVC)
set (PYTHON_EXECUTABLE "python")
else()
set (PYTHON_EXECUTABLE "python3")
endif()
set(PRODUCT_GUID_FILE "${CMAKE_CURRENT_SOURCE_DIR}/PRODUCT_GUID.txt")
if(EXISTS "${PRODUCT_GUID_FILE}")
file(STRINGS "${PRODUCT_GUID_FILE}" SAVED_PRODUCT_GUID)
list(GET SAVED_PRODUCT_GUID 0 SAVED_PRODUCT_GUID_VERSION)
message(STATUS "Saved Product GUID: ${SAVED_PRODUCT_GUID_VERSION}")
message(STATUS "project version: ${PROJECT_VERSION}")
if(NOT SAVED_PRODUCT_GUID_VERSION STREQUAL "${PROJECT_VERSION}")

execute_process(
COMMAND python ${CMAKE_CURRENT_SOURCE_DIR}/scripts/generate_wix_guid.py
OUTPUT_VARIABLE GENERATED_PRODUCT_GUID
OUTPUT_STRIP_TRAILING_WHITESPACE
)
file(WRITE "${PRODUCT_GUID_FILE}" "${PROJECT_VERSION}\n${GENERATED_PRODUCT_GUID}")
message(STATUS "Generated Product GUID: ${GENERATED_PRODUCT_GUID} for version ${PROJECT_VERSION}")
else()
string(REPLACE "\n" ";" GUID_CONTENTS "${SAVED_PRODUCT_GUID}")
list(GET GUID_CONTENTS 1 GENERATED_PRODUCT_GUID)
execute_process(
COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/scripts/generate_wix_guid.py
OUTPUT_VARIABLE GENERATED_PRODUCT_GUID
OUTPUT_STRIP_TRAILING_WHITESPACE
)
file(WRITE "${PRODUCT_GUID_FILE}" "${PROJECT_VERSION}\n${GENERATED_PRODUCT_GUID}")
message(STATUS "Generated Product GUID: ${GENERATED_PRODUCT_GUID} for version ${PROJECT_VERSION}")
else()
string(REPLACE "\n" ";" GUID_CONTENTS "${SAVED_PRODUCT_GUID}")
list(GET GUID_CONTENTS 1 GENERATED_PRODUCT_GUID)
endif()
else()
execute_process(
COMMAND python ${CMAKE_CURRENT_SOURCE_DIR}/scripts/generate_wix_guid.py
OUTPUT_VARIABLE GENERATED_PRODUCT_GUID
OUTPUT_STRIP_TRAILING_WHITESPACE
COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/scripts/generate_wix_guid.py
OUTPUT_VARIABLE GENERATED_PRODUCT_GUID
OUTPUT_STRIP_TRAILING_WHITESPACE
)
file(WRITE "${PRODUCT_GUID_FILE}" "${PROJECT_VERSION}\n${GENERATED_PRODUCT_GUID}")
endif()
Expand Down Expand Up @@ -385,4 +389,4 @@ if(CPACK_GENERATOR MATCHES "DEB")
set(CPACK_ARCHIVE_COMPONENT_INSTALL ON)
endif()

INCLUDE(CPack)
INCLUDE(CPack)
4 changes: 2 additions & 2 deletions PRODUCT_GUID.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
1.22.2
3c13e883-2082-4dcb-811f-81b387aef3ac
1.22.3
b3491b8d-9942-47bf-be47-8741f9614566
Loading