Skip to content

Commit e667886

Browse files
ArturHarasimiukCompute-Runtime-Automation
ArturHarasimiuk
authored and
Compute-Runtime-Automation
committed
package separation
Do not add intel-graphics-compiler nor intel-gmmlib libraries to Neo package. Change-Id: I97a8ca77ddcdcbd633e3bc99296938faefbc0327 Signed-off-by: Artur Harasimiuk <artur.harasimiuk@intel.com>
1 parent 7980465 commit e667886

File tree

3 files changed

+44
-67
lines changed

3 files changed

+44
-67
lines changed

‎documentation/BUILD_Centos.md‎

Lines changed: 15 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -11,56 +11,50 @@ Example:
1111
```shell
1212
sudo yum groups install "Development Tools"
1313
sudo yum install centos-release-scl epel-release
14-
sudo yum install devtoolset-4-gcc-c++ llvm-toolset-7-clang cmake3 ninja-build p7zip rpm-build dpkg xorg-x11-util-macros libpciaccess-devel which zlib-devel
14+
sudo yum install devtoolset-4-gcc-c++ cmake3 ninja-build
1515
sudo /usr/sbin/alternatives --install /usr/bin/cmake cmake /usr/bin/cmake3 50
1616
```
1717

18-
2. Create workspace folder and download sources:
18+
2. Instal required dependencies
19+
20+
Neo requires [Intel(R) Graphics Compiler for OpenCL(TM)](https://github.com/intel/intel-graphics-compiler) and [Intel(R) Graphics Memory Management](https://github.com/intel/gmmlib) to be installed on your system.
21+
22+
Please visit IGC and GmmLib repositories to build and install intel-igc-opencl-devel and intel-gmmlib-devel packages including all required dependencies
23+
24+
3. Create workspace folder and download sources:
25+
26+
Example:
1927
```
2028
workspace
21-
|- clang_source https://github.com/llvm-mirror/clang
22-
|- common_clang https://github.com/intel/opencl-clang
23-
|- llvm_patches https://github.com/intel/llvm-patches
24-
|- llvm_source https://github.com/llvm-mirror/llvm
25-
|- gmmlib https://github.com/intel/gmmlib
26-
|- igc https://github.com/intel/intel-graphics-compiler
27-
|- opencl_headers https://github.com/KhronosGroup/OpenCL-Headers
2829
|- neo https://github.com/intel/compute-runtime
2930
```
3031

3132
Example:
3233

3334
```shell
34-
git clone -b release_40 https://github.com/llvm-mirror/clang clang_source
35-
git clone https://github.com/intel/opencl-clang common_clang
36-
git clone https://github.com/intel/llvm-patches llvm_patches
37-
git clone -b release_40 https://github.com/llvm-mirror/llvm llvm_source
38-
git clone https://github.com/intel/gmmlib gmmlib
39-
git clone https://github.com/intel/intel-graphics-compiler igc
40-
git clone https://github.com/KhronosGroup/OpenCL-Headers opencl_headers
4135
git clone https://github.com/intel/compute-runtime neo
4236
```
4337

4438
Note: Instructions for compiling *Intel Graphics Compiler* copied from https://github.com/intel/intel-graphics-compiler/blob/master/README.md
4539

46-
3. Create folder for build:
40+
4. Create folder for build:
4741

4842
Example:
4943

5044
```shell
5145
mkdir build
5246
```
5347

54-
4. Enabling additional extension
48+
5. Enabling additional extension
5549

5650
* [cl_intel_va_api_media_sharing](https://github.com/intel/compute-runtime/blob/master/documentation/cl_intel_va_api_media_sharing.md)
5751

58-
5. Build complete driver:
52+
6. Build complete driver:
5953

6054
```shell
6155
cd build
62-
scl enable devtoolset-4 llvm-toolset-7 "cmake -DBUILD_TYPE=Release -DCMAKE_BUILD_TYPE=Release ../neo"
63-
scl enable devtoolset-4 llvm-toolset-7 "make -j `nproc` package"
56+
scl enable devtoolset-4 "cmake -DBUILD_TYPE=Release -DCMAKE_BUILD_TYPE=Release ../neo"
57+
scl enable devtoolset-4 "make -j `nproc` package"
6458
```
6559

6660
## Installing

‎documentation/BUILD_Ubuntu.md‎

Lines changed: 14 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -4,57 +4,49 @@
44

55
*Instructions assume clean Ubuntu 16.04.3 LTS installation.**
66

7-
1. Download & install required dependencies
7+
1. Download & install required packages
88

99
Example:
1010

1111
```shell
12-
sudo apt-get install ccache flex bison clang-4.0 cmake g++ git patch zlib1g-dev autoconf xutils-dev libtool pkg-config libpciaccess-dev
12+
sudo apt-get ccache cmake g++ git pkg-config
1313
```
1414

1515
See [LIMITATIONS.md](https://github.com/intel/compute-runtime/blob/master/documentation/LIMITATIONS.md) for other requirements and dependencies, when building and installing NEO.
1616

17-
2. Create workspace folder and download sources:
17+
2. Instal required dependencies
18+
19+
Neo requires [Intel(R) Graphics Compiler for OpenCL(TM)](https://github.com/intel/intel-graphics-compiler) and [Intel(R) Graphics Memory Management](https://github.com/intel/gmmlib) to be installed on your system.
20+
21+
Please visit theirs repositories and install intel-igc-opencl-devel and intel-gmmlib-devel packages including all required dependencies
22+
23+
3. Create workspace folder and download sources:
24+
25+
Example:
1826
```
1927
workspace
20-
|- clang_source https://github.com/llvm-mirror/clang
21-
|- common_clang https://github.com/intel/opencl-clang
22-
|- llvm_patches https://github.com/intel/llvm-patches
23-
|- llvm_source https://github.com/llvm-mirror/llvm
24-
|- gmmlib https://github.com/intel/gmmlib
25-
|- igc https://github.com/intel/intel-graphics-compiler
26-
|- opencl_headers https://github.com/KhronosGroup/OpenCL-Headers
2728
|- neo https://github.com/intel/compute-runtime
2829
```
2930

3031
Example:
3132

3233
```shell
33-
git clone -b release_40 https://github.com/llvm-mirror/clang clang_source
34-
git clone https://github.com/intel/opencl-clang common_clang
35-
git clone https://github.com/intel/llvm-patches llvm_patches
36-
git clone -b release_40 https://github.com/llvm-mirror/llvm llvm_source
37-
git clone https://github.com/intel/gmmlib gmmlib
38-
git clone https://github.com/intel/intel-graphics-compiler igc
39-
git clone https://github.com/KhronosGroup/OpenCL-Headers opencl_headers
4034
git clone https://github.com/intel/compute-runtime neo
4135
```
4236

43-
Note: Instructions for compiling *Intel Graphics Compiler* copied from https://github.com/intel/intel-graphics-compiler/blob/master/README.md
44-
45-
3. Create folder for build:
37+
4. Create folder for build:
4638

4739
Example:
4840

4941
```shell
5042
mkdir build
5143
```
5244

53-
4. Enabling additional extension
45+
5. Enabling additional extension
5446

5547
* [cl_intel_va_api_media_sharing](https://github.com/intel/compute-runtime/blob/master/documentation/cl_intel_va_api_media_sharing.md)
5648

57-
5. Build complete driver:
49+
6. Build complete driver:
5850

5951
```shell
6052
cd build

‎package.cmake‎

Lines changed: 15 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -31,30 +31,6 @@ if(UNIX)
3131
set(_dir_etc "/etc")
3232
endif()
3333

34-
if(DEFINED IGDRCL__IGC_TARGETS)
35-
foreach(TARGET_tmp ${IGDRCL__IGC_TARGETS})
36-
install(FILES $<TARGET_FILE:${TARGET_tmp}> DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT opencl)
37-
endforeach()
38-
else()
39-
file(GLOB _igc_libs "${IGC_DIR}/lib/*.so")
40-
foreach(_tmp ${_igc_libs})
41-
install(FILES ${_tmp} DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT opencl)
42-
endforeach()
43-
endif()
44-
45-
if(TARGET ${GMMUMD_LIB_NAME})
46-
install(FILES $<TARGET_FILE:${GMMUMD_LIB_NAME}> DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT opencl)
47-
else()
48-
if(EXISTS ${GMM_SOURCE_DIR}/lib/release/libigdgmm.so)
49-
file(GLOB _gmmlib_libs "${GMM_SOURCE_DIR}/lib/release/libigdgmm.so*")
50-
else()
51-
file(GLOB _gmmlib_libs "${GMM_SOURCE_DIR}/lib/libigdgmm.so*")
52-
endif()
53-
foreach(_tmp ${_gmmlib_libs})
54-
install(FILES ${_tmp} DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT opencl)
55-
endforeach()
56-
endif()
57-
5834
install(FILES
5935
$<TARGET_FILE:${NEO_DYNAMIC_LIB_NAME}>
6036
DESTINATION ${CMAKE_INSTALL_LIBDIR}
@@ -137,6 +113,21 @@ if(UNIX)
137113
endif()
138114
endif()
139115

116+
if(IGDRCL__GMM_FOUND)
117+
list(APPEND _external_package_dependencies "intel-gmmlib(=${IGDRCL__GMM_VERSION})")
118+
else()
119+
list(APPEND _external_package_dependencies "intel-gmmlib")
120+
endif()
121+
122+
if(IGDRCL__IGC_FOUND)
123+
list(APPEND _external_package_dependencies "intel-igc-opencl(=${IGDRCL__IGC_VERSION})")
124+
else()
125+
list(APPEND _external_package_dependencies "intel-igc-opencl")
126+
endif()
127+
128+
string(REPLACE ";" ", " CPACK_DEBIAN_OPENCL_PACKAGE_DEPENDS "${_external_package_dependencies}")
129+
string(REPLACE ";" ", " CPACK_RPM_OPENCL_PACKAGE_REQUIRES "${_external_package_dependencies}")
130+
140131
include(CPack)
141132

142133
get_directory_property(__HAS_PARENT PARENT_DIRECTORY)

0 commit comments

Comments
 (0)