From 5e86e5f565df320877cf29f47f85b45b9cd54656 Mon Sep 17 00:00:00 2001 From: Sandeep Kumar Date: Tue, 15 Nov 2016 12:41:05 +0530 Subject: [PATCH] fix_format Change-Id: I34e265de434263a11654e5deba044c3f21e86578 --- samples/2_Cookbook/8_peer2peer/Makefile | 71 ++++++++++---------- samples/2_Cookbook/8_peer2peer/peer2peer.cpp | 12 ++-- 2 files changed, 41 insertions(+), 42 deletions(-) diff --git a/samples/2_Cookbook/8_peer2peer/Makefile b/samples/2_Cookbook/8_peer2peer/Makefile index a1dad7d1da..5cb7473921 100644 --- a/samples/2_Cookbook/8_peer2peer/Makefile +++ b/samples/2_Cookbook/8_peer2peer/Makefile @@ -1,36 +1,35 @@ -HIP_PATH?= $(wildcard /opt/rocm/hip) -ifeq (,$(HIP_PATH)) - HIP_PATH=../../.. -endif - -HIPCC=$(HIP_PATH)/bin/hipcc - -TARGET=hcc - -SOURCES = peer2peer.cpp -OBJECTS = $(SOURCES:.cpp=.o) - -EXECUTABLE=./peer2peer - -.PHONY: test - - -all: $(EXECUTABLE) test - -CXXFLAGS =-g -CXX=$(HIPCC) - - -$(EXECUTABLE): $(OBJECTS) - $(HIPCC) $(OBJECTS) -o $@ - - -test: $(EXECUTABLE) - $(EXECUTABLE) - - -clean: - rm -f $(EXECUTABLE) - rm -f $(OBJECTS) - rm -f $(HIP_PATH)/src/*.o - +HIP_PATH?= $(wildcard /opt/rocm/hip) +ifeq (,$(HIP_PATH)) + HIP_PATH=../../.. +endif + +HIPCC=$(HIP_PATH)/bin/hipcc + +TARGET=hcc + +SOURCES = peer2peer.cpp +OBJECTS = $(SOURCES:.cpp=.o) + +EXECUTABLE=./peer2peer + +.PHONY: test + + +all: $(EXECUTABLE) test + +CXXFLAGS =-g +CXX=$(HIPCC) + + +$(EXECUTABLE): $(OBJECTS) + $(HIPCC) $(OBJECTS) -o $@ + +test: $(EXECUTABLE) + $(EXECUTABLE) + + +clean: +rm -f $(EXECUTABLE) +rm -f $(OBJECTS) +rm -f $(HIP_PATH)/src/*.o + diff --git a/samples/2_Cookbook/8_peer2peer/peer2peer.cpp b/samples/2_Cookbook/8_peer2peer/peer2peer.cpp index 624de56cb0..990599e1cb 100644 --- a/samples/2_Cookbook/8_peer2peer/peer2peer.cpp +++ b/samples/2_Cookbook/8_peer2peer/peer2peer.cpp @@ -108,7 +108,7 @@ void disablePeer2Peer(int currentGpu, int peerGpu) HIPCHECK(hipSetDevice(currentGpu)); hipDeviceCanAccessPeer(&canAccessPeer, currentGpu, peerGpu); - + if(canAccessPeer==1){ HIPCHECK(hipDeviceDisablePeerAccess(peerGpu)); } @@ -155,7 +155,7 @@ __global__ void matrixTranspose_dynamic_shared(hipLaunchParm lp, int main(){ checkPeer2PeerSupport(); - + int gpuCount; int currentGpu, peerGpu; @@ -191,10 +191,10 @@ int main(){ 0, 0, gpuTransposeMatrix[0], data[0], width); - HIPCHECK(hipSetDevice(peerGpu)); - TransposeMatrix[1] = (float*)malloc(NUM * sizeof(float)); - hipMalloc((void**)&gpuTransposeMatrix[1], NUM * sizeof(float)); - hipMalloc((void**)&data[1], NUM * sizeof(float)); + HIPCHECK(hipSetDevice(peerGpu)); + TransposeMatrix[1] = (float*)malloc(NUM * sizeof(float)); + hipMalloc((void**)&gpuTransposeMatrix[1], NUM * sizeof(float)); + hipMalloc((void**)&data[1], NUM * sizeof(float)); hipMemcpy(data[1], gpuTransposeMatrix[0], NUM * sizeof(float), hipMemcpyDeviceToDevice); hipLaunchKernel(matrixTranspose_dynamic_shared,