Media
/
compute-runtime
mirror of https://github.com/intel/compute-runtime.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

build: cleanup not needed variables from cmake 

Signed-off-by: Artur Harasimiuk <artur.harasimiuk@intel.com>
This commit is contained in:
Artur Harasimiuk 2024-08-01 11:32:18 +00:00 committed by Compute-Runtime-Automation
parent 63a7779c9d
commit 250601fd7b
6 changed files with 15 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
CMakeLists.txt
View File

@ -509,19 +509,13 @@ if(NOT DEFINED NEO_CURRENT_PLATFORMS_SUPPORT)
set(NEO_CURRENT_PLATFORMS_SUPPORT TRUE)
endif()
if(NEO_LEGACY_PLATFORMS_SUPPORT AND NOT NEO_CURRENT_PLATFORMS_SUPPORT)
if(NOT DEFINED NEO_OCLOC_VERSION_MAJOR)
message(FATAL_ERROR "NEO_OCLOC_VERSION_MAJOR is not defined")
endif()
if(NOT DEFINED NEO_OCLOC_VERSION_MINOR)
message(FATAL_ERROR "NEO_OCLOC_VERSION_MINOR is not defined")
if(NOT DEFINED NEO_OCLOC_VERSION_MODE)
set(NEO_OCLOC_VERSION_MODE "0")
endif()
set(NEO__SO_NAME_SUFFIX "_legacy1")
endif()
if(NOT DEFINED NEO_OCLOC_VERSION_MAJOR)
set(NEO_OCLOC_VERSION_MAJOR "${NEO_OCL_VERSION_MAJOR}")
endif()
if(NOT DEFINED NEO_OCLOC_VERSION_MINOR)
set(NEO_OCLOC_VERSION_MINOR "${NEO_OCL_VERSION_MINOR}")
if(NOT DEFINED NEO_OCLOC_VERSION_MODE)
set(NEO_OCLOC_VERSION_MODE "1")
endif()
include(platforms.cmake)
list(LENGTH ALL_PRODUCT_FAMILY_LIST ALL_PRODUCT_FAMILY_LIST_COUNT)

11
scripts/packaging/build_deb.sh
View File

