From 6e45eaf75ed900b1e5409bfbc9722a5a7d898159 Mon Sep 17 00:00:00 2001 From: Mustafa Abduljabbar Date: Wed, 3 Sep 2025 09:43:16 -0400 Subject: [PATCH] Use add_unroll.sh in topo_expl makefile (#1886) --- tools/topo_expl/Makefile | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/tools/topo_expl/Makefile b/tools/topo_expl/Makefile index 9fff285ccd..2341544b99 100644 --- a/tools/topo_expl/Makefile +++ b/tools/topo_expl/Makefile @@ -8,7 +8,7 @@ HIPCC = $(HIP_PATH)/bin/hipcc .DEFAULT_GOAL := all EXE = topo_expl -CXXFLAGS = -g -ffunction-sections -fdata-sections -Wl,--gc-sections -fgpu-rdc -Iinclude -Ihipify_rccl/include -Ihipify_rccl/include/plugin -Ihipify_rccl/device/include -Ihipify_rccl/graph -I/opt/rocm/include/ -DTOPO_EXPL -DENABLE_TRACE -DENABLE_LL128 -DNVTX_NO_IMPL -DRCCL_EXPOSE_STATIC -lpthread +CXXFLAGS = -g -ffunction-sections -fdata-sections -Wl,--gc-sections -fgpu-rdc -Iinclude -Ihipify_rccl/include -Ihipify_rccl/include/plugin -Ihipify_rccl/src/device/include -Ihipify_rccl/graph -I/opt/rocm/include/ -DTOPO_EXPL -DENABLE_TRACE -DENABLE_LL128 -DNVTX_NO_IMPL -DRCCL_EXPOSE_STATIC -lpthread files = $(EXE).cpp model.cpp utils.cpp hipify_rccl/graph/topo.cc hipify_rccl/graph/rings.cc hipify_rccl/graph/paths.cc hipify_rccl/graph/trees.cc ../../src/misc/param.cc \ hipify_rccl/graph/search.cc hipify_rccl/graph/connect.cc hipify_rccl/graph/tuning.cc hipify_rccl/graph/xml.cc ../../src/misc/nvmlwrap_stub.cc hipify_rccl/graph/rome_models.cc hipify_rccl/graph/archinfo.cc \ @@ -48,10 +48,10 @@ $(EXE): $(files) hipify: rm -rf hipify_rccl - mkdir -p hipify_rccl/device/include hipify_rccl/include/network/unpack + mkdir -p hipify_rccl/src/device/include hipify_rccl/include/network/unpack cp -a ../../src/include/ hipify_rccl/ cp -a ../../src/graph/ hipify_rccl/ - cp -a ../../src/device/*.h hipify_rccl/device/include + cp -a ../../src/device/*.h hipify_rccl/src/device/include cp -a ../../src/device/network/unpack/*.h hipify_rccl/include/network/unpack cp -a ../../src/enqueue.cc hipify_rccl/ cp -a ../../src/register/register.cc hipify_rccl/ @@ -61,9 +61,8 @@ hipify: hipify-perl -inplace -quiet-warnings hipify_rccl/include/latency_profiler/*.h hipify-perl -inplace -quiet-warnings hipify_rccl/include/plugin/*.h hipify-perl -inplace -quiet-warnings hipify_rccl/include/latency_profiler/*.h - hipify-perl -inplace -quiet-warnings hipify_rccl/device/include/*.h - sed -i "s/template/template/g" "hipify_rccl/device/include/common.h" - sed -i "s/\\(struct RunWorkBatch]*\\)>*/\\1, USE_ACC, COLL_UNROLL>/" "hipify_rccl/device/include/common.h" + hipify-perl -inplace -quiet-warnings hipify_rccl/src/device/include/*.h + bash ../../cmake/scripts/add_unroll.sh "hipify_rccl/src/device/include/common.h" hipify-perl -inplace -quiet-warnings hipify_rccl/graph/* hipify-perl -inplace -quiet-warnings hipify_rccl/include/network/unpack/* hipify-perl -inplace -quiet-warnings hipify_rccl/*.cc