Skip to content

Commit

Permalink
kokoro: Linux builds use Python 3.12 (#1378)
Browse files Browse the repository at this point in the history
Issue: #1377
dneto0 authored Jul 2, 2024
1 parent 7eb5050 commit 094566e
Showing 4 changed files with 15 additions and 11 deletions.
3 changes: 2 additions & 1 deletion kokoro/check-format/build-docker.sh
Original file line number Diff line number Diff line change
@@ -29,11 +29,12 @@ SRC=$PWD/github/clspv
# Marking the root of the repo as safe for ownership changes.
git config --global --add safe.directory $SRC

using python-3.12
using clang-8.0.0
which clang-format

cd $SRC
/usr/bin/python3 utils/fetch_sources.py
python3 utils/fetch_sources.py
cp third_party/llvm/clang/tools/clang-format/clang-format-diff.py utils/clang-format-diff.py

echo $(date): Check formatting...
9 changes: 5 additions & 4 deletions kokoro/scripts/linux/build-amber.sh
Original file line number Diff line number Diff line change
@@ -25,18 +25,19 @@ set -x
using cmake-3.26.3
using gcc-10
using ninja-1.10.0
using python-3.12

BUILD_ROOT=$PWD
SRC=$PWD/github/clspv
AMBER_SRC=$PWD/github/amber

cd $SRC
/usr/bin/python3 utils/fetch_sources.py
python3 utils/fetch_sources.py

cd $BUILD_ROOT/github
git clone https://github.com/google/amber.git amber
cd $BUILD_ROOT/github/amber
/usr/bin/python3 tools/git-sync-deps --with-swiftshader
python3 tools/git-sync-deps --with-swiftshader

mkdir build && cd $BUILD_ROOT/github/amber/build

@@ -47,7 +48,7 @@ fi
# Invoke the build.
BUILD_SHA=${KOKORO_GITHUB_COMMIT:-$KOKORO_GITHUB_PULL_REQUEST_COMMIT}
echo $(date): Starting build...
cmake -DPYTHON_EXECUTABLE:FILEPATH=/usr/bin/python3 -GNinja -DCMAKE_BUILD_TYPE=$BUILD_TYPE \
cmake -GNinja -DCMAKE_BUILD_TYPE=$BUILD_TYPE \
-DAMBER_ENABLE_SWIFTSHADER=TRUE -DAMBER_USE_CLSPV=TRUE \
-DBUILD_WSI_XCB_SUPPORT=OFF \
-DAMBER_CLSPV_DIR=$SRC -DAMBER_CLSPV_LLVM_DIR=$SRC/third_party/llvm \
@@ -58,7 +59,7 @@ ninja
echo $(date): Build completed.

echo $(date): Starting amber tests...
/usr/bin/python3 $SRC/amber/run_tests.py \
python3 $SRC/amber/run_tests.py \
--amber $BUILD_ROOT/github/amber/build/amber \
--dir $SRC/amber \
--swiftshader \
9 changes: 5 additions & 4 deletions kokoro/scripts/linux/build-clvk.sh
Original file line number Diff line number Diff line change
@@ -25,6 +25,7 @@ set -x
using cmake-3.26.3
using gcc-10
using ninja-1.10.0
using python-3.12

BUILD_ROOT=$PWD
SRC=$PWD/github/clspv
@@ -35,7 +36,7 @@ fi

# Get Clspv dependencies.
cd $SRC
/usr/bin/python3 utils/fetch_sources.py
python3 utils/fetch_sources.py

VULKAN_VERSION=v1.3.243

@@ -59,7 +60,7 @@ VULKAN_LOADER_BUILD="${VULKAN_LOADER_SRC}/build"
git clone https://github.com/KhronosGroup/Vulkan-Loader "${VULKAN_LOADER_SRC}"
git -C "${VULKAN_LOADER_SRC}" checkout tags/${VULKAN_VERSION}
mkdir "${VULKAN_LOADER_BUILD}"
cmake -DPYTHON_EXECUTABLE:FILEPATH=/usr/bin/python3 -GNinja -DCMAKE_BUILD_TYPE=${BUILD_TYPE} \
cmake -GNinja -DCMAKE_BUILD_TYPE=${BUILD_TYPE} \
-DVULKAN_HEADERS_INSTALL_DIR="${VULKAN_HEADERS_INSTALL}" -DBUILD_WSI_WAYLAND_SUPPORT=OFF -DBUILD_WSI_XLIB_SUPPORT=OFF \
-DBUILD_WSI_XCB_SUPPORT=OFF -S "${VULKAN_LOADER_SRC}" -B "${VULKAN_LOADER_BUILD}"
cmake --build "${VULKAN_LOADER_BUILD}"
@@ -71,7 +72,7 @@ SWIFTSHADER_SRC="$BUILD_ROOT/github/swiftshader"
SWIFTSHADER_BUILD="$SWIFTSHADER_SRC/kokoro-build"
git clone https://swiftshader.googlesource.com/SwiftShader.git "$SWIFTSHADER_SRC"
mkdir "$SWIFTSHADER_BUILD" && cd "$SWIFTSHADER_BUILD"
cmake -DPYTHON_EXECUTABLE:FILEPATH=/usr/bin/python3 -GNinja -DCMAKE_BUILD_TYPE=$BUILD_TYPE \
cmake -GNinja -DCMAKE_BUILD_TYPE=$BUILD_TYPE \
-DSWIFTSHADER_WARNINGS_AS_ERRORS=OFF -DSWIFTSHADER_BUILD_VULKAN=ON -DSWIFTSHADER_BUILD_EGL=OFF -DSWIFTSHADER_BUILD_GLESv2=OFF \
-DSWIFTSHADER_BUILD_GLES_CM=OFF -DSWIFTSHADER_BUILD_SAMPLES=OFF -DSWIFTSHADER_BUILD_TESTS=OFF -DSWIFTSHADER_BUILD_PVR=OFF \
"$SWIFTSHADER_SRC"
@@ -85,7 +86,7 @@ CLVK_BUILD="$CLVK_SRC/build"
git clone https://github.com/kpet/clvk "$CLVK_SRC"
cd "$CLVK_SRC" && git submodule update --init
mkdir "$CLVK_BUILD" && cd "$CLVK_BUILD"
cmake -DPYTHON_EXECUTABLE:FILEPATH=/usr/bin/python3 -GNinja -DCMAKE_BUILD_TYPE=$BUILD_TYPE \
cmake -GNinja -DCMAKE_BUILD_TYPE=$BUILD_TYPE \
-DCLVK_CLSPV_ONLINE_COMPILER=ON -DCLSPV_SOURCE_DIR="$SRC" \
-DCLVK_ENABLE_ASSERTIONS=ON \
-DCLVK_VULKAN_IMPLEMENTATION=custom -DVulkan_INCLUDE_DIRS=${VULKAN_HEADERS_SRC}/include -DVulkan_LIBRARIES="$VULKAN_LOADER_BUILD/loader/libvulkan.so" \
5 changes: 3 additions & 2 deletions kokoro/scripts/linux/build.sh
Original file line number Diff line number Diff line change
@@ -25,12 +25,13 @@ set -x
using cmake-3.26.3
using gcc-13
using ninja-1.10.0
using python-3.12

BUILD_ROOT=$PWD
SRC=$PWD/github/clspv

cd $SRC
/usr/bin/python3 utils/fetch_sources.py
python3 utils/fetch_sources.py

mkdir build && cd $SRC/build

@@ -39,7 +40,7 @@ if [ "$BUILD_TOOLCHAIN" == "clang" ]; then
fi

echo $(date): Starting build...
cmake -DPYTHON_EXECUTABLE:FILEPATH=/usr/bin/python3 -GNinja -DCMAKE_BUILD_TYPE=$BUILD_TYPE ..
cmake -GNinja -DCMAKE_BUILD_TYPE=$BUILD_TYPE ..

echo $(date): Build everything...
ninja

0 comments on commit 094566e

Please sign in to comment.