Skip to content

Commit

Permalink
Merge pull request #9 from edgargabriel/topic/ipc-directory-reorg
Browse files Browse the repository at this point in the history
src/ipc: IPC folder refactor
  • Loading branch information
edgargabriel authored Jul 25, 2024
2 parents a3c338c + 1183006 commit 6990f30
Show file tree
Hide file tree
Showing 8 changed files with 40 additions and 10 deletions.
2 changes: 1 addition & 1 deletion src/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@ target_sources(
backend_bc.cpp
context_host.cpp
context_device.cpp
ipc_policy.cpp
mpi_init_singleton.cpp
roc_shmem_gpu.cpp
roc_shmem.cpp
Expand Down Expand Up @@ -67,3 +66,4 @@ add_subdirectory(containers)
add_subdirectory(host)
add_subdirectory(memory)
add_subdirectory(sync)
add_subdirectory(ipc)
2 changes: 1 addition & 1 deletion src/backend_bc.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
#include "config.h" // NOLINT(build/include_subdir)
#include "roc_shmem/roc_shmem.hpp"
#include "backend_type.hpp"
#include "ipc_policy.hpp"
#include "ipc/ipc_policy.hpp"
#include "memory/symmetric_heap.hpp"
#include "stats.hpp"
#include "team_tracker.hpp"
Expand Down
2 changes: 1 addition & 1 deletion src/context.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
#include "backend_type.hpp"
#include "fence_policy.hpp"
#include "host/host.hpp"
#include "ipc_policy.hpp"
#include "ipc/ipc_policy.hpp"
#include "stats.hpp"
#include "sync/spin_ebo_block_mutex.hpp"
#include "wf_coal_policy.hpp"
Expand Down
30 changes: 30 additions & 0 deletions src/ipc/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
###############################################################################
# Copyright (c) 2024 Advanced Micro Devices, Inc. All rights reserved.
#
# Permission is hereby granted, free of charge, to any person obtaining a copy
# of this software and associated documentation files (the "Software"), to
# deal in the Software without restriction, including without limitation the
# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
# sell copies of the Software, and to permit persons to whom the Software is
# furnished to do so, subject to the following conditions:
#
# The above copyright notice and this permission notice shall be included in
# all copies or substantial portions of the Software.
#
# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
# IN THE SOFTWARE.
###############################################################################

###############################################################################
# ADD ROCSHMEM TARGET FOR FILES IN CURRENT DIRECTORY
###############################################################################
target_sources(
${PROJECT_NAME}
PRIVATE
ipc_policy.cpp
)
6 changes: 3 additions & 3 deletions src/ipc_policy.cpp → src/ipc/ipc_policy.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,9 @@
#include <mpi.h>

#include "config.h" // NOLINT(build/include_subdir)
#include "backend_bc.hpp"
#include "context_incl.hpp"
#include "util.hpp"
#include "../backend_bc.hpp"
#include "../context_incl.hpp"
#include "../util.hpp"

namespace rocshmem {

Expand Down
4 changes: 2 additions & 2 deletions src/ipc_policy.hpp → src/ipc/ipc_policy.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@
#include <vector>

#include "config.h" // NOLINT(build/include_subdir)
#include "memory/hip_allocator.hpp"
#include "util.hpp"
#include "../memory/hip_allocator.hpp"
#include "../util.hpp"

namespace rocshmem {

Expand Down
2 changes: 1 addition & 1 deletion src/reverse_offload/block_handle.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
#define LIBRARY_SRC_REVERSE_OFFLOAD_BLOCK_HANDLE_HPP_

#include "../hdp_policy.hpp"
#include "../ipc_policy.hpp"
#include "../ipc/ipc_policy.hpp"
#include "profiler.hpp"
#include "queue.hpp"

Expand Down
2 changes: 1 addition & 1 deletion src/reverse_offload/queue_proxy.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
#include "../atomic_return.hpp"
#include "../device_proxy.hpp"
#include "../hdp_policy.hpp"
#include "../ipc_policy.hpp"
#include "../ipc/ipc_policy.hpp"
#include "commands_types.hpp"
#include "profiler.hpp"
#include "../sync/abql_block_mutex.hpp"
Expand Down

0 comments on commit 6990f30

Please sign in to comment.