rename: 'mhp' -> 'mp' and 'shp' -> 'sp' (#804)

* rename - 'mhp' to 'mp'

* rename - 'shp' to 'sp'

Author: haichangsi

.github/workflows/onedpl.yml

@@ -30,19 +30,19 @@ jobs:
       run: |
         . /opt/intel/oneapi/setvars.sh
         cmake -B dr/build -DCMAKE_CXX_STANDARD=23 -DCMAKE_CXX_COMPILER=icpx -DONEDPL_BACKEND=dpcpp -DCMAKE_BUILD_TYPE=Release dr
-    - name: Build SHP tests
+    - name: Build SP tests
       run: |
         . /opt/intel/oneapi/setvars.sh
-        cmake --build dr/build --target shp-all-tests -- -j
-    - name: Run SHP tests
+        cmake --build dr/build --target sp-all-tests -- -j
+    - name: Run SP tests
       run: |
         . /opt/intel/oneapi/setvars.sh
-        ctest --test-dir dr/build -L SHP -j 4
+        ctest --test-dir dr/build -L SP -j 4
     # srun -p cluster dr/scripts/run_command_on_compute_node.sh dr/build/Testing/tests.outerr.txt ctest --test-dir dr/build -L TESTLABEL -j 4
     - uses: actions/upload-artifact@0b2256b8c012f0828dc542b3febcab082c67f72b # v4.3.4
       if: always()
       with:
         name: log-pvc-impi-icpx
         path: |
           dr/build/CMakeCache.txt
-          dr/build/test/distributed-ranges/shp/*.log
+          dr/build/test/distributed-ranges/sp/*.log

.github/workflows/pr.yml

@@ -61,9 +61,9 @@ jobs:
 #        name: log-gcc-${{ env.CXX }}
 #        path: |
 #          build/Testing
-#          build/test/gtest/mhp/*.log
-#          build/benchmarks/gbench/mhp/*.log
-#          build/examples/mhp/*.log
+#          build/test/gtest/mp/*.log
+#          build/benchmarks/gbench/mp/*.log
+#          build/examples/mp/*.log
 
   pvc_unit_tests:
     runs-on: gkpvc
@@ -102,12 +102,12 @@ jobs:
             build/CMakeCache.txt
             build/envdump.txt
             build/Testing
-            build/test/gtest/mhp/*.log
-            build/benchmarks/gbench/mhp/*.log
-            build/examples/mhp/*.log
-            build/test/gtest/shp/*.log
-            build/benchmarks/gbench/shp/*.log
-            build/examples/shp/*.log
+            build/test/gtest/mp/*.log
+            build/benchmarks/gbench/mp/*.log
+            build/examples/mp/*.log
+            build/test/gtest/sp/*.log
+            build/benchmarks/gbench/sp/*.log
+            build/examples/sp/*.log
 
 # disabled due to DRA-164
 #  ishmem_unit_tests:
@@ -130,20 +130,20 @@ jobs:
 #        run: cmake -B build -DCMAKE_BUILD_TYPE=${{ matrix.config }} -DENABLE_ISHMEM=on -DENABLE_L0=on -DENABLE_OFI=on -DOFI_PROVIDER=psm3 -DONETILE_PVC=on
 #      - name: Build ISHMEM
 #        run: cmake --build build --target shmem -- -j
-#      - name: Build MHP tests
-#        run: cmake --build build --target mhp-tests mhp-tests-3 -- -j
-#      - name: MHP unit tests
-#        # run: srun -p cluster scripts/run_command_on_compute_node.sh build/Testing/mhptests.outerr.txt ctest --test-dir build -R ^mhp-tests-sycl -L MHP -j 4
-#        run: ctest --test-dir build -R ^mhp-tests-sycl -L MHP -j 4
+#      - name: Build MP tests
+#        run: cmake --build build --target mp-tests mp-tests-3 -- -j
+#      - name: MP unit tests
+#        # run: srun -p cluster scripts/run_command_on_compute_node.sh build/Testing/mptests.outerr.txt ctest --test-dir build -R ^mp-tests-sycl -L MP -j 4
+#        run: ctest --test-dir build -R ^mp-tests-sycl -L MP -j 4
 #      - uses: actions/upload-artifact@0b2256b8c012f0828dc542b3febcab082c67f72b # v4.3.4
 #        if: always()
 #        with:
 #          name: log-ishmem-impi-icpx-${{ matrix.config }}
 #          path: |
 #            build/Testing
-#            build/test/gtest/mhp/*.log
-#            build/benchmarks/gbench/mhp/*.log
-#            build/examples/mhp/*.log
+#            build/test/gtest/mp/*.log
+#            build/benchmarks/gbench/mp/*.log
+#            build/examples/mp/*.log
 
   package:
     needs: []

.pre-commit-config.yaml

@@ -75,7 +75,7 @@ repos:
     always_run: true
   - id: dr-style-include
     name: dr-style-include
-    entry: python3 scripts/dr-style.py --Werror --include include/dr/mhp
+    entry: python3 scripts/dr-style.py --Werror --include include/dr/mp
     language: system
     pass_filenames: false
     always_run: true

CMakeLists.txt

@@ -148,11 +148,11 @@ FetchContent_Declare(
   GIT_TAG mdspan-0.6.0)
 FetchContent_MakeAvailable(mdspan)
 
-add_custom_target(mhp-all-tests)
-add_custom_target(shp-all-tests)
-add_custom_target(all-tests DEPENDS mhp-all-tests shp-all-tests)
+add_custom_target(mp-all-tests)
+add_custom_target(sp-all-tests)
+add_custom_target(all-tests DEPENDS mp-all-tests sp-all-tests)
 
-function(add_mhp_ctest_impl)
+function(add_mp_ctest_impl)
   set(options OFFLOAD GDB SYCL DRLOGS TESTLABEL)
   set(oneValueArgs NAME TEST_NAME NPROC TIMEOUT)
   set(multiValueArgs TARGS) # Test ARGumentS
@@ -234,25 +234,25 @@ function(add_mhp_ctest_impl)
   endif()
 
   if(AMC_TESTLABEL)
-    set_property(TEST ${AMC_TEST_NAME} PROPERTY LABELS TESTLABEL MHP)
+    set_property(TEST ${AMC_TEST_NAME} PROPERTY LABELS TESTLABEL MP)
   endif()
-  add_dependencies(mhp-all-tests ${AMC_NAME})
+  add_dependencies(mp-all-tests ${AMC_NAME})
 endfunction()
 
-function(add_mhp_auxiliary_ctests)
-  add_mhp_ctest_impl(${ARGN} GDB)
-  add_mhp_ctest_impl(${ARGN} GDB DRLOGS)
-  add_mhp_ctest_impl(${ARGN} DRLOGS)
+function(add_mp_auxiliary_ctests)
+  add_mp_ctest_impl(${ARGN} GDB)
+  add_mp_ctest_impl(${ARGN} GDB DRLOGS)
+  add_mp_ctest_impl(${ARGN} DRLOGS)
 endfunction()
 
-function(add_mhp_ctest)
-  add_mhp_ctest_impl(${ARGN} TESTLABEL)
-  add_mhp_auxiliary_ctests(${ARGN})
+function(add_mp_ctest)
+  add_mp_ctest_impl(${ARGN} TESTLABEL)
+  add_mp_auxiliary_ctests(${ARGN})
 endfunction()
 
-function(add_mhp_disabled_ctest)
-  add_mhp_ctest_impl(${ARGN})
-  add_mhp_auxiliary_ctests(${ARGN})
+function(add_mp_disabled_ctest)
+  add_mp_ctest_impl(${ARGN})
+  add_mp_auxiliary_ctests(${ARGN})
 endfunction()
 
 if(ENABLE_ISHMEM)
@@ -363,14 +363,14 @@ if(ENABLE_ISHMEM)
 
 endif()
 
-function(add_shp_disabled_ctest test_name name)
+function(add_sp_disabled_ctest test_name name)
   add_test(NAME ${test_name} COMMAND ./${name} ${ARGN})
-  add_dependencies(shp-all-tests ${name})
+  add_dependencies(sp-all-tests ${name})
 endfunction()
 
-function(add_shp_ctest test_name name)
-  add_shp_disabled_ctest(${test_name} ${name} ${ARGN})
-  set_property(TEST ${test_name} PROPERTY LABELS TESTLABEL SHP)
+function(add_sp_ctest test_name name)
+  add_sp_disabled_ctest(${test_name} ${name} ${ARGN})
+  set_property(TEST ${test_name} PROPERTY LABELS TESTLABEL SP)
 endfunction()
 
 install(DIRECTORY include DESTINATION ${CMAKE_INSTALL_PREFIX})
@@ -411,20 +411,20 @@ if(CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME)
     endif()
   endif()
 
-  add_subdirectory(test/gtest/mhp)
+  add_subdirectory(test/gtest/mp)
 
   if(ENABLE_SYCL)
     # disables rng::detail::box_compress::coalesce which causes rng::box to use
     # global non-const variable, which can not be used in SYCL kernels
     add_compile_definitions(RANGES_WORKAROUND_MSVC_249830)
 
-    add_subdirectory(examples/shp)
-    add_subdirectory(test/gtest/shp)
+    add_subdirectory(examples/sp)
+    add_subdirectory(test/gtest/sp)
   endif()
 
   add_subdirectory(examples/serial)
   add_subdirectory(test/gtest/serial)
-  add_subdirectory(examples/mhp)
+  add_subdirectory(examples/mp)
   add_subdirectory(benchmarks/gbench)
 
   # Requires clang, icpx/llvm nightly do not support the tools

benchmarks/gbench/CMakeLists.txt

@@ -24,11 +24,11 @@ if(CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME)
     add_compile_options(-Wno-error=cuda-compat)
   endif()
 
-  # mhp is not under ENABLE_SYCL to check benchmarks also compilation in gcc
-  add_subdirectory(mhp)
+  # mp is not under ENABLE_SYCL to check benchmarks also compilation in gcc
+  add_subdirectory(mp)
 
   if(ENABLE_SYCL)
-    add_subdirectory(shp)
-    add_custom_target(xhp-bench DEPENDS mhp-bench shp-bench)
+    add_subdirectory(sp)
+    add_custom_target(xhp-bench DEPENDS mp-bench sp-bench)
   endif()
 endif()

benchmarks/gbench/README.rst

@@ -10,42 +10,42 @@ We use google bench for micro-benchmarks.
 
 Show standard google bench options::
 
-  ./mhp-bench --help
+  ./mp-bench --help
 
 Show custom options::
 
-  ./mhp-bench --drhelp
+  ./mp-bench --drhelp
 
 See `user guide`_ for more information on google benchmark.
 
-MHP Sample Commands
+MP Sample Commands
 ===================
 
 Run all benchmarks with 2 ranks. Each rank uses a single thread::
 
-  mpirun -n 2 ./mhp-bench --benchmark_counters_tabular=true
+  mpirun -n 2 ./mp-bench --benchmark_counters_tabular=true
 
 Run all benchmarks with 2 ranks. Each rank uses a single SYCL device::
 
-  mpirun -n 2 ./mhp-bench --benchmark_counters_tabular=true --sycl
+  mpirun -n 2 ./mp-bench --benchmark_counters_tabular=true --sycl
 
 Run 2D stencil algorithms::
 
-  mpirun -n 2 ./mhp-bench --benchmark_counters_tabular=true --benchmark_filter=Stencil2D
+  mpirun -n 2 ./mp-bench --benchmark_counters_tabular=true --benchmark_filter=Stencil2D
 
 Run distributed ranges algorithms::
 
-  mpirun -n 2 ./mhp-bench --benchmark_counters_tabular=true --benchmark_filter=.*DR
+  mpirun -n 2 ./mp-bench --benchmark_counters_tabular=true --benchmark_filter=.*DR
 
 
-SHP Sample Commands
+SP Sample Commands
 ===================
 
-By default, SHP uses all available devices. When running on a 2 socket
-CPU system, SHP partitions the root device into 2 devices. Use ``-d``
+By default, SP uses all available devices. When running on a 2 socket
+CPU system, SP partitions the root device into 2 devices. Use ``-d``
 to explicitly control the number of devices::
 
-  ./shp-bench --benchmark_time_unit=ms --benchmark_counters_tabular=true -d 2
+  ./sp-bench --benchmark_time_unit=ms --benchmark_counters_tabular=true -d 2
 
 Benchmark Variants
 ==================

benchmarks/gbench/common/distributed_vector.cpp

@@ -180,7 +180,7 @@ template <class... BackendT>
 DR_BENCHMARK(Reduce_DR);
 
 #ifdef DRISHMEM
-DR_BENCHMARK(Reduce_DR<dr::mhp::IshmemBackend>)->Name("Reduce_DR_ishmem");
+DR_BENCHMARK(Reduce_DR<dr::mp::IshmemBackend>)->Name("Reduce_DR_ishmem");
 #endif
 
 static void Reduce_max_DR(benchmark::State &state) {
@@ -268,7 +268,7 @@ static void TransformIdentity_Serial(benchmark::State &state) {
 
 DR_BENCHMARK(TransformIdentity_Serial);
 
-#ifndef BENCH_SHP
+#ifndef BENCH_SP
 // segfault
 
 static void Mul_DR(benchmark::State &state) {

benchmarks/gbench/common/dr_bench.hpp

@@ -54,15 +54,15 @@ inline auto device_info(sycl::device device) {
 
 extern bool check_results;
 
-#ifdef BENCH_MHP
+#ifdef BENCH_MP
 #ifdef SYCL_LANGUAGE_VERSION
 
-inline sycl::context *mhp_global_context_ = nullptr;
+inline sycl::context *mp_global_context_ = nullptr;
 inline std::vector<sycl::device> devices;
 
 inline sycl::queue get_queue() {
-  if (mhp_global_context_ != nullptr) {
-    return sycl::queue(*mhp_global_context_, devices[0]);
+  if (mp_global_context_ != nullptr) {
+    return sycl::queue(*mp_global_context_, devices[0]);
   }
 
   auto root_devices = sycl::platform().get_devices();
@@ -90,29 +90,29 @@ inline sycl::queue get_queue() {
 
   assert(rng::size(devices) > 0);
 
-  mhp_global_context_ = new sycl::context(devices);
-  return sycl::queue(*mhp_global_context_, devices[0]);
+  mp_global_context_ = new sycl::context(devices);
+  return sycl::queue(*mp_global_context_, devices[0]);
 }
 
 #endif
 
-#include "dr/mhp.hpp"
+#include "dr/mp.hpp"
 
-namespace xhp = dr::mhp;
+namespace xhp = dr::mp;
 
 extern std::size_t stencil_steps;
 extern std::size_t num_rows;
 extern std::size_t num_columns;
 
 #endif
 
-#ifdef BENCH_SHP
+#ifdef BENCH_SP
 
-#include "dr/shp.hpp"
+#include "dr/sp.hpp"
 
-namespace xhp = dr::shp;
+namespace xhp = dr::sp;
 
-inline sycl::queue &get_queue() { return dr::shp::__detail::default_queue(); }
+inline sycl::queue &get_queue() { return dr::sp::__detail::default_queue(); }
 
 #endif
 

benchmarks/gbench/common/sort.cpp

@@ -34,7 +34,7 @@ class DRSortFixture : public benchmark::Fixture {
     delete vec;
 
     if (!rng::is_sorted(local_vec)) {
-      state.SkipWithError("mhp sort did not sort the vector");
+      state.SkipWithError("mp sort did not sort the vector");
     }
   }
 };
@@ -64,8 +64,8 @@ class SyclSortFixture : public benchmark::Fixture {
 public:
   void SetUp(::benchmark::State &) {
     dr::drlog.debug("setting up SyclSortFixture\n");
-    // when using mhp's get_queue() long execution is observed in this test
-    // (probably due to JIT), now mhp and shp use their own get_queue-s
+    // when using mp's get_queue() long execution is observed in this test
+    // (probably due to JIT), now mp and sp use their own get_queue-s
     queue = get_queue();
     policy = oneapi::dpl::execution::make_device_policy(queue);
     local_vec = std::vector<T>(default_vector_size);