ci: use the latest binary release to build Neo

Change-Id: If1e079a837aa1a3495b862e7f8637146956f3fd0
Signed-off-by: Jacek Danecki <jacek.danecki@intel.com>
This commit is contained in:
Jacek Danecki
2018-06-04 18:16:29 +02:00
parent 5eb2983404
commit 3b5f12979c
7 changed files with 14 additions and 9 deletions

View File

@ -19,6 +19,6 @@
# ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR # ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
# OTHER DEALINGS IN THE SOFTWARE. # OTHER DEALINGS IN THE SOFTWARE.
git clone --depth 1 ../compute-runtime neo git clone ../compute-runtime neo
docker build -f scripts/docker/Dockerfile-arch-gcc-5 -t neo-arch-gcc-5:ci . docker build -f scripts/docker/Dockerfile-arch-gcc-5 -t neo-arch-gcc-5:ci .

View File

@ -22,7 +22,7 @@
mkdir workspace; cd workspace mkdir workspace; cd workspace
git clone --depth 1 https://github.com/intel/gmmlib gmmlib git clone --depth 1 https://github.com/intel/gmmlib gmmlib
git clone --depth 1 https://github.com/KhronosGroup/OpenCL-Headers khronos git clone --depth 1 https://github.com/KhronosGroup/OpenCL-Headers khronos
git clone --depth 1 ../../compute-runtime neo git clone ../../compute-runtime neo
pushd neo/scripts/igc ; ./prepare.sh ; popd pushd neo/scripts/igc ; ./prepare.sh ; popd
mkdir build; cd build mkdir build; cd build

View File

@ -19,6 +19,6 @@
# ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR # ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
# OTHER DEALINGS IN THE SOFTWARE. # OTHER DEALINGS IN THE SOFTWARE.
git clone --depth 1 ../compute-runtime neo git clone ../compute-runtime neo
docker build -f scripts/docker/Dockerfile-ubuntu-16.04-gcc-5 -t neo-ubuntu-16.04-gcc-5:ci . docker build -f scripts/docker/Dockerfile-ubuntu-16.04-gcc-5 -t neo-ubuntu-16.04-gcc-5:ci .

View File

@ -19,6 +19,6 @@
# ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR # ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
# OTHER DEALINGS IN THE SOFTWARE. # OTHER DEALINGS IN THE SOFTWARE.
git clone --depth 1 ../compute-runtime neo git clone ../compute-runtime neo
docker build -f scripts/docker/Dockerfile-ubuntu-18.04-gcc-7 -t neo-ubuntu-18.4-gcc-7:ci . docker build -f scripts/docker/Dockerfile-ubuntu-18.04-gcc-7 -t neo-ubuntu-18.4-gcc-7:ci .

View File

@ -22,7 +22,7 @@ cmake_minimum_required(VERSION 3.2.0 FATAL_ERROR)
project(IntelGraphicsCompiler) project(IntelGraphicsCompiler)
set(IGC_LIBRARY_NAME "igdccl") set(IGC_LIBRARY_NAME "igc")
set(IGC_LIBRARY_NAME "${IGC_LIBRARY_NAME}" PARENT_SCOPE) set(IGC_LIBRARY_NAME "${IGC_LIBRARY_NAME}" PARENT_SCOPE)
set(FCL_LIBRARY_NAME "igdfcl") set(FCL_LIBRARY_NAME "igdfcl")
set(FCL_LIBRARY_NAME "${FCL_LIBRARY_NAME}" PARENT_SCOPE) set(FCL_LIBRARY_NAME "${FCL_LIBRARY_NAME}" PARENT_SCOPE)

View File

@ -19,6 +19,14 @@
# ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR # ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
# OTHER DEALINGS IN THE SOFTWARE. # OTHER DEALINGS IN THE SOFTWARE.
git tag -l
VER=`git describe --tags --abbrev=0`
IGC_INFO=($(git show ${VER}:../../manifests/manifest.yml | grep -U -A 1 intelgraphicscompiler ))
IGC_REV=${IGC_INFO[3]}
echo "NEO release: ${VER}"
echo "IGC_REV: ${IGC_REV}"
NEO_TOP_DIR=`git rev-parse --show-toplevel` NEO_TOP_DIR=`git rev-parse --show-toplevel`
WRK_DIR=${NEO_TOP_DIR}/.. WRK_DIR=${NEO_TOP_DIR}/..
@ -26,9 +34,6 @@ mkdir -p ${WRK_DIR}/igc/inc
cp CMakeLists.txt ${WRK_DIR}/igc cp CMakeLists.txt ${WRK_DIR}/igc
pushd ${WRK_DIR}/igc pushd ${WRK_DIR}/igc
VER=18.21.10858
IGC_REV=858e183
wget https://github.com/intel/compute-runtime/releases/download/${VER}/intel-opencl_${VER}_amd64.deb wget https://github.com/intel/compute-runtime/releases/download/${VER}/intel-opencl_${VER}_amd64.deb
ar -x intel-opencl_${VER}_amd64.deb ar -x intel-opencl_${VER}_amd64.deb
tar -xJf data.tar.xz tar -xJf data.tar.xz

View File

@ -28,6 +28,6 @@ then
IMAGE=neo-${BUILD_OS}-${COMPILER}-${GEN}:ci IMAGE=neo-${BUILD_OS}-${COMPILER}-${GEN}:ci
fi fi
git clone --depth 1 ../compute-runtime neo && \ git clone ../compute-runtime neo && \
docker build -f scripts/docker/${DOCKERFILE} -t ${IMAGE} . && \ docker build -f scripts/docker/${DOCKERFILE} -t ${IMAGE} . && \
docker images docker images