File tree 9 files changed +18
-11
lines changed
scripts/install_dependencies
9 files changed +18
-11
lines changed Original file line number Diff line number Diff line change 82
82
- name : Install dependencies
83
83
run : |
84
84
# install git (required to build pip deps from the sources)
85
- apt-get update && apt-get install --assume-yes --no-install-recommends git ca-certificates git-lfs
85
+ apt-get update && apt-get install --assume-yes --no-install-recommends git ca-certificates git-lfs ocl-icd-libopencl1
86
86
87
87
- name : Setup Python 3.11
88
88
uses : ./openvino/.github/actions/setup_python
Original file line number Diff line number Diff line change 95
95
run : |
96
96
# install git (required to build pip deps from the sources)
97
97
# install 'g++' to build 'detectron2' and 'natten' wheels
98
- sudo apt-get install --assume-yes --no-install-recommends g++ git ca-certificates
98
+ sudo apt-get install --assume-yes --no-install-recommends g++ git ca-certificates ocl-icd-libopencl1
99
99
100
100
- name : Setup Python 3.11
101
101
uses : ./openvino/.github/actions/setup_python
Original file line number Diff line number Diff line change 94
94
if : ${{ runner.os == 'Linux' }}
95
95
run : |
96
96
# install git (required to build pip deps from the sources)
97
- sudo apt-get install --assume-yes --no-install-recommends g++ git ca-certificates
97
+ sudo apt-get install --assume-yes --no-install-recommends g++ git ca-certificates ocl-icd-libopencl1
98
98
99
99
- name : Setup Python 3.11
100
100
uses : ./openvino/.github/actions/setup_python
Original file line number Diff line number Diff line change @@ -131,7 +131,7 @@ if [ "$os" == "raspbian9" ] || [ "$os" == "debian9" ] ; then
131
131
132
132
elif [ " $os " == " ubuntu18.04" ] ; then
133
133
134
- pkgs_core=(libtbb2)
134
+ pkgs_core=(ocl-icd-libopencl1 libtbb2)
135
135
pkgs_gpu=(ocl-icd-libopencl1)
136
136
pkgs_python=(python3.8 libpython3.8 python3.8-venv python3-pip)
137
137
pkgs_dev=(cmake pkg-config g++ gcc libc6-dev make sudo)
@@ -140,7 +140,7 @@ elif [ "$os" == "ubuntu20.04" ] || [ "$os" == "debian10" ] || [ "$os" == "raspbi
140
140
[ " $os " == " ubuntu21.10" ] || [ " $os " == " ubuntu22.04" ] || [ " $os " == " debian11" ] || [ " $os " == " raspbian11" ] ||
141
141
[ " $os " == " ubuntu22.10" ] || [ " $os " == " ubuntu23.04" ] || [ " $os " == " debian12" ] || [ " $os " == " raspbian12" ]; then
142
142
143
- pkgs_core=()
143
+ pkgs_core=(ocl-icd-libopencl1 )
144
144
pkgs_gpu=(ocl-icd-libopencl1)
145
145
pkgs_python=(python3 python3-venv python3-pip)
146
146
pkgs_dev=(cmake pkg-config g++ gcc libc6-dev make sudo)
@@ -223,6 +223,7 @@ elif [ "$os" == "centos7" ] || [ "$os" == "centos8" ] || [ "$os" == "centos9" ]
223
223
pkgs_python+=(python3 python3-pip)
224
224
extra_repos+=(" https://dl.fedoraproject.org/pub/epel/epel-release-latest-9.noarch.rpm" )
225
225
fi
226
+ pkgs_core+=(" ${! pkgs_gpu} " )
226
227
elif [ " $os " == " opensuse-leap15.3" ] ; then
227
228
pkgs_core=(libtbb2 libtbbmalloc2)
228
229
pkgs_gpu=(libOpenCL1)
Original file line number Diff line number Diff line change @@ -187,7 +187,7 @@ configure_package_config_file("${OpenVINO_SOURCE_DIR}/cmake/templates/OpenVINOCo
187
187
188
188
list (APPEND INSTALL_PATH_VARS "OPENVINO_LIB_DIR" )
189
189
# remove generator expression at the end, because searching in Release / Debug
190
- # will be done by inside OpenVINOConfig.cmak / ACLConfig.cmake
190
+ # will be done by inside OpenVINOConfig.cmake / ACLConfig.cmake
191
191
string (REPLACE "$<CONFIG>" "" OPENVINO_LIB_DIR "${OV_CPACK_LIBRARYDIR} " )
192
192
193
193
set (OV_TBB_DIR "${OV_TBB_DIR_INSTALL} " )
Original file line number Diff line number Diff line change @@ -38,7 +38,6 @@ function(ov_add_onednn_common)
38
38
set (ONEDNN_BUILD_GRAPH OFF CACHE BOOL "" FORCE)
39
39
set (DNNL_ENABLE_WORKLOAD "INFERENCE" CACHE STRING "" FORCE)
40
40
set (DNNL_LIBRARY_NAME "openvino_onednn_cpu" CACHE STRING "" FORCE)
41
- set (DNNL_EXPERIMENTAL_PROFILING ON CACHE BOOL "" FORCE)
42
41
43
42
if (X86_64)
44
43
set (DNNL_TARGET_ARCH "X64" CACHE STRING "" FORCE)
Original file line number Diff line number Diff line change @@ -178,8 +178,13 @@ if(ENABLE_ONEDNN_FOR_GPU)
178
178
# in case of static libraries, Intel GPU shares oneDNN with CPU plugin
179
179
set (DNNL_GPU_LIBRARY_NAME "openvino_onednn_cpu" CACHE STRING "Name of oneDNN library for Intel GPU Plugin" )
180
180
181
+ set (onednn_output_dir "${CMAKE_ARCHIVE_OUTPUT_DIRECTORY} " )
182
+ if (OV_GENERATOR_MULTI_CONFIG)
183
+ # TODO: here we assume Release config is used, but it will not work for debug
184
+ set (onednn_output_dir "${onednn_output_dir} /Release" )
185
+ endif ()
181
186
set (onednn_gpu_lib "${CMAKE_STATIC_LIBRARY_PREFIX}${DNNL_GPU_LIBRARY_NAME}${CMAKE_STATIC_LIBRARY_SUFFIX} " )
182
- set (ONEDNN_GPU_LIB_PATH ${CMAKE_ARCHIVE_OUTPUT_DIRECTORY } /${onednn_gpu_lib} CACHE FILEPATH "Path to oneDNN GPU library" )
187
+ set (ONEDNN_GPU_LIB_PATH ${onednn_output_dir } /${onednn_gpu_lib} CACHE FILEPATH "Path to oneDNN GPU library" )
183
188
184
189
add_library (onednn_gpu_tgt INTERFACE )
185
190
set_target_properties (onednn_gpu_tgt PROPERTIES
Original file line number Diff line number Diff line change @@ -60,5 +60,7 @@ set(opencl_root_hints "${OpenCL_INCLUDE_DIR}" PARENT_SCOPE)
60
60
61
61
ov_install_static_lib(OpenCL ${OV_CPACK_COMP_CORE} )
62
62
63
- install (TARGETS OpenCL EXPORT dnnl-targets
64
- ARCHIVE DESTINATION ${OV_CPACK_ARCHIVEDIR} COMPONENT ${OV_CPACK_COMP_CORE} )
63
+ if (NOT BUILD_SHARED_LIBS )
64
+ install (TARGETS OpenCL EXPORT dnnl-targets
65
+ ARCHIVE DESTINATION ${OV_CPACK_ARCHIVEDIR} COMPONENT ${OV_CPACK_COMP_CORE} )
66
+ endif ()
You can’t perform that action at this time.
0 commit comments