Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 18 additions & 0 deletions .github/docker/rhel.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,21 @@
ARG VMAJ
ARG VMIN
FROM ghcr.io/oneapi-src/level-zero-linux-compute/rhel:${VMAJ}.${VMIN}

RUN <<EOF
git clone --recurse-submodules --branch boost-1.76.0 https://github.com/boostorg/boost.git
cd boost
./bootstrap.sh
./b2 install \
-j 4 \
address-model=64 \
--with-chrono \
--with-log \
--with-program_options \
--with-serialization \
--with-system \
--with-timer \
--with-date_time
cd ..
rm -rf boost
EOF
25 changes: 23 additions & 2 deletions .github/docker/sles.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,29 @@ FROM ghcr.io/oneapi-src/level-zero-linux-compute/sles:${VMAJ}.${VMIN}

SHELL ["/bin/bash", "-e", "-c"]

ARG VMAJ
ARG VMIN

RUN <<EOF
if [ "$VMIN" = "4" ]; then
update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-11 120 \
--slave /usr/bin/g++ g++ /usr/bin/g++-11
update-alternatives --install /usr/bin/c++ c++ /usr/bin/g++-11 120
update-alternatives --install /usr/bin/cc cc /usr/bin/gcc-11 120
elif [ "$VMIN" = "6" ]; then
update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-13 120 \
--slave /usr/bin/g++ g++ /usr/bin/g++-13
update-alternatives --install /usr/bin/c++ c++ /usr/bin/g++-13 120
update-alternatives --install /usr/bin/cc cc /usr/bin/gcc-13 120
fi
update-alternatives --config gcc
update-alternatives --config c++
update-alternatives --config cc
EOF

# Static libraries for boost are not part of the SLES distribution
RUN <<EOF
git clone --recurse-submodules --branch boost-1.70.0 https://github.com/boostorg/boost.git
git clone --recurse-submodules --branch boost-1.76.0 https://github.com/boostorg/boost.git
cd boost
./bootstrap.sh
./b2 install \
Expand All @@ -19,7 +39,8 @@ cd boost
--with-program_options \
--with-serialization \
--with-system \
--with-date_time \
--with-timer
cd ..
rm -rf boost
EOF
EOF
49 changes: 20 additions & 29 deletions .github/docker/ubuntu.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,32 +4,23 @@ ARG VMAJ
ARG VMIN
FROM ghcr.io/oneapi-src/level-zero-linux-compute/ubuntu:${VMAJ}.${VMIN}

ARG VMAJ
ARG VMIN

SHELL ["/bin/bash", "-e", "-c"]

ENV DEBIAN_FRONTEND=noninteractive
# /etc/apt/apt.conf.d/docker-clean doesn't work on older versions of docker for U2204 containers
RUN --mount=type=cache,target=/var/cache/apt <<EOF
rm /etc/apt/apt.conf.d/docker-clean
apt-get update
apt-get install -o Dpkg::Options::="--force-overwrite" -y \
build-essential \
ccache \
clang-tidy \
cmake \
curl \
file \
git \
ninja-build \
libboost-all-dev \
libpapi-dev \
libpng-dev \
libva-dev \
ocl-icd-opencl-dev \
opencl-headers \
python3 \
python3-pip
rm -rf /var/lib/apt/lists/*
EOF
ENV BOOST_BUILD_PATH=/boost_1_76_0
ADD https://archives.boost.io/release/1.76.0/source/boost_1_76_0.tar.gz /boost_1_76_0.tar.gz
RUN <<EOF
tar xf /boost_1_76_0.tar.gz
rm /boost_1_76_0.tar.gz
cd /boost_1_76_0
./bootstrap.sh
./b2 install \
-j $(nproc) \
link=static \
address-model=64 \
--with-chrono \
--with-log \
--with-program_options \
--with-regex \
--with-serialization \
--with-system \
--with-timer
rm -rf /boost_1_76_0
EOF
9 changes: 5 additions & 4 deletions .github/docker/windows.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -90,16 +90,17 @@ cd ../.. && `
rm -rf OpenCL-ICD-Loader-2024.10.24"

RUN "`
curl -OSL --ssl-no-revoke https://archives.boost.io/release/1.73.0/source/boost_1_73_0.7z && `
7z.exe x boost_1_73_0.7z && `
cd boost_1_73_0 && `
curl -OSL --ssl-no-revoke https://archives.boost.io/release/1.76.0/source/boost_1_76_0.7z && `
7z.exe x boost_1_76_0.7z && `
cd boost_1_76_0 && `
MSYS_NO_PATHCONV=1 cmd /c bootstrap.bat && `
./b2.exe install -j 16 address-model=64 `
--with-chrono `
--with-log `
--with-program_options `
--with-serialization `
--with-system `
--with-date_time `
--with-timer && `
cd .. && `
rm -rf boost_1_73_0"
rm -rf boost_1_76_0"
5 changes: 2 additions & 3 deletions .github/workflows/build-multi.yml
Original file line number Diff line number Diff line change
Expand Up @@ -137,10 +137,9 @@ jobs:
{name: ubuntu, vmaj: 22, vmin: '04'},
{name: ubuntu, vmaj: 24, vmin: '04'},
{name: ubuntu, vmaj: 24, vmin: '10'},
{name: sles, vmaj: 15, vmin: 2},
{name: sles, vmaj: 15, vmin: 3},
{name: sles, vmaj: 15, vmin: 4},
{name: rhel, vmaj: 8, vmin: 6},
{name: sles, vmaj: 15, vmin: 6},
{name: rhel, vmaj: 8, vmin: 10},
{name: windows}
]
arch: ['']
Expand Down
7 changes: 4 additions & 3 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@ if(POLICY CMP0074)
cmake_policy(SET CMP0074 NEW)
endif()
project(level-zero-tests)
set(CMAKE_CXX_STANDARD 17)
set(CMAKE_CXX_STANDARD 20)
set(CMAKE_CXX_STANDARD_REQUIRED ON)

list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")

Expand Down Expand Up @@ -50,9 +51,9 @@ set(_Boost_LOG_SETUP_DEPENDENCIES log)
set(_Boost_LOG_DEPENDENCIES "")
if(BUILD_ZE_PERF_TESTS_ONLY)
# do not require boost when building perf tests only, will skip tests that use boost
find_package(Boost 1.65 COMPONENTS log program_options timer chrono system serialization)
find_package(Boost 1.76 COMPONENTS log program_options timer chrono system serialization)
else()
find_package(Boost 1.65 REQUIRED COMPONENTS log program_options timer chrono system serialization)
find_package(Boost 1.76 REQUIRED COMPONENTS log program_options timer chrono system serialization)
endif()
message(STATUS "Boost_FOUND: ${Boost_FOUND}")

Expand Down
Loading