Skip to content

Commit 8ec1d8d

Browse files
build: buildConfig update
Signed-off-by: ocldev <[email protected]>
1 parent 7ff879f commit 8ec1d8d

File tree

4 files changed

+16
-70
lines changed

4 files changed

+16
-70
lines changed

.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/24.05
22
draft: true
3+
branchtype: master

Jenkinsfile

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

1010
dependenciesRevision='b84a8dace09da83bf07c0a336a70a197cf839949-2262'
1111
kernelVersion='dev-5339'
12+
buildConfig = [
13+
'master-build': ['gcc7', 'gcc8', 'gcc9', 'gcc11'],
14+
'master-gate': ['gcc7', 'gcc8', 'gcc9', 'gcc10', 'gcc11', 'gcc12', 'gcc13'],
15+
'branch': 'master',
16+
]

manifests/manifest.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,10 @@ components:
2828
repository: https://github.com/intel/igsc.git
2929
component_version: 208
3030
infra:
31-
branch: master
31+
branch: neo/releases/24.05
3232
dest_dir: infra
3333
fetch_tags: true
34-
revision: v5705
34+
revision: v5705.1608.0
3535
type: git
3636
internal:
3737
branch: master

version.cmake

Lines changed: 7 additions & 67 deletions
Original file line numberDiff line numberDiff line change
@@ -1,80 +1,20 @@
11
#
2-
# Copyright (C) 2018-2022 Intel Corporation
2+
# Copyright (C) 2018-2024 Intel Corporation
33
#
44
# SPDX-License-Identifier: MIT
55
#
66

7-
if(UNIX)
8-
find_program(GIT NAMES git)
9-
find_program(PYTHON_EXECUTABLE NAMES "python3")
10-
if((NOT "${GIT}" STREQUAL "GIT-NOTFOUND") AND (NOT "${PYTHON_EXECUTABLE}" STREQUAL "PYTHON_EXECUTABLE-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-
set(PYTHON_arg ${CMAKE_CURRENT_SOURCE_DIR}/scripts/neo_ww_calculator.py ${GIT_output})
19-
execute_process(
20-
COMMAND ${PYTHON_EXECUTABLE} ${PYTHON_arg}
21-
OUTPUT_VARIABLE VERSION_output
22-
OUTPUT_STRIP_TRAILING_WHITESPACE
23-
)
24-
string(REPLACE "." ";" VERSION_list ${VERSION_output})
25-
endif()
26-
else()
27-
message(WARNING "Unable to determine OpenCL major.minor version. Defaulting to 1.0")
28-
endif()
29-
30-
if(NOT DEFINED NEO_OCL_VERSION_MAJOR)
31-
if(NOT DEFINED VERSION_list)
32-
set(NEO_OCL_VERSION_MAJOR 1)
33-
else()
34-
list(GET VERSION_list 0 NEO_OCL_VERSION_MAJOR)
35-
message(STATUS "Computed OpenCL version major is: ${NEO_OCL_VERSION_MAJOR}")
36-
endif()
37-
endif()
38-
39-
if(NOT DEFINED NEO_OCL_VERSION_MINOR)
40-
if(NOT DEFINED VERSION_list)
41-
set(NEO_OCL_VERSION_MINOR 0)
42-
else()
43-
list(GET VERSION_list 1 NEO_OCL_VERSION_MINOR)
44-
message(STATUS "Computed OpenCL version minor is: ${NEO_OCL_VERSION_MINOR}")
45-
endif()
46-
endif()
47-
else()
48-
if(NOT DEFINED NEO_OCL_VERSION_MAJOR)
49-
set(NEO_OCL_VERSION_MAJOR 1)
50-
endif()
51-
52-
if(NOT DEFINED NEO_OCL_VERSION_MINOR)
53-
set(NEO_OCL_VERSION_MINOR 0)
54-
endif()
55-
endif()
7+
set(NEO_OCL_VERSION_MAJOR 24)
8+
set(NEO_OCL_VERSION_MINOR 05)
569

5710
if(NOT DEFINED NEO_VERSION_BUILD)
58-
set(NEO_VERSION_BUILD 0)
59-
set(NEO_REVISION 0)
11+
set(NEO_VERSION_BUILD 028454)
12+
set(NEO_REVISION 028454)
6013
else()
61-
find_program(GIT NAMES git)
62-
if(NOT "${GIT}" STREQUAL "GIT-NOTFOUND")
63-
if(IS_DIRECTORY ${NEO_SOURCE_DIR}/.git)
64-
set(GIT_arg --git-dir=${NEO_SOURCE_DIR}/.git rev-parse HEAD)
65-
execute_process(
66-
COMMAND ${GIT} ${GIT_arg}
67-
OUTPUT_VARIABLE NEO_REVISION
68-
OUTPUT_STRIP_TRAILING_WHITESPACE
69-
)
70-
endif()
71-
endif()
72-
endif()
73-
if(NOT DEFINED NEO_REVISION)
74-
set(NEO_REVISION 0)
14+
set(NEO_REVISION ${NEO_VERSION_BUILD})
7515
endif()
7616

77-
# OpenCL pacakge version
17+
# OpenCL package version
7818
set(NEO_OCL_DRIVER_VERSION "${NEO_OCL_VERSION_MAJOR}.${NEO_OCL_VERSION_MINOR}.${NEO_VERSION_BUILD}")
7919

8020
# Level-Zero package version

0 commit comments

Comments
 (0)