diff --git a/CMakeLists.txt b/CMakeLists.txt index b07b98cc74..59e9522d37 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -74,7 +74,7 @@ option(BUILD_UNIT_TESTS "Build the unit tests" ON) set(ROCM_PATH "" CACHE PATH "ROCm path to use") -configure_file(cmake/config.h.in config.h) +configure_file(cmake/rocshmem_config.h.in rocshmem_config.h) ############################################################################### # Validate user passed options @@ -179,7 +179,7 @@ target_include_directories( ${PROJECT_NAME} PUBLIC $ - $ # CONFIG.H + $ # rocshmem_config.h $ ) @@ -190,7 +190,7 @@ set_target_properties( ${PROJECT_NAME} PROPERTIES PUBLIC_HEADER - "${CMAKE_BINARY_DIR}/config.h" + "${CMAKE_BINARY_DIR}/rocshmem_config.h" ) ############################################################################### diff --git a/cmake/config.h.in b/cmake/rocshmem_config.h.in similarity index 100% rename from cmake/config.h.in rename to cmake/rocshmem_config.h.in diff --git a/include/rocshmem/rocshmem.hpp b/include/rocshmem/rocshmem.hpp index 04ea6336fe..20fa559e72 100644 --- a/include/rocshmem/rocshmem.hpp +++ b/include/rocshmem/rocshmem.hpp @@ -26,7 +26,7 @@ #include #include -#include "config.h" +#include "rocshmem_config.h" #include "rocshmem_common.hpp" #include "rocshmem_RMA.hpp" #include "rocshmem_AMO.hpp" diff --git a/src/backend_bc.hpp b/src/backend_bc.hpp index d635f5bc5c..ccfd81c6f3 100644 --- a/src/backend_bc.hpp +++ b/src/backend_bc.hpp @@ -35,7 +35,7 @@ #include -#include "config.h" // NOLINT(build/include_subdir) +#include "rocshmem_config.h" // NOLINT(build/include_subdir) #include "rocshmem/rocshmem.hpp" #include "backend_type.hpp" #include "ipc_policy.hpp" diff --git a/src/backend_type.hpp b/src/backend_type.hpp index 50818eb178..020b956f57 100644 --- a/src/backend_type.hpp +++ b/src/backend_type.hpp @@ -34,7 +34,7 @@ * functions are not supported at this time. */ -#include "config.h" // NOLINT(build/include_subdir) +#include "rocshmem_config.h" // NOLINT(build/include_subdir) namespace rocshmem { diff --git a/src/context_device.cpp b/src/context_device.cpp index 1f5fbaae36..850274ef9f 100644 --- a/src/context_device.cpp +++ b/src/context_device.cpp @@ -20,7 +20,7 @@ * IN THE SOFTWARE. *****************************************************************************/ -#include "config.h" // NOLINT(build/include_subdir) +#include "rocshmem_config.h" // NOLINT(build/include_subdir) #include "backend_bc.hpp" #include "context_incl.hpp" #include "util.hpp" diff --git a/src/context_host.cpp b/src/context_host.cpp index ee97bd4b24..4dce6de3f6 100644 --- a/src/context_host.cpp +++ b/src/context_host.cpp @@ -20,7 +20,7 @@ * IN THE SOFTWARE. *****************************************************************************/ -#include "config.h" // NOLINT(build/include_subdir) +#include "rocshmem_config.h" // NOLINT(build/include_subdir) #include "backend_bc.hpp" #include "context_incl.hpp" diff --git a/src/context_tmpl_device.hpp b/src/context_tmpl_device.hpp index 015a9f9ed9..4a7862cb64 100644 --- a/src/context_tmpl_device.hpp +++ b/src/context_tmpl_device.hpp @@ -23,7 +23,7 @@ #ifndef LIBRARY_SRC_CONTEXT_TMPL_DEVICE_HPP_ #define LIBRARY_SRC_CONTEXT_TMPL_DEVICE_HPP_ -#include "config.h" // NOLINT(build/include_subdir) +#include "rocshmem_config.h" // NOLINT(build/include_subdir) #include "backend_type.hpp" #ifdef USE_GPU_IB #include "gpu_ib/context_ib_device.hpp" diff --git a/src/context_tmpl_host.hpp b/src/context_tmpl_host.hpp index ac226e1c83..8bc913f2fc 100644 --- a/src/context_tmpl_host.hpp +++ b/src/context_tmpl_host.hpp @@ -23,7 +23,7 @@ #ifndef LIBRARY_SRC_CONTEXT_TMPL_HOST_HPP_ #define LIBRARY_SRC_CONTEXT_TMPL_HOST_HPP_ -#include "config.h" // NOLINT(build/include_subdir) +#include "rocshmem_config.h" // NOLINT(build/include_subdir) #include "backend_type.hpp" #ifdef USE_GPU_IB #include "gpu_ib/context_ib_host.hpp" diff --git a/src/gpu_ib/connection_policy.cpp b/src/gpu_ib/connection_policy.cpp index f672a0bbb2..5ccf91a0ea 100644 --- a/src/gpu_ib/connection_policy.cpp +++ b/src/gpu_ib/connection_policy.cpp @@ -24,7 +24,7 @@ #include -#include "config.h" // NOLINT(build/include_subdir) +#include "rocshmem_config.h" // NOLINT(build/include_subdir) #include "dynamic_connection.hpp" #include "queue_pair.hpp" diff --git a/src/gpu_ib/connection_policy.hpp b/src/gpu_ib/connection_policy.hpp index 840fe1f2ca..76bb5db1cf 100644 --- a/src/gpu_ib/connection_policy.hpp +++ b/src/gpu_ib/connection_policy.hpp @@ -23,7 +23,7 @@ #ifndef LIBRARY_SRC_GPU_IB_CONNECTION_POLICY_HPP_ #define LIBRARY_SRC_GPU_IB_CONNECTION_POLICY_HPP_ -#include "config.h" // NOLINT(build/include_subdir) +#include "rocshmem_config.h" // NOLINT(build/include_subdir) #include "infiniband_structs.hpp" namespace rocshmem { diff --git a/src/gpu_ib/context_ib_device.cpp b/src/gpu_ib/context_ib_device.cpp index fed54fc6e8..c3e8146736 100644 --- a/src/gpu_ib/context_ib_device.cpp +++ b/src/gpu_ib/context_ib_device.cpp @@ -24,7 +24,7 @@ #include -#include "config.h" // NOLINT(build/include_subdir) +#include "rocshmem_config.h" // NOLINT(build/include_subdir) #include "rocshmem/rocshmem.hpp" #include "../backend_type.hpp" #include "../context_incl.hpp" diff --git a/src/gpu_ib/context_ib_host.cpp b/src/gpu_ib/context_ib_host.cpp index 530cfe392d..e569d7e6ef 100644 --- a/src/gpu_ib/context_ib_host.cpp +++ b/src/gpu_ib/context_ib_host.cpp @@ -24,7 +24,7 @@ #include -#include "config.h" // NOLINT(build/include_subdir) +#include "rocshmem_config.h" // NOLINT(build/include_subdir) #include "../backend_type.hpp" #include "../context_incl.hpp" #include "backend_ib.hpp" diff --git a/src/gpu_ib/context_ib_tmpl_device.hpp b/src/gpu_ib/context_ib_tmpl_device.hpp index 44b1dd2291..b29523c804 100644 --- a/src/gpu_ib/context_ib_tmpl_device.hpp +++ b/src/gpu_ib/context_ib_tmpl_device.hpp @@ -23,7 +23,7 @@ #ifndef LIBRARY_SRC_GPU_IB_CONTEXT_IB_TMPL_DEVICE_HPP_ #define LIBRARY_SRC_GPU_IB_CONTEXT_IB_TMPL_DEVICE_HPP_ -#include "config.h" // NOLINT(build/include_subdir) +#include "rocshmem_config.h" // NOLINT(build/include_subdir) #include "rocshmem/rocshmem.hpp" #include "context_ib_device.hpp" #include "gpu_ib_team.hpp" diff --git a/src/gpu_ib/context_ib_tmpl_host.hpp b/src/gpu_ib/context_ib_tmpl_host.hpp index 552a8c25a2..259f158162 100644 --- a/src/gpu_ib/context_ib_tmpl_host.hpp +++ b/src/gpu_ib/context_ib_tmpl_host.hpp @@ -23,7 +23,7 @@ #ifndef LIBRARY_SRC_GPU_IB_CONTEXT_IB_TMPL_HOST_HPP_ #define LIBRARY_SRC_GPU_IB_CONTEXT_IB_TMPL_HOST_HPP_ -#include "config.h" // NOLINT(build/include_subdir) +#include "rocshmem_config.h" // NOLINT(build/include_subdir) #include "../host/host_templates.hpp" namespace rocshmem { diff --git a/src/gpu_ib/network_policy.cpp b/src/gpu_ib/network_policy.cpp index 60ba379f49..b251dd2ad2 100644 --- a/src/gpu_ib/network_policy.cpp +++ b/src/gpu_ib/network_policy.cpp @@ -24,7 +24,7 @@ #include -#include "config.h" // NOLINT(build/include_subdir) +#include "rocshmem_config.h" // NOLINT(build/include_subdir) #include "../atomic_return.hpp" #include "../context_incl.hpp" #include "backend_ib.hpp" diff --git a/src/gpu_ib/network_policy.hpp b/src/gpu_ib/network_policy.hpp index 6e1ceb9107..ab3c75a589 100644 --- a/src/gpu_ib/network_policy.hpp +++ b/src/gpu_ib/network_policy.hpp @@ -26,7 +26,7 @@ #include #include -#include "config.h" // NOLINT(build/include_subdir) +#include "rocshmem_config.h" // NOLINT(build/include_subdir) #include "rocshmem/rocshmem.hpp" #include "connection_policy.hpp" #include "queue_pair.hpp" diff --git a/src/gpu_ib/queue_pair.cpp b/src/gpu_ib/queue_pair.cpp index 4a015e1f86..49357ff66c 100644 --- a/src/gpu_ib/queue_pair.cpp +++ b/src/gpu_ib/queue_pair.cpp @@ -24,7 +24,7 @@ #include -#include "config.h" // NOLINT(build/include_subdir) +#include "rocshmem_config.h" // NOLINT(build/include_subdir) #include "backend_ib.hpp" #include "endian.hpp" #include "segment_builder.hpp" diff --git a/src/gpu_ib/queue_pair.hpp b/src/gpu_ib/queue_pair.hpp index 649950c1dc..f17c51b3fe 100644 --- a/src/gpu_ib/queue_pair.hpp +++ b/src/gpu_ib/queue_pair.hpp @@ -34,7 +34,7 @@ #include -#include "config.h" // NOLINT(build/include_subdir) +#include "rocshmem_config.h" // NOLINT(build/include_subdir) #include "../atomic_return.hpp" #include "connection_policy.hpp" #include "thread_policy.hpp" diff --git a/src/gpu_ib/thread_policy.cpp b/src/gpu_ib/thread_policy.cpp index e202352b51..80dbcf5482 100644 --- a/src/gpu_ib/thread_policy.cpp +++ b/src/gpu_ib/thread_policy.cpp @@ -22,7 +22,7 @@ #include "thread_policy.hpp" -#include "config.h" // NOLINT(build/include_subdir) +#include "rocshmem_config.h" // NOLINT(build/include_subdir) #include "queue_pair.hpp" namespace rocshmem { diff --git a/src/gpu_ib/thread_policy.hpp b/src/gpu_ib/thread_policy.hpp index 6a7d5b6a1f..be79cb350e 100644 --- a/src/gpu_ib/thread_policy.hpp +++ b/src/gpu_ib/thread_policy.hpp @@ -23,7 +23,7 @@ #ifndef LIBRARY_SRC_GPU_IB_THREAD_POLICY_HPP_ #define LIBRARY_SRC_GPU_IB_THREAD_POLICY_HPP_ -#include "config.h" // NOLINT(build/include_subdir) +#include "rocshmem_config.h" // NOLINT(build/include_subdir) #include "../util.hpp" namespace rocshmem { diff --git a/src/hdp_policy.hpp b/src/hdp_policy.hpp index 3477b13b78..c6517e7d32 100644 --- a/src/hdp_policy.hpp +++ b/src/hdp_policy.hpp @@ -26,7 +26,7 @@ #include #include -#include "config.h" // NOLINT(build/include_subdir) +#include "rocshmem_config.h" // NOLINT(build/include_subdir) #include "memory/hip_allocator.hpp" #include "util.hpp" diff --git a/src/host/host.cpp b/src/host/host.cpp index 3826fd92f9..12608a589f 100644 --- a/src/host/host.cpp +++ b/src/host/host.cpp @@ -24,7 +24,7 @@ #include -#include "config.h" // NOLINT(build/include_subdir) +#include "rocshmem_config.h" // NOLINT(build/include_subdir) #include "host_helpers.hpp" #include "../memory/window_info.hpp" #include "../util.hpp" diff --git a/src/host/host_templates.hpp b/src/host/host_templates.hpp index 522d1398b1..b02d4903c0 100644 --- a/src/host/host_templates.hpp +++ b/src/host/host_templates.hpp @@ -24,7 +24,7 @@ #include -#include "config.h" // NOLINT(build/include_subdir) +#include "rocshmem_config.h" // NOLINT(build/include_subdir) #include "host_helpers.hpp" #include "../memory/window_info.hpp" #include "../team.hpp" diff --git a/src/ipc/context_ipc_device.cpp b/src/ipc/context_ipc_device.cpp index 9e8df917bd..d214c663b8 100644 --- a/src/ipc/context_ipc_device.cpp +++ b/src/ipc/context_ipc_device.cpp @@ -30,7 +30,7 @@ #include #include -#include "config.h" // NOLINT(build/include_subdir) +#include "rocshmem_config.h" // NOLINT(build/include_subdir) #include "rocshmem/rocshmem.hpp" #include "backend_ipc.hpp" diff --git a/src/ipc/context_ipc_host.cpp b/src/ipc/context_ipc_host.cpp index 0d3464f33d..051789b99a 100644 --- a/src/ipc/context_ipc_host.cpp +++ b/src/ipc/context_ipc_host.cpp @@ -24,7 +24,7 @@ #include -#include "config.h" // NOLINT(build/include_subdir) +#include "rocshmem_config.h" // NOLINT(build/include_subdir) #include "../backend_type.hpp" #include "../context_incl.hpp" #include "backend_ipc.hpp" diff --git a/src/ipc/context_ipc_tmpl_device.hpp b/src/ipc/context_ipc_tmpl_device.hpp index b83d763c1a..1be94d9ce4 100644 --- a/src/ipc/context_ipc_tmpl_device.hpp +++ b/src/ipc/context_ipc_tmpl_device.hpp @@ -23,7 +23,7 @@ #ifndef LIBRARY_SRC_IPC_CONTEXT_TMPL_DEVICE_HPP_ #define LIBRARY_SRC_IPC_CONTEXT_TMPL_DEVICE_HPP_ -#include "config.h" // NOLINT(build/include_subdir) +#include "rocshmem_config.h" // NOLINT(build/include_subdir) #include "rocshmem/rocshmem.hpp" #include "context_ipc_device.hpp" #include "../util.hpp" diff --git a/src/ipc/context_ipc_tmpl_host.hpp b/src/ipc/context_ipc_tmpl_host.hpp index 9e79849631..e1ff45f228 100644 --- a/src/ipc/context_ipc_tmpl_host.hpp +++ b/src/ipc/context_ipc_tmpl_host.hpp @@ -23,7 +23,7 @@ #ifndef LIBRARY_SRC_IPC_CONTEXT_TMPL_HOST_HPP_ #define LIBRARY_SRC_IPC_CONTEXT_TMPL_HOST_HPP_ -#include "config.h" // NOLINT(build/include_subdir) +#include "rocshmem_config.h" // NOLINT(build/include_subdir) #include "../host/host_templates.hpp" namespace rocshmem { diff --git a/src/ipc_policy.cpp b/src/ipc_policy.cpp index 2c3a96fa7c..79f13d91b8 100644 --- a/src/ipc_policy.cpp +++ b/src/ipc_policy.cpp @@ -24,7 +24,7 @@ #include -#include "config.h" // NOLINT(build/include_subdir) +#include "rocshmem_config.h" // NOLINT(build/include_subdir) #include "backend_bc.hpp" #include "context_incl.hpp" #include "util.hpp" diff --git a/src/ipc_policy.hpp b/src/ipc_policy.hpp index 74052bbe54..0cc7437e75 100644 --- a/src/ipc_policy.hpp +++ b/src/ipc_policy.hpp @@ -29,7 +29,7 @@ #include #include -#include "config.h" // NOLINT(build/include_subdir) +#include "rocshmem_config.h" // NOLINT(build/include_subdir) #include "memory/hip_allocator.hpp" #include "util.hpp" diff --git a/src/memory/heap_type.hpp b/src/memory/heap_type.hpp index 3f48edd11e..058f781b86 100644 --- a/src/memory/heap_type.hpp +++ b/src/memory/heap_type.hpp @@ -23,7 +23,7 @@ #ifndef LIBRARY_SRC_MEMORY_HEAP_TYPE_HPP_ #define LIBRARY_SRC_MEMORY_HEAP_TYPE_HPP_ -#include "config.h" // NOLINT(build/include_subdir) +#include "rocshmem_config.h" // NOLINT(build/include_subdir) #include "hip_allocator.hpp" /** diff --git a/src/reverse_offload/context_ro_device.cpp b/src/reverse_offload/context_ro_device.cpp index 43ce155cac..4cc5951de0 100644 --- a/src/reverse_offload/context_ro_device.cpp +++ b/src/reverse_offload/context_ro_device.cpp @@ -29,7 +29,7 @@ #include #include -#include "config.h" // NOLINT(build/include_subdir) +#include "rocshmem_config.h" // NOLINT(build/include_subdir) #include "rocshmem/rocshmem.hpp" #include "../backend_type.hpp" #include "../hdp_policy.hpp" diff --git a/src/reverse_offload/context_ro_host.cpp b/src/reverse_offload/context_ro_host.cpp index 5c3f5d1a70..62360a5224 100644 --- a/src/reverse_offload/context_ro_host.cpp +++ b/src/reverse_offload/context_ro_host.cpp @@ -24,7 +24,7 @@ #include -#include "config.h" // NOLINT(build/include_subdir) +#include "rocshmem_config.h" // NOLINT(build/include_subdir) #include "../backend_type.hpp" #include "../context_incl.hpp" #include "../host/host.hpp" diff --git a/src/reverse_offload/context_ro_tmpl_device.hpp b/src/reverse_offload/context_ro_tmpl_device.hpp index 003ddae928..d76a9eb222 100644 --- a/src/reverse_offload/context_ro_tmpl_device.hpp +++ b/src/reverse_offload/context_ro_tmpl_device.hpp @@ -23,7 +23,7 @@ #ifndef LIBRARY_SRC_REVERSE_OFFLOAD_RO_NET_GPU_TEMPLATES_HPP_ #define LIBRARY_SRC_REVERSE_OFFLOAD_RO_NET_GPU_TEMPLATES_HPP_ -#include "config.h" // NOLINT(build/include_subdir) +#include "rocshmem_config.h" // NOLINT(build/include_subdir) #include "commands_types.hpp" #include "context_ro_device.hpp" #include "queue_proxy.hpp" diff --git a/src/reverse_offload/context_ro_tmpl_host.hpp b/src/reverse_offload/context_ro_tmpl_host.hpp index 3bffda1cd0..28abfecc2e 100644 --- a/src/reverse_offload/context_ro_tmpl_host.hpp +++ b/src/reverse_offload/context_ro_tmpl_host.hpp @@ -22,7 +22,7 @@ #ifndef LIBRARY_SRC_REVERSE_OFFLOAD_RO_NET_HOST_TEMPLATES_HPP_ #define LIBRARY_SRC_REVERSE_OFFLOAD_RO_NET_HOST_TEMPLATES_HPP_ -#include "config.h" // NOLINT(build/include_subdir) +#include "rocshmem_config.h" // NOLINT(build/include_subdir) #include "../host/host_templates.hpp" namespace rocshmem { diff --git a/src/reverse_offload/profiler.hpp b/src/reverse_offload/profiler.hpp index 132538941a..a180f560c8 100644 --- a/src/reverse_offload/profiler.hpp +++ b/src/reverse_offload/profiler.hpp @@ -26,7 +26,7 @@ #include #include -#include "config.h" // NOLINT(build/include_subdir) +#include "rocshmem_config.h" // NOLINT(build/include_subdir) #include "../device_proxy.hpp" #include "../memory/../memory/hip_allocator.hpp" #include "../stats.hpp" diff --git a/src/rocshmem_gpu.cpp b/src/rocshmem_gpu.cpp index a9d3667ba9..0e4ce22508 100644 --- a/src/rocshmem_gpu.cpp +++ b/src/rocshmem_gpu.cpp @@ -41,7 +41,7 @@ #include -#include "config.h" // NOLINT(build/include_subdir) +#include "rocshmem_config.h" // NOLINT(build/include_subdir) #include "rocshmem/rocshmem.hpp" #include "backend_bc.hpp" #include "context_incl.hpp" diff --git a/src/util.cpp b/src/util.cpp index 7318b14208..e2f05faf4b 100644 --- a/src/util.cpp +++ b/src/util.cpp @@ -26,7 +26,7 @@ #include #include -#include "config.h" // NOLINT(build/include_subdir) +#include "rocshmem_config.h" // NOLINT(build/include_subdir) namespace rocshmem { diff --git a/src/util.hpp b/src/util.hpp index c02f891dc4..32ac87cc58 100644 --- a/src/util.hpp +++ b/src/util.hpp @@ -30,7 +30,7 @@ #include #include "assembly.hpp" -#include "config.h" // NOLINT(build/include_subdir) +#include "rocshmem_config.h" // NOLINT(build/include_subdir) #include "constants.hpp" namespace rocshmem { diff --git a/src/wf_coal_policy.hpp b/src/wf_coal_policy.hpp index 08a06323ca..2d70f8fc61 100644 --- a/src/wf_coal_policy.hpp +++ b/src/wf_coal_policy.hpp @@ -25,7 +25,7 @@ #include -#include "config.h" // NOLINT(build/include_subdir) +#include "rocshmem_config.h" // NOLINT(build/include_subdir) #include "util.hpp" namespace rocshmem {