Skip to content

Commit

Permalink
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Update AdaptiveCpp
Browse files Browse the repository at this point in the history
gonzalobg committed Jun 4, 2024

Verified

This commit was signed with the committer’s verified signature.
renovate-bot Mend Renovate
1 parent d5b776c commit d787351
Showing 2 changed files with 18 additions and 20 deletions.
26 changes: 12 additions & 14 deletions src/ci-prepare-bionic.sh
Original file line number Diff line number Diff line change
@@ -289,20 +289,18 @@ setup_dpcpp() {
check_size
}

setup_hipsycl() {
setup_adaptivecpp() {

sudo apt-get install -y -qq libboost-fiber-dev libboost-context-dev
local hipsycl_ver="0.9.1"
local tarball="v$hipsycl_ver.tar.gz"
local install_dir="$PWD/hipsycl_dist_$hipsycl_ver"

local url="https://github.com/AdaptiveCpp/AdaptiveCpp/archive/v$hipsycl_ver.tar.gz"
# local url="http://localhost:8000/AdaptiveCpp-$hipsycl_ver.tar.gz"
local adaptivecpp_ver="24.02.0"
local tarball="adaptivecpp_v$adaptivecpp.tar.gz"
local install_dir="$PWD/adaptivecpp_dist_v$adaptivecpp"
local url="https://github.com/AdaptiveCpp/AdaptiveCpp/archive/refs/tags/v$adaptivecpp.tar.gz"

get_and_untar "$tarball" "$url"

if [ "$SETUP" = true ]; then
local src="$PWD/AdaptiveCpp-$hipsycl_ver"
local src="$PWD/AdaptiveCpp-v$adaptivecpp"
rm -rf "$src/build"
rm -rf "$install_dir"
cmake "-B$src/build" "-H$src" \
@@ -315,10 +313,10 @@ setup_hipsycl() {
cmake --build "$src/build" --target install -j "$(nproc)"
fi

export_var HIPSYCL_DIR "$install_dir"
verify_dir_exists "$HIPSYCL_DIR"
# note: this will forward --version to the default compiler so it won't say anything about hipsycl
"$HIPSYCL_DIR/bin/syclcc-clang" --version
export_var AdaptiveCpp_DIR "$install_dir"
verify_dir_exists "$AdaptiveCpp_DIR"
# note: this will forward --version to the default compiler so it won't say anything about adaptivecpp
"$AdaptiveCpp_DIR/bin/syclcc-clang" --version
check_size
}

@@ -391,7 +389,7 @@ setup_cmake() {
}

if [ "$PARALLEL" = true ]; then
(setup_clang_gcc && setup_rocm && setup_hipsycl) & # these need apt so run sequentially
(setup_clang_gcc && setup_rocm && setup_adaptivecpp) & # these need apt so run sequentially
setup_cmake &
setup_oclcpu &
setup_aocc &
@@ -406,7 +404,7 @@ else
# these need apt
setup_clang_gcc
setup_rocm
setup_hipsycl
setup_adaptivecpp
setup_cmake
setup_aocc
setup_oclcpu
12 changes: 6 additions & 6 deletions src/ci-test-compile.sh
Original file line number Diff line number Diff line change
@@ -335,10 +335,10 @@ build_dpcpp() {
# run_build intel_build "dpcpp" sycl "-DCMAKE_CXX_COMPILER=${GCC_CXX:?} -DSYCL_COMPILER=ONEAPI-DPCPP"
}

build_hipsycl() {
run_build hipsycl_build "syclcc" sycl "
-DSYCL_COMPILER=HIPSYCL \
-DSYCL_COMPILER_DIR=${HIPSYCL_DIR:?}"
build_adaptivecpp() {
run_build adaptivecpp_build "syclcc" sycl "
-DSYCL_COMPILER=AdaptiveCpp \
-DSYCL_COMPILER_DIR=${AdaptiveCpp_DIR:?}"
}

echo "Test compiling with ${COMPILER} CXX for ${MODEL} model"
@@ -352,7 +352,7 @@ aocc) build_aocc ;;
aomp) build_aomp ;;
hip) build_hip ;;
dpcpp) build_dpcpp ;;
hipsycl) build_hipsycl ;;
adaptivecpp) build_adaptivecpp ;;

# XXX below are local only; licence or very large download required, candidate for local runner
icpx) build_icpx ;;
@@ -366,7 +366,7 @@ all)
build_aomp
build_hip
build_dpcpp
build_hipsycl
build_adaptivecpp

build_icpx
build_icpc

0 comments on commit d787351

Please sign in to comment.