@ -107,9 +107,6 @@ fi
echo "NEO_CURRENT_PLATFORMS_SUPPORT: ${NEO_CURRENT_PLATFORMS_SUPPORT}"
echo "NEO_LEGACY_PLATFORMS_SUPPORT: ${NEO_LEGACY_PLATFORMS_SUPPORT}"
export NEO_OCLOC_VERSION_MAJOR=${NEO_VERSION_MAJOR}
export NEO_OCLOC_VERSION_MINOR=${NEO_VERSION_MINOR}
if [[ "${NEO_LEGACY_PLATFORMS_SUPPORT}" == "TRUE" ]] && [[ ! "${NEO_CURRENT_PLATFORMS_SUPPORT}" == "TRUE" ]]; then
echo "Building Legacy package"
export NEO_OCLOC_VERSION_MODE=0
@ -121,8 +118,8 @@ if [[ "${NEO_LEGACY_PLATFORMS_SUPPORT}" == "TRUE" ]] && [[ ! "${NEO_CURRENT_PLAT
mv -v "$BUILD_DIR/debian/intel-ocloc.install" "$BUILD_DIR/debian/intel-ocloc-${NEO_LEGACY_VERSION}.install"
mv -v "$BUILD_DIR/debian/intel-ocloc.postinst" "$BUILD_DIR/debian/intel-ocloc-${NEO_LEGACY_VERSION}.postinst"
mv -v "$BUILD_DIR/debian/intel-ocloc.prerm" "$BUILD_DIR/debian/intel-ocloc-${NEO_LEGACY_VERSION}.prerm"
perl -pi -e "s/\/ocloc 0$/\/ocloc-${NEO_OCLOC_VERSION_MAJOR}.${NEO_OCLOC_VERSION_MINOR}.${NEO_OCLOC_VERSION_MODE} ${NEO_OCLOC_VERSION_MAJOR}${NEO_OCLOC_VERSION_MINOR}${NEO_OCLOC_VERSION_MODE}/" "$BUILD_DIR/debian/intel-ocloc-${NEO_LEGACY_VERSION}.postinst"
perl -pi -e "s/\/ocloc$/\/ocloc-${NEO_OCLOC_VERSION_MAJOR}.${NEO_OCLOC_VERSION_MINOR}.${NEO_OCLOC_VERSION_MODE}/" "$BUILD_DIR/debian/intel-ocloc-${NEO_LEGACY_VERSION}.prerm"
perl -pi -e "s/\/ocloc 0$/\/ocloc-${NEO_VERSION_MAJOR}.${NEO_VERSION_MINOR}.${NEO_OCLOC_VERSION_MODE} ${NEO_VERSION_MAJOR}${NEO_VERSION_MINOR}${NEO_OCLOC_VERSION_MODE}/" "$BUILD_DIR/debian/intel-ocloc-${NEO_LEGACY_VERSION}.postinst"
perl -pi -e "s/\/ocloc$/\/ocloc-${NEO_VERSION_MAJOR}.${NEO_VERSION_MINOR}.${NEO_OCLOC_VERSION_MODE}/" "$BUILD_DIR/debian/intel-ocloc-${NEO_LEGACY_VERSION}.prerm"
perl -i -lne 'if (/^Package: intel-ocloc-dev$/ .. /^$/) { print if !$flag } else {$flag=1; print}' "$BUILD_DIR/debian/control"
if [ "${NEO_BUILD_WITH_L0}" == "TRUE" ]; then
@ -134,8 +131,8 @@ else
echo "Building Current/Full package"
export NEO_OCLOC_VERSION_MODE=1
perl -pi -e "s/\/ocloc 0$/\/ocloc-${NEO_OCLOC_VERSION_MAJOR}.${NEO_OCLOC_VERSION_MINOR}.${NEO_OCLOC_VERSION_MODE} ${NEO_OCLOC_VERSION_MAJOR}${NEO_OCLOC_VERSION_MINOR}${NEO_OCLOC_VERSION_MODE}/" "$BUILD_DIR/debian/intel-ocloc.postinst"
perl -pi -e "s/\/ocloc$/\/ocloc-${NEO_OCLOC_VERSION_MAJOR}.${NEO_OCLOC_VERSION_MINOR}.${NEO_OCLOC_VERSION_MODE}/" "$BUILD_DIR/debian/intel-ocloc.prerm"
perl -pi -e "s/\/ocloc 0$/\/ocloc-${NEO_VERSION_MAJOR}.${NEO_VERSION_MINOR}.${NEO_OCLOC_VERSION_MODE} ${NEO_VERSION_MAJOR}${NEO_VERSION_MINOR}${NEO_OCLOC_VERSION_MODE}/" "$BUILD_DIR/debian/intel-ocloc.postinst"
perl -pi -e "s/\/ocloc$/\/ocloc-${NEO_VERSION_MAJOR}.${NEO_VERSION_MINOR}.${NEO_OCLOC_VERSION_MODE}/" "$BUILD_DIR/debian/intel-ocloc.prerm"
fi

7
scripts/packaging/opencl/build_opencl_deb.sh
View File

@ -91,9 +91,6 @@ fi
echo "NEO_CURRENT_PLATFORMS_SUPPORT: ${NEO_CURRENT_PLATFORMS_SUPPORT}"
echo "NEO_LEGACY_PLATFORMS_SUPPORT: ${NEO_LEGACY_PLATFORMS_SUPPORT}"
export NEO_OCLOC_VERSION_MAJOR=${NEO_OCL_VERSION_MAJOR}
export NEO_OCLOC_VERSION_MINOR=${NEO_OCL_VERSION_MINOR}
if [[ "${NEO_LEGACY_PLATFORMS_SUPPORT}" == "TRUE" ]] && [[ ! "${NEO_CURRENT_PLATFORMS_SUPPORT}" == "TRUE" ]]; then
echo "Building Legacy package"
export NEO_OCLOC_VERSION_MODE=0
@ -103,8 +100,8 @@ else
export NEO_OCLOC_VERSION_MODE=1
fi
perl -pi -e "s/\/ocloc 0$/\/ocloc-${NEO_OCLOC_VERSION_MAJOR}.${NEO_OCLOC_VERSION_MINOR}.${NEO_OCLOC_VERSION_MODE} ${NEO_OCLOC_VERSION_MAJOR}${NEO_OCLOC_VERSION_MINOR}${NEO_OCLOC_VERSION_MODE}/" "$BUILD_DIR/debian/postinst"
perl -pi -e "s/\/ocloc$/\/ocloc-${NEO_OCLOC_VERSION_MAJOR}.${NEO_OCLOC_VERSION_MINOR}.${NEO_OCLOC_VERSION_MODE}/" "$BUILD_DIR/debian/prerm"
perl -pi -e "s/\/ocloc 0$/\/ocloc-${NEO_OCL_VERSION_MAJOR}.${NEO_OCL_VERSION_MINOR}.${NEO_OCLOC_VERSION_MODE} ${NEO_OCL_VERSION_MAJOR}${NEO_OCL_VERSION_MINOR}${NEO_OCLOC_VERSION_MODE}/" "$BUILD_DIR/debian/postinst"
perl -pi -e "s/\/ocloc$/\/ocloc-${NEO_OCL_VERSION_MAJOR}.${NEO_OCL_VERSION_MINOR}.${NEO_OCLOC_VERSION_MODE}/" "$BUILD_DIR/debian/prerm"
#needs a top level CMAKE file
cat << EOF | tee $BUILD_DIR/CMakeLists.txt

6
scripts/packaging/opencl/ubuntu_20.04/debian/rules
View File

@ -13,16 +13,14 @@ NEO_ENABLE_XE_EU_DEBUG_SUPPORT ?= FALSE
NEO_FORCE_USE_AUB_STREAM ?= TRUE
NEO_LEGACY_PLATFORMS_SUPPORT ?= TRUE
NEO_CURRENT_PLATFORMS_SUPPORT ?= TRUE
NEO_OCLOC_VERSION_MAJOR ?= ${NEO_OCL_VERSION_MAJOR}
NEO_OCLOC_VERSION_MINOR ?= ${NEO_OCL_VERSION_MINOR}
NEO_OCLOC_VERSION_MODE ?= 1
override_dh_auto_configure:
dh_auto_configure -- ${NEO_BUILD_EXTRA_OPTS} \
-DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} \
-DNEO_OCL_VERSION_MAJOR=${NEO_OCL_VERSION_MAJOR} \
-DNEO_OCL_VERSION_MINOR=${NEO_OCL_VERSION_MINOR} \
-DNEO_OCLOC_VERSION_MAJOR=${NEO_OCLOC_VERSION_MAJOR} \
-DNEO_OCLOC_VERSION_MINOR=${NEO_OCLOC_VERSION_MINOR} \
-DNEO_OCLOC_VERSION_MODE=${NEO_OCLOC_VERSION_MODE} \
-DNEO_VERSION_BUILD=${NEO_OCL_VERSION_BUILD} \
-DNEO_SKIP_AUB_TESTS_RUN=${NEO_SKIP_AUB_TESTS_RUN} \
-DNEO_SKIP_UNIT_TESTS=${NEO_SKIP_UNIT_TESTS} \

6
scripts/packaging/ubuntu/debian/rules
View File

@ -14,16 +14,14 @@ NEO_FORCE_USE_AUB_STREAM ?= TRUE
NEO_BUILD_WITH_L0 ?= TRUE
NEO_LEGACY_PLATFORMS_SUPPORT ?= TRUE
NEO_CURRENT_PLATFORMS_SUPPORT ?= TRUE
NEO_OCLOC_VERSION_MAJOR ?= ${NEO_OCL_VERSION_MAJOR}
NEO_OCLOC_VERSION_MINOR ?= ${NEO_OCL_VERSION_MINOR}
NEO_OCLOC_VERSION_MODE ?= 1
override_dh_auto_configure:
dh_auto_configure -- ${NEO_BUILD_EXTRA_OPTS} \
-DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} \
-DNEO_OCL_VERSION_MAJOR=${NEO_VERSION_MAJOR} \
-DNEO_OCL_VERSION_MINOR=${NEO_VERSION_MINOR} \
-DNEO_OCLOC_VERSION_MAJOR=${NEO_OCLOC_VERSION_MAJOR} \
-DNEO_OCLOC_VERSION_MINOR=${NEO_OCLOC_VERSION_MINOR} \
-DNEO_OCLOC_VERSION_MODE=${NEO_OCLOC_VERSION_MODE} \
-DNEO_LEGACY_PLATFORMS_SUPPORT=${NEO_LEGACY_PLATFORMS_SUPPORT} \
-DNEO_CURRENT_PLATFORMS_SUPPORT=${NEO_CURRENT_PLATFORMS_SUPPORT} \
-DNEO_VERSION_BUILD=${NEO_VERSION_BUILD} \

