run dr shp-tests (#1591)

Author: haichangsi

.github/Dockerfile

@@ -0,0 +1,14 @@
+FROM intel/oneapi:latest
+RUN apt update --allow-insecure-repositories
+RUN add-apt-repository ppa:ubuntu-toolchain-r/test
+RUN apt install -y g++-13
+RUN apt install -y libgtest-dev
+RUN apt install -y libcxxopts-dev
+
+RUN apt remove --purge --auto-remove -y cmake
+RUN wget https://cmake.org/files/v3.29/cmake-3.29.2.tar.gz
+RUN tar -xzvf cmake-3.29.2.tar.gz && cd cmake-3.29.2 && ./bootstrap && make -j12 && make install
+
+RUN apt install -y libfmt-dev
+
+CMD /bin/bash

.github/workflows/ci.yml

@@ -8,6 +8,7 @@ on:
       - release_oneDPL
       - main
       - 'release/**'
+      - distributed-ranges
 
 permissions: read-all
 
@@ -220,6 +221,27 @@ jobs:
           make VERBOSE=1 -j${BUILD_CONCURRENCY} ${make_targets}
           ctest --timeout ${TEST_TIMEOUT} --output-on-failure ${ctest_flags}
 
+  dr-testing:
+    name: Run DR shp-tests
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - name: Build docker image
+        run: docker build . -t dr-test -f .github/Dockerfile
+      - name: Run tests
+        run: |
+          docker run --name dr-test -d -v $(pwd):/repo dr-test sh -c "
+            cd repo &&
+            mkdir build &&
+            cd build &&
+            cmake -DCMAKE_CXX_STANDARD=23 -DCMAKE_CXX_COMPILER=icpx -DONEDPL_BACKEND=dpcpp -DCMAKE_BUILD_TYPE=Release .. &&
+            cmake --build . --target shp-all-tests -j${nproc} &&
+            ctest --test-dir . -L SHP -j 4"
+          docker logs -f dr-test
+          exit_code=$(docker inspect dr-test --format='{{.State.ExitCode}}')
+          docker rm -f dr-test
+          exit $exit_code
+
   linux-pstl-offload-testing:
     name: PSTL offload ${{ matrix.device_type }},bknd=dpcpp,cmplr=${{ matrix.cxx_compiler }},${{ matrix.os }},std=с++${{ matrix.std }},cfg=${{ matrix.build_type }}
     runs-on: ['${{ matrix.os }}']

include/oneapi/dpl/internal/distributed_ranges_impl/shp/remove_vector.hpp renamed to include/oneapi/dpl/internal/distributed_ranges_impl/shp/remote_vector.hpp

@@ -69,11 +69,7 @@ endif()
 add_custom_target(build-onedpl-tests
     COMMENT "Build all oneDPL tests")
 
-if (ONEDPL_USE_DR)
-    set(run-onedpl-tests-depends build-onedpl-tests shp-tests shp-tests-3)
-else()
-    set(run-onedpl-tests-depends build-onedpl-tests)
-endif()
+set(run-onedpl-tests-depends build-onedpl-tests)
 
 add_custom_target(run-onedpl-tests
     COMMAND "${CMAKE_CTEST_COMMAND}" --output-on-failure
@@ -253,11 +249,6 @@ foreach (_file IN LISTS UNIT_TESTS)
 
 endforeach()
 
-if (ONEDPL_USE_DR)
-    add_custom_target(build-dr-tests COMMENT "Build dr tests" DEPENDS shp-tests shp-tests-3)
-    add_custom_target(run-dr-tests COMMENT "Run dr tests" DEPENDS build-dr-tests COMMAND ./distributed-ranges/shp/shp-tests ./distributed-ranges/shp/shp-tests-3)
-endif()
-
 # add additional TUs if required
 if (TARGET interop_allocs.pass)
     target_sources(interop_allocs.pass PRIVATE "${CMAKE_CURRENT_LIST_DIR}/pstl_offload/memory/interop_allocs_system.cpp"

test/CMakeLists.txt

@@ -105,13 +105,13 @@ TYPED_TEST(DistributedVectorTest, Resize) {
   EXPECT_EQ(dv, v);
 }
 
-template <typename AllocT> class DeviceVectorTest : public testing::Test {
+template <typename AllocT> class RemoteVectorTest : public testing::Test {
 public:
-  using DeviceVec = dr::shp::device_vector<typename AllocT::value_type, AllocT>;
+  using RemoteVec = dr::shp::remote_vector<typename AllocT::value_type, AllocT>;
 };
 
-TYPED_TEST_SUITE(DeviceVectorTest, AllocatorTypes);
+TYPED_TEST_SUITE(RemoteVectorTest, AllocatorTypes);
 
-TYPED_TEST(DeviceVectorTest, is_remote_contiguous_range) {
-  static_assert(dr::remote_contiguous_range<typename TestFixture::DeviceVec>);
+TYPED_TEST(RemoteVectorTest, is_remote_contiguous_range) {
+  static_assert(dr::remote_contiguous_range<typename TestFixture::RemoteVec>);
 }