Skip to content

Commit

Permalink
build system cleanups
Browse files Browse the repository at this point in the history
Make everything consistent.

Make it work on hipcc not installed in /opt, i.e. on Debian with Debian
packages.

Properly use condition, #!, and other factors.

Remove code that does nothing.

Add .gitignores as needed.
  • Loading branch information
baryluk committed Mar 14, 2024
1 parent ff81239 commit 8c6c866
Show file tree
Hide file tree
Showing 65 changed files with 348 additions and 758 deletions.
1 change: 1 addition & 0 deletions HIP-Examples-Applications/BinomialOption/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
BinomialOption
28 changes: 6 additions & 22 deletions HIP-Examples-Applications/BinomialOption/Makefile
Original file line number Diff line number Diff line change
@@ -1,29 +1,13 @@
HIP_PATH?= $(wildcard /opt/rocm)
HIPCC=$(HIP_PATH)/bin/hipcc

SOURCES = BinomialOption.cpp
OBJECTS = $(SOURCES:.cpp=.o)

EXECUTABLE=./BinomialOption
BinomialOption: BinomialOption.cpp ../include/HIPUtil.hpp ../include/SDKUtil.hpp
$(HIPCC) -o $@ BinomialOption.cpp

.PHONY: test
test: BinomialOption
$(shell pwd)/BinomialOption


all: $(EXECUTABLE) test

CXXFLAGS =-g
CXX=$(HIPCC)


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


test: $(EXECUTABLE)
$(EXECUTABLE)


