Skip to content

Commit 6b5ee10

Browse files
Compute-Runtime-AutomationCompute-Runtime-Automation
committed
build: buildConfig update
Signed-off-by: ocldev <ocldev@intel.com>
1 parent 2317330 commit 6b5ee10

5 files changed

Lines changed: 27 additions & 163 deletions

File tree

‎.github/pull-request.yml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
1-
defaultbranch: master
1+
defaultbranch: releases/26.18
22
draft: true
3+
branchtype: master

‎Jenkinsfile‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,3 +8,8 @@
88
*/
99

1010
dependenciesRevision='ac7faf0393ad3fa18bd9d36c3c13fafdba04d838-4110'
11+
buildConfig = [
12+
'master-build': ['gcc11', 'gcc12', 'gcc13', 'gcc14'],
13+
'master-gate': ['gcc11', 'gcc12', 'gcc13', 'gcc14'],
14+
'branch': 'master',
15+
]

‎manifests/infra.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
components:
22
infra:
3-
branch: master
3+
branch: neo/releases/26.18
44
dest_dir: infra
55
fetch_tags: true
6-
revision: v8105
6+
revision: v8105.3945.1
77
type: git
88
converter: M-3107
99
version: '1'

‎scripts/neo_ww_calculator.cmake‎

Lines changed: 1 addition & 80 deletions
Original file line numberDiff line numberDiff line change
@@ -4,85 +4,6 @@
44
# SPDX-License-Identifier: MIT
55
#
66

7-
macro(_is_leap_year year result)
8-
math(EXPR _mod400 "${year} % 400")
9-
math(EXPR _mod100 "${year} % 100")
10-
math(EXPR _mod4 "${year} % 4")
11-
if(_mod400 EQUAL 0 OR(_mod4 EQUAL 0 AND NOT _mod100 EQUAL 0))
12-
set(${result} TRUE)
13-
else()
14-
set(${result} FALSE)
15-
endif()
16-
endmacro()
17-
18-
function(neo_ww_calculator EPOCH OUT_VAR)
19-
set(SECONDS_PER_DAY 86400)
20-
21-
math(EXPR total_days "${EPOCH} / ${SECONDS_PER_DAY}")
22-
23-
math(EXPR year "1970 + ${total_days} / 365")
24-
25-
set(days_to_year 0)
26-
set(y 1970)
27-
while(y LESS year)
28-
_is_leap_year(${y} leap)
29-
if(leap)
30-
math(EXPR days_to_year "${days_to_year} + 366")
31-
else()
32-
math(EXPR days_to_year "${days_to_year} + 365")
33-
endif()
34-
math(EXPR y "${y} + 1")
35-
endwhile()
36-
37-
while(days_to_year GREATER total_days)
38-
math(EXPR year "${year} - 1")
39-
_is_leap_year(${year} leap)
40-
if(leap)
41-
math(EXPR days_to_year "${days_to_year} - 366")
42-
else()
43-
math(EXPR days_to_year "${days_to_year} - 365")
44-
endif()
45-
endwhile()
46-
47-
math(EXPR doy "${total_days} - ${days_to_year} + 1")
48-
49-
math(EXPR yr "${year} % 100")
50-
51-
math(EXPR y "${year} - 1")
52-
math(EXPR dow1 "(1 + 5*(${y} % 4) + 4*(${y} % 100) + 6*(${y} % 400)) % 7")
53-
54-
_is_leap_year(${year} leap)
55-
if(leap)
56-
set(y_days 366)
57-
else()
58-
set(y_days 365)
59-
endif()
60-
61-
math(EXPR _doy "${doy} - 1 + ${dow1}") # shift day of year to simulate Jan 1st as Sunday
62-
math(EXPR _ww "${_doy} / 7 + 1") # get workweek
63-
math(EXPR _wd "${_doy} % 7") # get days of week
64-
math(EXPR _y_days "${y_days} + ${dow1}") # adjusted number of days in year
65-
math(EXPR _w_days "${_y_days} - ${_doy} + ${_wd}") # number of week days to end of year
66-
67-
if(_w_days LESS 7)
68-
# last week has less than 7 days
69-
math(EXPR yr "(${yr} + 1) % 100")
70-
set(_ww 1)
71-
endif()
72-
73-
string(LENGTH "${yr}" yr_len)
74-
string(LENGTH "${_ww}" ww_len)
75-
if(yr_len LESS 2)
76-
set(yr "0${yr}")
77-
endif()
78-
if(ww_len LESS 2)
79-
set(_ww "0${_ww}")
80-
endif()
81-
82-
set(${OUT_VAR} "${yr}.${_ww}" PARENT_SCOPE)
83-
endfunction()
84-
857
if(CMAKE_SCRIPT_MODE_FILE AND CMAKE_ARGC GREATER 3)
86-
neo_ww_calculator(${CMAKE_ARGV3} _result)
87-
execute_process(COMMAND ${CMAKE_COMMAND} -E echo "${_result}")
8+
execute_process(COMMAND ${CMAKE_COMMAND} -E echo "26.18")
889
endif()

