Skip to content

Commit

Permalink
Rename hipSYCL to AdaptiveCpp, update CI version and filters
Browse files Browse the repository at this point in the history
  • Loading branch information
psalz committed Dec 14, 2024
1 parent 4426c69 commit 83188f5
Show file tree
Hide file tree
Showing 5 changed files with 42 additions and 7 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/cts_ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ jobs:
- sycl-impl: dpcpp
version: 6456fe89646deb8bf30c0eb32827a62ff6e58ffb
- sycl-impl: adaptivecpp
version: 3d8b1cd
version: 061e2d6ffe1084021d99f22ac1f16e28c6dab899
steps:
- name: Checkout
uses: actions/checkout@v3
Expand Down Expand Up @@ -116,7 +116,7 @@ jobs:
- sycl-impl: dpcpp
version: 6456fe89646deb8bf30c0eb32827a62ff6e58ffb
- sycl-impl: adaptivecpp
version: 3d8b1cd
version: 061e2d6ffe1084021d99f22ac1f16e28c6dab899
env:
container-workspace: /__w/${{ github.event.repository.name }}/${{ github.event.repository.name }}
parallel-build-jobs: 2
Expand Down
32 changes: 30 additions & 2 deletions ci/hipsycl.filter → ci/adaptivecpp.filter
Original file line number Diff line number Diff line change
@@ -1,44 +1,72 @@
accessor_basic
accessor_generic
accessor_legacy
accessor_placeholder
address_space
atomic
atomic_fence
atomic_ref
atomic_ref_stress
bit_cast
buffer
context
device
device_event
device_selector
error
event
exception_handling
exceptions
full_feature_set
group
group_functions
h_item
handler
header
hierarchical
host_accessor
host_task
id
image
image_accessor
invoke
is_device_copyable
item
kernel
kernel_args
kernel_bundle
language
local_accessor
marray_arithmetic_assignment
marray_arithmetic_binary
marray_basic
marray_bitwise
marray_pre_post
marray_relational
marray_arithmetic_assignment
marray_arithmetic_binary
math_builtin_api
multi_ptr
namespace
nd_item
nd_range
opencl_interop
optional_kernel_features
platform
pointers
property
queue
range
reduction
sampler
scalars
spec_constants
stream
sub_group
sycl_external
usm
vector_alias
vector_api
vector_constructors
vector_deduction_guides
vector_load_store
vector_operators
vector_swizzle_assignment
Expand Down
2 changes: 1 addition & 1 deletion cmake/AdapthipSYCL.cmake → cmake/AdaptAdaptiveCpp.cmake
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
add_library(SYCL::SYCL INTERFACE IMPORTED GLOBAL)
target_link_libraries(SYCL::SYCL INTERFACE AdaptiveCpp::AdaptiveCpp-rt)
target_link_libraries(SYCL::SYCL INTERFACE AdaptiveCpp::acpp-rt)
# add_sycl_executable_implementation function
# Builds a SYCL program, compiling multiple SYCL test case source files into a
# test executable, invoking a single-source/device compiler
Expand Down
11 changes: 9 additions & 2 deletions docker/hipsycl/Dockerfile → docker/adaptivecpp/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,19 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
apt-get clean && \
rm -rf /var/lib/apt/lists*

RUN git clone https://github.com/illuhad/AdaptiveCpp.git \
--branch=develop --single-branch --shallow-since=2021-08-01 \
RUN git clone https://github.com/AdaptiveCpp/AdaptiveCpp.git \
--branch=develop --single-branch --shallow-since=2024-12-01 \
--recurse-submodules /tmp/AdaptiveCpp && \
cd /tmp/AdaptiveCpp && \
git checkout $IMPL_VERSION && \
cmake /tmp/AdaptiveCpp -G Ninja -B /tmp/build \
-DWITH_SSCP_COMPILER=OFF \
-DWITH_STDPAR_COMPILER=OFF \
-DWITH_ACCELERATED_CPU=OFF \
-DWITH_CUDA_BACKEND=OFF \
-DWITH_ROCM_BACKEND=OFF \
-DWITH_OPENCL_BACKEND=OFF \
-DWITH_CPU_BACKEND=ON \
-DCMAKE_BUILD_TYPE=Release \
-DCMAKE_INSTALL_PREFIX=/sycl && \
cmake --build /tmp/build --target install && \
Expand Down
File renamed without changes.

0 comments on commit 83188f5

Please sign in to comment.