4
shared/offline_compiler/source/CMakeLists.txt
View File

@ -452,10 +452,8 @@ if(WIN32)
elseif(UNIX)
if(NOT NEO_CURRENT_PLATFORMS_SUPPORT)
set(LIBOCLOC_OUTPUT_NAME_SUFFIX ${NEO__SO_NAME_SUFFIX})
set(OCLOC_OUTPUT_NAME_SUFFIX "-${NEO_OCLOC_VERSION_MAJOR}.${NEO_OCLOC_VERSION_MINOR}.0")
else()
set(OCLOC_OUTPUT_NAME_SUFFIX "-${NEO_OCLOC_VERSION_MAJOR}.${NEO_OCLOC_VERSION_MINOR}.1")
endif()
set(OCLOC_OUTPUT_NAME_SUFFIX "-${NEO_OCL_VERSION_MAJOR}.${NEO_OCL_VERSION_MINOR}.${NEO_OCLOC_VERSION_MODE}")
endif()
set_target_properties(${OCLOC_NAME} PROPERTIES OUTPUT_NAME ${OCLOC_NAME}${OCLOC_OUTPUT_NAME_SUFFIX})
set_target_properties(${OCLOC_NAME}_lib PROPERTIES OUTPUT_NAME ${OCLOC_NAME}${LIBOCLOC_OUTPUT_NAME_SUFFIX})