‎version.cmake‎

Lines changed: 17 additions & 80 deletions
Original file line numberDiff line numberDiff line change
@@ -4,99 +4,36 @@
44
# SPDX-License-Identifier: MIT
55
#
66

7-
include(${CMAKE_CURRENT_SOURCE_DIR}/scripts/neo_ww_calculator.cmake)
8-
9-
find_program(GIT NAMES git)
10-
if(NOT "${GIT}" STREQUAL "GIT-NOTFOUND")
11-
if(IS_DIRECTORY ${NEO_SOURCE_DIR}/.git)
12-
set(GIT_arg --git-dir=${NEO_SOURCE_DIR}/.git show -s --format=%ct)
13-
execute_process(
14-
COMMAND ${GIT} ${GIT_arg}
15-
OUTPUT_VARIABLE GIT_output
16-
OUTPUT_STRIP_TRAILING_WHITESPACE
17-
)
18-
neo_ww_calculator(${GIT_output} VERSION_output)
19-
string(REPLACE "." ";" VERSION_list ${VERSION_output})
20-
else()
21-
message(WARNING "Unable to determine OpenCL major.minor version. Defaulting to 1.0")
22-
endif()
23-
24-
if(NOT DEFINED NEO_OCL_VERSION_MAJOR)
25-
if(NOT DEFINED VERSION_list)
26-
set(NEO_OCL_VERSION_MAJOR 1)
27-
else()
28-
list(GET VERSION_list 0 NEO_OCL_VERSION_MAJOR)
29-
message(STATUS "Computed OpenCL version major is: ${NEO_OCL_VERSION_MAJOR}")
30-
endif()
31-
endif()
32-
33-
if(NOT DEFINED NEO_OCL_VERSION_MINOR)
34-
if(NOT DEFINED VERSION_list)
35-
set(NEO_OCL_VERSION_MINOR 0)
36-
else()
37-
list(GET VERSION_list 1 NEO_OCL_VERSION_MINOR)
38-
message(STATUS "Computed OpenCL version minor is: ${NEO_OCL_VERSION_MINOR}")
39-
endif()
40-
endif()
41-
42-
if(IS_DIRECTORY ${NEO_SOURCE_DIR}/.git)
43-
set(GIT_arg --git-dir=${NEO_SOURCE_DIR}/.git rev-parse HEAD)
44-
execute_process(
45-
COMMAND ${GIT} ${GIT_arg}
46-
OUTPUT_VARIABLE NEO_REVISION
47-
OUTPUT_STRIP_TRAILING_WHITESPACE
48-
)
49-
endif()
50-
endif()
51-
52-
if(NOT DEFINED NEO_REVISION)
53-
set(NEO_REVISION "No git SHA found, compiled outside git folder")
54-
endif()
7+
set(NEO_OCL_VERSION_MAJOR 26)
8+
set(NEO_OCL_VERSION_MINOR 18)
559

5610
if(NOT DEFINED NEO_VERSION_BUILD)
57-
set(NEO_VERSION_BUILD 0)
11+
set(NEO_VERSION_BUILD 038308)
12+
set(NEO_REVISION 038308)
13+
else()
14+
set(NEO_REVISION ${NEO_VERSION_BUILD})
5815
endif()
5916

