Merge branch 'amd-develop' into amd-master

Change-Id: I52830df409da1f021c32ea569d4ae671aeb57b03 [ROCm/hip-tests commit: cc83c44714]
2016-12-15 16:25:18 +05:30
parent 0a01c0325f 7ba0720f71
commit 889363ee97
2 changed files with 8 additions and 7 deletions
@@ -1,6 +1,6 @@
 HIP_PATH?= $(wildcard /opt/rocm/hip)
 ifeq (,$(HIP_PATH))
-    HIP_PATH=../../..
+	HIP_PATH=../../..
 endif

 HIPCC=$(HIP_PATH)/bin/hipcc
@@ -22,14 +22,15 @@ CXX=$(HIPCC)


 $(EXECUTABLE): $(OBJECTS)
-    $(HIPCC) $(OBJECTS) -o $@
+	$(HIPCC) $(OBJECTS) -o $@
+

 test: $(EXECUTABLE)
-    $(EXECUTABLE)
+	$(EXECUTABLE)


 clean:
-rm -f $(EXECUTABLE)
-rm -f $(OBJECTS)
-rm -f $(HIP_PATH)/src/*.o
+	rm -f $(EXECUTABLE)
+	rm -f $(OBJECTS)
+	rm -f $(HIP_PATH)/src/*.o

@@ -12,7 +12,7 @@ endif
 ifeq (${HIP_PLATFORM}, hcc)
 	HCBLAS_ROOT?= $(wildcard /opt/rocm/hcblas)
 	HIPCC_FLAGS += -stdlib=libc++ -I$(HCBLAS_ROOT)/include
-	LIBS = -L$(HCBLAS_ROOT)/lib -lhcblas
+	LIBS = -L$(HCBLAS_ROOT)/lib -lhipblas -rpath $(HIP_PATH)/lib
 endif