.PHONY: clean
clean:
rm -f $(EXECUTABLE)
rm -f $(OBJECTS)
rm -f $(HIP_PATH)/src/*.o
rm -vf BinomialOption *.o
1 change: 1 addition & 0 deletions HIP-Examples-Applications/BitonicSort/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
BitonicSort
28 changes: 6 additions & 22 deletions HIP-Examples-Applications/BitonicSort/Makefile
Original file line number Diff line number Diff line change
@@ -1,29 +1,13 @@
HIP_PATH?= $(wildcard /opt/rocm)
HIPCC=$(HIP_PATH)/bin/hipcc

SOURCES = BitonicSort.cpp
OBJECTS = $(SOURCES:.cpp=.o)

EXECUTABLE=./BitonicSort
BitonicSort: BitonicSort.cpp ../include/HIPUtil.hpp ../include/SDKUtil.hpp
$(HIPCC) -o $@ BitonicSort.cpp

.PHONY: test
test: BitonicSort
$(shell pwd)/BitonicSort


all: $(EXECUTABLE) test

CXXFLAGS =-g
CXX=$(HIPCC)


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


test: $(EXECUTABLE)
$(EXECUTABLE)


.PHONY: clean
clean:
rm -f $(EXECUTABLE)
rm -f $(OBJECTS)
rm -f $(HIP_PATH)/src/*.o
rm -vf BitonicSort *.o
1 change: 1 addition & 0 deletions HIP-Examples-Applications/FastWalshTransform/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
FastWalshTransform
28 changes: 6 additions & 22 deletions HIP-Examples-Applications/FastWalshTransform/Makefile
Original file line number Diff line number Diff line change
@@ -1,29 +1,13 @@
HIP_PATH?= $(wildcard /opt/rocm)
HIPCC=$(HIP_PATH)/bin/hipcc

SOURCES = FastWalshTransform.cpp
OBJECTS = $(SOURCES:.cpp=.o)

EXECUTABLE=./FastWalshTransform
FastWalshTransform: FastWalshTransform.cpp ../include/HIPUtil.hpp ../include/SDKUtil.hpp
$(HIPCC) -o $@ FastWalshTransform.cpp

.PHONY: test
test: FastWalshTransform
$(shell pwd)/FastWalshTransform


all: $(EXECUTABLE) test

CXXFLAGS =-g
CXX=$(HIPCC)


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


test: $(EXECUTABLE)
$(EXECUTABLE)


.PHONY: clean
clean:
rm -f $(EXECUTABLE)
rm -f $(OBJECTS)
rm -f $(HIP_PATH)/src/*.o
rm -vf FastWalshTransform *.o
1 change: 1 addition & 0 deletions HIP-Examples-Applications/FloydWarshall/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
FloydWarshall
28 changes: 6 additions & 22 deletions HIP-Examples-Applications/FloydWarshall/Makefile
Original file line number Diff line number Diff line change
@@ -1,29 +1,13 @@
HIP_PATH?= $(wildcard /opt/rocm)
HIPCC=$(HIP_PATH)/bin/hipcc

SOURCES = FloydWarshall.cpp
OBJECTS = $(SOURCES:.cpp=.o)

EXECUTABLE=./FloydWarshall
FloydWarshall: FloydWarshall.cpp ../include/HIPUtil.hpp ../include/SDKUtil.hpp
$(HIPCC) -o $@ FloydWarshall.cpp

.PHONY: test
test: FloydWarshall
$(shell pwd)/FloydWarshall


all: $(EXECUTABLE) test

CXXFLAGS =-g
CXX=$(HIPCC)


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


test: $(EXECUTABLE)
$(EXECUTABLE)


.PHONY: clean
clean:
rm -f $(EXECUTABLE)
rm -f $(OBJECTS)
rm -f $(HIP_PATH)/src/*.o
rm -vf FloydWarshall *.o
1 change: 1 addition & 0 deletions HIP-Examples-Applications/HelloWorld/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
HelloWorld
28 changes: 6 additions & 22 deletions HIP-Examples-Applications/HelloWorld/Makefile
Original file line number Diff line number Diff line change
@@ -1,29 +1,13 @@
HIP_PATH?= $(wildcard /opt/rocm)
HIPCC=$(HIP_PATH)/bin/hipcc

SOURCES = HelloWorld.cpp
OBJECTS = $(SOURCES:.cpp=.o)

EXECUTABLE=./HelloWorld
HelloWorld: HelloWorld.cpp
$(HIPCC) -o $@ HelloWorld.cpp

.PHONY: test
test: HelloWorld
$(shell pwd)/HelloWorld


all: $(EXECUTABLE) test

CXXFLAGS =-g
CXX=$(HIPCC)


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


test: $(EXECUTABLE)
$(EXECUTABLE)


.PHONY: clean
clean:
rm -f $(EXECUTABLE)
rm -f $(OBJECTS)
rm -f $(HIP_PATH)/src/*.o
rm -vf HelloWorld *.o
1 change: 1 addition & 0 deletions HIP-Examples-Applications/Histogram/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Histogram
28 changes: 6 additions & 22 deletions HIP-Examples-Applications/Histogram/Makefile
Original file line number Diff line number Diff line change
@@ -1,29 +1,13 @@
HIP_PATH?= $(wildcard /opt/rocm)
HIPCC=$(HIP_PATH)/bin/hipcc

SOURCES = Histogram.cpp
OBJECTS = $(SOURCES:.cpp=.o)

EXECUTABLE=./Histogram
Histogram: Histogram.cpp Histogram.hpp ../include/HIPUtil.hpp ../include/SDKUtil.hpp
$(HIPCC) -o $@ Histogram.cpp

.PHONY: test
test: Histogram
$(shell pwd)/Histogram


all: $(EXECUTABLE) test

CXXFLAGS =-g
CXX=$(HIPCC)


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


test: $(EXECUTABLE)
$(EXECUTABLE)


.PHONY: clean
clean:
rm -f $(EXECUTABLE)
rm -f $(OBJECTS)
rm -f $(HIP_PATH)src/*.o
rm -vf Histogram *.o
1 change: 1 addition & 0 deletions HIP-Examples-Applications/MatrixMultiplication/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
MatrixMultiplication
28 changes: 6 additions & 22 deletions HIP-Examples-Applications/MatrixMultiplication/Makefile
Original file line number Diff line number Diff line change
@@ -1,29 +1,13 @@
HIP_PATH?= $(wildcard /opt/rocm)
HIPCC=$(HIP_PATH)/bin/hipcc

SOURCES = MatrixMultiplication.cpp
OBJECTS = $(SOURCES:.cpp=.o)

EXECUTABLE=./MatrixMultiplication
MatrixMultiplication: MatrixMultiplication.cpp ../include/HIPUtil.hpp ../include/SDKUtil.hpp
$(HIPCC) -o $@ MatrixMultiplication.cpp

.PHONY: test
test: MatrixMultiplication
$(shell pwd)/MatrixMultiplication


all: $(EXECUTABLE) test

CXXFLAGS =-g
CXX=$(HIPCC)


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


test: $(EXECUTABLE)
$(EXECUTABLE)


.PHONY: clean
clean:
rm -f $(EXECUTABLE)
rm -f $(OBJECTS)
rm -f $(HIP_PATH)/src/*.o
rm -vf MatrixMultiplication *.o
1 change: 1 addition & 0 deletions HIP-Examples-Applications/PrefixSum/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
PrefixSum
28 changes: 6 additions & 22 deletions HIP-Examples-Applications/PrefixSum/Makefile
Original file line number Diff line number Diff line change
@@ -1,29 +1,13 @@
HIP_PATH?= $(wildcard /opt/rocm)
HIPCC=$(HIP_PATH)/bin/hipcc

SOURCES = PrefixSum.cpp
OBJECTS = $(SOURCES:.cpp=.o)

EXECUTABLE=./PrefixSum
PrefixSum: PrefixSum.cpp ../include/HIPUtil.hpp ../include/SDKUtil.hpp
$(HIPCC) -o $@ PrefixSum.cpp

.PHONY: test
test: PrefixSum
$(shell pwd)/PrefixSum


all: $(EXECUTABLE) test

CXXFLAGS =-g
CXX=$(HIPCC)


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


test: $(EXECUTABLE)
$(EXECUTABLE)


.PHONY: clean
clean:
rm -f $(EXECUTABLE)
rm -f $(OBJECTS)
rm -f $(HIP_PATH)/src/*.o
rm -vf PrefixSum *.o
1 change: 1 addition & 0 deletions HIP-Examples-Applications/RecursiveGaussian/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
RecursiveGaussian
28 changes: 6 additions & 22 deletions HIP-Examples-Applications/RecursiveGaussian/Makefile
Original file line number Diff line number Diff line change
@@ -1,29 +1,13 @@
HIP_PATH?= $(wildcard /opt/rocm)
HIPCC=$(HIP_PATH)/bin/hipcc

SOURCES = RecursiveGaussian.cpp
OBJECTS = $(SOURCES:.cpp=.o)

EXECUTABLE=./RecursiveGaussian
RecursiveGaussian: RecursiveGaussian.cpp RecursiveGaussian.hpp ../include/HIPUtil.hpp ../include/SDKUtil.hpp ../include/SDKBitMap.hpp
$(HIPCC) -o $@ RecursiveGaussian.cpp

.PHONY: test
test: RecursiveGaussian
$(shell pwd)/RecursiveGaussian


all: $(EXECUTABLE) test

CXXFLAGS =-g
CXX=$(HIPCC)


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


test: $(EXECUTABLE)
$(EXECUTABLE)


.PHONY: clean
clean:
rm -f $(EXECUTABLE)
rm -f $(OBJECTS)
rm -f $(HIP_PATH)/src/*.o
rm -vf RecursiveGaussian *.o
1 change: 1 addition & 0 deletions HIP-Examples-Applications/SimpleConvolution/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
SimpleConvolution
28 changes: 6 additions & 22 deletions HIP-Examples-Applications/SimpleConvolution/Makefile
Original file line number Diff line number Diff line change
@@ -1,29 +1,13 @@
HIP_PATH?= $(wildcard /opt/rocm)
HIPCC=$(HIP_PATH)/bin/hipcc

SOURCES = SimpleConvolution.cpp
OBJECTS = $(SOURCES:.cpp=.o)

EXECUTABLE=./SimpleConvolution
SimpleConvolution: SimpleConvolution.cpp SimpleConvolution.hpp FilterCoeff.h ../include/HIPUtil.hpp ../include/SDKUtil.hpp
$(HIPCC) -o $@ SimpleConvolution.cpp

.PHONY: test
test: SimpleConvolution
$(shell pwd)/SimpleConvolution


all: $(EXECUTABLE) test

CXXFLAGS =-g
CXX=$(HIPCC)


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


test: $(EXECUTABLE)
$(EXECUTABLE)


.PHONY: clean
clean:
rm -f $(EXECUTABLE)
rm -f $(OBJECTS)
rm -f $(HIP_PATH)/src/*.o
rm -vf SimpleConvolution *.o
1 change: 1 addition & 0 deletions HIP-Examples-Applications/dct/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
dct
Loading

0 comments on commit 8c6c866

Please sign in to comment.