6017
if(NOT DEFINED NEO_VERSION_HOTFIX)
6118
set(NEO_VERSION_HOTFIX 0)
6219
endif()
6320

64-
if(UNIX)
65-
set(NEO_OCL_VERSION_SUFFIX "")
66-
if(NOT ("${NEO_VERSION_HOTFIX}" STREQUAL "0"))
67-
set(NEO_OCL_VERSION_SUFFIX ".${NEO_VERSION_HOTFIX}")
68-
endif()
21+
set(NEO_OCL_VERSION_SUFFIX "")
22+
if(NOT ("${NEO_VERSION_HOTFIX}" STREQUAL "0"))
23+
set(NEO_OCL_VERSION_SUFFIX ".${NEO_VERSION_HOTFIX}")
24+
endif()
6925

70-
if(NEO_VERSION_BUILD MATCHES "^([0-9]+)\\.([0-9]+)$")
71-
set(NEO_VERSION_BUILD "${CMAKE_MATCH_1}")
72-
if(NOT ("${NEO_OCL_VERSION_SUFFIX}" STREQUAL "") AND NOT ("${NEO_OCL_VERSION_SUFFIX}" STREQUAL ".${CMAKE_MATCH_2}"))
73-
message(FATAL_ERROR "Inconsistent hotfix version provided: ${NEO_VERSION_HOTFIX} vs ${CMAKE_MATCH_2}")
74-
endif()
75-
set(NEO_VERSION_HOTFIX "${CMAKE_MATCH_2}")
76-
set(NEO_OCL_VERSION_SUFFIX ".${NEO_VERSION_HOTFIX}")
26+
if(NEO_VERSION_BUILD MATCHES "^([0-9]+)\\.([0-9]+)$")
27+
set(NEO_VERSION_BUILD "${CMAKE_MATCH_1}")
28+
if(NOT ("${NEO_OCL_VERSION_SUFFIX}" STREQUAL "") AND NOT ("${NEO_OCL_VERSION_SUFFIX}" STREQUAL ".${CMAKE_MATCH_2}"))
29+
message(FATAL_ERROR "Inconsistent hotfix version provided: ${NEO_VERSION_HOTFIX} vs ${CMAKE_MATCH_2}")
7730
endif()
31+
set(NEO_VERSION_HOTFIX "${CMAKE_MATCH_2}")
32+
set(NEO_OCL_VERSION_SUFFIX ".${NEO_VERSION_HOTFIX}")
7833
endif()
7934

8035
# OpenCL package version
81-
if(WIN32)
82-
83-
if(NOT DEFINED WDDM_VERSION_NUMBER)
84-
set(WDDM_VERSION_NUMBER "1")
85-
endif()
86-
87-
if(NOT DEFINED BUILD_WINDOWS_VERSION_STRING_MINOR)
88-
set(BUILD_WINDOWS_VERSION_STRING_MINOR "0")
89-
endif()
90-
91-
if(NOT DEFINED BUILD_WINDOWS_VERSION_STRING_MAJOR)
92-
set(BUILD_WINDOWS_VERSION_STRING_MAJOR "0")
93-
endif()
94-
95-
set(NEO_OCL_DRIVER_VERSION "${WDDM_VERSION_NUMBER}.0.${BUILD_WINDOWS_VERSION_STRING_MAJOR}.${BUILD_WINDOWS_VERSION_STRING_MINOR} (${NEO_OCL_VERSION_MAJOR}.${NEO_OCL_VERSION_MINOR})")
96-
97-
else()
98-
set(NEO_OCL_DRIVER_VERSION "${NEO_OCL_VERSION_MAJOR}.${NEO_OCL_VERSION_MINOR}.${NEO_VERSION_BUILD}${NEO_OCL_VERSION_SUFFIX}")
99-
endif()
36+
set(NEO_OCL_DRIVER_VERSION "${NEO_OCL_VERSION_MAJOR}.${NEO_OCL_VERSION_MINOR}.${NEO_VERSION_BUILD}${NEO_OCL_VERSION_SUFFIX}")
10037

10138
# Level-Zero package version
10239
set(NEO_L0_VERSION_MAJOR 1)

0 commit comments

Comments
 (0)